Index: shared/scripts/names.py
===================================================================
diff -u -r9173ebd0962929fe8ab341b7f731d6adb39a0368 -r2ae9851b1e753b0e20aae033d2d50023c122ab5a
--- shared/scripts/names.py	(.../names.py)	(revision 9173ebd0962929fe8ab341b7f731d6adb39a0368)
+++ shared/scripts/names.py	(.../names.py)	(revision 2ae9851b1e753b0e20aae033d2d50023c122ab5a)
@@ -5,7 +5,7 @@
 
 def text_object(txt):
     return {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "text": txt, "type": "Text", "unnamed": 1, "visible": True}
-           #{"container": o_PreTreatmentConsumblesStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "occurrence": 5, "type": "StepBullet", "unnamed": 1, "visible": True}
+           #{"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "occurrence": 5, "type": "StepBullet", "unnamed": 1, "visible": True}
            #{"container": o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase, "id": "_nextStepsBullet", "occurrence": 4, "type": "StepBullet", "unnamed": 1, "visible": True}
            
 def bullet_object(num):
@@ -63,27 +63,20 @@
 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}
-o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True}
-o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConnectionStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentConsumblesStack", "type": "PreTreatmentConnectionStack", "visible": True}
-o_PreTreatmentConsumblesStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration = {"container": o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentUltrafiltration", "type": "PreTreatmentUltrafiltration", "visible": True}
 
 
 # pre-treatment patient connection 
 o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True}
-o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConsumablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentConsumblesStack", "type": "PreTreatmentConsumablesStack", "visible": True}
-o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConsumablesStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True}
-o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConnectionStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentConsumblesStack", "type": "PreTreatmentConnectionStack", "visible": True}
-#patient connection ultrafilteration section 
-o_PreTreatmentConsumblesStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration = {"container": o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentUltrafiltration", "type": "PreTreatmentUltrafiltration", "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_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True}
-o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True}
-o_PreTreatmentUltrafiltration_volumeSlider_Slider = {"container": o_PreTreatmentConsumblesStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "objectName": "_volumeSlider", "type": "Slider", "visible": True}
-o_PreTreatmentUltrafiltration_Ultrafiltration_Volume_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "Ultrafiltration Volume (L)", "type": "Text", "unnamed": 1, "visible": True}
-o_PreTreatmentUltrafiltration_Ultrafiltration_Setup_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "Ultrafiltration Setup", "type": "Text", "unnamed": 1, "visible": True}
-o_PreTreatmentUltrafiltration_CONFIRM_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
-o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2 = {"container": o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True}
+o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_pretreatmentConnectionStack ", "type": "PreTreatmentConnectionStack", "visible": True}
+o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentUltrafiltration", "type": "PreTreatmentUltrafiltration", "visible": True}
+
+
+#patient connection ultrafilteration section s
+o_PreTreatmentUltrafiltration_volumeSlider_Slider = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "objectName": "_volumeSlider", "type": "Slider", "visible": True}
+o_PreTreatmentUltrafiltration_Ultrafiltration_Volume_Text = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "Ultrafiltration Volume (L)", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentUltrafiltration_Ultrafiltration_Setup_Text = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "Ultrafiltration Setup", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentUltrafiltration_CONFIRM_Text = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2 = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True}
 o_PreTreatmentbase_skip_text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True}
 #patient connection BP/HR section part
 o_PreTreatmentBase_Patient_Connection_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "Patient Connection", "type": "Text", "unnamed": 1, "visible": True}
@@ -104,9 +97,9 @@
 o_swipeview_tutorial_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "type": "Text", "unnamed": 1, "visible": True}
 o_PreTreatmentBase_rightImage_Image = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
 o_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True}
-o_PreTreatmentUltrafiltration_Indicators = {"container": o_PreTreatmentConsumblesStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True}
+o_PreTreatmentUltrafiltration_Indicators = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True}
 o_PreTreatmentFlowBase_Indicators = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True}
-o_PreTreatmentUltrafiltration_NotificationBar_NotificationBar = {"container": o_PreTreatmentConsumblesStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
+o_PreTreatmentUltrafiltration_NotificationBar_NotificationBar = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
 o_PreTreatmentBase_nextStepsBullet_StepBullet = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "occurrence": 7, "type": "StepBullet", "unnamed": 1, "visible": True}
 o_PreTreatmentBase_BACK_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True}
 o_PreTreatmentBase_CONFIRM_Text_2 = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}