Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -rc0c63c4b149dafea2b02e4cd31f223e392ff7818 -re0412efcf85964a18ec52ad80f233c45998eb45a
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision e0412efcf85964a18ec52ad80f233c45998eb45a)
@@ -30,20 +30,20 @@
     connect(&_FileSaver, SIGNAL(fileSaved(bool)),
             this, SLOT(onFinishedSaveNewTreatment(bool)));
 
-    connect(this, SIGNAL(requestValidateParameters(AdjustTreatmentParametersRequestData)),
-            &_GuiController, SLOT(doAdjustment(AdjustTreatmentParametersRequestData)));
+    connect(this, SIGNAL(requestValidateParameters(AdjustParametersValidationRequestData)),
+            &_GuiController, SLOT(doAdjustment(AdjustParametersValidationRequestData)));
 
-    connect(&_GuiController, SIGNAL(didActionReceive(AdjustTreatmentParametersResponseData)),
-            this, SLOT(doActionReceive(AdjustTreatmentParametersResponseData)));
+    connect(&_GuiController, SIGNAL(didActionReceive(AdjustParametersValidationResponseData)),
+            this, SLOT(doActionReceive(AdjustParametersValidationResponseData)));
 
-    connect(this, SIGNAL(requestSelectParameters(StartTreatmentRequestData)),
-            &_GuiController, SLOT(doAdjustment(StartTreatmentRequestData)));
+    connect(this, SIGNAL(requestSelectParameters(AdjustInitTreatmentRequestData)),
+            &_GuiController, SLOT(doAdjustment(AdjustInitTreatmentRequestData)));
 
-    connect(this, SIGNAL(requestConfirm(ConfirmTreatmentRequestData)),
-            &_GuiController, SLOT(doAdjustment(ConfirmTreatmentRequestData)));
+    connect(this, SIGNAL(requestConfirm(AdjustParametersConfirmRequestData)),
+            &_GuiController, SLOT(doAdjustment(AdjustParametersConfirmRequestData)));
 
-    connect(&_GuiController, SIGNAL(didActionReceive(StartTreatmentResponseData)),
-            this, SLOT(doActionReceive(StartTreatmentResponseData)));
+    connect(&_GuiController, SIGNAL(didActionReceive(AdjustInitTreatmentResponseData)),
+            this, SLOT(doActionReceive(AdjustInitTreatmentResponseData)));
 
     connect(this, SIGNAL(requestConcurrentSave(QString,QString,bool)),
             &_FileSaver, SLOT(onConcurrentSave(QString,QString,bool)));
@@ -235,7 +235,7 @@
  * \param messageData The message data must contain the reject reason codes for all parameters
  * \returns True if FW OK's treatment parameters, false otherwise
  */
-bool VTreatmentCreate::doActionReceive(AdjustTreatmentParametersResponseData data) {
+bool VTreatmentCreate::doActionReceive(AdjustParametersValidationResponseData data) {
 
     bool success = true;
     if (data.bloodFlowRate != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) {
@@ -346,13 +346,12 @@
  *  to start selecting treatment parameters, cancel, or start the treatment
  * @param messageData
  */
-void VTreatmentCreate::doActionReceive(const StartTreatmentResponseData &messageData)
+void VTreatmentCreate::doActionReceive(const AdjustInitTreatmentResponseData &messageData)
 {
-    qDebug() << "Received response after start treatment request: " << messageData.startTreatmentResponse;
-    if (messageData.startTreatmentResponse != 1)
+    if (messageData.mAccepted != 1)
         return;
 
-    if (startTreatmentRequest.request == StartTreatmentRequestData::eCancel) {
+    if (initTreatmentRequest.requestedState ==  AdjustInitTreatmentRequestData::eCancel) {
         //goToNextPage(false);
     }
     else {
@@ -464,7 +463,7 @@
         saveNewTreatment(obj);
 
     // Tell FW we confirm
-    confirmTreatmentRequest.request = ConfirmTreatmentRequestData::eConfirm;
+    confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm;
     emit requestConfirm(confirmTreatmentRequest);
 
     // no FW response required
@@ -573,8 +572,8 @@
  */
 void VTreatmentCreate::doStartTreatment() {
     qDebug() << "Requesting to start a treatment...";
-    startTreatmentRequest.request = StartTreatmentRequestData::eStartTreatment;
-    emit requestSelectParameters(startTreatmentRequest);
+    initTreatmentRequest.requestedState = AdjustInitTreatmentRequestData::eInitiate;
+    emit requestSelectParameters(initTreatmentRequest);
 }
 
 /**
@@ -583,7 +582,7 @@
  * \param   vData - the selected TreatmentParametersData
  * \return  true on success, false otherwise.
  */
-bool VTreatmentCreate::validate(const AdjustTreatmentParametersRequestData &vData)
+bool VTreatmentCreate::validate(const AdjustParametersValidationRequestData &vData)
 {
     bool success = true;
 
@@ -868,8 +867,8 @@
  */
 void VTreatmentCreate::doSelectParameters()
 {
-    startTreatmentRequest.request = StartTreatmentRequestData::eSelectParams;
-    emit requestSelectParameters(startTreatmentRequest);
+    initTreatmentRequest.requestedState = AdjustInitTreatmentRequestData::eInitiate;
+    emit requestSelectParameters(initTreatmentRequest);
 }
 
 /**
@@ -879,8 +878,8 @@
  */
 void VTreatmentCreate::doCancelSelectingParameters()
 {
-    startTreatmentRequest.request = StartTreatmentRequestData::eCancel;
-    emit requestSelectParameters(startTreatmentRequest);
+    initTreatmentRequest.requestedState = AdjustInitTreatmentRequestData::eCancel;
+    emit requestSelectParameters(initTreatmentRequest);
 }
 
 /**
@@ -890,7 +889,7 @@
  */
 void VTreatmentCreate::doCancelConfirmParameters()
 {
-    confirmTreatmentRequest.request = ConfirmTreatmentRequestData::eCancel;
+    confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eCancel;
     emit requestConfirm(confirmTreatmentRequest);
     // goToNextPage(false);
 }