Index: tst_AlarmStatusData/test.py
===================================================================
diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r93fe289e1e33e4b2cf824e30f810490f073ecab3
--- tst_AlarmStatusData/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
+++ tst_AlarmStatusData/test.py	(.../test.py)	(revision 93fe289e1e33e4b2cf824e30f810490f073ecab3)
@@ -14,7 +14,7 @@
 
 
 import names
-from dialin.squish import utils, denaliMessages
+from dialin.ui import utils, hd_simulator
 
 
 def isNotificationBar():
@@ -61,26 +61,26 @@
     startApplication(names.AUT_NAME)
     utils.waitForGUI(1)
 
-    denaliMessages.setAlarmStatus(0, 0, 0, 0, 0)
+    hd_simulator.setAlarmStatus(0, 0, 0, 0, 0)
     test_values                  (0, 0, 0, 0, 0)
  
     for i in range(len(names.AlarmTextMap)):
         # setting priority is to see notification dialog is also showing correct text
         for j in names.AlarmPriority:
-            denaliMessages.setAlarmStatus(j, i, 0, 0, 0)
+            hd_simulator.setAlarmStatus(j, i, 0, 0, 0)
             test_values                  (j, i, 0, 0, 0)
  
-    denaliMessages.setAlarmStatus(1, 2, 3, 4, 5)
+    hd_simulator.setAlarmStatus(1, 2, 3, 4, 5)
     test_values                  (1, 2, 3, 4, 5)
    
     # Coverage
-    denaliMessages.setAlarmStatus(1, 2, 3, 4, 5)
+    hd_simulator.setAlarmStatus(1, 2, 3, 4, 5)
     test_values                  (1, 2, 3, 4, 5)
  
-    denaliMessages.setAlarmStatus(0, 1, 3, 4, 5)
+    hd_simulator.setAlarmStatus(0, 1, 3, 4, 5)
     test_values                  (0, 1, 3, 4, 5)
   
-    denaliMessages.setAlarmStatus(0, 0, 0, 0, 0)
+    hd_simulator.setAlarmStatus(0, 0, 0, 0, 0)
     #test_values                  (0, 0, 0, 0, 0)
 
     utils.tstDone()