Rename some of the XML files for better clarity