Renamed xml prior to tell, don't ask refactoring.