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]))