Index: suite_leahi/tst_rinseback/test.py
===================================================================
diff -u -rf05519ac142a13cbaf6f31c5a4dab88117461d00 -r535c5a49b6d814e8531fa43fc816f0658d1bafef
--- suite_leahi/tst_rinseback/test.py	(.../test.py)	(revision f05519ac142a13cbaf6f31c5a4dab88117461d00)
+++ suite_leahi/tst_rinseback/test.py	(.../test.py)	(revision 535c5a49b6d814e8531fa43fc816f0658d1bafef)
@@ -76,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,TDTreaRinsebackStates.RINSEBACK_STOP_INIT_STATE.value)
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_INIT_STATE.value)
+    change_treatmentstates(TDTreatmentStates.DIALYSIS_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_INIT_STATE.value)
+    change_treatmentstates(TDTreatmentStates.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
@@ -123,7 +123,7 @@
 
 def verify_pressure_value():
     test.startSection("Verify the pressure container values")
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_RUN_STATE.value)
+    change_treatmentstates(TDTreatmentStates.RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_RUN_STATE.value)
     td.td_pressure(H2_arterial_pressure     = -151,
                    H14_venous_pressure      = -12, 
                    limit_state              = 0, 
@@ -202,7 +202,7 @@
     rejectionReason = waitForObject(utility.setObjectText(text="[1] "+ REJECT_TEXT,obj =names.o_EndTreatmentRinseback_NotificationBar_NotificationBarSmall))
     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,
+    change_treatmentstates( TDTreatmentStates.RINSEBACK_STATE.value,
                             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))
@@ -223,7 +223,7 @@
     test.compare(timeoutValue,"01:24","Rinseback paused text should be'{}'".format(timeoutValue))
     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,
+    change_treatmentstates( TDTreatmentStates.RINSEBACK_STATE.value,
                     TDTreaRinsebackStates.RINSEBACK_RUN_STATE.value)
     test.endSection()
     
@@ -239,7 +239,7 @@
     
 def verify_blood_return_complete():
     test.startSection("Verify the Blood Return Complete State")
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_STATE.value)
+    change_treatmentstates(TDTreatmentStates.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,
@@ -250,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,TDTreaRinsebackStates.RINSEBACK_PAUSED_STATE.value)
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_STATE.value)
+    change_treatmentstates(TDTreatmentStates.RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_PAUSED_STATE.value)
+    change_treatmentstates(TDTreatmentStates.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,TDTreaRinsebackStates.RINSEBACK_PAUSED_STATE.value)
-    change_treatmentstates(TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_STOP_STATE.value)
+    change_treatmentstates(TDTreatmentStates.RINSEBACK_STATE.value,TDTreaRinsebackStates.RINSEBACK_PAUSED_STATE.value)
+    change_treatmentstates(TDTreatmentStates.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")