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]