Index: leahi_dialin/dd/modules/events.py
===================================================================
diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r3e6eac0e751fd74569068bc8754f0828cd4fcd84
--- leahi_dialin/dd/modules/events.py	(.../events.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
+++ leahi_dialin/dd/modules/events.py	(.../events.py)	(revision 3e6eac0e751fd74569068bc8754f0828cd4fcd84)
@@ -193,13 +193,13 @@
         event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2)        
         
         # Update event data from integer to name if it's op mode change
-        if event_enum is dd_enum_repository.DDEventList.op_mode_CHANGE:
+        if event_enum is dd_enum_repository.DDEventList.DD_EVENT_OP_MODE_CHANGE:
             event_data_1 = dd_enum_repository.DDOpModes(event_data_1).name
             event_data_2 = dd_enum_repository.DDOpModes(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 dd_enum_repository.DDEventList.sub_mode_CHANGE:
+        elif event_enum is dd_enum_repository.DDEventList.DD_EVENT_SUB_MODE_CHANGE:
             # Get the Op Mode Change messages
             op_modes_list = self._event_dictionary[dd_enum_repository.DDEventList.DD_EVENT_OP_MODE_CHANGE.name]