Update XML and schema to use namespacing and referencing