Index: dialin/ui/dg_simulator.py
===================================================================
diff -u -rd3a22e97fad0b715b1e9fba138236334ae7dbb6d -rb00c2599a7998e05f92679d9194535c68429c329
--- dialin/ui/dg_simulator.py	(.../dg_simulator.py)	(revision d3a22e97fad0b715b1e9fba138236334ae7dbb6d)
+++ dialin/ui/dg_simulator.py	(.../dg_simulator.py)	(revision b00c2599a7998e05f92679d9194535c68429c329)
@@ -37,7 +37,6 @@
         self.console_out = console_out
         self.can_interface = DenaliCanMessenger(can_interface=can_interface,
                                                 logger=self.logger,
-                                                log_can=self._log_manager.log_level == "CAN_ONLY",
                                                 console_out=console_out,
                                                 passive_mode=passive_mode)
         self.can_interface.start()
@@ -49,10 +48,10 @@
                                                                            MsgIds.MSG_ID_UI_DG_SET_RTC_REQUEST.value,
                                                                            self._handler_set_rtc_request)
                 self.can_interface.register_receiving_publication_function(DenaliChannels.ui_sync_broadcast_ch_id,
-                                                                           MsgIds.MSG_ID_REQUEST_FW_VERSIONS.value,
+                                                                           MsgIds.MSG_ID_FW_VERSIONS_REQUEST.value,
                                                                            self._handler_request_dg_version)
                 self.can_interface.register_receiving_publication_function(DenaliChannels.ui_sync_broadcast_ch_id,
-                                                                           MsgIds.MSG_ID_UI_REQUEST_SERVICE_INFO.value,
+                                                                           MsgIds.MSG_ID_UI_SERVICE_INFO_REQUEST.value,
                                                                            self._handler_system_usage_response)
 
     def _handler_system_usage_response(self) -> None:
Index: dialin/ui/hd_simulator_alarms.py
===================================================================
diff -u -rd3a22e97fad0b715b1e9fba138236334ae7dbb6d -rb00c2599a7998e05f92679d9194535c68429c329
--- dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision d3a22e97fad0b715b1e9fba138236334ae7dbb6d)
+++ dialin/ui/hd_simulator_alarms.py	(.../hd_simulator_alarms.py)	(revision b00c2599a7998e05f92679d9194535c68429c329)
@@ -119,13 +119,13 @@
         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_USER_REQUEST_ALARM_SILENCE.value,
+                                                                       MsgIds.MSG_ID_USER_ALARM_SILENCE_REQUEST.value,
                                                                        self._handler_alarm_silence)
             self.can_interface.register_receiving_publication_function(channel_id,
-                                                                       MsgIds.MSG_ID_UI_ALARM_USER_ACTION.value,
+                                                                       MsgIds.MSG_ID_UI_ALARM_USER_ACTION_REQUEST.value,
                                                                        self._handler_user_action)
             self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_hd_ch_id,
-                                                                       MsgIds.MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD.value,
+                                                                       MsgIds.MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST.value,
                                                                        self._handler_request_override_alarm_volume)
 
     def _send_alarm_volume_broadcast(self):
@@ -239,7 +239,7 @@
         payload = state + top + escalates_in + silence_expires + flags
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_alarm_broadcast_ch_id,
-                                              message_id=MsgIds.MSG_ID_ALARM_STATUS.value,
+                                              message_id=MsgIds.MSG_ID_ALARM_STATUS_DATA.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
@@ -318,7 +318,7 @@
         payload = state + top + escalates_in + silence_expires + flags
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_alarm_broadcast_ch_id,
-                                              message_id=MsgIds.MSG_ID_ALARM_STATUS.value,
+                                              message_id=MsgIds.MSG_ID_ALARM_STATUS_DATA.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)