Index: leahi_dialin/ui/fp_messaging.py
===================================================================
diff -u -r372d9868eab437585688e307e166881c42d2fc9b -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/ui/fp_messaging.py	(.../fp_messaging.py)	(revision 372d9868eab437585688e307e166881c42d2fc9b)
+++ leahi_dialin/ui/fp_messaging.py	(.../fp_messaging.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:
@@ -60,8 +60,8 @@
         payload += conversions.unsigned_byte_to_bytearray   (fpga_lab         )
         payload += conversions.unsigned_integer_to_bytearray(compatibility_rev)
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_VERSION_RESPONSE.value,
                                             payload=payload)
 
@@ -100,8 +100,8 @@
         payload += conversions.float_to_bytearray(x3Pressure  )
         payload += conversions.float_to_bytearray(x4Pressure  )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_PRESSURES_DATA.value,
                                             payload=payload)
 
@@ -140,8 +140,8 @@
         payload += conversions.float_to_bytearray           (p12PumpDutyCyclePct   )
         payload += conversions.float_to_bytearray           (p12PumpFBDutyCyclePct )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_RO_PUMP_DATA.value,
                                             payload=payload)
 
@@ -156,8 +156,8 @@
         """
         payload = conversions.unsigned_integer_to_bytearray(p25Level    )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_LEVEL_DATA.value,
                                             payload=payload)
 
@@ -181,8 +181,8 @@
         payload += conversions.float_to_bytearray(p7Temp    )
         payload += conversions.float_to_bytearray(p16Temp   )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_FLOW_DATA.value,
                                             payload=payload)
 
@@ -200,8 +200,8 @@
         payload  = conversions.float_to_bytearray(p9Conductivity    )
         payload += conversions.float_to_bytearray(p18Conductivity   )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_CONDUCTIVITY_DATA.value,
                                             payload=payload)
 
@@ -252,8 +252,8 @@
         payload += conversions.float_to_bytearray(p7Temp   )
         payload += conversions.float_to_bytearray(p16Temp  )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_TEMPERATURE_DATA.value,
                                             payload=payload)
 
@@ -292,8 +292,8 @@
         payload += conversions.float_to_bytearray           (p40PumpDutyCyclePct   )
         payload += conversions.float_to_bytearray           (p40PumpFBDutyCyclePct )
 
-        message = CAN.DenaliMessage.build_message(
-                                            channel_id=CAN.DenaliChannels.fp_sync_broadcast_ch_id,
+        message = CAN.CanMessage.build_message(
+                                            channel_id=CAN.CanChannels.fp_sync_broadcast_ch_id,
                                             message_id=msg_ids.MsgIds.MSG_ID_FP_BOOST_PUMP_DATA.value,
                                             payload=payload)