Index: unittests/tst_models.cpp
===================================================================
diff -u -r846a9ebc350e33be4affab3cc4c136248900015d -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 846a9ebc350e33be4affab3cc4c136248900015d)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1)
@@ -49,8 +49,8 @@
 #include "MAlarmTriggered.h"
 #include "MAlarmCleared.h"
 
-#include "mtreatmentparameters.h"
-#include "mtreatmentparametersresp.h"
+#include "MTreatmentParameters.h"
+#include "MTreatmentParametersResp.h"
 
 // #define CONSOLEOUT
 
@@ -1469,7 +1469,7 @@
 
 void tst_models::tst_MTreatmentParametersResp()
 {
-    Model::TreatmentParametersResp mData;
+    Model::MTreatmentParametersResponse mData;
 
 
     QFETCH(int       , errorIndex );
@@ -1599,14 +1599,14 @@
 
 void tst_models::tst_MTreatmentParametersResp_fromVariantList()
 {
-    Model::TreatmentParametersResp mData;
+    Model::MTreatmentParametersResponse mData;
 
     QVariantList list;
     for (int i = 0; i < 20; ++i)
     {
 
         list.append(QVariant(1));
-        TreatmentParametersRespData tempData = mData.fromVariantList(list);
+        AdjustTreatmentParametersResponseData tempData = mData.fromVariantList(list);
         if (i == 17) {
             QVERIFY(1 == tempData.requestValid);
             QVERIFY(1 == tempData.bloodFlowRate);
@@ -1628,7 +1628,7 @@
             QVERIFY(1 == tempData.rinsebackFlowRate);
         }
         else {
-            TreatmentParametersRespData data;
+            AdjustTreatmentParametersResponseData data;
             QVERIFY(data.requestValid                == tempData.requestValid);
             QVERIFY(data.bloodFlowRate               == tempData.bloodFlowRate);
             QVERIFY(data.dialysateFlowRate           == tempData.dialysateFlowRate);
@@ -1655,14 +1655,14 @@
 
 void tst_models::tst_MTreatmentParameters_fromVariantList()
 {
-    Model::TreatmentParameters mData;
+    Model::MAdjustTreatmentParametersRequest mData;
 
     QVariantList list;
     for (int i = 0; i < 20; ++i)
     {
 
         list.append(QVariant(1));
-        TreatmentData tempData = mData.fromVariantList(list);
+        AdjustTreatmentParametersRequestData tempData = mData.fromVariantList(list);
         if (i == 16) {
             QVERIFY(1 == tempData.bloodFlowRate);
             QVERIFY(1 == tempData.dialysateFlowRate);
@@ -1683,7 +1683,7 @@
             QVERIFY(1 == tempData.rinsebackFlowRate);
         }
         else {
-            TreatmentData data;
+            AdjustTreatmentParametersRequestData data;
             QVERIFY(data.bloodFlowRate               == tempData.bloodFlowRate);
             QVERIFY(data.dialysateFlowRate           == tempData.dialysateFlowRate);
             QVERIFY(data.duration                    == tempData.duration);
@@ -1706,6 +1706,7 @@
     }
 }
 
+
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MSalineBolusResponse data definition ~~~~~~~~~~~~~~~~~~~~~~~~ //