Index: sources/view/hd/data/VPreTreatmentStatesData.h
===================================================================
diff -u -r22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb -rdb2238dcf17941be6a3c587b55a3ef06b94cee96
--- sources/view/hd/data/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision 22bd5aba8d60c1cfda0e0b3bdcb0f54cdc27dafb)
+++ sources/view/hd/data/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision db2238dcf17941be6a3c587b55a3ef06b94cee96)
@@ -107,17 +107,17 @@
 
     // Prime blood and dialysate circuits and run wet self-tests state
     PROPERTY( bool   , prime_start                              , false ) ///< HD_PRIME_START_STATE                             , Prime start state
-    PROPERTY( bool   , prime_waitUserStart                      , false ) ///< HD_PRIME_WAIT_FOR_USER_START_STATE               , Wait for user to start prime state
-    PROPERTY( bool   , prime_salineSetup                        , false ) ///< HD_PRIME_SALINE_SETUP_STATE                      , Saline setup state
-    PROPERTY( bool   , prime_salinePurgeAir                     , false ) ///< HD_PRIME_SALINE_PURGE_AIR_STATE                  , Saline purge air state
-    PROPERTY( bool   , prime_salineCirculateBloodCircuit        , false ) ///< HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE         , Circulate blood circuit state
-    PROPERTY( bool   , prime_reservoiOneFillComplete            , false ) ///< HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE       , Wait for reservoir 1 fill complete
-    PROPERTY( bool   , prime_dialysateDialyzer                  , false ) ///< HD_PRIME_DIALYSATE_DIALYZER_STATE                , Dialysate dialyzer fluid path state
-    PROPERTY( bool   , prime_reservoirTwoFillComplete           , false ) ///< HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE       , Wait for reservoir 2 fill complete
-    PROPERTY( bool   , prime_dialysateBypass                    , false ) ///< HD_PRIME_DIALYSATE_BYPASS_STATE                  , Dialysate bypass fluid path state
-    PROPERTY( bool   , prime_wetSelfTests                       , false ) ///< HD_PRIME_WET_SELF_TESTS_STATE                    , Perform wet self-tests after priming complete
-    PROPERTY( bool   , prime_pause                              , false ) ///< HD_PRIME_PAUSE                                   , Prime pause state, waits to be resumed
-    PROPERTY( bool   , prime_complete                           , false ) ///< HD_PRIME_COMPLETE                                , Prime complete 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
+    STATE   ( bool   , prime_salineCirculateBloodCircuit        , false ) ///< HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE         , Circulate blood circuit state
+    STATE   ( bool   , prime_reservoiOneFillComplete            , false ) ///< HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE       , Wait for reservoir 1 fill complete
+    STATE   ( bool   , prime_dialysateDialyzer                  , false ) ///< HD_PRIME_DIALYSATE_DIALYZER_STATE                , Dialysate dialyzer fluid path state
+    STATE   ( bool   , prime_reservoirTwoFillComplete           , false ) ///< HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE       , Wait for reservoir 2 fill complete
+    STATE   ( bool   , prime_dialysateBypass                    , false ) ///< HD_PRIME_DIALYSATE_BYPASS_STATE                  , Dialysate bypass fluid path state
+    STATE   ( bool   , prime_wetSelfTests                       , false ) ///< HD_PRIME_WET_SELF_TESTS_STATE                    , Perform wet self-tests after priming complete
+    STATE   ( bool   , prime_pause                              , false ) ///< HD_PRIME_PAUSE                                   , Prime pause state, waits to be resumed
+    STATE   ( bool   , prime_complete                           , false ) ///< HD_PRIME_COMPLETE                                , Prime complete state
 
     // Re-circulate blood and dialysate circuits state
     PROPERTY( bool   , recirculate_start                        , false ) ///< PRE_TREATMENT_RECIRC_STATE                       , Pre-treatment recirculate state.