Changing naming of the xml tools