Homogenization

Made all IDs in .xml files camelCase