Refactored edit mode field names