Change xml file names and remove update xml code