XML renamed
Addressed comments after review of the following guys:

 - Carsten Strotmann, Andre Kostur, Simon Pereault,
   Jinmei Tatuya, and Suresh Krishnan (thanks!)