Index: unittests/tst_models.cpp
===================================================================
diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r9cc1608f615e66d0f1c3a022aa6d19579d76b241
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision d2035a8728794afeefaa244bf8d1597926d945f5)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 9cc1608f615e66d0f1c3a022aa6d19579d76b241)
@@ -1,16 +1,16 @@
 /*!
- * 
+ *
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- * 
+ *
  * \file tst_models.cpp
  * \author (last) Peter Lucia
  * \date (last) 07-Jul-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 21-Apr-2020
- * 
+ *
  */
 #include "tst_models.h"
 
@@ -43,7 +43,7 @@
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
 #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
 
-#include "malarmstatus.h"
+#include "MAlarmStatusData.h"
 
 // #define CONSOLEOUT
 
@@ -382,13 +382,13 @@
 void tst_models::tst_MAlarmStatus()
 {
 
-    for (int i = 1; i < GuiAlarmID::NUM_OF_ALARM_IDS; ++i) {
-        QVERIFY(!Model::MAlarmStatus::toText(GuiAlarmID(i)).isEmpty());
+    for (int i = 1; i < Gui::GuiAlarmID::NUM_OF_ALARM_IDS; ++i) {
+        QVERIFY(!Model::MAlarmStatus::toText(Gui::GuiAlarmID(i)).isEmpty());
     }
 
-    QCOMPARE(Model::MAlarmStatus::toText(GuiAlarmID(0)), tr(""));
-    QCOMPARE(Model::MAlarmStatus::toText(GuiAlarmID(-1)), tr("Alarm Not Recognized."));
-    QCOMPARE(Model::MAlarmStatus::toText(GuiAlarmID(599)), tr("Alarm Not Recognized."));
+    QCOMPARE(Model::MAlarmStatus::toText(Gui::GuiAlarmID(0)), tr(""));
+    QCOMPARE(Model::MAlarmStatus::toText(Gui::GuiAlarmID(-1)), tr("Alarm Not Recognized."));
+    QCOMPARE(Model::MAlarmStatus::toText(Gui::GuiAlarmID(599)), tr("Alarm Not Recognized."));
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~