fix field names to match backend