Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca -r3e7b064885d99793bb56d940bd613555b1cdbdfa
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 3e7b064885d99793bb56d940bd613555b1cdbdfa)
@@ -102,7 +102,7 @@
     BOOL result = FALSE;
 
     // switch reservoir command only valid in re-circulate mode
-    if ( MODE_CIRC == getCurrentOperationMode() )
+    if ( DG_MODE_CIRC == getCurrentOperationMode() )
     {
         // validate parameters
         if ( resID < NUM_OF_RESERVOIRS )
@@ -129,14 +129,14 @@
     BOOL result = FALSE;
 
     // fill command only valid in re-circulate mode
-    if ( ( MODE_CIRC == getCurrentOperationMode() ) &&
+    if ( ( DG_MODE_CIRC == getCurrentOperationMode() ) &&
          ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getCurrentRecirculateState() ) )
     {
         // validate parameters
         if ( fillToVolMl < MAX_FILL_VOLUME_ML )
         {
             fillVolumeTargetMl.data = fillToVolMl;
-            requestNewOperationMode( MODE_FILL );
+            requestNewOperationMode( DG_MODE_FILL );
             result = TRUE;
         }
     }
@@ -157,10 +157,10 @@
     BOOL result = FALSE;
 
     // stop fill command only valid in fill mode
-    if ( MODE_FILL == getCurrentOperationMode() )
+    if ( DG_MODE_FILL == getCurrentOperationMode() )
     {
         fillVolumeTargetMl.data = 0;
-        requestNewOperationMode( MODE_CIRC );
+        requestNewOperationMode( DG_MODE_CIRC );
     }
 
     return result;
@@ -180,13 +180,13 @@
     BOOL result = FALSE;
 
     // drain command only valid in re-circulate mode
-    if ( MODE_CIRC == getCurrentOperationMode() )
+    if ( DG_MODE_CIRC == getCurrentOperationMode() )
     {
         // validate parameters
         if ( ( drainToVolMl > MIN_DRAIN_VOLUME_ML ) && ( drainToVolMl < MAX_DRAIN_VOLUME_ML ) )
         {
             drainVolumeTargetMl.data = drainToVolMl;
-            requestNewOperationMode( MODE_DRAI );
+            requestNewOperationMode( DG_MODE_DRAI );
         }
     }
 
@@ -206,10 +206,10 @@
     BOOL result = FALSE;
 
     // stop drain command only valid in drain mode
-    if ( MODE_DRAI == getCurrentOperationMode() )
+    if ( DG_MODE_DRAI == getCurrentOperationMode() )
     {
         drainVolumeTargetMl.data = 0;
-        requestNewOperationMode( MODE_CIRC );
+        requestNewOperationMode( DG_MODE_CIRC );
     }
 
     return result;