Index: tst_rinseback_setup/test.py
===================================================================
diff -u -r472731060f96a73795f8feefe2b81969490e6ce1 -r6bb43117bca2673c5de877f5b70b094da344418a
--- tst_rinseback_setup/test.py	(.../test.py)	(revision 472731060f96a73795f8feefe2b81969490e6ce1)
+++ tst_rinseback_setup/test.py	(.../test.py)	(revision 6bb43117bca2673c5de877f5b70b094da344418a)
@@ -21,7 +21,7 @@
 from configuration import config
 from dialin.ui.hd_simulator import HDSimulator
 from configuration import utility
-from dialin.common.hd_defs import HDOpModes, HDOpSubModes, TreatmentStates, TreatmentEndStates, TreatmentRinsebackStates
+from dialin.common.hd_defs import HDOpModes, HDStandbyStates, TreatmentStates, TreatmentEndStates, TreatmentRinsebackStates
 
 hd_simulator = HDSimulator()
 SCREEN_OBJ = names.o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit
@@ -49,7 +49,7 @@
     """
     test.startSection("verifying Rinseback Stop INIT state screens")
     hd_simulator.cmd_set_treatment_time(sec_total = COUNT_DOWN_VALUE, sec_elapsed = SEC_ELAPSED, sec_remain = SEC_REMAINING)
-    hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value)
+    hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value)
     hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_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=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value,