Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r2a60f0eba906f0641e22a5d7f5c7ba1750911dcd
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 2a60f0eba906f0641e22a5d7f5c7ba1750911dcd)
@@ -505,7 +505,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 );
@@ -532,14 +532,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;
@@ -590,14 +590,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;