Index: tst_ServiceShutdown/test.py
===================================================================
diff -u -r2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24 -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7
--- tst_ServiceShutdown/test.py	(.../test.py)	(revision 2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24)
+++ tst_ServiceShutdown/test.py	(.../test.py)	(revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7)
@@ -13,9 +13,10 @@
 #
 
 import names
-from dialin.squish import utils, denaliMessages
+from dialin.ui import globals, HDSimulator
+from dialin.ui import utils
+HDSimulator = HDSimulator()
 
-
 ################################################################################
 # This test need to be changed when the Service screen has been implemented    #
 # This is only checking the functionality exists and it's working              # 
@@ -38,25 +39,25 @@
     test.compare(waitForObjectExists(names.o_treatmentHome).visible, True, utils.SRSUI(vSRSUI))
 
 def showNtest_PowerOffDialog(vSRSUI=""):
-    denaliMessages.show_PowerOffDialog()
+    HDSimulator.cmd_show_poweroff_dialog()
     test_PowerOffDialog(vSRSUI)
     
 def hideNtest_PowerOffDialog(vSRSUI=""):
-    denaliMessages.hide_PowerOffDialog()
+    HDSimulator.cmd_hide_poweroff_dialog()
     test_PowerOffButton(vSRSUI)
 
 def showNtest_PowerOffNotificationDialog(vSRSUI=""):
-    mSRSUI = utils.SRSUI(vSRSUI)
-    denaliMessages.show_PowerOffNotificationDialog()
+    mSRSUI = globals.SRSUI(vSRSUI)
+    HDSimulator.cmd_show_poweroff_notification_dialog()
     test.compare(str(waitForObjectExists(names.o_poweroff_notification).baseUrl.path), "/dialogs/AutoHideInfo.qml", mSRSUI + " - Dialog")
     constantPartOfTheMessage = "System is shutting down" 
     test.compare(str(waitForObjectExists(names.o_poweroff_notification).text)[0:len(constantPartOfTheMessage)], constantPartOfTheMessage, mSRSUI + " - Message Text")
     utils.waitForGUI(5)  # dialog timeout
     utils.waitForGUI(1)  # animation transition
     
 def showNtest_PowerOffRejectionDialog(vSRSUI=""):
-    mSRSUI = utils.SRSUI(vSRSUI)
-    denaliMessages.show_PowerOffRejectionDialog()
+    mSRSUI = globals.SRSUI(vSRSUI)
+    HDSimulator.cmd_show_poweroff_rejection_dialog()
     test.compare(str(waitForObjectExists(names.o_poweroff_rejection).baseUrl.path), "/dialogs/AutoHideInfo.qml", mSRSUI + " - Dialog")
     constantPartOfTheMessage = "Cannot shutdown during "  # there might be the reason, concatenated at the end of the string. 
     test.compare(str(waitForObjectExists(names.o_poweroff_rejection).text)[0:len(constantPartOfTheMessage)], constantPartOfTheMessage, mSRSUI + " - Message Text")