Index: sources/model/MModel.h
===================================================================
diff -u -raaa318408687dd27830dbb692b953d2b70c69d38 -r727105312283abe9b0ebcd30dc0b6abeb1b96f68
--- sources/model/MModel.h	(.../MModel.h)	(revision aaa318408687dd27830dbb692b953d2b70c69d38)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68)
@@ -161,7 +161,7 @@
     REGISTER_METATYPE(                                 AdjustUltrafiltrationStateResponseData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationEditResponseData ) \
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
-    REGISTER_METATYPE(                                               MTreatmentParametersData ) \
+    REGISTER_METATYPE(                                          AdjustTreatmentParametersData ) \
     REGISTER_METATYPE(                                               AdjustSalineResponseData )
 
 //===============================================================================//
@@ -300,7 +300,7 @@
     ACTION_RECEIVE_SIGNAL(                                         AdjustDurationResponseData ) \
     ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_SIGNAL(                           AdjustUltrafiltrationConfirmResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                       MTreatmentParametersRespData ) \
+    ACTION_RECEIVE_SIGNAL(                                  AdjustTreatmentParametersRespData ) \
     ACTION_RECEIVE_SIGNAL(                                           AdjustSalineResponseData )
 //--------------------------------------------------------------------------------//
 //--------------------------------------------------------------------------------//
Index: sources/model/MTreatmentParameters.h
===================================================================
diff -u -raaa318408687dd27830dbb692b953d2b70c69d38 -r727105312283abe9b0ebcd30dc0b6abeb1b96f68
--- sources/model/MTreatmentParameters.h	(.../MTreatmentParameters.h)	(revision aaa318408687dd27830dbb692b953d2b70c69d38)
+++ sources/model/MTreatmentParameters.h	(.../MTreatmentParameters.h)	(revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68)
@@ -43,5 +43,5 @@
 };
 }
 
-typedef Model::MTreatmentParameters::Data MTreatmentParametersData;
+typedef Model::MTreatmentParameters::Data AdjustTreatmentParametersData;
 #endif // MTREATMENTPARAMETERS_H
Index: sources/model/MTreatmentParametersResp.cpp
===================================================================
diff -u -raaa318408687dd27830dbb692b953d2b70c69d38 -r727105312283abe9b0ebcd30dc0b6abeb1b96f68
--- sources/model/MTreatmentParametersResp.cpp	(.../MTreatmentParametersResp.cpp)	(revision aaa318408687dd27830dbb692b953d2b70c69d38)
+++ sources/model/MTreatmentParametersResp.cpp	(.../MTreatmentParametersResp.cpp)	(revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68)
@@ -31,7 +31,7 @@
 
 }
 
-MTreatmentParametersRespData MTreatmentParametersResp::fromVariantList(const QVariantList &list)
+AdjustTreatmentParametersRespData MTreatmentParametersResp::fromVariantList(const QVariantList &list)
 {
     Data data;
     if (list.length() != 18)
@@ -123,7 +123,7 @@
             .arg(_data.rinsebackFlowRate.value);
 }
 
-MTreatmentParametersRespData MTreatmentParametersResp::data() const {
+AdjustTreatmentParametersRespData MTreatmentParametersResp::data() const {
     Data data;
     data.requestValid                    = _data.requestValid.value;
     data.bloodFlowRate                   = _data.bloodFlowRate.value;
Index: sources/model/MTreatmentParametersResp.h
===================================================================
diff -u -raaa318408687dd27830dbb692b953d2b70c69d38 -r727105312283abe9b0ebcd30dc0b6abeb1b96f68
--- sources/model/MTreatmentParametersResp.h	(.../MTreatmentParametersResp.h)	(revision aaa318408687dd27830dbb692b953d2b70c69d38)
+++ sources/model/MTreatmentParametersResp.h	(.../MTreatmentParametersResp.h)	(revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68)
@@ -75,5 +75,5 @@
 
 }
 
-typedef Model::MTreatmentParametersResp::Data MTreatmentParametersRespData;
+typedef Model::MTreatmentParametersResp::Data AdjustTreatmentParametersRespData;
 #endif // MTREATMENTPARAMETERSRESP_H
Index: sources/view/VCreateTreatment.cpp
===================================================================
diff -u -raaa318408687dd27830dbb692b953d2b70c69d38 -r727105312283abe9b0ebcd30dc0b6abeb1b96f68
--- sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision aaa318408687dd27830dbb692b953d2b70c69d38)
+++ sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68)
@@ -238,7 +238,7 @@
         return false;
 
     Model::MTreatmentParametersResp response;
