Change from Prop to Property and Property to Obligation