Index: leahi_dialin/ui/td_messaging_alarms.py
===================================================================
diff -u -r49a5752911c816d6f33e9800cda8c1221f0dca9e -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/ui/td_messaging_alarms.py	(.../td_messaging_alarms.py)	(revision 49a5752911c816d6f33e9800cda8c1221f0dca9e)
+++ leahi_dialin/ui/td_messaging_alarms.py	(.../td_messaging_alarms.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -24,7 +24,7 @@
             def info(a1, a2):
                 pass
 
-        self.can_interface = CAN.DenaliCanMessenger(can_interface=self.can_Channel, logger=fakeLogger() )
+        self.can_interface = CAN.CanMessenger(can_interface=self.can_Channel, logger=fakeLogger() )
         self.can_interface.start()
 
         if self.can_interface is not None:
@@ -50,8 +50,8 @@
         payload += conversions.integer_to_bytearray (silence_expires)
         payload += conversions.short_to_bytearray   (flags          )
 
-        message = CAN.DenaliMessage.build_message(
-            channel_id=CAN.DenaliChannels.td_alarm_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+            channel_id=CAN.CanChannels.td_alarm_broadcast_ch_id,
             message_id=CAN.MsgIds.MSG_ID_ALARM_STATUS_DATA.value,
             payload=payload)
 
@@ -90,8 +90,8 @@
         payload += conversions.integer_to_bytearray(a8)
         payload += conversions.integer_to_bytearray(a9)
 
-        message = CAN.DenaliMessage.build_message(
-            channel_id=CAN.DenaliChannels.td_to_ui_ch_id,
+        message = CAN.CanMessage.build_message(
+            channel_id=CAN.CanChannels.td_to_ui_ch_id,
             message_id=CAN.MsgIds.MSG_ID_TD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE.value,
             payload=payload)
 
@@ -153,8 +153,8 @@
         payload += conversions.unsigned_integer_to_bytearray(clear_top)
 
 
-        message = CAN.DenaliMessage.build_message(
-            channel_id=CAN.DenaliChannels.td_alarm_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+            channel_id=CAN.CanChannels.td_alarm_broadcast_ch_id,
             message_id=CAN.MsgIds.MSG_ID_ALARM_TRIGGERED.value,
             payload=payload)
 
@@ -175,8 +175,8 @@
 
         payload = conversions.integer_to_bytearray(alarm_id)
 
-        message = CAN.DenaliMessage.build_message(
-            channel_id=CAN.DenaliChannels.td_alarm_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+            channel_id=CAN.CanChannels.td_alarm_broadcast_ch_id,
             message_id=CAN.MsgIds.MSG_ID_ALARM_CLEARED.value,
             payload=payload)
 
@@ -197,8 +197,8 @@
 
         payload = conversions.integer_to_bytearray(alarm_id)
         
-        message = CAN.DenaliMessage.build_message(
-            channel_id=CAN.DenaliChannels.td_alarm_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+            channel_id=CAN.CanChannels.td_alarm_broadcast_ch_id,
             message_id=CAN.MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value,
             payload=payload)