Index: suite_leahi/tst_rinseback/test.py
===================================================================
diff -u -rab8c9554486ad673aa83390f8ad877cc838f96b8 -rfdc9c92e7292731f9f4624232769bca1933fe049
--- suite_leahi/tst_rinseback/test.py	(.../test.py)	(revision ab8c9554486ad673aa83390f8ad877cc838f96b8)
+++ suite_leahi/tst_rinseback/test.py	(.../test.py)	(revision fdc9c92e7292731f9f4624232769bca1933fe049)
@@ -37,8 +37,7 @@
 from leahi_dialin.ui                import utils
 from configuration                  import utility,config
 from leahi_dialin.ui.td_messaging   import TD_Messaging
-from leahi_dialin.common.ui_defs    import TXStates
-from leahi_dialin.common.td_defs    import TDOpModes,TDTreatmentStates
+from leahi_dialin.common.td_defs    import TDOpModes,TDTreatmentStates,TDTreaRinsebackStates
 from leahi_dialin.utils             import conversions
 from configuration.getrejectiontext import ScopedRejectionRepository
 from pathlib                        import Path
@@ -77,8 +76,8 @@
 def verify_blood_return_setup_screen():
     test.startSection("Verify Blood Return Setup Screen")
     td.td_operation_mode(TDOpModes.MODE_TREA.value)
-    change_treatmentstates(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value,TXStates.RINSEBACK_STOP_INIT_STATE)
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TXStates.RINSEBACK_STOP_INIT_STATE)
+    change_treatmentstates(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_INIT_STATE.value)
+    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_INIT_STATE.value)
     headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000)
     blood_return_setup_screen_headerbar_title_text = utility.findChildByText(
         headerbar_container, config.BLOOD_RETURN_SETUP
@@ -124,7 +123,7 @@
 
 def verify_pressure_value():
     test.startSection("Verify the pressure container values")
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TXStates.RINSEBACK_RUN_STATE)
+    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_RUN_STATE.value)
     td.td_pressure(H2_arterial_pressure     = -151,
                    H14_venous_pressure      = -12, 
                    limit_state              = 0, 
@@ -204,7 +203,7 @@
     test.compare(rejectionReason.text,"[1] "+ REJECT_TEXT,  "Rejection Reason text should be :" + str(rejectionReason.text))
     td.td_rinseback_cmd_response(vRejectionReason = 0)
     change_treatmentstates( TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,
-                            TXStates.RINSEBACK_PAUSED_STATE)
+                            TDTreaRinsebackStates.RINSEBACK_PAUSED_STATE.value)
     progressbar_color = waitForObject(names.o_EndTreatmentRinseback_targetVolumeProgress_ProgressCircle).color.name
     test.compare(progressbar_color, "#9b864e", "Progress bar should be'{}'".format(progressbar_color))
     rinseback = waitForObject(utility.setObjectText(text=config.RINSEBACK_PAUSED ,obj =names.o_EndTreatmentRinseback))
@@ -225,7 +224,7 @@
     mouseClick(waitForObject(names.o_EndTreatmentRinseback_pauseResumeButton_TouchRect, 2000))
     test.verify(waitFor( lambda: rinsebackrequest == 4, 3000), "Testing FW received Resume Rinseback request")
     change_treatmentstates( TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,
-                    TXStates.RINSEBACK_RUN_STATE)
+                    TDTreaRinsebackStates.RINSEBACK_RUN_STATE.value)
     test.endSection()
     
 def verify_increment_decrement_rinseback_values():
@@ -240,7 +239,7 @@
     
 def verify_blood_return_complete():
     test.startSection("Verify the Blood Return Complete State")
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TXStates.RINSEBACK_STOP_STATE)
+    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_STATE.value)
     blood_return_complete = utility.get_object_from_names(names.o_Blood_Return_Complete_Title_Text)
     test.compare(
         blood_return_complete.text,
@@ -251,14 +250,14 @@
     mouseClick(end_treatment_button)
     test.verify(waitFor( lambda: rinsebackrequest == 8, 3000), "Testing FW received End Treatment value")
 
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TXStates.RINSEBACK_PAUSED_STATE)
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TXStates.RINSEBACK_STOP_STATE)
+    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_PAUSED_STATE.value)
+    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_STATE.value)
     fluid_bolus_button = utility.get_object_from_names(names.o_Blood_Return_Complete_Fluid_Bolus_TouchRect)
     mouseClick(fluid_bolus_button)
     test.verify(waitFor( lambda: rinsebackrequest == 6, 3000), "Testing FW received Fluid Bolus value")
 
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TXStates.RINSEBACK_PAUSED_STATE)
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TXStates.RINSEBACK_STOP_STATE)
+    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_PAUSED_STATE.value)
+    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_STATE.value)
     recirculate_button = utility.get_object_from_names(names.o_Blood_Return_Complete_Recirculate_TouchRect)
     mouseClick(recirculate_button)
     test.verify(waitFor( lambda: rinsebackrequest == 7, 3000), "Testing FW received Recirculate value")