Index: leahi_dialin/dd/modules/events.py
===================================================================
diff -u -rd27c40205e18118f4689f62463a266da1f91dba6 -r17b02f26012e7378daf831057c6f62c4ecdcfff0
--- leahi_dialin/dd/modules/events.py	(.../events.py)	(revision d27c40205e18118f4689f62463a266da1f91dba6)
+++ leahi_dialin/dd/modules/events.py	(.../events.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
@@ -60,14 +60,14 @@
 
         # Dictionary of the mode as key and the sub mode states enum class as the value
         self._dd_op_mode_2_sub_mode = {dd_enum_repository.DDOpModes.MODE_FAUL.name: dd_enum_repository.DDFaultStates,
-                                       dd_enum_repository.DDOpModes.MODE_SERV.name: dd_enum_repository.DDServiceModesStates,
+                                       dd_enum_repository.DDOpModes.MODE_SERV.name: dd_enum_repository.DDServiceStates,
                                        dd_enum_repository.DDOpModes.MODE_INIT.name: dd_enum_repository.DDInitStates,
-                                       dd_enum_repository.DDOpModes.MODE_STAN.name: dd_enum_repository.DDStandByModeStates,
+                                       dd_enum_repository.DDOpModes.MODE_STAN.name: dd_enum_repository.DDStandbyStates,
                                        dd_enum_repository.DDOpModes.MODE_PREG.name: dd_enum_repository.DDPreGenDialysateStates,
                                        dd_enum_repository.DDOpModes.MODE_GEND.name: dd_enum_repository.DDGenDialysateModeStates,
-                                       dd_enum_repository.DDOpModes.MODE_POSG.name: dd_enum_repository.DDPostGenDialysateState,
-                                       dd_enum_repository.DDOpModes.MODE_HEAT.name: dd_enum_repository.DDHeatersState,
-                                       dd_enum_repository.DDOpModes.MODE_HCOL.name: dd_enum_repository.DDHeatersCoolingStates,
+                                       dd_enum_repository.DDOpModes.MODE_POSG.name: dd_enum_repository.DDPostGenDialysateStates,
+                                       dd_enum_repository.DDOpModes.MODE_HEAT.name: dd_enum_repository.DDHeatDisinfectStates,
+                                       dd_enum_repository.DDOpModes.MODE_HCOL.name: dd_enum_repository.DDHeaterCoolingStates,
                                        dd_enum_repository.DDOpModes.MODE_ROPS.name: dd_enum_repository.DDROPermeateStates,
                                        dd_enum_repository.DDOpModes.MODE_NLEG.name: dd_enum_repository.DDNotLegalStates}