Rename variables of class generateOldXML
Resolving merge conflicts