Merge "Change ResultType#getXmlString to use name()"