Index: shared/scripts/names.py
===================================================================
diff -u -r2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24 -rc97be7423d6f06aceaad5f45969518bccc3d922f
--- shared/scripts/names.py	(.../names.py)	(revision 2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24)
+++ shared/scripts/names.py	(.../names.py)	(revision c97be7423d6f06aceaad5f45969518bccc3d922f)
@@ -116,6 +116,7 @@
 o_poweroff_cancel       = {"container": o_QQuickView  , "id": "_cancelTouch"   , "type": "TouchRect"  , "unnamed": 1, "visible": True}
 o_poweroff_notification = {"container": o_Overlay     , "id": "_titleText"     , "type": "TitleText"  , "unnamed": 1, "visible": True, "type": "Text", "text": "System is shutting down"}
 o_poweroff_rejection    = {"container": o_Overlay     , "id": "_titleText"     , "type": "TitleText"  , "unnamed": 1, "visible": True, "type": "Text"}
+o_settings_end_treatment  = {"container": o_QQuickView  , "objectName": "_endTreatmentButton", "type": "TouchRect"}
 
 # Main Treatment Screen 
 o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True}
@@ -127,6 +128,7 @@
 o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration = {"container": o_treatmentStart_TreatmentStart, "id": "_ultrafiltrationTouchArea", "type": "TreatmentUltrafiltration", "unnamed": 1, "visible": True}
 o_treatmentStart_fluidManagementTouchArea_TouchArea = {"container": o_treatmentStart_TreatmentStart, "id": "_fluidManagementTouchArea", "type": "TouchArea", "unnamed": 1, "visible": True}
 o_treatmentStart_solutionInfusionTouchArea_TouchArea = {"container": o_treatmentStart_TreatmentStart, "id": "_solutionInfusionTouchArea", "type": "TouchArea", "unnamed": 1, "visible": True}
+o_treatmentStart_back = {"container": {"type":"Gui::MainView"}, "objectName": "_touchRect0", "type": "TouchRect"}
 
 # Blood/Dialysate Treatment Section
 o_treatmentStart_FLOWS_Text = {"container": o_treatmentStart_TreatmentStart, "text": "FLOWS", "type": "Text", "unnamed": 1, "visible": True}
@@ -161,7 +163,7 @@
 o_okay_alarm = {"container": o_Overlay, "id": "_okay", "type": "TouchRect", "unnamed": 1, "visible": True}
 o_alarm_bar = {"container": o_qquickview_alarm, "objectName": "NotificationBar", "type": "NotificationBar"}
 o_treatmentStart_heparinTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_heparinTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True}
-o_dismiss_alarm = {"container": o_Overlay, "id": "_dismiss", "type": "TouchRect", "unnamed": 1, "visible": True}
+o_dismiss_alarm = {"container": o_Overlay, "id": "_silence", "type": "TouchRect", "unnamed": 1, "visible": True}
 o_treatmentStart_TimeText_TimeText = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText", "type": "TimeText", "visible": True}
 o_treatmentStart_TimeText_hour_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_hour", "type": "Text", "visible": True}
 o_treatmentStart_TimeText_minute_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_minute", "type": "Text", "visible": True}
@@ -388,7 +390,7 @@
 
 o_create_treatment_button = {"container": o_treatmentHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1 }
 o_create_treatment_container = {"container": o_qquickview_alarm, "objectName": "TreatmentCreate", "type": "TreatmentCreate" }
-o_create_treatment_flickable = {"container": o_create_treatment_container, "id": "_flickable", "type": "Flickable", "unnamed": 1 }
+o_create_treatment_flickable = {"container": o_create_treatment_container, "objectName": "TreatmentCreateFlickable", "type": "Flickable"}
 o_create_treatment_saline_bolus_0 = {"container": o_create_treatment_container, "objectName": "_salineBolusRect0", "type": "TouchRect"}
 o_create_treatment_saline_bolus_1 = {"container": o_create_treatment_container, "objectName": "_salineBolusRect1", "type": "TouchRect"}
 o_create_treatment_saline_bolus_2 = {"container": o_create_treatment_container, "objectName": "_salineBolusRect2", "type": "TouchRect"}
@@ -402,7 +404,19 @@
 o_create_treatment_dialyzer_3 = {"container": o_create_treatment_container, "objectName": "_dialyzerTypeRect3", "type": "TouchRect"}
 o_create_treatment_continue = {"container": o_create_treatment_container, "objectName": "_continueButton", "type": "TouchRect"}
 o_create_treatment_rinseback = {"container": o_create_treatment_container, "objectName": "_rinsebackFlowRate", "type": "SliderCreateTreatment"}
+o_create_treatment_back_button = {"container": o_create_treatment_container, "objectName": "_backButton", "type": "BackButton"}
 
 o_create_treatment_confirm_container = {"container": o_qquickview_alarm, "objectName": "TreatmentConfirm", "type": "TreatmentConfirm" }
 o_create_treatment_confirm = {"container": o_create_treatment_confirm_container, "objectName": "_continueRect", "type": "TouchRect"}
+o_create_treatment_confirm_back_button = {"container": o_create_treatment_confirm_container, "objectName": "_backButton", "type": "BackButton"}
 
+# Confirm + Priming + Begin Treatment
+o_confirm_treatment_flickable = {"container": o_create_treatment_confirm_container, "objectName": "_treatmentConfirmFlickable", "type": "Flickable"}
+o_priming_container = {"container": o_qquickview_alarm, "objectName": "_treatmentPrime", "type": "TreatmentPrime"}
+o_priming_back_button = {"container": o_priming_container, "objectName": "_backButton", "type": "BackButton"}
+o_priming_flickable = {"container": o_priming_container, "objectName": "_treatmentPrimeFlickable", "type": "Flickable"}
+o_priming_continue_button = {"container": o_priming_container, "objectName": "_treatmentPrimeContinueButton", "type": "TouchRect"}
+o_treatment_begin_container = {"container": o_qquickview_alarm, "objectName": "_treatmentBegin", "type": "TreatmentBegin"}
+o_treatment_begin_flickable = {"container": o_treatment_begin_container, "objectName": "_treatmentBeginFlickable", "type": "TreatmentBegin"}
+o_treatment_begin_start_button = {"container": o_treatment_begin_container, "objectName": "_treatmentBeginStart", "type": "TouchRect"}
+o_treatment_begin_back_button = {"container": o_treatment_begin_container, "objectName": "_backButton", "type": "BackButton"}