Index: sources/view/hd/data/VPreTreatmentStatesData.h
===================================================================
diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -rbd01334f257c35b96b7b232beacbcd7fae60c852
--- sources/view/hd/data/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision db2238dcf17941be6a3c587b55a3ef06b94cee96)
+++ sources/view/hd/data/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision bd01334f257c35b96b7b232beacbcd7fae60c852)
@@ -83,7 +83,7 @@
     PROPERTY( bool   , selfTestNoCartridge_pumps                , false ) ///< NO_CART_SELF_TESTS_PUMPS_STATE                   , No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state.
     PROPERTY( bool   , selfTestNoCartridge_leakDetectors        , false ) ///< NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE          , No cartridge leak detectors self-test state.
     PROPERTY( bool   , selfTestNoCartridge_boardTemperature     , false ) ///< NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE       , No cartridge board temperature self-test state.
-    PROPERTY( bool   , selfTestNoCartridge_doorSwitch           , false ) ///< NO_CART_SELF_TESTS_DOOR_SWITCH_STATE             , No cartridge door switch self-test state.
+    PROPERTY( bool   , selfTestNoCartridge_startHoming          , false ) ///< NO_CART_SELF_TESTS_START_HOMING_STATE            , No cartridge start home valves and pumps state
     PROPERTY( bool   , selfTestNoCartridge_homeValvesAndPumps   , false ) ///< NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE   , No cartridge home valves and pumps self-test state.
     PROPERTY( bool   , selfTestNoCartridge_homeIdle             , false ) ///< NO_CART_SELF_TESTS_HOME_IDLE_STATE               , Wait for valves and pumps finish homing state.
     PROPERTY( bool   , selfTestNoCartridge_stopped              , false ) ///< NO_CART_SELF_TESTS_STOPPED_STATE                 , No cart self-test stopped state.
@@ -96,8 +96,7 @@
     // Self tests dry state
     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_bubbleDetector               , false ) ///< DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE             , Bubble detectors dry self-test state.
-    STATE   ( bool   , selfTestDry_airTrap                      , false ) ///< DRY_SELF_TESTS_AIR_TRAP_STATE                    , Air trap fill level ultrasonic sensor dry self-test state.
+    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_pressureSensorsSetup         , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE      , Pressure sensors dry self-test setup valves and pump state.
     STATE   ( bool   , selfTestDry_pressureSensors              , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_STATE            , Pressure sensors verify pressure readings state.