Make serialization field names match spec