Index: leahi_dialin/dd/proxies/td_proxy.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/dd/proxies/td_proxy.py	(.../td_proxy.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -21,7 +21,7 @@
 from leahi_dialin.common.generic_defs import DataTypes
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
@@ -32,18 +32,18 @@
     Dialysate Delivery (DD) Dialin API sub-class for TD proxy ( injection ) related commands.
     """
 
-    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         TDProxy constructor
 
-        @param can_interface: the Denali CAN interface object
+        @param can_interface: the CAN interface object
         """
         super().__init__()
         self.can_interface = can_interface
         self.logger = logger
 
         if self.can_interface is not None:
-            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_dd_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_dd_ch_id,
                                                                        message_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA.value,
                                                                        function = self._handler_dialysate_delivery_request_response)
 
@@ -104,7 +104,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.dialin_to_dd_ch_id,
+                             channel_id = CanChannels.dialin_to_dd_ch_id,
                              msg_id = MsgIds.MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA,
                              entity_name = 'TD Gen Dialysate Request',
                              override_text = 'N/A',
@@ -134,7 +134,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.dialin_to_dd_ch_id,
+                             channel_id = CanChannels.dialin_to_dd_ch_id,
                              msg_id = MsgIds.MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA,
                              entity_name = 'TD Pre-Gen Dialysate Request',
                              override_text = 'N/A',