Revert "Fix field names"