Index: leahi_dialin/fp/modules/events.py
===================================================================
diff -u -r3b0a81ce7a7bee195a26fdcb9f1ad387088fb26d -rd0dedd8e720be5de357176ffb095484ec082c830
--- leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 3b0a81ce7a7bee195a26fdcb9f1ad387088fb26d)
+++ leahi_dialin/fp/modules/events.py	(.../events.py)	(revision d0dedd8e720be5de357176ffb095484ec082c830)
@@ -105,7 +105,7 @@
 
         msg_list = []
         msg_list.append((event_id,      DataTypes.U32))
-        if event_enum is fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS:
+        if event_enum is fp_enum_repository.FPEventList.OPERATION_STATUS:
             msg_list.append((data_typ_1,    DataTypes.U32))     # It's not used in operation status case
             msg_list.append((op_mode,       DataTypes.U08))
             msg_list.append((sub_mode,      DataTypes.U08))
@@ -131,15 +131,15 @@
        
         # Check if the event state name is operation mode change. If it is, get the name of the operation modes
         # from the op modes enum class
-        if event_enum is fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE:
+        if event_enum is fp_enum_repository.FPEventList.OP_MODE_CHANGE:
             data_1 = fp_enum_repository.FPOpModes(data_1.value).name
             data_2 = fp_enum_repository.FPOpModes(data_2.value).name
             event_tuple = (current_timestamp, event_enum.name, data_1.value, data_2.value)
 
         # Check if the event state name is sub mode change.
-        elif event_enum is fp_enum_repository.FPEventList.FP_EVENT_SUB_MODE_CHANGE:
+        elif event_enum is fp_enum_repository.FPEventList.SUB_MODE_CHANGE:
             # Get the Op Mode Change messages
-            op_modes_list = self._event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_OP_MODE_CHANGE.name]
+            op_modes_list = self._event_dictionary[fp_enum_repository.FPEventList.OP_MODE_CHANGE.name]
             
             # If there are Op mode change messages, use it to determine the operation mode for the current submode change
             # Index description:
@@ -149,7 +149,7 @@
             # 3: Current Op / Sub Mode
             if len(op_modes_list) != 0:
                 # Get the Sub Mode Change messages
-                sub_mode_list = self._event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_SUB_MODE_CHANGE.name]
+                sub_mode_list = self._event_dictionary[fp_enum_repository.FPEventList.SUB_MODE_CHANGE.name]
                 last_op_mode_message = op_modes_list[-1]
 
                 # Check if this is not the very first Sub Mode Change message
@@ -180,7 +180,7 @@
             # to identify the Op Modes for the Sub Modes
             else:
                 # Get the Operation Status Change messages
-                op_status_list = self._event_dictionary[fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS.name]
+                op_status_list = self._event_dictionary[fp_enum_repository.FPEventList.OPERATION_STATUS.name]
                 
                 data_2_found = False
                 event_1_op_mode = self.UNKNOWN_STATE
@@ -220,7 +220,7 @@
             # Update the tuple
             event_tuple = (current_timestamp, event_enum.name, data_1.value, data_2.value)
 
-        elif event_enum is fp_enum_repository.FPEventList.FP_EVENT_OPERATION_STATUS:
+        elif event_enum is fp_enum_repository.FPEventList.OPERATION_STATUS:
             op_mode_enum, sub_mode_enum, state_enum, _ = self._operation_status_match(op_mode=op_mode.value, sub_mode=sub_mode.value, state=sub_state.value)
             event_tuple = (current_timestamp, op_mode_enum, sub_mode_enum, state_enum)