Tweaks to CSV to XML import and rename file