Index: DGDefs.h
===================================================================
diff -u -rfa5c4d6c8d31116be2270e447a3793a3113c905c -r9c105f31997faac411ab7b7580b039e2b9215964
--- DGDefs.h	(.../DGDefs.h)	(revision fa5c4d6c8d31116be2270e447a3793a3113c905c)
+++ DGDefs.h	(.../DGDefs.h)	(revision 9c105f31997faac411ab7b7580b039e2b9215964)
@@ -360,8 +360,10 @@
     DG_CHEM_DISINFECT_STATE_PRIME_DISINFECTANT,                 ///< Chemical disinfect, prime disinfectant state
     DG_CHEM_DISINFECT_STATE_DISINFECTANT_FLUSH,                 ///< Chemical disinfect, disinfectant flush state
     DG_CHEM_DISINFECT_STATE_FILL_WITH_DISINFECTANT,             ///< Chemical disinfect, fill with disinfectant state
-    DG_CHEM_DISINFECT_STATE_R2_DISINFECTANT_FILL_R1_DRAIN,      ///< Chemical disinfect, fill R2 with disinfectant, partial drain R1
-    DG_CHEM_DISINFECT_STATE_R1_DISINFECTANT_FILL_R2_DRAIN,      ///< Chemical disinfect, fill R1 with disinfectant, partial drain R2
+    DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2,                 ///< Chemical disinfect, fill R1 with disinfectant, overflow to R2
+    DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R1_FILL_R2_TO_R1,     ///< Chemical disinfect, fill R2 with disinfectant, partial drain R1
+    DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1,                 ///< Chemical disinfect, fill R2 with disinfectant, overflow to R1
+    DG_CHEM_DISINFECT_STATE_PARTIAL_DRAIN_R2_FILL_R1_TO_R2,     ///< Chemical disinfect, fill R1 with disinfectant, partial drain R2
     DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH,                  ///< Chemical disinfect, cancel basic path state
     DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH,                  ///< Chemical disinfect, cancel water path state
     DG_CHEM_DISINFECT_STATE_COMPLETE,                           ///< Chemical disinfect, complete state
@@ -412,8 +414,8 @@
 enum DG_Chem_Flush_States
 {
     DG_CHEM_DISINFECT_FLUSH_STATE_START = 0,                    ///< Chemical disinfect, start state
-    DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R1,        ///< Chemical disinfect flush, drain R1 state
-    DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R2,        ///< Chemical disinfect flush, drain R2 state
+    DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1,                     ///< Chemical disinfect flush, drain R1 state
+    DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R2,                     ///< Chemical disinfect flush, drain R2 state
     DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN,                  ///< Chemical disinfect flush, flush drain state
     DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE,      ///< Chemical disinfect flush, flush disinfectant line state
     DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF,                     ///< Chemical disinfect flush, flush UF state