Added rule macro shadowing
Renamed 'rule' to 'property'