Index: unittests/tst_models.cpp
===================================================================
diff -u -r727105312283abe9b0ebcd30dc0b6abeb1b96f68 -r5387db3e9735f3bbf768906858dbcd725cf23528
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 5387db3e9735f3bbf768906858dbcd725cf23528)
@@ -1469,7 +1469,7 @@
 
 void tst_models::tst_MTreatmentParametersResp()
 {
-    Model::MTreatmentParametersResp mData;
+    Model::MTreatmentParametersResponse mData;
 
 
     QFETCH(int       , errorIndex );
@@ -1600,14 +1600,14 @@
 
 void tst_models::tst_MTreatmentParametersResp_fromVariantList()
 {
-    Model::MTreatmentParametersResp mData;
+    Model::MTreatmentParametersResponse mData;
 
     QVariantList list;
     for (int i = 0; i < 20; ++i)
     {
 
         list.append(QVariant(1));
-        AdjustTreatmentParametersRespData tempData = mData.fromVariantList(list);
+        AdjustTreatmentParametersResponseData tempData = mData.fromVariantList(list);
         if (i == 17) {
             QVERIFY(1 == tempData.requestValid);
             QVERIFY(1 == tempData.bloodFlowRate);
@@ -1629,7 +1629,7 @@
             QVERIFY(1 == tempData.rinsebackFlowRate);
         }
         else {
-            AdjustTreatmentParametersRespData data;
+            AdjustTreatmentParametersResponseData data;
             QVERIFY(data.requestValid                == tempData.requestValid);
             QVERIFY(data.bloodFlowRate               == tempData.bloodFlowRate);
             QVERIFY(data.dialysateFlowRate           == tempData.dialysateFlowRate);
@@ -1656,14 +1656,14 @@
 
 void tst_models::tst_MTreatmentParameters_fromVariantList()
 {
-    Model::MTreatmentParameters mData;
+    Model::MAdjustTreatmentParametersRequest mData;
 
     QVariantList list;
     for (int i = 0; i < 20; ++i)
     {
 
         list.append(QVariant(1));
-        AdjustTreatmentParametersData tempData = mData.fromVariantList(list);
+        AdjustTreatmentParametersRequestData tempData = mData.fromVariantList(list);
         if (i == 16) {
             QVERIFY(1 == tempData.bloodFlowRate);
             QVERIFY(1 == tempData.dialysateFlowRate);
@@ -1684,7 +1684,7 @@
             QVERIFY(1 == tempData.rinsebackFlowRate);
         }
         else {
-            AdjustTreatmentParametersData data;
+            AdjustTreatmentParametersRequestData data;
             QVERIFY(data.bloodFlowRate               == tempData.bloodFlowRate);
             QVERIFY(data.dialysateFlowRate           == tempData.dialysateFlowRate);
             QVERIFY(data.duration                    == tempData.duration);