Index: sources/model/MModel.h
===================================================================
diff -u -recb2c280db303fbf2321b484572c092ae2c55cce -r6be878894c1362d7d5d24259dbe14b4773e35f6c
--- sources/model/MModel.h	(.../MModel.h)	(revision ecb2c280db303fbf2321b484572c092ae2c55cce)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 6be878894c1362d7d5d24259dbe14b4773e35f6c)
@@ -161,7 +161,7 @@
     REGISTER_METATYPE(                                 AdjustUltrafiltrationStateResponseData ) \
     REGISTER_METATYPE(                                  AdjustUltrafiltrationEditResponseData ) \
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
-    REGISTER_METATYPE(                                                          TreatmentData ) \
+    REGISTER_METATYPE(                                                TreatmentParametersData ) \
     REGISTER_METATYPE(                                               AdjustSalineResponseData )
 
 //===============================================================================//
Index: sources/model/MTreatmentParameters.h
===================================================================
diff -u -r5d9b5db331ea59a55688e6f708a19b3ad2105805 -r6be878894c1362d7d5d24259dbe14b4773e35f6c
--- sources/model/MTreatmentParameters.h	(.../MTreatmentParameters.h)	(revision 5d9b5db331ea59a55688e6f708a19b3ad2105805)
+++ sources/model/MTreatmentParameters.h	(.../MTreatmentParameters.h)	(revision 6be878894c1362d7d5d24259dbe14b4773e35f6c)
@@ -43,5 +43,5 @@
 };
 }
 
-typedef Model::TreatmentParameters::Data TreatmentData;
+typedef Model::TreatmentParameters::Data TreatmentParametersData;
 #endif // MTREATMENTPARAMETERS_H
Index: sources/view/VCreateTreatment.cpp
===================================================================
diff -u -r810e4b12507feba688c3ea2ab045040214661298 -r6be878894c1362d7d5d24259dbe14b4773e35f6c
--- sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision 810e4b12507feba688c3ea2ab045040214661298)
+++ sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision 6be878894c1362d7d5d24259dbe14b4773e35f6c)
@@ -469,10 +469,10 @@
 /**
  * \brief VCreateTreatment::validate
  *  Validates the create new treatment input.
- * \param vData - the selected TreatmentData
+ * \param vData - the selected TreatmentParametersData
  * \return true on success, false otherwise.
  */
-bool VCreateTreatment::validate(const TreatmentData &vData)
+bool VCreateTreatment::validate(const TreatmentParametersData &vData)
 {
     bool success = true;
 
Index: sources/view/VCreateTreatment.h
===================================================================
diff -u -recb2c280db303fbf2321b484572c092ae2c55cce -r6be878894c1362d7d5d24259dbe14b4773e35f6c
--- sources/view/VCreateTreatment.h	(.../VCreateTreatment.h)	(revision ecb2c280db303fbf2321b484572c092ae2c55cce)
+++ sources/view/VCreateTreatment.h	(.../VCreateTreatment.h)	(revision 6be878894c1362d7d5d24259dbe14b4773e35f6c)
@@ -116,8 +116,8 @@
     PROPERTY(bool, continueEnabled, false)  
     PROPERTY(bool, saveTreatmentProfile, false)
 
-    TreatmentData treatmentData;
-    bool          validate(const TreatmentData &vData);
+    TreatmentParametersData treatmentData;
+    bool          validate(const TreatmentParametersData &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 TreatmentData &data);
+    void didCreateTreatment(const TreatmentParametersData &data);
     void showConfirm();
     void showPrime();
     void showBegin();
Index: unittests/tst_models.cpp
===================================================================
diff -u -recb2c280db303fbf2321b484572c092ae2c55cce -r6be878894c1362d7d5d24259dbe14b4773e35f6c
--- unittests/tst_models.cpp	(.../tst_models.cpp)	(revision ecb2c280db303fbf2321b484572c092ae2c55cce)
+++ unittests/tst_models.cpp	(.../tst_models.cpp)	(revision 6be878894c1362d7d5d24259dbe14b4773e35f6c)
@@ -1663,7 +1663,7 @@
     {
 
         list.append(QVariant(1));
-        TreatmentData tempData = mData.fromVariantList(list);
+        TreatmentParametersData tempData = mData.fromVariantList(list);
         if (i == 16) {
             QVERIFY(1 == tempData.bloodFlowRate);
             QVERIFY(1 == tempData.dialysateFlowRate);
@@ -1684,7 +1684,7 @@
             QVERIFY(1 == tempData.rinsebackFlowRate);
         }
         else {
-            TreatmentData data;
+            TreatmentParametersData data;
             QVERIFY(data.bloodFlowRate               == tempData.bloodFlowRate);
             QVERIFY(data.dialysateFlowRate           == tempData.dialysateFlowRate);
             QVERIFY(data.duration                    == tempData.duration);
Index: unittests/tst_views.cpp
===================================================================
diff -u -recb2c280db303fbf2321b484572c092ae2c55cce -r6be878894c1362d7d5d24259dbe14b4773e35f6c
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision ecb2c280db303fbf2321b484572c092ae2c55cce)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 6be878894c1362d7d5d24259dbe14b4773e35f6c)
@@ -663,7 +663,7 @@
         QVERIFY(!view.onFWValidationResponse(action, messageData));
     }
 
-    TreatmentData dataBackup = view.treatmentData;
+    TreatmentParametersData dataBackup = view.treatmentData;
 
     QVariantList validMessageData;
     for (int i = 0; i < 18; ++i) { validMessageData.append(0); }