-    MTreatmentParametersRespData data = response.fromVariantList(messageData);
+    AdjustTreatmentParametersRespData data = response.fromVariantList(messageData);
 
     bool success = true;
     if (data.requestValid != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) {
@@ -320,7 +320,6 @@
         emit showConfirm();
 
     return success;
-
 }
 
 /**
@@ -472,7 +471,7 @@
  * \param vData - the selected TreatmentParametersData
  * \return true on success, false otherwise.
  */
-bool VCreateTreatment::validate(const MTreatmentParametersData &vData)
+bool VCreateTreatment::validate(const AdjustTreatmentParametersData &vData)
 {
     bool success = true;
 
@@ -651,7 +650,6 @@
         return false;
     else
         return true;
-
 }
 
 /**
Index: sources/view/VCreateTreatment.h
===================================================================
diff -u -raaa318408687dd27830dbb692b953d2b70c69d38 -r727105312283abe9b0ebcd30dc0b6abeb1b96f68
--- sources/view/VCreateTreatment.h	(.../VCreateTreatment.h)	(revision aaa318408687dd27830dbb692b953d2b70c69d38)
+++ sources/view/VCreateTreatment.h	(.../VCreateTreatment.h)	(revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68)
@@ -116,8 +116,8 @@
     PROPERTY(bool, continueEnabled, false)  
     PROPERTY(bool, saveTreatmentProfile, false)
 
-    MTreatmentParametersData treatmentData;
-    bool          validate(const MTreatmentParametersData &vData);
+    AdjustTreatmentParametersData treatmentData;
+    bool          validate(const AdjustTreatmentParametersData &vData);
     QString       saveNewTreatment(const QJsonObject &obj, const QString &dir = Treatment_Profiles_Dir);
     QString       getParameterRangesDataCSV();
     bool          saveTreatmentRangesCSV(const QString &filename);
@@ -144,7 +144,7 @@
     void onFinishedSaveNewTreatment(bool result);
 
 signals:
-    void didCreateTreatment(const MTreatmentParametersData &data);
+    void didCreateTreatment(const AdjustTreatmentParametersData &data);
     void showConfirm();
     void showPrime();
     void showBegin();
Index: unittests/tst_models.cpp
===================================================================
diff -u -raaa318408687dd27830dbb692b953d2b70c69d38 -r727105312283abe9b0ebcd30dc0b6abeb1b96f68
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision aaa318408687dd27830dbb692b953d2b70c69d38)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68)
@@ -1607,7 +1607,7 @@
     {
 
         list.append(QVariant(1));
-        MTreatmentParametersRespData tempData = mData.fromVariantList(list);
+        AdjustTreatmentParametersRespData tempData = mData.fromVariantList(list);
         if (i == 17) {
             QVERIFY(1 == tempData.requestValid);
             QVERIFY(1 == tempData.bloodFlowRate);
@@ -1629,7 +1629,7 @@
             QVERIFY(1 == tempData.rinsebackFlowRate);
         }
         else {
-            MTreatmentParametersRespData data;
+            AdjustTreatmentParametersRespData data;
             QVERIFY(data.requestValid                == tempData.requestValid);
             QVERIFY(data.bloodFlowRate               == tempData.bloodFlowRate);
             QVERIFY(data.dialysateFlowRate           == tempData.dialysateFlowRate);
@@ -1663,7 +1663,7 @@
     {
 
         list.append(QVariant(1));
-        MTreatmentParametersData tempData = mData.fromVariantList(list);
+        AdjustTreatmentParametersData tempData = mData.fromVariantList(list);
         if (i == 16) {
             QVERIFY(1 == tempData.bloodFlowRate);
             QVERIFY(1 == tempData.dialysateFlowRate);
@@ -1684,7 +1684,7 @@
             QVERIFY(1 == tempData.rinsebackFlowRate);
         }
         else {
-            MTreatmentParametersData data;
+            AdjustTreatmentParametersData data;
             QVERIFY(data.bloodFlowRate               == tempData.bloodFlowRate);
             QVERIFY(data.dialysateFlowRate           == tempData.dialysateFlowRate);
             QVERIFY(data.duration                    == tempData.duration);
Index: unittests/tst_views.cpp
===================================================================
diff -u -raaa318408687dd27830dbb692b953d2b70c69d38 -r727105312283abe9b0ebcd30dc0b6abeb1b96f68
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision aaa318408687dd27830dbb692b953d2b70c69d38)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 727105312283abe9b0ebcd30dc0b6abeb1b96f68)
@@ -663,7 +663,7 @@
         QVERIFY(!view.onFWValidationResponse(action, messageData));
     }
 
-    MTreatmentParametersData dataBackup = view.treatmentData;
+    AdjustTreatmentParametersData dataBackup = view.treatmentData;
 
     QVariantList validMessageData;
     for (int i = 0; i < 18; ++i) { validMessageData.append(0); }