Index: unittests/tst_models.cpp
===================================================================
diff -u -r96854524927f212c24b9e4a253baeff2e672228f -re0412efcf85964a18ec52ad80f233c45998eb45a
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 96854524927f212c24b9e4a253baeff2e672228f)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
@@ -20,7 +20,7 @@
 #include "MTreatmentAdjustBloodDialysateResponse.h"
 #include "MTreatmentAdjustDurationResponse.h"
 #include "MTreatmentRangesData.h"
-#include "MPowerOff.h"
+#include "MAdjustPowerOff.h"
 
 #include "MDGDrainPumpData.h"
 #include "MDGHeatersData.h"
@@ -39,7 +39,7 @@
 #include "MTreatmentTimeData.h"
 #include "MTreatmentPressureOcclusionData.h"
 #include "MTreatmentSalineData.h"
-#include "MPreTreatmentPrimeData.h"
+#include "MPreTreatmentDisposablePrimeData.h"
 
 #include "MTreatmentAdjustUltrafiltrationStateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
@@ -52,8 +52,8 @@
 #include "MAlarmTriggered.h"
 #include "MAlarmCleared.h"
 
-#include "MTreatmentParametersResp.h"
-#include "MStartTreatmentResponse.h"
+#include "MPreTreatmentAdjustParametersValidationResponse.h"
+#include "MPreTreatmentAdjustInitTreatmentResponse.h"
 
 #include "MessageInterpreter.h"
 
@@ -1599,7 +1599,7 @@
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MTreatmentParametersResp test definition ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MTreatmentParametersResp()
 {
-    Model::MTreatmentParametersResponse mData;
+    Model::MAdjustParametersValidationResponse mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1743,7 +1743,7 @@
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MPreTreatmentPrime test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MPreTreatmentPrime() {
-    Model::MPreTreatmentPrime mData;
+    Model::MPreTreatmentDisposablePrime mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1767,9 +1767,9 @@
     }
 }
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
-void tst_models::tst_MStartTreatmentResponse_data () {
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAdjustInitTreatmentResponse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAdjustInitTreatmentResponse data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MAdjustInitTreatmentResponse_data () {
     QTest::addColumn<int        >("errorIndex");
     QTest::addColumn<QByteArray >("data");
     QTest::newRow("msg complete              ") <<  0 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07"));
@@ -1783,9 +1783,9 @@
     QTest::newRow("startTreatmentRejectReason") <<  2 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06"));
 }
 
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
-void tst_models::tst_MStartTreatmentResponse() {
-    Model::MStartTreatmentResponse mData;
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MAdjustInitTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
+void tst_models::tst_MAdjustInitTreatmentResponse() {
+    Model::MAdjustInitTreatmentResponse mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1951,20 +1951,20 @@
     QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmUserActionReq, vData, payload));
 }
 
-void tst_models::tst_MStartTreatmentRequest()
+void tst_models::tst_MInitTreatmentRequest()
 {
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_StartTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AdjustInitTreatmentReq, vData, payload));
 }
 
 void tst_models::tst_MConfirmTreatmentRequest()
 {
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_ConfirmTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AdjustParametersConfirmReq, vData, payload));
 }
 
 void tst_models::tst_MEndTreatmentRequest()
@@ -1986,5 +1986,5 @@
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_CreateTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AdjustParametersValidationReq, vData, payload));
 }