Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r5eadbc384bcd003d9c298a80adabd4d3a9b7dc97 -re0f0f1fbb5525cf1c192091f3e017eb174fb6548
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 5eadbc384bcd003d9c298a80adabd4d3a9b7dc97)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision e0f0f1fbb5525cf1c192091f3e017eb174fb6548)
@@ -78,7 +78,7 @@
 o_SettingsStack_SettingsStack               = {"container": o_Gui_MainView,                                                     "objectName": "_SettingsStack",             "type": "SettingsStack",                        }
 o_UserConfirmation_SettingsServicePassword  = {"container": o_SettingsStack_SettingsStack,                                      "objectName": "UserConfirmation",           "type": "SettingsServicePassword"               }
 o_loginPage_Titletext                       = {"container": o_UserConfirmation_SettingsServicePassword, "id":"_titleText",                                                  "type": "Text",                 "unnamed": 1    }
-o_userConfirmation_TextInput                = {"container": o_UserConfirmation_SettingsServicePassword, "echoMode": 2, "id": "_input", "passwordCharacter": "•",            "type": "TextInput",            "unnamed": 1    }
+o_userConfirmation_TextInput                = {"container": o_UserConfirmation_SettingsServicePassword, "id": "_input",            "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_SettingsHome_confirmButton                = {"container": o_SettingsHome,                                                     "objectName": "_confirmButton",             "type": "ConfirmButton"                          }
@@ -97,4 +97,4 @@
 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    }
+o_confirmTouch_ConfirmButton                = {"container": o_Overlay,                                  "id": "_confirmTouch",                                              "type": "ConfirmButton",        "unnamed": 1    }
\ No newline at end of file
Index: suite_leahi/tst_service_export_logs/test.py
===================================================================
diff -u -rca8a58fe0abeb3d18a1325d745005c373de81f22 -re0f0f1fbb5525cf1c192091f3e017eb174fb6548
--- suite_leahi/tst_service_export_logs/test.py	(.../test.py)	(revision ca8a58fe0abeb3d18a1325d745005c373de81f22)
+++ suite_leahi/tst_service_export_logs/test.py	(.../test.py)	(revision e0f0f1fbb5525cf1c192091f3e017eb174fb6548)
@@ -43,13 +43,13 @@
 
 
 def navigate_to_export_logs():
-    grid_container = waitForObject(names.o_DeviceSettingsGrid)
+    grid_container = utility.get_object_from_names(names.o_DeviceSettingsGrid)
     export_logs_item = utility.findChildByText(grid_container, "Export Logs")
 
     if export_logs_item is not None:
         mouseClick(export_logs_item)
     
-    headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000)
+    headerbar_container = utility.get_object_from_names(names.o_headerBar_HeaderBar)
     export_log_screen_title_text = utility.findChildByText(
         headerbar_container, "Export Logs"
     )
@@ -70,7 +70,6 @@
     eject_usb_button = utility.get_object_from_names(
         names.o_USBEjectButton,
         error_message="eject usb button object not found",
-        timeout_ms=3000,
     )
     if eject_usb_button is not None:
         test.compare(
@@ -89,17 +88,16 @@
     export_button = utility.get_object_from_names(
         names.o_ExportButton,
         error_message="Export button was not enabled",
-        timeout_ms=3000,
     )
     if export_button is not None:
         mouseClick(export_button)
+        
     utils.waitForGUI(
         1
     )  # This wait is to verify that the Application log export to USB is complete. Increase seconds in waitForGUI if the test compare fails.
     export_log_status = utility.get_object_from_names(
         names.o_ExportLogsNotificationBar,
         error_message="export log status missing",
-        timeout_ms=3000,
     )
     if export_log_status is not None:
 
@@ -115,22 +113,20 @@
 
 def select_different_log_type(whichTypeIndex):
     log_type_combo_box = utility.get_object_from_names(
-        names.o_LogTypeComboBox, error_message="Combo box object is missing", timeout_ms=3000
+        names.o_LogTypeComboBox, error_message="Combo box object is missing",
     )
     if log_type_combo_box is not None:
-        mouseClick(waitForObjectExists(names.o_LogTypeComboBox))
+        mouseClick(utility.get_object_from_names(names.o_LogTypeComboBox))
         log_type_option = utility.get_object_from_names(
             utility.setObjectText(names.o_OptionComboBox,
                 config.EXPORT_LOGS_OPTIONS[whichTypeIndex]),
             error_message=f"Option {config.EXPORT_LOGS_OPTIONS[whichTypeIndex]} object is missing",
-            timeout_ms=500,
         )
         if log_type_option is not None:
             mouseClick(log_type_option)
             combo_box_text = utility.get_object_from_names(
                 names.o_LogTypeComboBox,
                 error_message="unable to select from Combo Box",
-                timeout_ms=1000,
             )
             test.compare(
                 config.EXPORT_LOGS_OPTIONS[whichTypeIndex],
@@ -143,15 +139,13 @@
             export_button = utility.get_object_from_names(
                 names.o_ExportButton,
                 error_message="Export button was not enabled",
-                timeout_ms=3000,
             )
             if export_button is not None:
                 mouseClick(export_button)
 
             export_log_progress_status = utility.get_object_from_names(
                 names.o_ExportLogsNotificationBar,
                 error_message="export log progress status missing",
-                timeout_ms=2000,
             )
             if export_log_progress_status is not None:
                 test.compare(
@@ -173,22 +167,20 @@
     select_a_file = utility.get_object_from_names(
         names.o_ExportLogsProgressRect,
         error_message="eject o_ExportLogsProgressRect object not found",
-        timeout_ms=3000,
     )
     if select_a_file is not None:
         mouseClick(select_a_file)
+        
     export_button = utility.get_object_from_names(
         names.o_ExportButton,
         error_message="Export button was not enabled",
-        timeout_ms=3000,
     )
     if export_button is not None:
         mouseClick(export_button)
     
     export_log_status = utility.get_object_from_names(
         names.o_ExportLogsNotificationBar,
         error_message="export log status missing",
-        timeout_ms=3000,
     )
     if export_log_status is not None:
         test.compare(