Index: leahi_dialin/fp/modules/fp_test_configs.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -22,7 +22,7 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_override
 from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions
-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, bytearray_to_integer
@@ -33,17 +33,17 @@
     FP Dialin API sub-class for setting and getting the test configurations.
     """
 
-    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_to_dialin_ch_id,
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_to_dialin_ch_id,
                                                                        message_id = MsgIds.MSG_ID_FP_SEND_TEST_CONFIGURATION.value,
                                                                        function = self._handler_fp_test_config_sync)
 
@@ -97,7 +97,7 @@
         response = cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_SET_TEST_CONFIGURATION,
             entity_name = f'FP {DDFPTestConfigOptions(config).name} Test Config',
             override_text = 'Active',
@@ -120,7 +120,7 @@
         return cmd_generic_override(
             payload = None,
             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_GET_TEST_CONFIGURATION,
             entity_name = f'Get FP Test Configuration Record',
             override_text = 'Active',
@@ -139,7 +139,7 @@
         response = cmd_generic_override(
             payload = None,
             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_RESET_ALL_TEST_CONFIGURATIONS,
             entity_name = f'Reset all DD & FP Test Configurations',
             override_text = 'Active',