Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -ra69fcb7945b0300b47ce3287f8cb22c7c26171dc -r6d500da57b7590f105f7b39261af4321998d2175
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision a69fcb7945b0300b47ce3287f8cb22c7c26171dc)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 6d500da57b7590f105f7b39261af4321998d2175)
@@ -252,9 +252,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 );
                 }
@@ -270,7 +270,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;
             }
@@ -280,9 +280,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;
 
@@ -305,7 +305,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;
@@ -1121,15 +1121,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 );
Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r315969d00060073e112c4619946c13a61f68bcbd -r6d500da57b7590f105f7b39261af4321998d2175
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 315969d00060073e112c4619946c13a61f68bcbd)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 6d500da57b7590f105f7b39261af4321998d2175)
@@ -90,7 +90,7 @@
             break;
 
         case CONSUMABLE_SELF_TESTS_FILL_CMD_STATE:
-            if ( ( DG_MODE_CIRC == getDGOpMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
+            if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE;
                 cmdStartDGFill( FILL_RESERVOIR_TO_VOLUME_ML );
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -ra31707ccbf01a1b40f8500bc491dc9c616e7a163 -r6d500da57b7590f105f7b39261af4321998d2175
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision a31707ccbf01a1b40f8500bc491dc9c616e7a163)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 6d500da57b7590f105f7b39261af4321998d2175)
@@ -507,7 +507,7 @@
 {
     DRAIN_STATE_T state = DRAIN_FIRST_RESERVOIR_START_STATE;
 
-    if ( ( DG_MODE_CIRC == getDGOpMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
+    if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
     {
         state = DRAIN_FIRST_RESERVOIR_STATE;
         cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE );
@@ -534,14 +534,14 @@
     }
 
     // Drain has started and DG goes to re-circ mode flush lines state means drain completed
-    if ( ( TRUE == isDrainStarted ) && ( DG_RECIRCULATE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
+    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
     {
         isDrainCompleted = TRUE;
     }
 
     if ( TRUE == isDrainCompleted )
     {
-        if ( ( DG_MODE_CIRC == getDGOpMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
+        if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
         {
             isDrainStarted = FALSE;
             isDrainCompleted = FALSE;
@@ -592,14 +592,14 @@
     }
 
     // Drain has started and DG goes to re-circ mode flush lines state means drain completed
-    if ( ( TRUE == isDrainStarted ) && ( DG_RECIRCULATE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
+    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
     {
         isDrainCompleted = TRUE;
     }
 
     if ( TRUE == isDrainCompleted )
     {
-        if ( ( DG_MODE_CIRC == getDGOpMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
+        if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
         {
             isDrainStarted = FALSE;
             isDrainCompleted = FALSE;
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r6d500da57b7590f105f7b39261af4321998d2175
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6d500da57b7590f105f7b39261af4321998d2175)
@@ -865,7 +865,7 @@
 
     if ( TRUE == hasDGCompletedReservoirSwitch() )
     {
-        if ( ( DG_MODE_CIRC == dgOpMode ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode ) )
+        if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
         {
             state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_RESP_STATE;
             cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE );
@@ -918,7 +918,7 @@
     DG_OP_MODE_T dgOpMode = getDGOpMode();
     U32 dgSubMode = getDGSubMode();
 
-    if ( ( DG_MODE_CIRC == dgOpMode ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode ) )
+    if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
         state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
 
@@ -985,7 +985,7 @@
     DG_OP_MODE_T dgOpMode = getDGOpMode();
     U32 dgSubMode = getDGSubMode();
 
-    if ( ( DG_MODE_CIRC == dgOpMode ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode ) )
+    if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
         if ( ( TRUE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] ) && ( TRUE == reservoirFlushedStatus[ DG_RESERVOIR_2 ] ) )
         {
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r028345aae95254cd8ff027d0da533b345da06b4f -r6d500da57b7590f105f7b39261af4321998d2175
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 028345aae95254cd8ff027d0da533b345da06b4f)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6d500da57b7590f105f7b39261af4321998d2175)
@@ -480,7 +480,7 @@
         cmdStopDGFill();
     }
 
-    if ( DG_MODE_CIRC == dgOperationMode )
+    if ( DG_MODE_GENE == dgOperationMode )
     {
         cmdStopDG();
     }