Index: leahi_dialin/fp/modules/alarms.py
===================================================================
diff -u -r27cd8e0e7b47617083e8c12f73306f0ba648e687 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision 27cd8e0e7b47617083e8c12f73306f0ba648e687)
+++ leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -24,7 +24,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_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels
+from leahi_dialin.protocols.CAN import CanMessenger, CanMessage, 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
@@ -35,19 +35,19 @@
     FP interface containing alarm related commands.
     """
     _ALARM_ID_MAX_ALARMS = 500
-    START_POS_ALARM_ID = DenaliMessage.PAYLOAD_START_INDEX
+    START_POS_ALARM_ID = CanMessage.PAYLOAD_START_INDEX
     END_POS_ALARM_ID = START_POS_ALARM_ID + 2
 
-    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
-        @param can_interface: Denali Can Messenger object
+        @param can_interface: Can Messenger 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.fp_alarm_broadcast_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_alarm_broadcast_ch_id,
                                                                        message_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value,
                                                                        function = self._handler_alarm_triggered)
 
@@ -131,7 +131,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = '',
             module_name = 'FP Alarm state',
             logger = self.logger,
@@ -156,7 +156,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = '',
             module_name = 'FP Alarm info',
             logger = self.logger,
@@ -187,7 +187,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST,
             entity_name = f'FP {alarm_name} Alarm state',
             override_text = f'{state_name}',
@@ -210,7 +210,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST,
             entity_name = f'FP Alarms',
             override_text = f'Cleared',