Refactor property name