Index: leahi_dialin/ui/td_messaging.py
===================================================================
diff -u -r7e864b8d034f7a5cb961402d4f6672b180a57bb5 -r3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2
--- leahi_dialin/ui/td_messaging.py	(.../td_messaging.py)	(revision 7e864b8d034f7a5cb961402d4f6672b180a57bb5)
+++ leahi_dialin/ui/td_messaging.py	(.../td_messaging.py)	(revision 3e2f7365bb1a643d2fc9bea2dc51f4b15f0ba9e2)
@@ -580,8 +580,8 @@
         payload =  conversions.unsigned_integer_to_bytearray    (valve      )
         payload += conversions.unsigned_integer_to_bytearray    (timeout    )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.td_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_TD_WATER_SAMPLE_DATA.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -600,8 +600,8 @@
         payload += conversions.integer_to_bytearray (vRejectionReason)
         payload += conversions.float_to_bytearray   (vValue          )
 
-        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=msg_ids.MsgIds.MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1587,8 +1587,8 @@
         payload += conversions.integer_to_bytearray(vVenousAsymmetricRejectReason   )
         payload += conversions.integer_to_bytearray(vTmpWindowRejectReason          )
 
-        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=msg_ids.MsgIds.MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1623,8 +1623,8 @@
         payload += conversions.integer_to_bytearray(vSodiumRejectReason                 )
         payload += conversions.integer_to_bytearray(vBicarbonateRejectReason            )
 
-        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=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_SET_POINTS_CHANGE_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1640,8 +1640,8 @@
         payload  = conversions.integer_to_bytearray(vAccepted)
         payload += conversions.integer_to_bytearray(vRejectionReason)
     
-        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=msg_ids.MsgIds.MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)
@@ -1803,8 +1803,8 @@
         payload  += conversions.float_to_bytearray( vIsoUfRateTarget                                 )
         payload  += conversions.float_to_bytearray( vWaterSampleTestResult                           )
 
-        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=msg_ids.MsgIds.MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE.value,
                                             payload=payload)
         self.can_interface.send(message, 0)