Index: shared/scripts/names.py
===================================================================
diff -u -rd1f77a43896c36aeb59d454b37040d699bc8c902 -r4e2ca621f8a8106c777c9373d3b5411017ad0708
--- shared/scripts/names.py	(.../names.py)	(revision d1f77a43896c36aeb59d454b37040d699bc8c902)
+++ shared/scripts/names.py	(.../names.py)	(revision 4e2ca621f8a8106c777c9373d3b5411017ad0708)
@@ -49,17 +49,16 @@
 o_service_text = {"container": o_Gui_MainView, "text": "Service", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsHome_SettingsHome_2 = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True}
 o_service_home_text_obj = {"container": o_SettingsHome_SettingsHome_2, "type": "Text", "unnamed": 1, "visible": True}
-o_set_date_and_time_text = {"container": o_Gui_MainView, "text": "Set Date And Time", "type": "Text", "unnamed": 1, "visible": True}
 o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True}
 o_set_date_and_time_text_obj = {"container": o_SettingsHome_SettingsHome, "type": "Text", "unnamed": 1, "visible": True}
-o_back_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iBack", "type": "Image", "unnamed": 1, "visible": True}
+o_SettingsBase_SettingsDateTime = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True}
+o_SettingsBase_mouseArea_MouseArea = {"container": o_SettingsBase_SettingsDateTime, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True}
 o_eject_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True}
 o_arrow_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
 o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True}
 o_settings_base_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True}
 o_switch_keyboard_to_keypad = {"container": o_Gui_MainView, "text": "&123", "type": "Text", "unnamed": 1, "visible": True}
-o_keyboard_object = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
-o_SettingsBase_SettingsDateTime = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDateTime", "visible": True}
+o_keyboard_object =  {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True}
 o_settings_date_and_time_text = {"container": o_SettingsBase_SettingsDateTime, "type": "Text", "unnamed": 1, "visible": True}
 o_date_time_container = {"container": o_SettingsBase_SettingsDateTime, "id": "_container", "type": "Column", "unnamed": 1, "visible": True}
 #virtal keypad input field
@@ -71,7 +70,8 @@
 o_minimize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iChevronDown", "type": "Image", "unnamed": 1, "visible": True}
 o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True}
 o_settings_home_text_obj = {"container": o_SettingsHome_SettingsHome, "type": "Text", "unnamed": 1, "visible": True}
-
+o_SettingsDateTime_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsDateTime, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True}
+o_SettingsHome_mouseArea_MouseArea_2 = {"container": o_SettingsHome_SettingsHome, "id": "_mouseArea", "occurrence": 7, "type": "MouseArea", "unnamed": 1, "visible": True}
 # service screen 
 o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True}
 o_services_screen_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True}
Index: tst_settings_date_and_time/test.py
===================================================================
diff -u -ra58d7af64baf37c4bc405ca01052bf066da7b892 -r4e2ca621f8a8106c777c9373d3b5411017ad0708
--- tst_settings_date_and_time/test.py	(.../test.py)	(revision a58d7af64baf37c4bc405ca01052bf066da7b892)
+++ tst_settings_date_and_time/test.py	(.../test.py)	(revision 4e2ca621f8a8106c777c9373d3b5411017ad0708)
@@ -51,14 +51,17 @@
     names.o_service_home_text_obj["text"] = text
     return names.o_service_home_text_obj
 
+
 def settings_text_obj(text):
     names.o_set_date_and_time_text_obj["text"] = text
     return names.o_set_date_and_time_text_obj
 
+
 def date_time_screen_text_obj(text):
     names.o_settings_date_and_time_text["text"] = text
     return names.o_settings_date_and_time_text
 
+
 def navigate_to_service_screen():
     """
         Method to navigate to "Service" screen
@@ -78,11 +81,12 @@
     """
     test.startSection("Navigating 'Set Date And Time' screen")
     utils.waitForGUI(0.5)
-    mouseClick(waitForObjectExists(names.o_set_date_and_time_text))
+    mouseClick(waitForObjectExists(names.o_SettingsHome_mouseArea_MouseArea_2))
     set_date_and_time_title = waitForObjectExists(settings_text_obj(SET_DATE_AND_TIME_TEXT))
     test.compare(set_date_and_time_title.text, SET_DATE_AND_TIME_TEXT, "{} should be displayed when user is navigated to 'Set Date And Time' screen".format(SET_DATE_AND_TIME_TEXT))
     test.endSection()
     
+
 def verify_back_btn():
     """
         Method to verify the back button and click 
@@ -91,9 +95,9 @@
     test.compare(str(waitForObjectExists(settings_text_obj(config.BACK_TEXT)).text), config.BACK_TEXT,"'BACK' button text should be {}".format(config.BACK_TEXT))
     utils.waitForGUI(0.1)
     test.compare(waitForObjectExists(settings_text_obj(config.BACK_TEXT)).enabled , True, "'BACK' button should be enabled")   
-    mouseClick(waitForObjectExists(names.o_back_btn))
+    mouseClick(waitForObjectExists(names.o_SettingsDateTime_mouseArea_MouseArea_2))
     utils.waitForGUI(0.5)
-    mouseClick(waitForObjectExists(names.o_set_date_and_time_text))
+    mouseClick(waitForObjectExists(names.o_SettingsHome_mouseArea_MouseArea_2))
     test.endSection()
                
 def verify_entered_date_and_time(hour, min, day, month, year, valid_parameter_passed):
@@ -230,6 +234,7 @@
             test.compare(input_field_color, config.IN_RANGE_COLOR, "Year value {} is in range of {} and {}".format(entry, YEAR_LOWER_LIMIT, YEAR_UPPER_LIMIT))          
     test.endSection()
     
+
 def verify_confirm_btn(valid_parameter_passed):
     """
         Method to verify the status of confirm