Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re699d00afc964052ec0e91ca72e101d21aa00413
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision e699d00afc964052ec0e91ca72e101d21aa00413)
@@ -40,7 +40,7 @@
     // Be careful it is always triggered on each message.
     TRIGGER ( bool   , state                                    , false ) // changes in case any message received.
 
-    PROPERTY( quint8 , subMode                                  ,     0 ) ///< HD_PRE_TREATMENT_START_STATE                     , Start pre-treatment mode state
+    PROPERTY( quint8 , subMode                                  ,     0 ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE              , Water sample state
     PROPERTY( quint8 , waterSampleState                         ,     0 ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE              , Water sample state
     PROPERTY( quint8 , selfTestConsumablesState                 ,     0 ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,     , Consumable self-tests state
     PROPERTY( quint8 , selfTestNoCartridgeState                 ,     0 ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE         , Self tests with no cartridge state
@@ -51,7 +51,6 @@
     PROPERTY( quint8 , patientConnectionState                   ,     0 ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE        , Patient connection state
 
     // Start pre-treatment mode state
-    PROPERTY( bool   , start                                    , false ) ///< HD_PRE_TREATMENT_START_STATE                     , Start pre-treatment mode state
     PROPERTY( bool   , waterSample                              , false ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE              , Water sample state
     PROPERTY( bool   , selfTestConsumables                      , false ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,     , Consumable self-tests state
     PROPERTY( bool   , selfTestNoCartridge                      , false ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE         , Self tests with no cartridge state
@@ -67,12 +66,11 @@
 
     // Self tests consumables state
     PROPERTY( bool   , selfTestConsumables_install              , false ) ///< CONSUMABLE_SELF_TESTS_INSTALL_STATE              , Consumable self-tests install state
-    STATE   ( bool   , selfTestConsumables_waterQuality         , false ) ///< CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE  , Consumable self-tests water quality check state
+    STATE   ( bool   , selfTestConsumables_prime                , false ) ///< CONSUMABLE_SELF_PRIME_STATE                      , Consumable self-tests prime concentrate lines state
     STATE   ( bool   , selfTestConsumables_biCarbPump           , false ) ///< CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE    , Consumable self-tests bicarbonate concentrate pump check state
     STATE   ( bool   , selfTestConsumables_acidPump             , false ) ///< CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE      , Consumable self-tests acid concentrate pump check state
     STATE   ( bool   , selfTestConsumables_complete             , false ) ///< CONSUMABLE_SELF_TESTS_COMPLETE_STATE             , Consumable self-tests complete state
 
-    PROPERTY( bool   , selfTestNoCartridge_start                , false ) ///< NO_CART_SELF_TESTS_START_STATE                   , No cartridge self-tests starting state.
     PROPERTY( bool   , selfTestNoCartridge_waitDoorClose        , false ) ///< NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE     , Wait for door to be closed before running self-tests.
     PROPERTY( bool   , selfTestNoCartridge_pressureCheck        , false ) ///< NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE         , No cartridge pressure sensors self-test state
     PROPERTY( bool   , selfTestNoCartridge_homeValves           , false ) ///< NO_CART_SELF_TESTS_HOME_VALVES_STATE             , No cartridge home valves state
@@ -90,7 +88,7 @@
     PROPERTY( bool   , selfTestDry_start                        , false ) ///< DRY_SELF_TESTS_START_STATE                       , Dry self-tests starting state.
     PROPERTY( bool   , selfTestDry_waitDoorClose                , false ) ///< DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE         , Wait for door to close before executing self-tests.
     STATE   ( bool   , selfTestDry_usedCartridge                , false ) ///< DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE        , Used Cartridge self-test state.
-    STATE   ( bool   , selfTestDry_occlusionSensors             , false ) ///< DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE           , Occlusion sensors dry self-test state.
+    STATE   ( bool   , selfTestDry_cartridgeLoaded              , false ) ///< DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE      , Cartridge loaded check dry self-test state.
 
     STATE   ( bool   , selfTestDry_pressureSensorsNormalSetup   , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE       , Pressure sensor setup state.
     STATE   ( bool   , selfTestDry_pressureSensorsVenousSetup   , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE       , Venous pressure sensor dry self-test setup valves and pump state
@@ -107,7 +105,6 @@
     STATE   ( bool   , selfTestDry_complete                     , false ) ///< DRY_SELF_TESTS_COMPLETE_STATE                    , Dry self-test complete state.
 
     // Prime blood and dialysate circuits and run wet self-tests state
-    PROPERTY( bool   , prime_start                              , false ) ///< HD_PRIME_START_STATE                             , Prime start state
     STATE   ( bool   , prime_waitUserStart                      , false ) ///< HD_PRIME_WAIT_FOR_USER_START_STATE               , Wait for user to start prime state
     STATE   ( bool   , prime_salineSetup                        , false ) ///< HD_PRIME_SALINE_SETUP_STATE                      , Saline setup state
     STATE   ( bool   , prime_salinePurgeAir                     , false ) ///< HD_PRIME_SALINE_PURGE_AIR_STATE                  , Saline purge air state