Index: dialin/common/dg_defs.py
===================================================================
diff -u -rbe5fbabd50dc31e5e5a5e4b99893fb8b92d016bd -r195b5d1aaf9e5a9e104d40947093d8af4e3860f7
--- dialin/common/dg_defs.py	(.../dg_defs.py)	(revision be5fbabd50dc31e5e5a5e4b99893fb8b92d016bd)
+++ dialin/common/dg_defs.py	(.../dg_defs.py)	(revision 195b5d1aaf9e5a9e104d40947093d8af4e3860f7)
@@ -78,12 +78,11 @@
 
 
 @unique
-class DGRecircModeStates(DialinEnum):
-    DG_RECIRCULATE_MODE_STATE_START = 0             # Start re-circulation mode state
-    DG_RECIRCULATE_MODE_STATE_FLUSH_LINES = 1       # Flush lines state
-    DG_RECIRCULATE_MODE_STATE_RECIRC_WATER = 2      # Re-circulate water state
-    DG_RECIRCULATE_MODE_STATE_PAUSE = 3             # Pause state (pumps = heaters = lamps off)
-    NUM_OF_DG_RECIRCULATE_MODE_STATES = 4           # Number of fill mode states
+class DGGenIdleModeStates(DialinEnum):
+    DG_GEN_IDLE_MODE_STATE_START = 0
+    DG_GEN_IDLE_MODE_STATE_FLUSH_LINES = 1
+    DG_GEN_IDLE_MODE_STATE_FLUSH_WATER, = 2
+    NUM_OF_DG_GEN_IDLE_MODE_STATES = 3
 
 
 @unique
Index: dialin/dg/events.py
===================================================================
diff -u -rbe5fbabd50dc31e5e5a5e4b99893fb8b92d016bd -r195b5d1aaf9e5a9e104d40947093d8af4e3860f7
--- dialin/dg/events.py	(.../events.py)	(revision be5fbabd50dc31e5e5a5e4b99893fb8b92d016bd)
+++ dialin/dg/events.py	(.../events.py)	(revision 195b5d1aaf9e5a9e104d40947093d8af4e3860f7)
@@ -51,7 +51,7 @@
         self._dg_op_mode_2_sub_mode = {DGOpModes.DG_MODE_FAUL.name: DGFaultStates,
                                        DGOpModes.DG_MODE_INIT.name: DGInitStates,
                                        DGOpModes.DG_MODE_STAN.name: DGStandByModeStates,
-                                       DGOpModes.DG_MODE_GENE.name: DGRecircModeStates,
+                                       DGOpModes.DG_MODE_GENE.name: DGGenIdleModeStates,
                                        DGOpModes.DG_MODE_FILL.name: DGFillModeStates,
                                        DGOpModes.DG_MODE_DRAI.name: DGDrainModeStates,
                                        DGOpModes.DG_MODE_FLUS.name: DGFlushStates,