Index: tst_ServiceShutdown/test.py
===================================================================
diff -u -r2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24 -red2d7cb5c8c2059444fd17cd4e1c0975461a903c
--- tst_ServiceShutdown/test.py	(.../test.py)	(revision 2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24)
+++ tst_ServiceShutdown/test.py	(.../test.py)	(revision ed2d7cb5c8c2059444fd17cd4e1c0975461a903c)
@@ -13,8 +13,10 @@
 #
 
 import names
-from dialin.squish import utils, denaliMessages
+from dialin.ui.hd_simulator import HDSimulator
+from dialin.ui import utils
 
+hd_simulator = HDSimulator()
 
 ################################################################################
 # This test need to be changed when the Service screen has been implemented    #
@@ -38,16 +40,16 @@
     test.compare(waitForObjectExists(names.o_treatmentHome).visible, True, utils.SRSUI(vSRSUI))
 
 def showNtest_PowerOffDialog(vSRSUI=""):
-    denaliMessages.show_PowerOffDialog()
+    hd_simulator.cmd_show_poweroff_dialog()
     test_PowerOffDialog(vSRSUI)
     
 def hideNtest_PowerOffDialog(vSRSUI=""):
-    denaliMessages.hide_PowerOffDialog()
+    hd_simulator.cmd_hide_poweroff_dialog()
     test_PowerOffButton(vSRSUI)
 
 def showNtest_PowerOffNotificationDialog(vSRSUI=""):
     mSRSUI = utils.SRSUI(vSRSUI)
-    denaliMessages.show_PowerOffNotificationDialog()
+    hd_simulator.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")
@@ -56,7 +58,7 @@
     
 def showNtest_PowerOffRejectionDialog(vSRSUI=""):
     mSRSUI = utils.SRSUI(vSRSUI)
-    denaliMessages.show_PowerOffRejectionDialog()
+    hd_simulator.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")