Rename and remove XML files for greater clarity