Field names refactoring.