Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r1c31bae22357f3d032ee615ddf28ab5a1d434288 -r58e95c2fa3d72e6a9e11efea6a7529c36f23b895
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 1c31bae22357f3d032ee615ddf28ab5a1d434288)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 58e95c2fa3d72e6a9e11efea6a7529c36f23b895)
@@ -263,9 +263,9 @@
             break;
 
         case TREATMENT_RESERVOIR_MGMT_FLUSH_DG_LINES_STATE:
-            if ( DG_MODE_CIRC == dgOpMode )
+            if ( DG_MODE_GENE == dgOpMode )
             {
-                if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
+                if ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode )
                 {
                     cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE );
                 }
@@ -281,7 +281,7 @@
             break;
 
         case TREATMENT_RESERVOIR_MGMT_DRAIN_RESERVOIR_STATE:
-            if ( DG_MODE_CIRC == dgOpMode )
+            if ( DG_MODE_GENE == dgOpMode )
             {
                 currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_WAIT_TO_FILL_STATE;
             }
@@ -291,9 +291,9 @@
             // Delay fill start if we have paused treatment?
             if ( getTreatmentState() == TREATMENT_DIALYSIS_STATE )
             {
-                if ( DG_MODE_CIRC == dgOpMode )
+                if ( DG_MODE_GENE == dgOpMode )
                 {
-                    if ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode )
+                    if ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode )
                     {
                         U32 fillToVolume = FILL_RESERVOIR_TO_VOLUME_ML;
 
@@ -316,7 +316,7 @@
             break;
 
         case TREATMENT_RESERVOIR_MGMT_FILL_RESERVOIR_STATE:
-            if ( ( DG_MODE_CIRC == dgOpMode ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
+            if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
             {
                 resMgmtTimer = getMSTimerCount();
                 currentTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE;
@@ -1173,15 +1173,15 @@
  *************************************************************************/
 static void checkDGRestart( void )
 {
-    if ( ( dgStartCommandSent == TRUE ) && ( DG_MODE_CIRC == dgCurrentOpMode ) )
+    if ( ( dgStartCommandSent == TRUE ) && ( DG_MODE_GENE == dgCurrentOpMode ) )
     {
         dgStartCommandSent = FALSE;
         dgStarted = TRUE;
     }
 
     if ( TRUE == dgStarted )
     {
-        if ( ( DG_MODE_FAUL != dgCurrentOpMode ) && ( DG_MODE_CIRC != dgCurrentOpMode ) &&
+        if ( ( DG_MODE_FAUL != dgCurrentOpMode ) && ( DG_MODE_GENE != dgCurrentOpMode ) &&
              ( DG_MODE_FILL != dgCurrentOpMode ) && ( DG_MODE_DRAI != dgCurrentOpMode ) )
         {
             activateAlarmNoData( ALARM_ID_DG_RESTARTED_FAULT );