XML naming convention enforcement

deleteddeleteddeleted