Index: dialin/common/hd_defs.py
===================================================================
diff -u -ra8b402ddc92a355e855956442f9c782ed1032fc1 -rbb3d6e80efc730856e4409d9a2c61c31e6a0aa7e
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision a8b402ddc92a355e855956442f9c782ed1032fc1)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision bb3d6e80efc730856e4409d9a2c61c31e6a0aa7e)
@@ -32,7 +32,7 @@
 
 
 @unique
-class StandbyStates(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 -ra8b402ddc92a355e855956442f9c782ed1032fc1 -rbb3d6e80efc730856e4409d9a2c61c31e6a0aa7e
--- dialin/hd/hd_events.py	(.../hd_events.py)	(revision a8b402ddc92a355e855956442f9c782ed1032fc1)
+++ dialin/hd/hd_events.py	(.../hd_events.py)	(revision bb3d6e80efc730856e4409d9a2c61c31e6a0aa7e)
@@ -50,7 +50,7 @@
         # Dictionary of 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,