Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -rce164b0ef964275d2d15799391c031c4073e8d07 -r4de5be406334f420c6a7fe8cc6347d73f45ba74a
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision ce164b0ef964275d2d15799391c031c4073e8d07)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 4de5be406334f420c6a7fe8cc6347d73f45ba74a)
@@ -39,9 +39,7 @@
 o_treatmentTimeNotificationBarSmall         = {"container": mainTreatmentScreen,                                                "objectName": "notification",               "type": "NotificationBarSmall"                  } 
 
 # settings_service_export_logs
-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"                             }
+o_mainMenu_MainMenu                         = {"container": o_Gui_MainView,                             "id": "_mainMenu",                                                  "type": "MainMenu",             "unnamed": 1    }
 o_SettingsHome                              = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsHome",              "type": "SettingsHome"                          }
 o_SettingsExportLogs                        = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsBase",              "type": "SettingsExportLogs"                    }
 o_DeviceSettingsTitleText                   = {"container": o_SettingsHome,                             "id":"_titleText",                                                  "type": "Text",                 "unnamed": 1    }
@@ -94,17 +92,18 @@
 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_SettingsHome_confirmButton                = {"container": o_SettingsHome,                                                     "objectName": "_confirmButton",             "type": "ConfirmButton"                         }
+o_SettingsBase_SettingsAdvancedMode         = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsBase",              "type": "SettingsAdvancedMode"                  }
+o_settingsAdvancedMode_BaseSwitch           = {"checkable": True, "container": o_SettingsBase_SettingsAdvancedMode, "id": "_settingsAdvancedMode",                          "type": "BaseSwitch",           "unnamed": 1    }
+o_SettingsBase_backButton_AdvancedMode      = {"container": o_SettingsBase_SettingsAdvancedMode,                                "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_SettingsBase_backButton_NTP_Switch        = {"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_SettingsBase_backButton_RootSSH           = {"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_userConfirmation_backButton_FactoryReset  = {"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    }
\ No newline at end of file
+o_confirmTouch_ConfirmButton                = {"container": o_Overlay,                                  "id": "_confirmTouch",                                              "type": "ConfirmButton",        "unnamed": 1    }