refactored xml file names to more appropriate and logical