Index: tst_disinfection/test.py
===================================================================
diff -u -r1462b91c2ed482c9ad78fafb68953426189a5b6f -r6bb43117bca2673c5de877f5b70b094da344418a
--- tst_disinfection/test.py	(.../test.py)	(revision 1462b91c2ed482c9ad78fafb68953426189a5b6f)
+++ tst_disinfection/test.py	(.../test.py)	(revision 6bb43117bca2673c5de877f5b70b094da344418a)
@@ -22,7 +22,7 @@
 from configuration import utility
 from dialin.common.dg_defs import DGHeatDisinfectStates, DGChemicalDisinfectStates, DGFlushStates
 from dialin.utils.conversions import integer_to_bytearray, unsigned_integer_to_bytearray
-from dialin.common.hd_defs import HDOpSubModes, HDOpModes
+from dialin.common.hd_defs import HDStandbyStates, HDOpModes
 from posix import utime
 
 
@@ -195,7 +195,7 @@
         @return: None
     """
     test.startSection("Verification of Disinfection from settings path.")
-    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE.value)
+    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value)
     
     mouseClick(waitForObject(names.o_touchRect2_TouchRect))
     test.log("User is navigated to DG Cleaning from settings")
@@ -216,7 +216,7 @@
     test.log("User clicked on 'DG Cleaning' button -> Message ID : 154")
     
     mouseClick(waitForObject(names.o_SettingsBase_image_Image))
-    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value)
+    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value)
     
     utils.waitForGUI(1)
     test.compare(waitForObject(names.o_disinfectHome_backButton_BackButton).text.text, config.BACK_TEXT, "Message : 154 is verified from UI to HD")
@@ -232,7 +232,7 @@
         @return: None
     """
     test.startSection("Verification of chemical disinfection.")
-    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value)
+    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value)
     mouseClick(waitForObject(names.o_disinfectHome_Chemical_Disinfect))
     
     utility.verify_page_step_indicator_for_disinfect(DISINFECT_TREATMENT_OBJECT['Chemical'], config.DISINFECT_TREATMENT_ID, 1, config.CHEMICAL_DISINFECT_TREATMENT_SCREENS)
@@ -271,7 +271,7 @@
         @return: None
     """
     test.startSection("Verification of heat disinfection.")
-    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value)
+    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value)
     mouseClick(waitForObject(names.o_disinfectHome_Heat_Disinfect))
     
     utility.verify_page_step_indicator_for_disinfect(DISINFECT_TREATMENT_OBJECT['Heat'],config.DISINFECT_TREATMENT_ID, 1, config.HEAT_DISINFECT_TREATMENT_SCREENS)
@@ -299,7 +299,7 @@
         @return: None
     """
     test.startSection("Verification of Water Flush.")
-    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value)
+    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value)
     mouseClick(waitForObject(names.o_disinfectHome_TouchRect))
     
     utility.verify_page_step_indicator_for_disinfect(DISINFECT_TREATMENT_OBJECT['Flush'],config.DISINFECT_TREATMENT_ID, 1, config.FLUSH_DISINFECT_TREATMENT_SCREENS)