Updated property attribute names