Index: shared/scripts/names.py
===================================================================
diff -u -r66579e2dfbba8c77673add25b3fa6ebaba4b4f10 -r472731060f96a73795f8feefe2b81969490e6ce1
--- shared/scripts/names.py	(.../names.py)	(revision 66579e2dfbba8c77673add25b3fa6ebaba4b4f10)
+++ shared/scripts/names.py	(.../names.py)	(revision 472731060f96a73795f8feefe2b81969490e6ce1)
@@ -598,18 +598,25 @@
 o_rinse_back_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "Rinseback Setup", "type": "Text", "unnamed": 1, "visible": True}
 #Rinseback Start button text 
 o_start_rinseback_init_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackInit_beginRinsebackTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_beginRinsebackTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True}
 #Rinseback back to treatment button text
 o_init_rinseback_back_to_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "BACK TO TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackInit_backTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_backTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True}
 #Rinseback end treatment button text
 o_init_rinseback_end_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackInit_endTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_endTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True}
 #Rinseback END image and button text
 o_EndTreatmentRinseback_imageEnd_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageEnd", "source": "qrc:/images/iRedCrossWCircle", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_MouseArea = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "type": "MouseArea", "unnamed": 1, "visible": True}
 #Decelerate Image text and button text
 o_EndTreatmentRinseback_imageDecelerate_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageDecelerate", "source": "qrc:/images/iDecelerate", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_MouseArea_2 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True}
 #Accelerate Image text and button text
 o_EndTreatmentRinseback_imageAccelerate_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageAccelerate", "source": "qrc:/images/iAccelerate", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_MouseArea_3 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "occurrence": 4, "type": "MouseArea", "unnamed": 1, "visible": True}
 #Pause Image text and button text
 o_EndTreatmentRinseback_imagePause_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imagePause", "source": "qrc:/images/iPauseLightBlue", "type": "ImageText", "unnamed": 1, "visible": True}
+o_EndTreatmentRinseback_MouseArea_4 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True}
 #Rinseback Title text
 o_EndTreatmentRinseback_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "Rinseback", "type": "Text", "unnamed": 1, "visible": True}
 #Resume Image text and button text
@@ -620,12 +627,16 @@
 o_EndTreatmentRinsebackComplete_END_TREATMENT_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
 #Rinseback complete Additional text
 o_EndTreatmentRinsebackComplete_ADDITIONAL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "ADDITIONAL", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackComplete_beginRinsebackTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_beginRinsebackTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True}
 #Rinseback complete back to treatment text
 o_EndTreatmentRinsebackComplete_Back_to_treatment_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "BACK TO TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackComplete_backTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_backTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True}
 #Rinseback Additional rinseback text
 o_EndTreatmentAdditional_Additional_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "text": "Additional Rinseback", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackComplete_endTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_endTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True}
 #Rinseback complete confirm button
 o_EndTreatmentRinsebackComplete_Confirm_Button = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentRinsebackComplete_mouseArea_MouseArea = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True}
 #Rinseback setup Progress circle
 o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_Circle", "type": "ProgressCircle", "visible": True}
 #Rinseback Title text
@@ -651,7 +662,6 @@
 #Rinseback rejection messages 
 o_rinseback_rejection_msg = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "type": "Text", "unnamed": 1, "visible": True}
 
-
 #heparin syringe disposables
 o_preTreatmentDisposablesStack_preTreatmentDisposablesHeparinSyringe_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesHeparinSyringe", "type": "TreatmentFlowBase", "visible": True}
 o_blood_flow_minimum_value  =  {"container": o_Overlay, "text": "100mL/min", "type": "Text", "unnamed": 1, "visible": True}
@@ -661,7 +671,6 @@
 o_handler_Rectangle = {"container": o_Overlay, "id": "_handler", "type": "Rectangle", "unnamed": 1, "visible": True}
 o_treatment_saline_notification_msg = {"container": o_treatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True}
 
-
 # vitals 
 # vitals title text on main-treatment screen
 o_vitals_title = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "VITALS", "type": "Text", "unnamed": 1, "visible": True}
@@ -955,7 +964,6 @@
 o_postModeScreen_ScreenItem = {"container": o_Gui_MainView, "id": "_postModeScreen", "type": "ScreenItem", "unnamed": 1, "visible": True}
 
 
-
 #alarm minimize button
 o_minimize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iChevronDown", "type": "Image", "unnamed": 1, "visible": True}
 o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True}