Rename XML things to indicate they relate to schema 1, in preparation for schema 2