Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r75fa3e3a7efa1a2397bd9bb2a06babf9eef33eee -rb7e775aa9732ca5856ca1d96273a5f2ada55f9c3
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 75fa3e3a7efa1a2397bd9bb2a06babf9eef33eee)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision b7e775aa9732ca5856ca1d96273a5f2ada55f9c3)
@@ -82,7 +82,7 @@
     flushStartReqReceived  = FALSE;
     dataPublishCounter     = 0;
     hasDisinfectCmdBeenSet = FALSE;
-    dgDisinfectState       = DG_DISINFECT_NOT_RUNNING;
+    dgDisinfectState       = DG_DISINFECT_NOT_RUNNING_STATE;
 }
 
 /*********************************************************************//**
@@ -483,7 +483,7 @@
         else if ( DG_MODE_FLUS == getDGOpMode() )
         {
             hasDisinfectCmdBeenSet = FALSE;
-            dgDisinfectState = DG_DISINFECT_FLUSH;
+            dgDisinfectState = DG_DISINFECT_FLUSH_STATE;
             currentStandbyState = STANDBY_DG_FLUSH_IN_PROGRESS_STATE;
         }
     }
@@ -497,7 +497,7 @@
         else if ( DG_MODE_HEAT == getDGOpMode() )
         {
             hasDisinfectCmdBeenSet = FALSE;
-            dgDisinfectState = DG_DISINFECT_HEAT;
+            dgDisinfectState = DG_DISINFECT_HEAT_STATE;
             currentStandbyState = STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE;
         }
     }
@@ -511,7 +511,7 @@
         else if ( DG_MODE_CHEM == getDGOpMode() )
         {
             hasDisinfectCmdBeenSet = FALSE;
-            dgDisinfectState = DG_DISINFECT_CHEM;
+            dgDisinfectState = DG_DISINFECT_CHEM_STATE;
             currentStandbyState = STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE;
         }
     }
@@ -533,7 +533,7 @@
 
     if ( getDGOpMode() != DG_MODE_FLUS )
     {
-        dgDisinfectState = DG_DISINFECT_NOT_RUNNING;
+        dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
     }
     publishDisinfectData();
@@ -555,7 +555,7 @@
 
     if ( getDGOpMode() != DG_MODE_HEAT )
     {
-        dgDisinfectState = DG_DISINFECT_NOT_RUNNING;
+        dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
     }
     publishDisinfectData();
@@ -577,7 +577,7 @@
 
     if ( getDGOpMode() != DG_MODE_CHEM )
     {
-        dgDisinfectState = DG_DISINFECT_NOT_RUNNING;
+        dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
         currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
     }
     publishDisinfectData();