Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -r3e7b064885d99793bb56d940bd613555b1cdbdfa
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3e7b064885d99793bb56d940bd613555b1cdbdfa)
@@ -765,11 +765,11 @@
 
         memcpy( &startingTreatment, message->payload, sizeof(U32) );
 
-        if ( MODE_STAN == getCurrentOperationMode() && TRUE == startingTreatment )
+        if ( DG_MODE_STAN == getCurrentOperationMode() && TRUE == startingTreatment )
         {
             result = requestDGStart();
         }
-        else if ( MODE_CIRC == getCurrentOperationMode() && FALSE == startingTreatment )
+        else if ( DG_MODE_CIRC == getCurrentOperationMode() && FALSE == startingTreatment )
         {
             result = requestDGStop();
         }
@@ -792,7 +792,7 @@
 
     if ( message->hdr.payloadLen == 0 )
     {
-        if ( MODE_STAN == getCurrentOperationMode() )
+        if ( DG_MODE_STAN == getCurrentOperationMode() )
         {
             result = requestWaterSample();
         }