Renamed schema files to incorporate 21 to match the specific version