Index: leahi_dialin/td/modules/alarms.py
===================================================================
diff -u -rd5d173f098022abd74435f48a30961c7be89d184 -r6fa8a72c463310fd943270135aebfcb10d7a1210
--- leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision d5d173f098022abd74435f48a30961c7be89d184)
+++ leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision 6fa8a72c463310fd943270135aebfcb10d7a1210)
@@ -77,23 +77,23 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.td_alarm_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_ALARM_STATUS_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_alarm_status_data = MsgIds.MSG_ID_ALARM_STATUS_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_status_data,
                                                                        self._handler_alarms_status_sync)
 
             channel_id = DenaliChannels.td_alarm_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_alarm_triggered = MsgIds.MSG_ID_ALARM_TRIGGERED.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_triggered,
                                                                        self._handler_alarm_trigger)
-            msg_id = MsgIds.MSG_ID_ALARM_CLEARED.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_alarm_cleared = MsgIds.MSG_ID_ALARM_CLEARED.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_cleared,
                                                                        self._handler_alarm_clear)
-            msg_id = MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_alarm_condition_cleared = MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_condition_cleared,
                                                                        self._handler_alarm_condition_clear)
             channel_id = DenaliChannels.td_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_TD_ALARM_INFORMATION_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, msg_id,
+            self.msg_id_td_alarm_info_data = MsgIds.MSG_ID_TD_ALARM_INFORMATION_DATA.value
+            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_alarm_info_data,
                                                                        self._handler_alarm_information_sync)
 
         self.td_alarm_status_timestamp = 0.0
@@ -161,7 +161,7 @@
         for x in range(500):
             self.alarm_states[x] = False
 
-    @publish(["td_alarm_status_timestamp", "alarms_priority_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"])
+    @publish(["msg_id_td_alarm_status_data", "td_alarm_status_timestamp", "alarms_priority_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"])
     def _handler_alarms_status_sync(self, message, timestamp=0.0):
         """
         Handles published alarms status messages.  alarms status data are captured
@@ -178,8 +178,8 @@
 
         self.td_alarm_status_timestamp = timestamp
 
-    @publish(["td_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", "alarm_data",
-              "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"])
+    @publish(["msg_id_td_alarm_triggered", "td_alarm_triggered_timestamp", "alarm_states", "alarm_conditions",
+              "alarm_data", "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"])
     def _handler_alarm_trigger(self, message, timestamp=0.0):
         """
         Handles published TD alarm activation messages.
@@ -218,7 +218,7 @@
         self.last_alarm_data_2 = data_2[0]
         self.td_alarm_triggered_timestamp = timestamp
 
-    @publish(["TD_alarm_cleared_timestamp", "alarm_states", "alarm_conditions"])
+    @publish(["msg_id_td_alarm_cleared", "TD_alarm_cleared_timestamp", "alarm_states", "alarm_conditions"])
     def _handler_alarm_clear(self, message, timestamp=0.0):
         """
         Handles published TD alarm clear messages.
@@ -231,7 +231,7 @@
         self.alarm_conditions[alarm_id[0]] = False
         self.td_alarm_cleared_timestamp = timestamp
 
-    @publish(["td_alarm_clr_condition_timestamp", "alarm_conditions", "alarm_conditions"])
+    @publish(["msg_id_td_alarm_condition_cleared", "td_alarm_clr_condition_timestamp", "alarm_conditions", "alarm_conditions"])
     def _handler_alarm_condition_clear(self, message, timestamp=0.0):
         """
         Handles published TD alarm clear alarm condition messages.
@@ -243,8 +243,9 @@
         self.alarm_conditions[alarm_id[0]] = False
         self.td_alarm_clr_condition_timestamp = timestamp
 
-    @publish(["td_alarm_information_timestamp", "alarm_volume", "alarm_audio_curr_hg", "alarm_audio_curr_lg", "alarm_backup_audio_curr",
-              "safety_shutdown_active", "ac_power_lost", "alarm_table_button_blockers", "alarm_state_button_blockers"])
+    @publish(["msg_id_td_alarm_info_data", "td_alarm_information_timestamp", "alarm_volume", "alarm_audio_curr_hg",
+              "alarm_audio_curr_lg", "alarm_backup_audio_curr", "safety_shutdown_active", "ac_power_lost",
+              "alarm_table_button_blockers", "alarm_state_button_blockers"])
     def _handler_alarm_information_sync(self, message, timestamp=0.0):
         """
         Handles published TD alarm information broadcast messages.