Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -45,7 +45,7 @@
 from ..common.generic_defs import DataTypes
 from ..common.msg_defs import MsgIds, MsgFieldPositions
 from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
+from ..protocols.CAN import CanMessage, CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.base import publish, LogManager
 from ..utils.conversions import integer_to_bytearray, bytearray_to_byte
@@ -81,21 +81,21 @@
         self.logger = self._log_manager.logger
 
         # Create listener
-        self.can_interface = DenaliCanMessenger(can_interface=can_interface,
+        self.can_interface = CanMessenger(can_interface=can_interface,
                                                 logger=self.logger)
         self.can_interface.start()
         self.callback_id = None
         # register handler for DD operation mode broadcast messages
         if self.can_interface is not None:
-            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
                                                                        message_id = MsgIds.MSG_ID_DD_OP_MODE_DATA.value,
                                                                        function = self._handler_dd_op_mode_sync)
 
-            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
                                                                        message_id = MsgIds.MSG_ID_DD_VERSION_RESPONSE.value,
                                                                        function = self._handler_dd_version_response_sync)
 
-            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id,
                                                                        message_id = MsgIds.MSG_ID_DD_DEBUG_EVENT.value,
                                                                        function = self._handler_dd_debug_event_sync)
 
@@ -270,7 +270,7 @@
     #     return cmd_generic_broadcast_interval_override(
     #         ms = ms,
     #         reset = reset,
-    #         channel_id = DenaliChannels.dialin_to_dd_ch_id,
+    #         channel_id = Channels.dialin_to_dd_ch_id,
     #         msg_id = MsgIds.MSG_ID_DD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
     #         module_name = 'TD Operation Mode',
     #         logger = self.logger,
@@ -285,7 +285,7 @@
         @param resend: (bool) if False (default), try to login once. Otherwise, tries to login indefinitely
         @return: 1 if logged in, 0 if log in failed
         """
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
+        message = CanMessage.build_message(channel_id=CanChannels.dialin_to_dd_ch_id,
                                               message_id=MsgIds.MSG_ID_DD_TESTER_LOGIN_REQUEST.value,
                                               payload=list(map(int, map(ord, self.DD_LOGIN_PASSWORD))))
 
@@ -295,14 +295,14 @@
         received_message = self.can_interface.send(message, resend=resend)
 
         if received_message is not None:
-            if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1:
+            if received_message['message'][CanMessage.PAYLOAD_START_INDEX] == 1:
                 self.logger.debug("Success: Logged In")
                 self.dd_set_logged_in_status(True)
                 #self._send_dd_checkin_message()  # Timer starts interval first
                 #self.can_interface.transmit_interval_dictionary[self.callback_id].start()
             else:
                 self.logger.debug("Failure: Log In Failed.")
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+            return received_message['message'][CanMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.debug("Login Timeout!!!!")
             return False
@@ -325,7 +325,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST,
             entity_name = 'DD Operation Mode',
             override_text = dd_enum_repository.DDOpModes(new_mode).name,
@@ -344,7 +344,7 @@
         return cmd_generic_override(
             payload = None,
             reset = NO_RESET,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_SOFTWARE_RESET_REQUEST,
             entity_name = 'DD Software Reset',
             override_text = '',
@@ -369,7 +369,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,
-            channel_id = DenaliChannels.dialin_to_dd_ch_id,
+            channel_id = CanChannels.dialin_to_dd_ch_id,
             msg_id = MsgIds.MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST,
             entity_name = 'DD Safety Shutdown',
             override_text = str(active),