Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -rf6d23e89ccf01b57313b0e920f013dc1027706d4 -rc5bf21254e1af66a2459cfb8f0fcbbbe956bd8cc
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision f6d23e89ccf01b57313b0e920f013dc1027706d4)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision c5bf21254e1af66a2459cfb8f0fcbbbe956bd8cc)
@@ -81,3 +81,29 @@
 o_SettingsBase_SettingsWiFi                 = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsBase",              "type": "SettingsWiFi"                          }
 o_SettingsBase_WifiScreen_ScanButton        = {"container": o_SettingsBase_SettingsWiFi,                "id": "_scanButton",                                                "type": "TouchRect",            "unnamed": 1    }
 o_SettingsBase_WifiScreen_BackButton        = {"container": o_SettingsBase_SettingsWiFi,                                        "objectName": "_backButton",                "type": "BackButton"                            }
+
+#Device Settings Wi-Fi
+o_SettingsBase_SettingsWiFi                 = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsBase",              "type": "SettingsWiFi"                          }
+o_SettingsBase_WifiScreen_ScanButton        = {"container": o_SettingsBase_SettingsWiFi,                "id": "_scanButton",                                                "type": "TouchRect",            "unnamed": 1    }
+o_SettingsBase_WifiScreen_BackButton        = {"container": o_SettingsBase_SettingsWiFi,                                        "objectName": "_backButton",                "type": "BackButton"                            }
+
+# Settings 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_headerBar_HeaderBar                       = {"container": o_Gui_MainView,                             "id": "_headerBar",                                                 "type": "HeaderBar",            "unnamed": 1    }
+o_userConfirmation_ConfirmButton            = {"container": o_UserConfirmation_SettingsServicePassword,                         "objectName": "_confirmButton",             "type": "ConfirmButton"                         }
+o_SettingsBase_SettingsUserMode             = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsBase",              "type": "SettingsUserMode"                      }
+o_SettingsBase_settingsUserMode_BaseSwitch  = {"checkable": True, "container": o_SettingsBase_SettingsUserMode, "id": "_settingsUserMode",                                  "type": "BaseSwitch",           "unnamed": 1    }
+o_SettingsBase_backButton_BackButton        = {"container": o_SettingsBase_SettingsUserMode,                                    "objectName": "_backButton",                "type": "BackButton"                            }
+o_SettingsBase_SettingsDateTime             = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsBase",              "type": "SettingsDateTime"                      }
+o_SettingsBase_ntpSwitch_BaseSwitch         = {"checkable": True, "container": o_SettingsBase_SettingsDateTime, "id": "_ntpSwitch",                                         "type": "BaseSwitch",           "unnamed": 1    }
+o_SettingsBase_backButton_BackButton_2      = {"container": o_SettingsBase_SettingsDateTime,                                    "objectName": "_backButton",                "type": "BackButton"                            }
+o_timeContainer_LabelUnitContainer          = {"container": o_SettingsBase_SettingsDateTime,            "id": "_timeContainer",                                             "type": "LabelUnitContainer",   "unnamed": 1    }
+o_SettingsBase_SettingsRootSSHAccess        = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsBase",              "type": "SettingsRootSSHAccess"                 }
+o_SettingsBase_backButton_BackButton_3      = {"container": o_SettingsBase_SettingsRootSSHAccess,                               "objectName": "_backButton",                "type": "BackButton"                            }
+o_userConfirmation_SettingsFactoryReset     = {"container": o_Gui_MainView,                                                     "objectName": "UserConfirmation",           "type": "SettingsFactoryReset"                  }
+o_userConfirmation_backButton_BackButton    = {"container": o_userConfirmation_SettingsFactoryReset,                            "objectName": "_backButton",                "type": "BackButton"                            }
+o_factoryReset_ConfirmButton                = {"container": o_userConfirmation_SettingsFactoryReset,                            "objectName": "_confirmButton",             "type": "ConfirmButton"                         }
+o_cancelTouch_TouchRect                     = {"container": o_Overlay,                                  "id": "_cancelTouch",                                               "type": "TouchRect",            "unnamed": 1    }
+o_confirmTouch_ConfirmButton                = {"container": o_Overlay,                                  "id": "_confirmTouch",                                              "type": "ConfirmButton",        "unnamed": 1    }