Index: dialin/common/msg_defs.py
===================================================================
diff -u -rcf56d42c5946ec79502d636db26f19fa4a1fdb64 -r9f11c0ef3af059fbe331c803464b3be500a3ae03
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision cf56d42c5946ec79502d636db26f19fa4a1fdb64)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 9f11c0ef3af059fbe331c803464b3be500a3ae03)
@@ -77,7 +77,6 @@
     MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37                        # DG heat disinfection publish data
     MSG_ID_UI_START_TREATMENT = 0x38                            # UI user request to initiate a treatment
     MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39                   # HD response to user request to initiate a treatment
-    MSG_ID_UI_ALARM_ACKNOWLEDGE = 0x3F                          # UI Tells HD an alarm has been acknowledged
     MSG_ID_HD_VALVES_DATA = 0x3B                                # HD broadcast of valves data
     MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3A              # UI user confirmation of treatment parameters
     MSG_ID_UI_TREATMENT_END_REQUEST = 0x3C                      # UI user treatment end request
@@ -92,9 +91,7 @@
     MSG_ID_CAN_ERROR_COUNT = 0x999                              # test code in support of EMC testing
 
     # service/test CAN messages
-    MSG_ID_FIRST_TESTER_MESSAGE = 0x8000                        # First HD test message ID
-    MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE   # HD tester log-in
-    MSG_ID_HD_MESSAGE = 0x8001                                  # Obsolete - TODO - remove when all references to this ID are deleted
+    MSG_ID_TESTER_LOGIN_REQUEST = 0x8000                        # HD tester log-in
     MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0x8001               # Dialysate outlet flow set point override request
     MSG_ID_OFF_BUTTON_STATE_OVERRIDE = 0x8002                   # Off button override request
     MSG_ID_STOP_BUTTON_STATE_OVERRIDE = 0x8003                  # Stop button override request
@@ -153,8 +150,7 @@
     MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038                       # Dialysate inlet pump home command
     MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039                      # Dialysate outlet pump home command
 
-    MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000                     # First DG test message ID
-    MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE  # DG tester log-in
+    MSG_ID_DG_TESTER_LOGIN_REQUEST = 0XA000                     # DG tester log-in
     MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001                     # DG alarm state override message ID
     MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0xA002           # Watchdog check-in override request
     MSG_ID_DG_SET_RTC_DATE_TIME = 0xA004                        # DG RTC set date/time
@@ -187,7 +183,6 @@
     MSG_ID_HEAT_DISINFECT_RSRVR2_TO_RSRVR1_DURATION_MINS = 0xA01F    # Heat disinfection reservoir 2 to reservoir 1 duration in minutes
     MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN = 0xA020          # Heat disinfection number of cycles to run
     MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021    # Heat disinfection data publish interval override request
-    MSG_ID_PRIMING_STATUS = 0x43                                # The priming status
     MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022                   # DG reset request
     MSG_ID_DG_OPERATION_MODE_REQUEST = 0xA023                   # DG change operation mode request
     MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024      # Concentrate pump target speed override request
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -rda3d88051a0ccd89f86ed4f6c2bbb0a067b6f148 -r9f11c0ef3af059fbe331c803464b3be500a3ae03
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision da3d88051a0ccd89f86ed4f6c2bbb0a067b6f148)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 9f11c0ef3af059fbe331c803464b3be500a3ae03)
@@ -221,7 +221,7 @@
         payload += integer_to_bytearray(seconds_total)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
-                                              message_id=MsgIds.MSG_ID_PRIMING_STATUS.value,
+                                              message_id=MsgIds.MSG_ID_DG_PRIMING_STATUS_DATA.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
Index: dialin/ui/hd_simulator_alarms.py
===================================================================
diff -u -rda3d88051a0ccd89f86ed4f6c2bbb0a067b6f148 -r9f11c0ef3af059fbe331c803464b3be500a3ae03
--- dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision da3d88051a0ccd89f86ed4f6c2bbb0a067b6f148)
+++ dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision 9f11c0ef3af059fbe331c803464b3be500a3ae03)
@@ -108,7 +108,7 @@
         if self.can_interface is not None:
             channel_id = DenaliChannels.ui_to_hd_ch_id
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_UI_ALARM_ACKNOWLEDGE.value,
+                                                                       MsgIds.MSG_ID_UI_ALARM_USER_ACKNOWLEDGE.value,
                                                                        self._handler_alarm_acknowledge)
             self.can_interface.register_receiving_publication_function(channel_id,
                                                                        MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value,