Index: dialin/common/hd_defs.py
===================================================================
diff -u -r4a82d8520d1fd51983b45ec460ba13eb3e451b3f -r7066faf667d6416689868171a2bdc3ae92929d62
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 4a82d8520d1fd51983b45ec460ba13eb3e451b3f)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 7066faf667d6416689868171a2bdc3ae92929d62)
@@ -32,7 +32,7 @@
 
 
 @unique
-class HDOpSubModes(DialinEnum):
+class HDStandbyStates(DialinEnum):
     STANDBY_START_STATE                                     =  0    # Start standby.
     STANDBY_WAIT_FOR_TREATMENT_STATE                        =  1    # Wait for treatment.
     STANDBY_WAIT_FOR_DISINFECT_STATE                        =  2    # Wait for UI to send disinfect option.
Index: dialin/hd/hd_events.py
===================================================================
diff -u -r5eb006b08eb1d7b641b22fff20072ab7b685cfec -r7066faf667d6416689868171a2bdc3ae92929d62
--- dialin/hd/hd_events.py	(.../hd_events.py)	(revision 5eb006b08eb1d7b641b22fff20072ab7b685cfec)
+++ dialin/hd/hd_events.py	(.../hd_events.py)	(revision 7066faf667d6416689868171a2bdc3ae92929d62)
@@ -50,7 +50,7 @@
         # Dictionary of the the mode as key and the sub mode states enum class as the value
         self._hd_op_mode_2_sub_mode = {HDOpModes.MODE_FAUL.name: HDFaultStates,
                                        HDOpModes.MODE_INIT.name: HDInitStates,
-                                       HDOpModes.MODE_STAN.name: StandbyStates,
+                                       HDOpModes.MODE_STAN.name: HDStandbyStates,
                                        HDOpModes.MODE_TPAR.name: TreatmentParametersStates,
                                        HDOpModes.MODE_PRET.name: PreTreatmentSubModes,
                                        HDOpModes.MODE_TREA.name: TreatmentStates,