Index: shared/scripts/names.py
===================================================================
diff -u -rd518b54a0543fdb11fb4ebd9f9eb9dd4334232b1 -raa4bf301318f72695425903f1c5078c42fbf446b
--- shared/scripts/names.py	(.../names.py)	(revision d518b54a0543fdb11fb4ebd9f9eb9dd4334232b1)
+++ shared/scripts/names.py	(.../names.py)	(revision aa4bf301318f72695425903f1c5078c42fbf446b)
@@ -27,13 +27,13 @@
 o_NinePatchImage = {"container": o_Gui_MainView, "occurrence": 6, "type": "NinePatchImage", "unnamed": 1, "visible": False}
 o_PreTreatmentBase_backgroundRect_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True}
 o_PreTreatmentBase_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True}
-
-
+  
+  
 #standbymode
 o_MainHome_MainHome = {"container": o_Gui_MainView, "objectName": "_MainHome", "type": "MainHome", "visible": True}
 o_standby_page = {"container": o_MainHome_MainHome, "type": "Column", "unnamed": 1, "visible": True}
-
-
+  
+  
 #in-treatment
 o_blood_priming = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "Blood Priming", "type": "Text", "unnamed": 1, "visible": True}
 o_blood_priming_value_by_default = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True}
@@ -46,39 +46,27 @@
 o_uf_close_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True}
 o_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True}
 o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True}
-
-
-#pre-treatment priming
-o_PreTreatmentBase_TreatmentFlowBase = {"container": ":o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack", "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True}
-o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True}
-o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentPrimeStack", "type": "PreTreatmentPrimeStack", "visible": True}
-o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True}
-o_begin_prime_text = {"container": o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase, "text": "Begin Prime", "type": "Text", "unnamed": 1, "visible": True}
-o_self_test_dry_progress = {"container": o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True}
-o_self_test_dry_check_list = {"container": o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase, "type": "Column", "unnamed": 1, "visible": True}
-o_self_test_dry_check_list_text = {"container": o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase, "type": "Text", "unnamed": 1, "visible": True}
-#Priming title
-o_priming_title_text = {"container": o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase, "text": "Priming", "type": "Text", "unnamed": 1, "visible": True}
-
-
+  
+  
 #disposable
-o_PreTreatmentStack_PreTreatmentDisposableStack_PreTreatmentDisposablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentDisposableStack", "type": "PreTreatmentDisposablesStack", "visible": True}
-o_PreTreatmentDisposableStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentDisposableStack_PreTreatmentDisposablesStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True}
-o_system_self_test = {"container": o_PreTreatmentDisposableStack_PreTreatmentBase_TreatmentFlowBase, "text" : "System Self Test", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True}
+o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentDisposablesStack", "type": "PreTreatmentDisposablesStack", "visible": True}
+o_preTreatmentDisposablesStack_preTreatmentDisposablesSelfTest_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSelfTest", "type": "TreatmentFlowBase", "visible": True}
+o_system_self_test = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "text" : "System Self Test", "type": "Text", "unnamed": 1, "visible": True}
 #progress
-o_system_self_test_progress = {"container": o_PreTreatmentDisposableStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True}
-o_system_test_text = {"container": o_PreTreatmentDisposableStack_PreTreatmentBase_TreatmentFlowBase, "text": "System Self Test", "type": "Text", "unnamed": 1, "visible": True}
+o_system_self_test_progress = {"container":o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True}
+o_system_test_text = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "text": "System Self Test", "type": "Text", "unnamed": 1, "visible": True}
 #right and left button
-o_PreTreatmentBase_rightImage_Image={"container": o_PreTreatmentDisposableStack_PreTreatmentBase_TreatmentFlowBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentDisposableStack_PreTreatmentBase_TreatmentFlowBase, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_rightImage_Image={"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True}
 o_next_button_text = {"container": o_Gui_MainView, "text":"NEXT", "type": "Text", "unnamed": 1, "visible": True}
-o_right_side_arrow = {"container": o_PreTreatmentDisposableStack_PreTreatmentBase_TreatmentFlowBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
+o_right_side_arrow = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
 o_back_button_text = {"container": o_Gui_MainView, "text":"BACK", "type": "Text", "unnamed": 1, "visible": True}
-o_confirm_button_text = {"container": o_PreTreatmentDisposableStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_swipeview_SwipeView = {"container": o_PreTreatmentDisposableStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
+o_confirm_button_text = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_swipeview_SwipeView = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
 o_cartridge_installation_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Open the front panel door.\nAnd check the cartridge.", "type": "Text", "unnamed": 1, "visible": True}
 o_heparin_syringe_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Connect the cartridge blood and dialysis fluid lines to the dialyzer.", "type": "Text", "unnamed": 1, "visible": True}
-
+  
 #text and bullet object
 o_text_object = {"type": "Text", "unnamed": 1, "visible": True}
 o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True}
\ No newline at end of file