[refactor] Renamed property to value_property and block_property to property (1m)