Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r25e7d601d795c1622dd4c6e437b3dce91a676e83 -re0412efcf85964a18ec52ad80f233c45998eb45a
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 25e7d601d795c1622dd4c6e437b3dce91a676e83)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
@@ -10,7 +10,7 @@
 #include <QHash>
 
 // Project
-#include "MTreatmentParametersResp.h"
+#include "MPreTreatmentAdjustParametersValidationResponse.h"
 #include "GuiController.h"
 #include "StorageGlobals.h"
 #include "FileSaver.h"
@@ -48,11 +48,11 @@
  * - The data is validated for correctness and compatibility
  * - The continue button is enabled upon success so FW can validate the parameter selection
  *
- * \sa Model::MAdjustTreatmentParametersReq
- * \sa Model::MTreatmentParametersResponse
- * \sa Model::MStartTreatmentReq
+ * \sa Model::MAdjustParametersValidationResponse
+ * \sa Model::MAdjustParametersConfirmReq
+ * \sa Model::MInitTreatmentReq
  * \sa Model::MConfirmTreatmentReq
- * \sa Model::MStartTreatmentResponse
+ * \sa Model::MAdjustInitTreatmentResponse
  */
 class VTreatmentCreate : public QObject
 {
@@ -212,8 +212,8 @@
     PROPERTY(bool, continueEnabled, false)  
     PROPERTY(bool, saveTreatmentProfile, false)
 
-    AdjustTreatmentParametersRequestData treatmentData;
-    bool          validate(const AdjustTreatmentParametersRequestData &vData);
+    AdjustParametersValidationRequestData treatmentData;
+    bool          validate(const AdjustParametersValidationRequestData &vData);
     QString       saveNewTreatment(const QJsonObject &obj, const QString &dir = Treatment_Profiles_Dir);
     QString       getParameterRangesDataCSV();
     bool          saveTreatmentRangesCSV(const QString &filename);
@@ -246,8 +246,8 @@
     Page pageToShow = None;
 
     QString enumToString(GuiRequestReasons vEnum);
-    StartTreatmentRequestData startTreatmentRequest;
-    ConfirmTreatmentRequestData confirmTreatmentRequest;
+    AdjustInitTreatmentRequestData initTreatmentRequest;
+    AdjustParametersConfirmRequestData confirmTreatmentRequest;
     void goToNextPage(bool forward);
 
 
@@ -261,9 +261,9 @@
     void showBegin();
     void pop();
     void showTreatmentStart();
-    void requestValidateParameters(const AdjustTreatmentParametersRequestData &data);
-    void requestConfirm(const ConfirmTreatmentRequestData &data);
-    void requestSelectParameters(const StartTreatmentRequestData &data);
+    void requestValidateParameters(const AdjustParametersValidationRequestData &data);
+    void requestConfirm(const AdjustParametersConfirmRequestData &data);
+    void requestSelectParameters(const AdjustInitTreatmentRequestData &data);
     void resetCreateTreatment();
     void fwValidationFailed(QString reason);
     void fwValidationSuccess();
@@ -276,8 +276,8 @@
     void doFinishedConfirm();
     void doFinishedPrime();
     void doStartTreatment();
-    bool doActionReceive(AdjustTreatmentParametersResponseData data);
-    void doActionReceive(const StartTreatmentResponseData &messageData);
+    bool doActionReceive(AdjustParametersValidationResponseData data);
+    void doActionReceive(const AdjustInitTreatmentResponseData &messageData);
     void doUserModifiedParameters();
     QStringList doGetPrescriptionParameterNames();
     QStringList doGetPrescriptionParameterValues();