property name refactor