Fix more field names.