Index: dialin/hd/ui_proxy.py
===================================================================
diff -u -r6e92c24e6e1bc8b22bfbe188085578ad3f3359d9 -rde18ddfc1d74a39cd434af5c9a32962050aaef5f
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 6e92c24e6e1bc8b22bfbe188085578ad3f3359d9)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision de18ddfc1d74a39cd434af5c9a32962050aaef5f)
@@ -194,7 +194,7 @@
                                                         MsgIds.MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE.value,
                                                         self._handler_treatment_end_cmd_response)
             self.can_interface.\
-                register_receiving_publication_function(DenaliChannels.hd_to_ui_ch_id,
+                register_receiving_publication_function(DenaliChannels.hd_sync_broadcast_ch_id,
                                                         MsgIds.MSG_ID_HD_DISINFECTS_UI_STATES_DATA.value,
                                                         self._handler_disinfects_data_publish)
 
@@ -247,8 +247,8 @@
         self.treatment_end_cmd_succeeded = False
         self.treatment_end_cmd_reject_reason = 0
 
-        self.disinfects_hd_mode = 0
-        self.disinfects_submode = 0
+        self.disinfects_hd_submode = 0
+        self.disinfects_dg_mode = 0
 
         self.reject_reasons = OrderedDict()
         for attr in dir(self):
@@ -1665,7 +1665,7 @@
         self.logger.debug("Sending setting standby submode to wait for disinfect to HD.")
         self.can_interface.send(message, 0)
 
-    @_publish(["disinfects_hd_mode", "disinfects_submode"])
+    @_publish(["disinfects_hd_submode", "disinfects_dg_mode"])
     def _handler_disinfects_data_publish(self, message: dict) -> None:
         """
         Handles published disinfect mode and submode that is published to UI
@@ -1674,12 +1674,12 @@
 
         @return: None
         """
-        hd_state = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
         dg_submode = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        hd_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
-        self.disinfects_hd_mode = hd_state
-        self.disinfects_submode = dg_submode
+        self.disinfects_hd_submode = hd_state
+        self.disinfects_dg_mode = dg_submode
 
 
Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -r6e92c24e6e1bc8b22bfbe188085578ad3f3359d9 -rde18ddfc1d74a39cd434af5c9a32962050aaef5f
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 6e92c24e6e1bc8b22bfbe188085578ad3f3359d9)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision de18ddfc1d74a39cd434af5c9a32962050aaef5f)
@@ -204,7 +204,7 @@
                     dg.hd_proxy.cmd_switch_reservoirs(reservoirID=1)
                 timer += 1
 
-                if timer > ((1/sleep_time) * 10):
+                if timer > ((1/sleep_time) * 1):
                     timer = 1
                     counter += 1
 
@@ -325,7 +325,7 @@
     hd.ui.cmd_ui_set_standby_submode_to_disinfect()
 
     while True:
-        print(hd.ui.disinfects_hd_mode, hd.ui.disinfects_submode)
+        print(hd.ui.disinfects_hd_submode, hd.ui.disinfects_dg_mode)
         sleep(1)
 
 
@@ -339,9 +339,9 @@
 
     #run_chemical_disinfect()
 
-    #run_dg()
+    run_dg()
 
-    cmd_set_disinfect_ui_screen()
+    #cmd_set_disinfect_ui_screen()