changed xml tag names