changes to reflect new names in schema