Fix XML names