Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -r9e234daa89b49df33be6faeaa597e6592526b539 -rc3a1e077ddeba65709084f9af5dd756741db8b4f
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 9e234daa89b49df33be6faeaa597e6592526b539)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision c3a1e077ddeba65709084f9af5dd756741db8b4f)
@@ -36,14 +36,14 @@
     connect(&_GuiController, SIGNAL(didActionReceive(AdjustTreatmentParametersResponseData)),
             this, SLOT(doActionReceive(AdjustTreatmentParametersResponseData)));
 
-    connect(this, SIGNAL(requestSelectParameters(StartTreatmentRequestData)),
-            &_GuiController, SLOT(doAdjustment(StartTreatmentRequestData)));
+    connect(this, SIGNAL(requestSelectParameters(TreatmentStartRequestData)),
+            &_GuiController, SLOT(doAdjustment(TreatmentStartRequestData)));
 
-    connect(this, SIGNAL(requestConfirm(ConfirmTreatmentRequestData)),
-            &_GuiController, SLOT(doAdjustment(ConfirmTreatmentRequestData)));
+    connect(this, SIGNAL(requestConfirm(TreatmentConfirmRequestData)),
+            &_GuiController, SLOT(doAdjustment(TreatmentConfirmRequestData)));
 
-    connect(&_GuiController, SIGNAL(didActionReceive(StartTreatmentResponseData)),
-            this, SLOT(doActionReceive(StartTreatmentResponseData)));
+    connect(&_GuiController, SIGNAL(didActionReceive(TreatmentStartResponseData)),
+            this, SLOT(doActionReceive(TreatmentStartResponseData)));
 
     connect(this, SIGNAL(requestConcurrentSave(QString,QString,bool)),
             &_FileSaver, SLOT(onConcurrentSave(QString,QString,bool)));
@@ -345,13 +345,13 @@
  *  to start selecting treatment parameters, cancel, or start the treatment
  * @param messageData
  */
-void VTreatmentCreate::doActionReceive(const StartTreatmentResponseData &messageData)
+void VTreatmentCreate::doActionReceive(const TreatmentStartResponseData &messageData)
 {
     qDebug() << "Received response after start treatment request: " << messageData.startTreatmentResponse;
     if (messageData.startTreatmentResponse != 1)
         return;
 
-    if (startTreatmentRequest.request == StartTreatmentRequestData::eCancel)
+    if (startTreatmentRequest.request == TreatmentStartRequestData::eCancel)
         goToNextPage(false);
     else
         goToNextPage(true);
@@ -463,7 +463,7 @@
         saveNewTreatment(obj);
 
     // Tell FW we confirm
-    confirmTreatmentRequest.request = ConfirmTreatmentRequestData::eConfirm;
+    confirmTreatmentRequest.request = TreatmentConfirmRequestData::eConfirm;
     emit requestConfirm(confirmTreatmentRequest);
 
     // no FW response required
@@ -574,7 +574,7 @@
  */
 void VTreatmentCreate::doStartTreatment() {
     qDebug() << "Requesting to start a treatment...";
-    startTreatmentRequest.request = StartTreatmentRequestData::eStartTreatment;
+    startTreatmentRequest.request = TreatmentStartRequestData::eStartTreatment;
     emit requestSelectParameters(startTreatmentRequest);
 }
 
@@ -869,7 +869,7 @@
 void VTreatmentCreate::doSelectParameters()
 {
     qDebug() << "Sending request to FW to select parameters...";
-    startTreatmentRequest.request = StartTreatmentRequestData::eSelectParams;
+    startTreatmentRequest.request = TreatmentStartRequestData::eSelectParams;
     emit requestSelectParameters(startTreatmentRequest);
 }
 
@@ -880,7 +880,7 @@
 void VTreatmentCreate::doCancelSelectingParameters()
 {
     qDebug() << "Sending request to FW to cancel selecting parameters...";
-    startTreatmentRequest.request = StartTreatmentRequestData::eCancel;
+    startTreatmentRequest.request = TreatmentStartRequestData::eCancel;
     emit requestSelectParameters(startTreatmentRequest);
 }
 
@@ -892,7 +892,7 @@
 {
     // Tell FW we cancel confirm
     qDebug() << "Telling FW user is cancelling confirm treatment parameters...";
-    confirmTreatmentRequest.request = ConfirmTreatmentRequestData::eCancel;
+    confirmTreatmentRequest.request = TreatmentConfirmRequestData::eCancel;
     emit requestConfirm(confirmTreatmentRequest);
     goToNextPage(false);
 }