Index: sources/view/hd/data/VPreTreatmentStatesData.h
===================================================================
diff -u -rc0c63c4b149dafea2b02e4cd31f223e392ff7818 -r22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb
--- sources/view/hd/data/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
+++ sources/view/hd/data/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision 22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb)
@@ -96,14 +96,14 @@
     // 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.
-    PROPERTY( bool   , selfTestDry_bubbleDetector               , false ) ///< DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE             , Bubble detectors dry self-test state.
-    PROPERTY( bool   , selfTestDry_airTrap                      , false ) ///< DRY_SELF_TESTS_AIR_TRAP_STATE                    , Air trap fill level ultrasonic sensor dry self-test state.
-    PROPERTY( bool   , selfTestDry_occlusionSensors             , false ) ///< DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE           , Occlusion sensors dry self-test state.
-    PROPERTY( bool   , selfTestDry_pressureSensorsSetup         , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE      , Pressure sensors dry self-test setup valves and pump state.
-    PROPERTY( bool   , selfTestDry_pressureSensors              , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_STATE            , Pressure sensors verify pressure readings state.
-    PROPERTY( bool   , selfTestDry_pressureSensorsNormal        , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE     , Pressure sensors verify normal pressure readings state.
-    PROPERTY( bool   , selfTestDry_stopped                      , false ) ///< DRY_SELF_TESTS_STOPPED_STATE                     , Dry self-test stopped state.
-    PROPERTY( bool   , selfTestDry_complete                     , false ) ///< DRY_SELF_TESTS_COMPLETE_STATE                    , Dry self-test complete state.
+    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_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.
+    STATE   ( bool   , selfTestDry_pressureSensorsNormal        , false ) ///< DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE     , Pressure sensors verify normal pressure readings state.
+    STATE   ( bool   , selfTestDry_stopped                      , false ) ///< DRY_SELF_TESTS_STOPPED_STATE                     , Dry self-test stopped state.
+    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