refactor field name