Index: unittests/tst_views.cpp
===================================================================
diff -u -r90d4b8ed818464463083ac39d28d80958bb2c1d9 -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1
--- unittests/tst_views.cpp	(.../tst_views.cpp)	(revision 90d4b8ed818464463083ac39d28d80958bb2c1d9)
+++ unittests/tst_views.cpp	(.../tst_views.cpp)	(revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1)
@@ -1,16 +1,16 @@
 /*!
- *
+ * 
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- *
+ * 
  * \file tst_views.cpp
  * \author (last) Behrouz NemaiPour
  * \date (last) 23-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 21-Apr-2020
- *
+ * 
  */
 #include "tst_views.h"
 
@@ -76,7 +76,7 @@
 {
 
     for (int i = 0; i < 18; ++i) {
-        View::VCreateTreatment view;
+        View::VTreatmentCreate view;
         if (i != 0) view.set_bloodFlowRate(view.bloodFlowRateMax());
         if (i != 1) view.set_dialysateFlowRate(view.dialysateFlowRateMax());
         if (i != 2) view.set_duration(view.durationMax());
@@ -153,7 +153,7 @@
  *  Simulates a user selection of valid parameters
  * \param view VCreateTreatment object to be set with valid parameters
  */
-void tst_views::VCreateTreatment_simulate_valid_parameters(View::VCreateTreatment &view)
+void tst_views::VCreateTreatment_simulate_valid_parameters(View::VTreatmentCreate &view)
 {
     view.set_bloodFlowRate(view.bloodFlowRateMax());
     view.set_dialysateFlowRate(view.dialysateFlowRateMax());
@@ -238,7 +238,7 @@
  */
 void tst_views::VCreateTreatment_validation_ranges()
 {
-    View::VCreateTreatment view;
+    View::VTreatmentCreate view;
 
     // adjust quint32 minimums
     view.bloodFlowRateMin(1);
@@ -345,7 +345,7 @@
 
 void tst_views::VCreateTreatment_check_init()
 {
-    View::VCreateTreatment view;
+    View::VTreatmentCreate view;
     quint32 val = 150; view.bloodFlowRateMin(val); ++val;
                        view.bloodFlowRateMin(val);
                        view.bloodFlowRateMin(val);
@@ -522,7 +522,7 @@
 
 void tst_views::VCreateTreatment_save_csv()
 {
-    View::VCreateTreatment view;
+    View::VTreatmentCreate view;
     QString csvData = view.getParameterRangesDataCSV();
     QString filename = QString("/tmp/out_%0.csv").arg(QDateTime::currentDateTime().toString(datetimeFormat));
 
@@ -543,7 +543,7 @@
  */
 void tst_views::VCreateTreatment_save()
 {
-    View::VCreateTreatment view;
+    View::VTreatmentCreate view;
 
     QJsonObject objectWritten {
         {"bloodFlowRate",               QString::number(view.treatmentData.bloodFlowRate)},
@@ -587,7 +587,7 @@
  */
 void tst_views::VCreateTreatment_enums()
 {
-    View::VCreateTreatment view;
+    View::VTreatmentCreate view;
 
     GuiRequestReasons reason = GuiRequestReasons::REQUEST_REJECT_REASON_NONE;
     QCOMPARE(view.enumToString(reason), "REQUEST_REJECT_REASON_NONE");
@@ -603,7 +603,7 @@
  */
 void tst_views::VCreateTreatment_json()
 {
-    View::VCreateTreatment view;
+    View::VTreatmentCreate view;
 
     QJsonArray arr;
     QStringList list;
@@ -635,7 +635,7 @@
  */
 void tst_views::VCreateTreatment_fw_validation_response()
 {
-    View::VCreateTreatment view;
+    View::VTreatmentCreate view;
     GuiActionType action = GuiActionType::ID_CreateTreatmentRsp;
 
     for (int i = 0; i < 18; ++i)
@@ -684,7 +684,7 @@
     view.onFinishedSaveNewTreatment(true);
     view.onFinishedSaveNewTreatment(false);
     view.onFinishedPrime();
-    view.onStart();
+    view.onStartTreatment();
 
     QCOMPARE(view.treatmentData.bloodFlowRate, dataBackup.bloodFlowRate);
     QCOMPARE(view.treatmentData.dialysateFlowRate, dataBackup.dialysateFlowRate);
@@ -712,7 +712,7 @@
  */
 void tst_views::VCreateTreatment_load_parameter_ranges()
 {
-    View::VCreateTreatment view;
+    View::VTreatmentCreate view;
 
     QJsonObject obj;