Fixed field names being returned without underscores