Index: leahi_dialin/td/proxies/ui_proxy.py
===================================================================
diff -u -r636775bd0ba262967bcf06e194658b97720e2517 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 636775bd0ba262967bcf06e194658b97720e2517)
+++ leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -24,7 +24,7 @@
 from leahi_dialin.common.generic_defs import DataTypes
 from leahi_dialin.common.msg_defs import MsgIds, RequestRejectReasons
 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.conversions import integer_to_bytearray, unsigned_byte_to_bytearray, float_to_bytearray, \
                                         short_to_bytearray
@@ -37,30 +37,30 @@
 
     SW_COMPATIBILITY_REV = 0
 
-    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         DDProxy 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_ui_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id,
                                                                        message_id = MsgIds.MSG_ID_TD_RESP_TREATMENT_PARAMS_TO_VALIDATE.value,
                                                                        function = self._handler_tx_parameters_val_resp_sync)
 
-            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_ui_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id,
                                                                        message_id = MsgIds.MSG_ID_TD_RESP_ULTRAFILTRATION_VOLUME_TO_VALIDATE.value,
                                                                        function = self._handler_uf_val_resp_sync)
 
-            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_ui_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id,
                                                                        message_id = MsgIds.MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW.value,
                                                                        function = self._handler_initiate_treatment_resp_sync)
 
-            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.td_to_ui_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id,
                                                                        message_id = MsgIds.MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE.value,
                                                                        function = self._handler_uf_pause_resp_sync)
 
@@ -283,7 +283,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.ui_to_td_ch_id,
+                             channel_id = CanChannels.ui_to_td_ch_id,
                              msg_id = MsgIds.MSG_ID_UI_TREATMENT_PARAMS_TO_VALIDATE,
                              entity_name = 'Sneding UI Treatment Parameter to TD',
                              override_text = 'N/A',
@@ -307,7 +307,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.ui_sync_broadcast_ch_id,
+                             channel_id = CanChannels.ui_sync_broadcast_ch_id,
                              msg_id = MsgIds.MSG_ID_FW_VERSIONS_REQUEST,
                              entity_name = 'UI Version Request',
                              override_text = 'N/A',
@@ -327,7 +327,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.ui_to_td_ch_id,
+                             channel_id = CanChannels.ui_to_td_ch_id,
                              msg_id = MsgIds.MSG_ID_UI_INITIATE_TREATMENT_WORKFLOW,
                              entity_name = 'UI Initiate Treatment Workflow',
                              override_text = 'N/A',
@@ -347,7 +347,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.ui_to_td_ch_id,
+                             channel_id = CanChannels.ui_to_td_ch_id,
                              msg_id = MsgIds.MSG_ID_UI_TREATMENT_PARAMS_CONFIRMED,
                              entity_name = 'UI Confirm Treatment Parameters',
                              override_text = 'N/A',
@@ -369,7 +369,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.ui_to_td_ch_id,
+                             channel_id = CanChannels.ui_to_td_ch_id,
                              msg_id = MsgIds.MSG_ID_UI_UF_PAUSE_RESUME_REQUEST,
                              entity_name = 'UI Pause or Resume UF Request',
                              override_text = 'N/A',
@@ -389,7 +389,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.ui_to_td_ch_id,
+                             channel_id = CanChannels.ui_to_td_ch_id,
                              msg_id = MsgIds.MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE,
                              entity_name = 'Validate UI Ultrafiltration Volume',
                              override_text = 'N/A',
@@ -405,7 +405,7 @@
         """
         cmd_generic_override(payload = None,
                              reset = None,
-                             channel_id = DenaliChannels.ui_to_td_ch_id,
+                             channel_id = CanChannels.ui_to_td_ch_id,
                              msg_id = MsgIds.MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST,
                              entity_name = 'UI Active Alarm List Request',
                              override_text = 'N/A',
@@ -425,7 +425,7 @@
 
         cmd_generic_override(payload = payload,
                              reset = None,
-                             channel_id = DenaliChannels.ui_to_td_ch_id,
+                             channel_id = CanChannels.ui_to_td_ch_id,
                              msg_id = MsgIds.MSG_ID_USER_ALARM_SILENCE_REQUEST,
                              entity_name = 'UI Alarm Silence Request',
                              override_text = 'N/A',