Update and rename x.xml to x2.xml