Update and rename old-ace.xml to ace.xml