Changed attribute ids so they are XML 1.0 valid