Fixed references to old property names