Index: tst_ServiceShutdown/test.py
===================================================================
diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3
--- tst_ServiceShutdown/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
+++ tst_ServiceShutdown/test.py	(.../test.py)	(revision 93fe289e1e33e4b2cf824e30f810490f073ecab3)
@@ -13,7 +13,8 @@
 #
 
 import names
-from dialin.squish import utils, globals, denaliMessages
+from dialin.ui import globals, hd_simulator
+from dialin.ui import utils
 
 
 ################################################################################
@@ -38,16 +39,16 @@
     test.compare(waitForObjectExists(names.o_treatmentHome).visible, True, globals.SRSUI(vSRSUI))
 
 def showNtest_PowerOffDialog(vSRSUI=""):
-    denaliMessages.show_PowerOffDialog()
+    hd_simulator.show_PowerOffDialog()
     test_PowerOffDialog(vSRSUI)
     
 def hideNtest_PowerOffDialog(vSRSUI=""):
-    denaliMessages.hide_PowerOffDialog()
+    hd_simulator.hide_PowerOffDialog()
     test_PowerOffButton(vSRSUI)
 
 def showNtest_PowerOffNotificationDialog(vSRSUI=""):
     mSRSUI = globals.SRSUI(vSRSUI)
-    denaliMessages.show_PowerOffNotificationDialog()
+    hd_simulator.show_PowerOffNotificationDialog()
     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 +57,7 @@
     
 def showNtest_PowerOffRejectionDialog(vSRSUI=""):
     mSRSUI = globals.SRSUI(vSRSUI)
-    denaliMessages.show_PowerOffRejectionDialog()
+    hd_simulator.show_PowerOffRejectionDialog()
     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")