Index: shared/scripts/names.py
===================================================================
diff -u -rd4c17278e9f190d4a61ac5304715295643c64091 -r698f268928ecb519a2fe80ec1e937f7c92082184
--- shared/scripts/names.py	(.../names.py)	(revision d4c17278e9f190d4a61ac5304715295643c64091)
+++ shared/scripts/names.py	(.../names.py)	(revision 698f268928ecb519a2fe80ec1e937f7c92082184)
@@ -77,43 +77,43 @@
 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}
+o_PreTreatmentbase_skip_text = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "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}
-o_PreTreatmentBase_Continue_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_input_TextInput_2 = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True}                 
-o_PreTreatmentBase_BP_HR_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "occurrence": 2, "text": "BP/HR", "type": "Text", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_Blood_Pressure_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "Blood Pressure", "type": "Text", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_mmHg_Label = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "mmHg", "type": "Label", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_Heart_Rate_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "Heart Rate", "type": "Text", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_BPM_Label = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "BPM", "type": "Label", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_bloodPressureSystolic_TextEntry = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_bloodPressureSystolic", "type": "TextEntry", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_input_TextInput_3 = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "echoMode": 0, "id": "_input", "occurrence": 2, "type": "TextInput", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_bloodPressureDiastolic_TextEntry = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_bloodPressureDiastolic", "type": "TextEntry", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_input_TextInput_4 = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "echoMode": 0, "id": "_input", "occurrence": 3, "type": "TextInput", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_heartRate_TextEntry = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_heartRate", "type": "TextEntry", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_Patient_Connection_Text = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "text": "Patient Connection", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_Continue_Text = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_input_TextInput_2 = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True}                 
+o_PreTreatmentBase_BP_HR_Text = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "occurrence": 2, "text": "BP/HR", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_Blood_Pressure_Text = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "text": "Blood Pressure", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_mmHg_Label = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "text": "mmHg", "type": "Label", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_Heart_Rate_Text = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "text": "Heart Rate", "type": "Text", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_BPM_Label = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "text": "BPM", "type": "Label", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_bloodPressureSystolic_TextEntry = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_bloodPressureSystolic", "type": "TextEntry", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_input_TextInput_3 = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "echoMode": 0, "id": "_input", "occurrence": 2, "type": "TextInput", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_bloodPressureDiastolic_TextEntry = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_bloodPressureDiastolic", "type": "TextEntry", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_input_TextInput_4 = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "echoMode": 0, "id": "_input", "occurrence": 3, "type": "TextInput", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_heartRate_TextEntry = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_heartRate", "type": "TextEntry", "unnamed": 1, "visible": True}
 #patient connection training section
-o_PreTreatmentBase_swipeview_SwipeView = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_swipeview_SwipeView = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
 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_PreTreatmentBase_rightImage_Image = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "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_PreTreatmentFlowBase_Indicators = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "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_nextStepsBullet_StepBullet = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_nextStepsBullet", "occurrence": 7, "type": "StepBullet", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_BACK_Text = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True}
 o_PreTreatmentBase_CONFIRM_Text_2 = {"container": o_Gui_MainView, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
 #virtal keypad input field
-o_keypad_input = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id":"keyText", "type": "Text", "unnamed": 1, "visible": True}
+o_keypad_input = {"container": o_Gui_MainView, "id":"keyText", "type": "Text", "unnamed": 1, "visible": True}
 #virtal keypad back space key
 o_back_space_key = {"container": o_Gui_MainView, "id": "backspaceKeyBackground", "type": "Rectangle", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_Indicators =  {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "type": "StepBullet", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_Indicators =  {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "type": "StepBullet", "unnamed": 1, "visible": True}
 #systolic, diastolic and heart rate input field
 o_pop_up_systolic_input_field = {"container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True}
 o_pop_up_diastolic_input_field = {"container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "occurrence": 2, "type": "TextInput", "unnamed": 1, "visible": True}
 o_pop_up_heart_rate_input_field = {"backgroundcolor": "#254670", "container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "occurrence": 3, "type": "TextInput", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_gridSteps_Grid = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_gridSteps", "occurrence": 2, "type": "Grid", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_indicator_StepIndicator = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_indicator", "type": "StepIndicator", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_headStepBullet_StepBullet = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_headStepBullet", "occurrence": 2, "type": "StepBullet", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_gridStepsRest_Grid_2 = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_gridStepsRest", "occurrence": 10, "type": "Grid", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_gridSteps_Grid = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_gridSteps", "occurrence": 2, "type": "Grid", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_indicator_StepIndicator = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_indicator", "type": "StepIndicator", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_headStepBullet_StepBullet = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_headStepBullet", "occurrence": 2, "type": "StepBullet", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_gridStepsRest_Grid_2 = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "id": "_gridStepsRest", "occurrence": 10, "type": "Grid", "unnamed": 1, "visible": True}