Updated naming in xml