Index: leahi_dialin/td/modules/events.py
===================================================================
diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r3e6eac0e751fd74569068bc8754f0828cd4fcd84
--- leahi_dialin/td/modules/events.py	(.../events.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
+++ leahi_dialin/td/modules/events.py	(.../events.py)	(revision 3e6eac0e751fd74569068bc8754f0828cd4fcd84)
@@ -189,14 +189,14 @@
         event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2)
         # 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 td_enum_repository.TDEventList.op_mode_CHANGE:
+        if event_enum is td_enum_repository.TDEventList.TD_EVENT_OP_MODE_CHANGE:
             event_data_1 = td_enum_repository.TDOpModes(event_data_1).name
             event_data_2 = td_enum_repository.TDOpModes(event_data_2).name
             event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2)
         # Check if the event state name is sub mode change.
-        elif event_enum is td_enum_repository.TDEventList.sub_mode_CHANGE:
+        elif event_enum is td_enum_repository.TDEventList.TD_EVENT_SUB_MODE_CHANGE:
             # Get the Op Mode Change messages
-            op_modes_list = self._event_dictionary[td_enum_repository.TDEventList.op_mode_CHANGE.name]
+            op_modes_list = self._event_dictionary[td_enum_repository.TDEventList.TD_EVENT_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:
@@ -206,7 +206,7 @@
             # 3: Current Op / Sub Mode
             if len(op_modes_list) != 0:
                 # Get the Sub Mode Change messages
-                sub_mode_list = self._event_dictionary[td_enum_repository.TDEventList.sub_mode_CHANGE.name]
+                sub_mode_list = self._event_dictionary[td_enum_repository.TDEventList.TD_EVENT_SUB_MODE_CHANGE.name]
                 last_op_mode_message = op_modes_list[-1]
 
                 # Check if this is not the very first Sub Mode Change message