Index: leahi_dialin/common/override_templates.py
===================================================================
diff -u -r47a803c6dd859a5bcc7a6c82e0cb160c350473ea -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/common/override_templates.py	(.../override_templates.py)	(revision 47a803c6dd859a5bcc7a6c82e0cb160c350473ea)
+++ leahi_dialin/common/override_templates.py	(.../override_templates.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -20,7 +20,7 @@
 # Project imports
 from .constants import RESET
 from .msg_defs import MsgIds
-from ..protocols.CAN import DenaliMessage, DenaliChannels
+from ..protocols.CAN import CanMessage, CanChannels
 from ..utils.checks import check_broadcast_interval_override_ms
 from ..utils.conversions import integer_to_bytearray
 
@@ -29,7 +29,7 @@
                                             ms: int,
                                             reset: int,
                                             msg_id: MsgIds,
-                                            channel_id: DenaliChannels,
+                                            channel_id: CanChannels,
                                             module_name: str,
                                             logger: Logger,
                                             can_interface) -> int:
@@ -42,7 +42,7 @@
     @param ms:  integer - interval (in ms) to override with
     @param reset:  integer - 1 to reset a previous override, 0 to override
     @param msg_id: MsgIds - The override's msg id
-    @param channel_id: DenaliChannels - The override's channel id
+    @param channel_id: Channels - The override's channel id
     @param module_name: str - The module's name to put into the debug prints
     @param logger: str - The logger for printing debug and error messages
     @param can_interface: The can_interface
@@ -71,7 +71,7 @@
                          payload: bytearray,
                          reset: int,
                          msg_id: MsgIds,
-                         channel_id: DenaliChannels,
+                         channel_id: CanChannels,
                          entity_name: str,
                          override_text: str,
                          logger: Logger,
@@ -84,14 +84,14 @@
     @param payload:  bytearray - the actual payload
     @param reset:  integer - 1 to reset a previous override, 0 to override
     @param msg_id: MsgIds - The override's msg id
-    @param channel_id: DenaliChannels - The override's channel id
+    @param channel_id: Channels - The override's channel id
     @param entity_name: str - The entity's name that will be overriden to put into the debug prints
     @param override_text: str - The value to be overriden with to put into the debug prints
     @param logger: str - The logger for printing debug and error messages
     @param can_interface: The can_interface
     @return: 1 if successful, zero otherwise
     """
-    message = DenaliMessage.build_message(channel_id=channel_id,
+    message = CanMessage.build_message(channel_id=channel_id,
                                           message_id=msg_id.value,
                                           payload=payload)
 
@@ -107,13 +107,13 @@
     if received_message is not None:
         if payload is None or reset is None:
             str_res = f'not called' if reset is not None and reset == RESET else 'Called'
-            logger.debug(f'{entity_name} is {str_res} {str(received_message["message"][DenaliMessage.PAYLOAD_START_INDEX])}')
+            logger.debug(f'{entity_name} is {str_res} {str(received_message["message"][CanMessage.PAYLOAD_START_INDEX])}')
         else:
             str_res = f'its default value' if reset == RESET else override_text
-            logger.debug(f'{entity_name} is overridden to {str_res} {str(received_message["message"][DenaliMessage.PAYLOAD_START_INDEX])}')
+            logger.debug(f'{entity_name} is overridden to {str_res} {str(received_message["message"][CanMessage.PAYLOAD_START_INDEX])}')
         
         # response payload is OK or not OK
-        return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        return received_message['message'][CanMessage.PAYLOAD_START_INDEX]
     else:
         logger.error("Timeout!!!!")
         return False