Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd51921b4d923754ab63db79923d28c09c27af5aa -rb77ac4c0c78edd52b24f6e048189557855cd5b58
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d51921b4d923754ab63db79923d28c09c27af5aa)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b77ac4c0c78edd52b24f6e048189557855cd5b58)
@@ -1083,20 +1083,20 @@
 {
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof( DG_START_STOP_CMD_T ) )
+    if ( message->hdr.payloadLen == sizeof( DG_START_STOP_TX_CMD_REQUEST_T ) )
     {
-        DG_START_STOP_CMD_T startingTreatment;
+        DG_START_STOP_TX_CMD_REQUEST_T startingTreatment;
         DG_OP_MODE_T dgMode = getCurrentOperationMode();
 
-        memcpy( &startingTreatment, message->payload, sizeof( DG_START_STOP_CMD_T ) );
+        memcpy( &startingTreatment, message->payload, sizeof( DG_START_STOP_TX_CMD_REQUEST_T ) );
 
-        if ( ( DG_MODE_STAN == dgMode ) && ( TRUE == startingTreatment.startDG ) )
+        if ( ( DG_MODE_STAN == dgMode ) && ( TRUE == startingTreatment.start ) )
         {
             // If the command is start DG, set the acid and bicarb types to be used, otherwise in the stop command it does not matter
             setAcidAndBicarbType( startingTreatment.acidType, startingTreatment.bicarbType );
             result = requestDGStart();
         }
-        else if ( ( dgMode >= DG_MODE_GENE ) && ( dgMode <= DG_MODE_DRAI ) && ( FALSE == startingTreatment.startDG ) )
+        else if ( ( dgMode >= DG_MODE_GENE ) && ( dgMode <= DG_MODE_DRAI ) && ( FALSE == startingTreatment.start ) )
         {
             result = requestDGStop();
         }