small refactor in XML object and method names