Index: dialin/hd/alarms.py
===================================================================
diff -u -r70fb122058d520cbbbe922518d8d50b2dec5e2e4 -rc12f3a44ddd8ed3a8e88cebdeab8951b09428b89
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 70fb122058d520cbbbe922518d8d50b2dec5e2e4)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision c12f3a44ddd8ed3a8e88cebdeab8951b09428b89)
@@ -93,11 +93,6 @@
         # alarm states based on received HD alarm activation and alarm clear messages
         self.alarm_states = [False] * 500
 
-        self.ids = OrderedDict()
-#        for attr in dir(AlarmList):
-#            if not callable(getattr(AlarmList, attr)) and attr.startswith("ALARM_ID"):
-#                self.ids[attr] = getattr(AlarmList, attr)
-#        self.ids = OrderedDict(sorted(self.ids.items(), key=lambda key: key[1].value))
 
     def get_alarm_states(self):
         """
@@ -159,14 +154,6 @@
         """
         return self.alarms_flags
 
-    def get_alarm_ids(self):
-        """
-        Returns a dictionary of the alarm short name and the corresponding id
-
-        @return: OrderedDict of the alarm ids
-        """
-        return self.ids
-
     @_publish(["alarms_state", "alarm_top", "alarms_silence_expires_in", "alarms_escalates_in", "alarms_flags"])
     def _handler_alarms_status_sync(self, message):
         """
@@ -238,7 +225,7 @@
         payload = rst + sta + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_ALARM_STATE_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_ALARM_STATE_OVERRIDE.value,
                                               payload=payload)
 
         # Send message
@@ -274,7 +261,7 @@
         payload = rst + ms + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_ALARM_TIME_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_ALARM_TIME_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override alarm time since activated")
@@ -322,7 +309,7 @@
         payload = rst + pat
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_ALARM_LAMP_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("Override Alarm Lamp Pattern")