Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -r83caf575cae31050f77bd25d2bb86f380c2338c8 -r9498ba0c5cd12801de49e3eda26d9b3a8dfc4e55
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision 83caf575cae31050f77bd25d2bb86f380c2338c8)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 9498ba0c5cd12801de49e3eda26d9b3a8dfc4e55)
@@ -201,8 +201,8 @@
     test.compare(current_progress, expected_progress, "{} should be the current progress".format(expected_progress))
     test.endSection()
     
-def rejection_msg(text): 
-    names.o_rejection_msg["text"] = text
-    return names.o_rejection_msg
+def rinseback_rejection_msg(text): 
+    names.o_rinseback_rejection_msg["text"] = text
+    return names.o_rinseback_rejection_msg
     
     
\ No newline at end of file
Index: shared/scripts/names.py
===================================================================
diff -u -r83caf575cae31050f77bd25d2bb86f380c2338c8 -r9498ba0c5cd12801de49e3eda26d9b3a8dfc4e55
--- shared/scripts/names.py	(.../names.py)	(revision 83caf575cae31050f77bd25d2bb86f380c2338c8)
+++ shared/scripts/names.py	(.../names.py)	(revision 9498ba0c5cd12801de49e3eda26d9b3a8dfc4e55)
@@ -85,11 +85,8 @@
 o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentAdditional", "type": "EndTreatmentBase", "visible": True}
 o_EndTreatmentAdditional_Additional_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "text": "Additional Rinseback", "type": "Text", "unnamed": 1, "visible": True}
 o_rinseback_timer_ml_min_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "  mL/min", "type": "Text", "unnamed": 1, "visible": True}
-# o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_circle", "type": "ProgressCircle", "visible": True}
-# o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True}
 o_shape_Shape = {"container": o_Gui_MainView, "id": "_shape", "type": "Shape", "unnamed": 1, "visible": True}
 o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_Circle", "type": "ProgressCircle", "visible": True}
-# o_self_test_dry_progress_circle = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "id": "_progressCircle", "type": "ProgressCircle", "unnamed": 1, "visible": True}
 
 o_EndTreatmentRinseback_0_mL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True}
 o_rinseback_title = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "Rinseback", "type": "Text", "unnamed": 1, "visible": True}
@@ -110,7 +107,5 @@
 o_EndTreatmentRinseback_circle_ProgressCircle = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_circle", "type": "ProgressCircle", "unnamed": 1, "visible": True}
 o_EndTreatmentAdditional_circle_ProgressCircle = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "id": "_circle", "type": "ProgressCircle", "unnamed": 1, "visible": True}
 
-# o_text_volume_rinseback_run_state = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "type": "Text", "unnamed": 1, "visible": True}
-# {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True}
-o_rejection_msg = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "type": "Text", "unnamed": 1, "visible": True}
+o_rinseback_rejection_msg = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "type": "Text", "unnamed": 1, "visible": True}
 
Index: tst_rinseback_setup/test.py
===================================================================
diff -u -r83caf575cae31050f77bd25d2bb86f380c2338c8 -r9498ba0c5cd12801de49e3eda26d9b3a8dfc4e55
--- tst_rinseback_setup/test.py	(.../test.py)	(revision 83caf575cae31050f77bd25d2bb86f380c2338c8)
+++ tst_rinseback_setup/test.py	(.../test.py)	(revision 9498ba0c5cd12801de49e3eda26d9b3a8dfc4e55)
@@ -249,7 +249,7 @@
     test.startSection("verifying rejection messages in rinseback screens ")
     for reason_id in range(1, config.NUM_OF_REQUEST_REJECT_REASONS + 1):
         hd_simulator.cmd_send_treatment_adjust_rinseback_response(accepted = 0, reason= reason_id)   
-        rejection_message = waitForObjectExists(utility.rejection_msg(text=config.REJECTION_REASON[reason_id]))
+        rejection_message = waitForObjectExists(utility.rinseback_rejection_msg(text=config.REJECTION_REASON[reason_id]))
         test.compare(rejection_message.text, config.REJECTION_REASON[reason_id], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[reason_id]))
     test.endSection()