refactoring property names