Make xml root tags consistent