Fixing field names