Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r0e16f6d7e1f8349a7ccf945c666f6fdab7752d16 -r8ac0eae52c22298abedaec3200ebd450888c3ac2
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 0e16f6d7e1f8349a7ccf945c666f6fdab7752d16)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 8ac0eae52c22298abedaec3200ebd450888c3ac2)
@@ -39,6 +39,8 @@
 o_treatmentTimeNotificationBarSmall                             = {"container": mainTreatmentScreen,                                                                                                                           "objectName": "notification",                                                         "type": "NotificationBarSmall"                                                           }
                                                                                                                                                                                                                                                                                                                         
 # settings_service_export_logs                                                                                                                                                                                                                                                                                                                                                                      
+o_mainMenu_MainMenu                                             = {"container": o_Gui_MainView,                                                          "id": "_mainMenu",                                                                                                                                     "type": "MainMenu",                                                   "unnamed": 1        }
+o_headerBar_HeaderBar                                           = {"container": o_Gui_MainView,                                                          "id": "_headerBar",                                                                                                                                    "type": "HeaderBar",                                                  "unnamed": 1        }
 o_listView_ListView                                             = {"container": o_Gui_MainView,                                                          "id": "_listView",                                                                                                                                         "type": "ListView",                                               "unnamed": 1        }
 o_listView_delegateControl                                      = {"container": o_listView_ListView,        "index": 2,                                                                                                        "objectName": "delegateControl",                                                     "type": "Item"                                                                        }
 o_Settings_Menu                                                 = {"container": o_listView_delegateControl,                                                                                                                    "objectName": "_touchRect2",                                                         "type": "TouchRect"                                                                   }
@@ -224,3 +226,21 @@
 o_preTreatmentStack_Text                                        = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                                                                                                          "type": "Text",                                                      "unnamed": 1           }
 o_preTreatmentStack_stepIndicator_StepIndicator                 = {"container": o_preTreatmentStack_PreTreatmentStack,                                   "id": "_stepIndicator",                                                                                                                                "type": "StepIndicator",                                             "unnamed": 1           } 
                     
+#Service
+o_SettingsStack_SettingsStack                                   = {"container": o_Gui_MainView,                                                                                                                             "objectName": "_SettingsStack",                                                     "type": "SettingsStack",                                                                     }
+o_UserConfirmation_SettingsServicePassword                      = {"container": o_SettingsStack_SettingsStack,                                                                                                              "objectName": "UserConfirmation",                                                   "type": "SettingsServicePassword",                                                           }
+o_userConfirmation_TextInput                                    = {"container": o_UserConfirmation_SettingsServicePassword,               "echoMode": 2, "id": "_input", "passwordCharacter": "•",                                                                                                              "type": "TextInput",                                                  "unnamed": 1,          }
+o_userConfirmation_ConfirmButton                                = {"container": o_UserConfirmation_SettingsServicePassword,                                                                                                 "objectName": "_confirmButton",                                                     "type": "ConfirmButton",                                                                     }
+
+#Helpers
+o_PreTreatmentSampleStack_PreTreatmentWaterSample               = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                      "objectName": "_PreTreatmentSampleStack",                                           "type": "PreTreatmentWaterSample",                                                           }
+o_PreTreatmentSampleStack_button_TouchRect                      = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample,                       "id": "_button",                                                                                                                                       "type": "TouchRect",                                                  "unnamed": 1           }
+o_preTreatmentStack_repeater_Repeater                           = {"container": o_preTreatmentStack_PreTreatmentStack,                                   "id": "repeater",                                                                                                                                      "type": "Repeater",                                                   "unnamed": 1           }
+
+# Feature Options
+o_SettingsBase_SettingsFeatureConfigurations                    = {"container": o_Gui_MainView,                                                                                                                             "objectName": "_SettingsBase",                                                      "type": "SettingsFeatureConfigurations",                                                     }
+o_SettingsBase_integratedBPCuffSwitch_BaseSwitch                = {"checkable": True, "container": o_SettingsBase_SettingsFeatureConfigurations,         "id": "_integratedBPCuffSwitch",                                                                                                                       "type": "BaseSwitch",                                                 "unnamed": 1           }
+o_SettingsFeatureConfigurations_BackButton                      = {"container": o_SettingsBase_SettingsFeatureConfigurations,                                                                                               "objectName": "_backButton",                                                        "type": "BackButton",                                                                        }
+o_SettingsBase_heparinSyringePumpSwitch_BaseSwitch              = {"checkable": True, "container": o_SettingsBase_SettingsFeatureConfigurations,         "id": "_heparinSyringePumpSwitch",                                                                                                                     "type": "BaseSwitch",                                                 "unnamed": 1           }
+o_vitalsButton_VitalsButton                                     = {"container": o_Gui_MainView,                                                          "id": "_vitalsButton",                                                                                                                                 "type": "VitalsButton",                                               "unnamed": 1           }
+o_vitalsPopup_Close_Image                                       = {"container": o_Overlay,                                                               "id": "_image", "source": "qrc:/images/iClose",                                                                                                        "type": "Image",                                                      "unnamed": 1           }