Index: dialin/dg/heat_disinfect.py
===================================================================
diff -u -r6e92c24e6e1bc8b22bfbe188085578ad3f3359d9 -r696821d82f79006d71147ebda2d6fed290b8a500
--- dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision 6e92c24e6e1bc8b22bfbe188085578ad3f3359d9)
+++ dialin/dg/heat_disinfect.py	(.../heat_disinfect.py)	(revision 696821d82f79006d71147ebda2d6fed290b8a500)
@@ -78,7 +78,7 @@
         self.overall_elapsed_time = 0
         self.state_elapsed_time = 0
         self.heat_disinfect_target_time = 0
-        self.heat_disinfect_elapsed_time = 0
+        self.heat_disinfect_count_down_time = 0
         self.cancellation_mode = 0
         self.r1_level = 0
         self.r2_level = 0
@@ -94,7 +94,7 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_heat_disinfect_to_ui_sync)
 
-    @_publish(["heat_disinfect_target_time", "heat_disinfect_elapsed_time"])
+    @_publish(["heat_disinfect_target_time", "heat_disinfect_count_down_time"])
     def _handler_heat_disinfect_to_ui_sync(self, message):
         """
         Handles published heat disinfect message
@@ -104,11 +104,11 @@
         """
         disinfect_target_time = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        disinfect_elapsed_time = struct.unpack('i', bytearray(
+        disinfect_count_down_time = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
         self.heat_disinfect_target_time = int(disinfect_target_time / 1000)
-        self.heat_disinfect_elapsed_time = int(disinfect_elapsed_time / 1000)
+        self.heat_disinfect_count_down_time = disinfect_count_down_time
 
     @_publish(["heat_disinfect_state", "overall_elapsed_time", "state_elapsed_time", "cancellation_mode", "r1_level",
                "r2_level", "heat_disinfect_ui_state"])
Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -r073c46104bf422d897f1043d745dee360288ad98 -r696821d82f79006d71147ebda2d6fed290b8a500
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 073c46104bf422d897f1043d745dee360288ad98)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 696821d82f79006d71147ebda2d6fed290b8a500)
@@ -41,12 +41,12 @@
 def get_heat_disinfect_mode_info():
 
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, '
-            'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, '
+            'R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {} '
             .format(HeatDisinfectStates(dg.heat_disinfect.heat_disinfect_state).name,
                     dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time,
-                    dg.heat_disinfect.heat_disinfect_elapsed_time,
-                    HeatCancellationModes(dg.heat_disinfect.cancellation_mode).name, dg.heat_disinfect.r1_level,
-                    dg.heat_disinfect.r2_level, hd.alarms.alarm_top))
+                    dg.heat_disinfect.heat_disinfect_elapsed_time, dg.heat_disinfect.r1_level,
+                    dg.heat_disinfect.r2_level, hd.alarms.alarm_top,
+                    HeatDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name))
     return info