Index: tst_treatment_saline_data/test.py
===================================================================
diff -u -r2aff4bbf5a1749195064cfc9b8acc9f55aab601d -rc0794178d98672bdfbaf2b7315e7f007b6b79295
--- tst_treatment_saline_data/test.py	(.../test.py)	(revision 2aff4bbf5a1749195064cfc9b8acc9f55aab601d)
+++ tst_treatment_saline_data/test.py	(.../test.py)	(revision c0794178d98672bdfbaf2b7315e7f007b6b79295)
@@ -99,7 +99,7 @@
     if (not accept_status): test.compare(waitForObjectExists(utility.rejection_msg(config.REJECTION_REASON[rejection_reason])).text, config.REJECTION_REASON[rejection_reason], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[rejection_reason]))
 
     #set saline transition state.
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=saline_states, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=saline_states, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value)  
 
@@ -213,15 +213,15 @@
     
     test.startSection("verification of saline parameter states on main treatment screen")
 
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE  .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) 
     
     mouseClick(waitForObject(names.o_treatmentHome_startFluidButton_TouchRect))
     test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), True, "START BOLUS button is enable")
     test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), True, "Start Bolus text is enable")
     
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE  .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) 
     
@@ -231,7 +231,7 @@
     test.compare((waitForObjectExists(names.o_treatmentHome_image_Image).visible), True, "Pause Image is Visible")
     test.compare(str(waitForObjectExists(names.o_treatmentHome_Treatment_Paused_Text).text), "Treatment Paused", "Treatment Paused text is visible")
 
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE  .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) 
     
@@ -240,7 +240,7 @@
     test.compare((waitForObjectExists(names.o_treatmentHome_image_Image).visible), True, "Pause Image is Visible")
     test.compare(str(waitForObjectExists(names.o_treatmentHome_Treatment_Paused_Text).text), "Treatment Paused", "Treatment Paused text is visible")
 
-    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_STOP_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_STOP_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) 
     
@@ -257,7 +257,7 @@
     utils.waitForGUI(1)
 
     #navigate to dialysis state
-    hd_simulator.cmd_set_treatment_states_data(sub_mode= HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
+    hd_simulator.cmd_set_treatment_states_data(sub_mode= HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,
                                                treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value)