Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
===================================================================
diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r9bc48695cdb977a80d3279cacdc101d5164f1b4b
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(.../VDisinfectAdjustDisinfect.cpp)	(revision ccba568494c6b7214116f818a0ac89d0fa3ba81b)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(.../VDisinfectAdjustDisinfect.cpp)	(revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b)
@@ -62,12 +62,12 @@
     // *** has to be the last to let the information to be set and then emit the signal ***
     // *** otherwise will use the Previous values before being set.                     ***
     switch ( _data.mState ) {
-    case GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE             : adjustment_DisinfectStartFlush        (true); break;
-    case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_ACTIVE_COOL  : adjustment_DisinfectStartHeatActive   (true); break;
-    case GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE              : adjustment_DisinfectStartChemical     (true); break;
-    case GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE        : adjustment_DisinfectStartChemFlush    (true); break;
-    case GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE: adjustment_DisinfectStartROPermeate   (true); break;
-    case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_PASSIVE_COOL : adjustment_DisinfectStartHeatPassive  (true); break;
+    case GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE             : adjustment_DisinfectStartFlush        (true); break;
+    // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_ACTIVE_COOL  : adjustment_DisinfectStartHeatActive   (true); break;
+    // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_CHEM_STATE              : adjustment_DisinfectStartChemical     (true); break;
+    // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_CHEM_FLUSH_STATE        : adjustment_DisinfectStartChemFlush    (true); break;
+    case GuiDisinfectDGStates::DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE: adjustment_DisinfectStartROPermeate   (true); break;
+    // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_PASSIVE_COOL : adjustment_DisinfectStartHeatPassive  (true); break;
     default:                                                                                                        break;
     }
 }
@@ -100,7 +100,7 @@
  */
 void View::VDisinfectAdjustDisinfect::doDisinfectClear()
 {
-    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_NOT_RUNNING_STATE;
+    _data.mState = GuiDisinfectDGStates::DD_DISINFECT_NOT_RUNNING_STATE;
 }
 
 /*!
@@ -110,7 +110,7 @@
  */
 void View::VDisinfectAdjustDisinfect::doDisinfectFlush()
 {
-    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE;
+    _data.mState = GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE;
 }
 
 /*!
@@ -119,7 +119,7 @@
  */
 void View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool()
 {
-    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_ACTIVE_COOL;
+    // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_ACTIVE_COOL;
 }
 
 /*!
@@ -128,7 +128,7 @@
  */
 void View::VDisinfectAdjustDisinfect::doDisinfectChemical()
 {
-    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE;
+    // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_STATE;
 }
 
 /*!
@@ -137,7 +137,7 @@
  */
 void View::VDisinfectAdjustDisinfect::doDisinfectChemFlush()
 {
-    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE;
+    // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_FLUSH_STATE;
 }
 
 /*!
@@ -146,7 +146,7 @@
  */
 void View::VDisinfectAdjustDisinfect::doDisinfectROPermeate()
 {
-    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE;
+    _data.mState = GuiDisinfectDGStates::DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE;
 }
 
 /*!
@@ -155,7 +155,7 @@
  */
 void View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool()
 {
-    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_PASSIVE_COOL;
+    // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_PASSIVE_COOL;
 }
 
 void View::VDisinfectAdjustDisinfect::doDisinfectConfirm()