Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -r3317ac65578c37688f260093b37d782b89006297 -rb014ef641d747cbb2a1ed79da99b3489b65612d0
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision 3317ac65578c37688f260093b37d782b89006297)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision b014ef641d747cbb2a1ed79da99b3489b65612d0)
@@ -8,7 +8,7 @@
 # @file    dialysate_generator.py
 #
 # @author  (last)      Micahel Garthwaite
-# @date    (last)      15-Aug-2023
+# @date    (last)      17-Aug-2023
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
@@ -147,11 +147,11 @@
         # register handler for HD operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.dg_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_DG_OP_MODE.value
+            msg_id = MsgIds.MSG_ID_DG_OP_MODE_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_dg_op_mode_sync)
             self.can_interface.register_receiving_publication_function(DenaliChannels.dg_sync_broadcast_ch_id,
-                                                                       MsgIds.MSG_ID_DG_VERSION.value,
+                                                                       MsgIds.MSG_ID_DG_VERSION_REPONSE.value,
                                                                        self._handler_dg_version)
 
             self.callback_id = self.can_interface.register_transmitting_interval_message(INTERVAL_10s,
@@ -372,7 +372,7 @@
         payload = major + minor + micro + build + compatibility
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.ui_sync_broadcast_ch_id,
-                                              message_id=MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value,
+                                              message_id=MsgIds.MSG_ID_FW_VERSIONS_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("Sending Dialin request for version to DG")
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r3317ac65578c37688f260093b37d782b89006297 -rb014ef641d747cbb2a1ed79da99b3489b65612d0
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 3317ac65578c37688f260093b37d782b89006297)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision b014ef641d747cbb2a1ed79da99b3489b65612d0)
@@ -8,7 +8,7 @@
 # @file    hemodialysis_device.py
 #
 # @author  (last)      Micahel Garthwaite
-# @date    (last)      15-Aug-2023
+# @date    (last)      17-Aug-2023
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
@@ -110,7 +110,7 @@
         # register handler for HD operation mode broadcast messages
         if self.can_interface is not None:
             channel_id = DenaliChannels.hd_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_HD_OP_MODE.value
+            msg_id = MsgIds.MSG_ID_HD_OP_MODE_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_hd_op_mode_sync)
 
@@ -119,7 +119,7 @@
                                                                        self._handler_hd_debug_event_sync)
 
             self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id,
-                                                                       MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value,
+                                                                       MsgIds.MSG_ID_UI_VERSION_INFO_RESPONSE.value,
                                                                        self._handler_ui_version_response_sync)
 
             self.callback_id = self.can_interface.register_transmitting_interval_message(INTERVAL_10s,