Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -rb28e8ef041ad2c1be9509e404d89587567ff26b7 -r0bb330c1823aad987899f72b12c302551d575c5a
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision b28e8ef041ad2c1be9509e404d89587567ff26b7)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 0bb330c1823aad987899f72b12c302551d575c5a)
@@ -2,7 +2,12 @@
 
 from objectmaphelper import *
 
+# Top Parents
+o_QQuickView                = {                                                                             "type": "QQuickView"                        }
+o_Overlay                   = {"container": o_QQuickView,                                                   "type": "Overlay"                           }
 o_Gui_MainView              = {                                                                             "type": "Gui::MainView",    "unnamed": 1    }
+
+#Solution Infusion
 standByScreen_MainHome      = {"container": o_Gui_MainView,                                                 "type": "MainHome"                          }
 treatmentStack              = {"container": o_Gui_MainView,                                                 "type": "TreatmentStack"                    }
 startTreatmentButton        = {"container": standByScreen_MainHome, "id": "_startTreatmentRect",            "type": "TouchRect",        "unnamed": 1    }
@@ -14,23 +19,21 @@
 salineProgressBar           = {"container": mainTreatmentScreen,    "id": "_fluidProgressBar",              "type": "ProgressBar",      "unnamed": 1    }
 
 # settings_service_export_logs
-o_QQuickView                = {                                                                             "type": "QQuickView"                        }
-o_Overlay                   = {"container": o_QQuickView,                                                   "type": "Overlay"                           }
-settingsHome                = {"container": o_Gui_MainView,         "objectName": "_SettingsHome",          "type": "SettingsHome"                      }
-settingsExportLogs          = {"container": o_Gui_MainView,         "objectName": "_SettingsBase",          "type": "SettingsExportLogs"                }
-serviceText                 = {"container": settingsHome,                                                   "type": "Text",             "unnamed": 1    }
-settingsInformation         = {"container": o_Gui_MainView,         "objectName": "_SettingsBase",          "type": "SettingsBase"                      }
-usbEjectButton              = {"container": settingsExportLogs,     "id": "_usbEjectButton",                "type": "USBButton",        "unnamed": 1    }
-exportLogsText              = {"container": settingsInformation,    "text": "Export Logs",                  "type": "Text",             "unnamed": 1    }
-comboBox                    = {"container": settingsInformation,    "id": "_logTypeCombo",                  "type": "ComboBox",         "unnamed": 1    }
-optionComboBox              = {"container": o_Overlay,                                                      "type": "Text",             "unnamed": 1    }
-exportButton                = {"container": settingsExportLogs,     "id": "_logTypeExportButton",           "type": "ExportButton",     "unnamed": 1    }
-progressRect                = {"container": settingsExportLogs,     "id": "_progressRect",                  "type": "ProgressRect",     "unnamed": 1    }
-settingsHomeExportLogs      = {"container": settingsHome,           "text": "Export Logs",                  "type": "Text",             "unnamed": 1,   }
-notificationBar             = {"container": settingsExportLogs,     "objectName": "NotificationBar",        "type": "NotificationBarSmall",             }
+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    }
+o_ServiceText               = {"container": o_SettingsHome,                                                 "type": "Text",             "unnamed": 1    }
+o_SettingsInformation       = {"container": o_Gui_MainView,         "objectName": "_SettingsBase",          "type": "SettingsBase"                      }
+o_USBEjectButton            = {"container": o_SettingsExportLogs,   "id": "_usbEjectButton",                "type": "USBButton",        "unnamed": 1    }
+o_ExportLogsPageTitleText   = {"container": o_SettingsInformation,  "id":"_titleText",                      "type": "Text",             "unnamed": 1    }
+o_LogTypeComboBox           = {"container": o_SettingsInformation,  "id": "_logTypeCombo",                  "type": "ComboBox",         "unnamed": 1    }
+o_OptionComboBox            = {"container": o_Overlay,                                                      "type": "Text",             "unnamed": 1    }
+o_ExportButton              = {"container": o_SettingsExportLogs,   "id": "_logTypeExportButton",           "type": "ExportButton",     "unnamed": 1    }
+o_ExportLogsProgressRect    = {"container": o_SettingsExportLogs,   "id": "_progressRect",                  "type": "ProgressRect",     "unnamed": 1    }
+o_ExportLogsNotificationBar = {"container": o_SettingsExportLogs,   "id": "_information",                   "type": "NotificationBarSmall"              }
+o_DeviceSettingsPageExportLogs= {"container": o_SettingsHome,       "id": "_touchItem", "occurrence": 7,    "type": "TouchRect",        "unnamed": 1,   "visible": True    }
 
-#Information popup
-informationIconButton       = {"container": o_Gui_MainView,         "id": "_informationButton",             "type": "IconButton",       "unnamed": 1    }
-informationParameters       = {"container": o_Overlay,                                                      "type": "Text",             "unnamed": 1    }
-
-
+#HeaderBar Information Pop up
+o_InformationIconButton     = {"container": o_Gui_MainView,         "id": "_informationButton",             "type": "IconButton",       "unnamed": 1    }
+o_InformationParameters     = {"container": o_Overlay,                                                      "type": "Text",             "unnamed": 1    }
+o_VersionColumn             = {"container": o_Overlay,              "id": "_versionColumn",                 "type": "Column",           "unnamed": 1    }