Fixing the JSON field names