refactor property names