Index: tst_service_screen/test.py
===================================================================
diff -u -rd1f77a43896c36aeb59d454b37040d699bc8c902 -r5cd3c99da0bc502e4a21bbb1c8db4e877b8b11f8
--- tst_service_screen/test.py	(.../test.py)	(revision d1f77a43896c36aeb59d454b37040d699bc8c902)
+++ tst_service_screen/test.py	(.../test.py)	(revision 5cd3c99da0bc502e4a21bbb1c8db4e877b8b11f8)
@@ -18,15 +18,11 @@
 from dialin.common.hd_defs import HDOpModes, HDOpSubModes
 from dialin.ui import utils
 
+hd_simulator = HDSimulator()
 
-
-EXPORT_LOGS = "Export Logs"
-
 SERVICE_SCREEN_OPTIONS = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "DG Cleaning", "Service", "Export Logs"]
 
-hd_simulator = HDSimulator()
 
-
 def custom_object_for_export_log(text):
     """
         Method to set custom object property for export option
@@ -79,7 +75,7 @@
     """
     test.startSection("Verifying the the export logs screen")
     test.log("Navigating to service screen to export log screen")
-    mouseClick(waitForObjectExists(settings_text_obj(EXPORT_LOGS)))
+    mouseClick(waitForObjectExists(names.o_SettingsHome_export_log_mouseArea_MouseArea))
     test.compare(waitForObjectExists(names.o_export_logs_text).text,config.EXPORT_LOG_TEXT,"{} should be under export logs screen ".format(config.EXPORT_LOG_TEXT))
     log_status = get_storage_data_status(names.o_usb_folder_slider)
     test.verify(log_status == False, "export data rectangles should not be filled with contents under USB drive.")
@@ -88,7 +84,7 @@
     for option in range(len(config.EXPORT_LOGS_OPTIONS)):
         
         utils.waitForGUI(1)
-        mouseClick(waitForObjectExists(names.o_combo_box ))
+        mouseClick(waitForObjectExists(names.o_combo_box))
         export_option = waitForObjectExists(custom_object_for_export_log(config.EXPORT_LOGS_OPTIONS[option]))
         
         utils.waitForGUI(1)
@@ -108,7 +104,7 @@
     test.compare(waitForObjectExists(names.o_SettingsBase_progressCircle_ProgressCircle).color.name, config.RED_COLOR,"{} color progress bar is displayed for sd-card".format(config.RED_COLOR))
     test.compare(waitForObjectExists(names.o_SettingsBase_progressCircle_ProgressCircle_2).color.name, config.GREEN_COLOR,"{} color progress bar is displayed for usb-drive".format(config.GREEN_COLOR))
     
-    mouseClick(waitForObjectExists(names.o_export_btn ))
+    mouseClick(waitForObjectExists(names.o_SettingsBase_export_button_mouseArea_MouseArea_2))
     utils.waitForGUI(2)
     
     log_status = get_storage_data_status(names.o_usb_folder_slider)
@@ -135,12 +131,10 @@
     verify shutdown button  after clicking export button
     """
     test.startSection("verification of system shutdown option")
-    mouseClick(waitForObjectExists(names.o_keyboard_object))
+    mouseClick(waitForObjectExists(names.o_SettingsBase_export_log_backButton_BackButton))   
     test.compare(waitForObjectExists(names.o_keyboard_object).text, config.SHUTDOWN_BUTTON_TEXT, "User should able to click {}".format(config.SHUTDOWN_BUTTON_TEXT))
-    
-    utils.waitForGUI(1.5)
-    mouseClick(waitForObjectExists(names.o_keyboard_object))
-    
+    utils.waitForGUI(1)
+    mouseClick(waitForObjectExists(names.o_SettingsHome_service_confirmButton_TouchRect))
     test.endSection()