- Refactoring of field names