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]