Refactor property names.