Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rba0335ef18c7859109251f130178acc785c1d39e -r6f1f269cd7d91f41c51797d17a85a7ea249e21f3
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision ba0335ef18c7859109251f130178acc785c1d39e)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 6f1f269cd7d91f41c51797d17a85a7ea249e21f3)
@@ -2012,16 +2012,16 @@
         if ( ( DG_CHEM_DISINFECT_STATE_DISINFECT_R1_TO_R2 == chemDisinfectState ) ||
              ( DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1 == chemDisinfectState ) )
         {
-            uiData.chemDisinfectTargetTime  = CHEM_DISINFECT_TIME_MS;
-            uiData.chemDisinfectElapsedTime = calcTimeSince( chemDisinfectTimer );
-            data.R1FillLevel                = R1ChemDisinfectVol;
-            data.R2FillLevel                = R2ChemDisinfectVol;
+            uiData.chemDisinfectTargetTime    = CHEM_DISINFECT_TIME_MS;
+            uiData.chemDisinfectCountdownTime = CHEM_DISINFECT_TIME_MS - calcTimeSince( chemDisinfectTimer );
+            data.R1FillLevel                  = R1ChemDisinfectVol;
+            data.R2FillLevel                  = R2ChemDisinfectVol;
         }
         else
         {
-            uiData.chemDisinfectElapsedTime = 0.0;
-            data.R1FillLevel                = 0.0;
-            data.R2FillLevel                = 0.0;
+            uiData.chemDisinfectCountdownTime = 0.0;
+            data.R1FillLevel                  = 0.0;
+            data.R2FillLevel                  = 0.0;
         }
 
         data.postDisinfectTargetRinseCount  = NUM_OF_POST_DISINFECT_RINSES;