Index: leahi_dialin/fp/filtration_purification.py
===================================================================
diff -u -rfc66ce51dca2af3afb1de1426f3eb1cf5285d66f -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision fc66ce51dca2af3afb1de1426f3eb1cf5285d66f)
+++ leahi_dialin/fp/filtration_purification.py	(.../filtration_purification.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -37,7 +37,8 @@
 from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions
 from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
-from ..utils.base import AbstractSubSystem, publish, LogManager
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish, LogManager
 from ..utils.conversions import integer_to_bytearray, bytearray_to_byte
 
 
Index: leahi_dialin/fp/modules/alarms.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -22,8 +22,9 @@
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels
+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,7 +36,7 @@
     START_POS_ALARM_ID = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_ALARM_ID = START_POS_ALARM_ID + 2
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
@@ -65,8 +66,8 @@
         self.alarm_data_type = dict()                               #: The Alarm's Data type in dict format
 
         # Loop through the list of the event data type enum and update the dictionary
-        for data_type in fp_enum_repository.FPEventDataTypes:
-            event_data_type = fp_enum_repository.FPEventDataTypes(data_type).name
+        for data_type in fp_enum_repository.DataTypes:
+            event_data_type = fp_enum_repository.DataTypes(data_type).name
             struct_unpack_type = None
 
             # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is
@@ -96,13 +97,13 @@
 
         data_typ_1 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
         # Get the corresponding structure format
-        struct_data_type_1 = self.alarm_data_type[fp_enum_repository.FPEventDataTypes(data_typ_1[0]).name]
+        struct_data_type_1 = self.alarm_data_type[fp_enum_repository.DataTypes(data_typ_1[0]).name]
         # Get the data value by unpacking the data type
         data_1 = struct.unpack(struct_data_type_1, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
 
         data_typ_2 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
         # Get the corresponding structure format
-        struct_data_type_2 = self.alarm_data_type[fp_enum_repository.FPEventDataTypes(data_typ_2[0]).name]
+        struct_data_type_2 = self.alarm_data_type[fp_enum_repository.DataTypes(data_typ_2[0]).name]
         # Get the data value by unpacking the data type
         data_2 = struct.unpack(struct_data_type_2, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
 
Index: leahi_dialin/fp/modules/boost_pump.py
===================================================================
diff -u -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b)
+++ leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -31,7 +32,7 @@
         Dialin API sub-class for FP Boost pump controller related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         FPBoostPump constructor
         """
Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r70ede35f42770305f04b251b3372ef42a9cecbf5 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 70ede35f42770305f04b251b3372ef42a9cecbf5)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -22,8 +22,9 @@
 from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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,7 +33,7 @@
         Dialin API sub-class for conductivity sensors related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
Index: leahi_dialin/fp/modules/events.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/events.py	(.../events.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels, DenaliCanMessenger
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 
 
 class FPEvents(AbstractSubSystem):
@@ -31,24 +32,23 @@
     """
     UNKNOWN_STATE = "UNKNOWN_PREVIOUS_STATE"
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
 
         @param can_interface: Denali CAN Messenger object
         """
         super().__init__()
-        self.can_interface = can_interface
+        self.can_interface: DenaliCanMessenger = can_interface
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.fp_sync_broadcast_ch_id
-            self.msg_id_fp_event = MsgIds.MSG_ID_FP_EVENT.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_event, self._handler_events_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_FP_EVENT.value,
+                                                                       function = self._handler_events_sync)
 
-            channel_id = DenaliChannels.fp_sync_broadcast_ch_id
-            self.msg_id_fp_op_mode_data = MsgIds.MSG_ID_FP_OP_MODE_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_op_mode_data,
-                                                                       self._handler_fp_op_mode_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.fp_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_FP_OP_MODE_DATA.value,
+                                                                       function = self._handler_fp_op_mode_sync)
 
         self.fp_events_timestamp = 0.0                          #: The timestamp of the last Event message
         self.fp_event_op_mode = 0                               #: The new Operation Mode value
@@ -76,8 +76,8 @@
             self._fp_event_dictionary[fp_enum_repository.FPEventList(event).name] = []
 
         # Loop through the list of the event data type enum and update the dictionary
-        for data_type in fp_enum_repository.FPEventDataTypes:
-            event_data_type = fp_enum_repository.FPEventDataTypes(data_type).name
+        for data_type in fp_enum_repository.DataTypes:
+            event_data_type = fp_enum_repository.DataTypes(data_type).name
             struct_unpack_type = None
 
             # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is
@@ -173,7 +173,7 @@
             # Get the data type
             event_data_type_1 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-            struct_data_type = self._fp_event_data_type[fp_enum_repository.FPEventDataTypes(event_data_type_1).name]
+            struct_data_type = self._fp_event_data_type[fp_enum_repository.DataTypes(event_data_type_1).name]
             op_mode = struct.unpack('<B', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.START_POS_FIELD_3+1]))[0]
             sub_mode = struct.unpack('<B', bytearray(
@@ -182,7 +182,7 @@
                 message['message'][MsgFieldPositions.START_POS_FIELD_3+2:MsgFieldPositions.START_POS_FIELD_3+3]))[0]
             event_data_type_2 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-            struct_data_type = self._fp_event_data_type[fp_enum_repository.FPEventDataTypes(event_data_type_2).name]
+            struct_data_type = self._fp_event_data_type[fp_enum_repository.DataTypes(event_data_type_2).name]
             event_data_2 = struct.unpack(struct_data_type, bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
@@ -191,15 +191,15 @@
             event_data_type_1 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
             # Get the corresponding structure format
-            struct_data_type = self._fp_event_data_type[fp_enum_repository.FPEventDataTypes(event_data_type_1).name]
+            struct_data_type = self._fp_event_data_type[fp_enum_repository.DataTypes(event_data_type_1).name]
             # Get the data value by unpacking the data type
             event_data_1 = struct.unpack(struct_data_type, bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
 
             event_data_type_2 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
-            struct_data_type = self._fp_event_data_type[fp_enum_repository.FPEventDataTypes(event_data_type_2).name]
+            struct_data_type = self._fp_event_data_type[fp_enum_repository.DataTypes(event_data_type_2).name]
             event_data_2 = struct.unpack(struct_data_type, bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
Index: leahi_dialin/fp/modules/flow_sensors.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -31,7 +32,7 @@
          API sub-class for FP flow sensor related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali CAN Messenger object
         """
Index: leahi_dialin/fp/modules/fp_test_configs.py
===================================================================
diff -u -r21a1d644c7d02e7588781b9025b422aa9d74c9ca -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision 21a1d644c7d02e7588781b9025b422aa9d74c9ca)
+++ leahi_dialin/fp/modules/fp_test_configs.py	(.../fp_test_configs.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -17,12 +17,12 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.global_vars import GlobalVariables
 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 DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -31,7 +31,7 @@
     FP Dialin API sub-class for setting and getting the test configurations.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali CAN Messenger object
         """
Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -rb0929a0985784c80e2d184413995a87e6aa23d4b -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision b0929a0985784c80e2d184413995a87e6aa23d4b)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -22,8 +22,9 @@
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -32,7 +33,7 @@
         Dialin API sub-class for levels related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali CAN Messenger object
         """
Index: leahi_dialin/fp/modules/permeate_tank.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/permeate_tank.py	(.../permeate_tank.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/permeate_tank.py	(.../permeate_tank.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -20,8 +20,9 @@
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 
 
 class FPPermeateTank(AbstractSubSystem):
@@ -31,7 +32,7 @@
     Filtration Purification (FP) Dialin API sub-class for permeate tank related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Leahi Can Messenger object
         """
Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -r70ede35f42770305f04b251b3372ef42a9cecbf5 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 70ede35f42770305f04b251b3372ef42a9cecbf5)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -22,8 +22,9 @@
 from leahi_dialin.common.fp_defs import BETA_IOFP_PRES_SENSOR_OFFSET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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,7 +33,7 @@
         Dialin API sub-class for FP pressure sensor related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         FPPressureSensors constructor
         """
Index: leahi_dialin/fp/modules/ro_pump.py
===================================================================
diff -u -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b)
+++ leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -31,7 +32,7 @@
         Dialin API sub-class for FP RO pump controller related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         FPROPump constructor
         """
Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r9f947930678d5b13aa8f788f4e3d58cd1370a541 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 9f947930678d5b13aa8f788f4e3d58cd1370a541)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -22,14 +22,15 @@
 from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET, BETA_IOFP_PRES_SENSOR_OFFSET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
 class FPTemperatureSensors(AbstractSubSystem):
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         super().__init__()
 
         self.can_interface = can_interface
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -rd089b54d2fde7f8c36acce41a47d7acee4ef5da6 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision d089b54d2fde7f8c36acce41a47d7acee4ef5da6)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -23,8 +23,9 @@
 from leahi_dialin.common.fp_defs import BETA_IOFP_VALVE_OFFSET
 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 DenaliMessage, DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -44,7 +45,7 @@
     START_FP_VALVES_STATES = END_IO_VALVES_STATES
     END_FP_VALVES_STATES = START_FP_VALVES_STATES + 1  # FP Valves States come in as a U08 value (1 byte)
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali CAN Messenger object
         """
Index: leahi_dialin/fp/modules/water_pumps.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -20,8 +20,8 @@
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
@@ -30,7 +30,7 @@
         Dialin API sub-class for FP water pump driver related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         FPPumps constructor
         """
Index: leahi_dialin/fp/proxies/dd_proxy.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/fp/proxies/dd_proxy.py	(.../dd_proxy.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/fp/proxies/dd_proxy.py	(.../dd_proxy.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -19,8 +19,8 @@
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.test_config_defs import DDFPTestConfigOptions
-from leahi_dialin.protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -r3f6c0e94db8379f00cb7fbc91daa189d6b06f379 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 3f6c0e94db8379f00cb7fbc91daa189d6b06f379)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 MAX_AIR_PUMP_POWER_LEVEL = 255  #Maximum air pump power allowed
@@ -34,7 +35,7 @@
     Treatment Delivery (TD) Dialin API sub-class for air pump related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -r6f76dccbc46cfa9f663285d2febd7588cec49bb3 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 6f76dccbc46cfa9f663285d2febd7588cec49bb3)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -37,7 +38,7 @@
     AIR_DETECTED_AT_LEVEL = 0
     FLUID_DETECTED_AT_LEVEL = 1
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
Index: leahi_dialin/td/modules/alarms.py
===================================================================
diff -u -r47a803c6dd859a5bcc7a6c82e0cb160c350473ea -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision 47a803c6dd859a5bcc7a6c82e0cb160c350473ea)
+++ leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -23,9 +23,11 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, DialinEnum, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels
+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
+from leahi_dialin.utils.enums import DialinEnum
 
 
 class TDAlarms(AbstractSubSystem):
@@ -69,7 +71,7 @@
     START_POS_ALARMS_FLAGS = END_POS_ALARM_SILENCE_EXPIRES_IN
     END_POS_ALARMS_FLAGS = START_POS_ALARMS_FLAGS + 2
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
@@ -143,8 +145,8 @@
         self.ui_alarm_list_timestamp = 0.0                      #: The timestamp of the last Alarm List 
 
         # Loop through the list of the event data type enum and update the dictionary
-        for data_type in td_enum_repository.TDEventDataTypes:
-            event_data_type = td_enum_repository.TDEventDataTypes(data_type).name
+        for data_type in td_enum_repository.DataTypes:
+            event_data_type = td_enum_repository.DataTypes(data_type).name
             struct_unpack_type = None
 
             # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is
@@ -204,13 +206,13 @@
 
         data_typ_1 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
         # Get the corresponding structure format
-        struct_data_type_1 = self.alarm_data_type[td_enum_repository.TDEventDataTypes(data_typ_1[0]).name]
+        struct_data_type_1 = self.alarm_data_type[td_enum_repository.DataTypes(data_typ_1[0]).name]
         # Get the data value by unpacking the data type
         data_1 = struct.unpack(struct_data_type_1, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))
 
         data_typ_2 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))
         # Get the corresponding structure format
-        struct_data_type_2 = self.alarm_data_type[td_enum_repository.TDEventDataTypes(data_typ_2[0]).name]
+        struct_data_type_2 = self.alarm_data_type[td_enum_repository.DataTypes(data_typ_2[0]).name]
         # Get the data value by unpacking the data type
         data_2 = struct.unpack(struct_data_type_2, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))
 
Index: leahi_dialin/td/modules/blood_flow.py
===================================================================
diff -u -r33150daab2a54bde85830da329b931202ab5f961 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision 33150daab2a54bde85830da329b931202ab5f961)
+++ leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -31,7 +32,7 @@
         Treatment Device (TD) Dialin API sub-class for blood-flow related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         TDBloodFlow constructor
         """
Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -43,7 +44,7 @@
     AIR_BUBBLE_NORMAL_STATE = 0      # Normal state
     AIR_BUBBLE_SELF_TEST_STATE = 1   # Self-test state
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
Index: leahi_dialin/td/modules/buttons.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,7 +21,8 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision c6b28ca8a6aae3f70458f05b5bf445069e2fe457)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -33,7 +34,7 @@
     Treatment Delivery (TD) Dialin API sub-class for ejector motor related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
Index: leahi_dialin/td/modules/events.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/events.py	(.../events.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/events.py	(.../events.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 
 from leahi_dialin.common import td_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 
 
 class TDEvents(AbstractSubSystem):
@@ -31,7 +32,7 @@
     """
     UNKNOWN_STATE = "UNKNOWN_PREVIOUS_STATE"
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali CAN Messenger object
         """
@@ -74,8 +75,8 @@
             self._td_event_dictionary[td_enum_repository.TDEventList(event).name] = []
 
         # Loop through the list of the event data type enum and update the dictionary
-        for data_type in td_enum_repository.TDEventDataTypes:
-            event_data_type = td_enum_repository.TDEventDataTypes(data_type).name
+        for data_type in td_enum_repository.DataTypes:
+            event_data_type = td_enum_repository.DataTypes(data_type).name
             struct_unpack_type = None
 
             # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is
@@ -171,7 +172,7 @@
             # Get the data type
             event_data_type_1 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-            struct_data_type = self._td_event_data_type[td_enum_repository.TDEventDataTypes(event_data_type_1).name]
+            struct_data_type = self._td_event_data_type[td_enum_repository.DataTypes(event_data_type_1).name]
             op_mode = struct.unpack('<B', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.START_POS_FIELD_3+1]))[0]
             sub_mode = struct.unpack('<B', bytearray(
@@ -180,7 +181,7 @@
                 message['message'][MsgFieldPositions.START_POS_FIELD_3+2:MsgFieldPositions.START_POS_FIELD_3+3]))[0]
             event_data_type_2 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-            struct_data_type = self._td_event_data_type[td_enum_repository.TDEventDataTypes(event_data_type_2).name]
+            struct_data_type = self._td_event_data_type[td_enum_repository.DataTypes(event_data_type_2).name]
             event_data_2 = struct.unpack(struct_data_type, bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
@@ -189,15 +190,15 @@
             event_data_type_1 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
             # Get the corresponding structure format
-            struct_data_type = self._td_event_data_type[td_enum_repository.TDEventDataTypes(event_data_type_1).name]
+            struct_data_type = self._td_event_data_type[td_enum_repository.DataTypes(event_data_type_1).name]
             # Get the data value by unpacking the data type
             event_data_1 = struct.unpack(struct_data_type, bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
 
             event_data_type_2 = struct.unpack('i', bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
-            struct_data_type = self._td_event_data_type[td_enum_repository.TDEventDataTypes(event_data_type_2).name]
+            struct_data_type = self._td_event_data_type[td_enum_repository.DataTypes(event_data_type_2).name]
             event_data_2 = struct.unpack(struct_data_type, bytearray(
                 message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -r21a1d644c7d02e7588781b9025b422aa9d74c9ca -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 21a1d644c7d02e7588781b9025b422aa9d74c9ca)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -22,8 +22,9 @@
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
 
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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,7 +33,7 @@
     Treatment Delivery (TD) Dialin API sub-class for pressure related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         TDPressureSensors constructor
         """
Index: leahi_dialin/td/modules/switches.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/switches.py	(.../switches.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/switches.py	(.../switches.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -31,7 +32,7 @@
     @brief Treatment Device (TD) Dialin API sub-class for TD switches related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         TDSwitches constructor
         """
Index: leahi_dialin/td/modules/td_test_configs.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/td_test_configs.py	(.../td_test_configs.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/td_test_configs.py	(.../td_test_configs.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -20,8 +20,9 @@
 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 TDTestConfigOptions
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -30,7 +31,7 @@
     TD Dialin API sub-class for setting and getting the test configurations.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali CAN Messenger object
         """
Index: leahi_dialin/td/modules/temperature_sensors.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -31,7 +32,7 @@
     Treatment Delivery (TD) Dialin API sub-class for temperature related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         TDTemperatureSensors constructor
         """
Index: leahi_dialin/td/modules/treatment.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -31,7 +32,7 @@
     Treatment Delivery (TD) Dialin API sub-class for treatment related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         TDTreatment constructor
         """
Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r62e0f169dcd17b68ab7ec40a3f58f51ace9af24a -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 62e0f169dcd17b68ab7ec40a3f58f51ace9af24a)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 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.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliMessage, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -58,7 +59,7 @@
     START_MAX_HOMING_ENC = END_POS_D
     END_MAX_HOMING_ENC = START_MAX_HOMING_ENC + 2
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         TDValves constructor
 
Index: leahi_dialin/td/modules/voltages.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -21,8 +21,9 @@
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
 
@@ -31,7 +32,7 @@
     Treatment Delivery (TD) Dialin API sub-class for voltage monitor related commands and data.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         TDVoltages constructor
         """
Index: leahi_dialin/td/proxies/dd_proxy.py
===================================================================
diff -u -r1813f6556e8a726a6e300caffe0bcafc40010aa9 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/proxies/dd_proxy.py	(.../dd_proxy.py)	(revision 1813f6556e8a726a6e300caffe0bcafc40010aa9)
+++ leahi_dialin/td/proxies/dd_proxy.py	(.../dd_proxy.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -17,7 +17,7 @@
 from logging import Logger
 
 from leahi_dialin.protocols.CAN import DenaliCanMessenger
-from leahi_dialin.utils.base import AbstractSubSystem
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 
 
 class DDProxy(AbstractSubSystem):
Index: leahi_dialin/td/proxies/ui_proxy.py
===================================================================
diff -u -r47a803c6dd859a5bcc7a6c82e0cb160c350473ea -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision 47a803c6dd859a5bcc7a6c82e0cb160c350473ea)
+++ leahi_dialin/td/proxies/ui_proxy.py	(.../ui_proxy.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -20,8 +20,8 @@
 from leahi_dialin.common.constants import ACCEPTED
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions, RequestRejectReasons
 from leahi_dialin.common.override_templates import cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
Index: leahi_dialin/td/treatment_delivery.py
===================================================================
diff -u -r3f6c0e94db8379f00cb7fbc91daa189d6b06f379 -rf03c9a32180573f2430105ad69eb91d9f597a96b
--- leahi_dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision 3f6c0e94db8379f00cb7fbc91daa189d6b06f379)
+++ leahi_dialin/td/treatment_delivery.py	(.../treatment_delivery.py)	(revision f03c9a32180573f2430105ad69eb91d9f597a96b)
@@ -43,7 +43,8 @@
 from ..common import td_enum_repository
 from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels
-from ..utils.base import AbstractSubSystem, publish, LogManager
+from ..utils.abstract_classes import AbstractSubSystem
+from ..utils.base import publish, LogManager
 from ..utils.conversions import integer_to_bytearray, bytearray_to_byte