Index: unittests/tst_models.cpp
===================================================================
diff -u -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e -r66e87ea403ec12a273553284919684282d87bc6a
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 66e87ea403ec12a273553284919684282d87bc6a)
@@ -1745,7 +1745,7 @@
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MStartTreatmentResponse() {
-    Model::MStartTreatmentResponse mData;
+    Model::MTreatmentStartResponse mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1783,7 +1783,7 @@
 
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MEndTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ //
 void tst_models::tst_MEndTreatmentResponse() {
-    Model::MEndTreatmentResponse mData;
+    Model::MTreatmentEndResponse mData;
 
     QFETCH(int       , errorIndex );
     QFETCH(QByteArray, data       );
@@ -1916,15 +1916,15 @@
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_StartTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentStartReq, 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_TreatmentConfirmReq, vData, payload));
 }
 
 void tst_models::tst_MEndTreatmentRequest()
@@ -1933,18 +1933,18 @@
     QVariantList vData;
     QByteArray payload;
     Message msg;
-    msg.actionId = Gui::GuiActions::ID_EndTreatmentReq;
+    msg.actionId = Gui::GuiActions::ID_TreatmentEndReq;
 
-    QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload));
+    QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentEndReq, vData, payload));
     QVERIFY(!interpreter.interpretMessage_HD(msg,vData));
     vData.append(0);
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentEndReq, vData, payload));
 }
 
 void tst_models::tst_MAdjustmentTreatmentParametersRequest()
 {
     MessageInterpreter interpreter;
     QVariantList vData;
     QByteArray payload;
-    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_CreateTreatmentReq, vData, payload));
+    QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentCreateReq, vData, payload));
 }