Refactored field names