Refactor property names