Refactor the little xml file to math with the new naming conventions.