Refactoring field names