Fix mapping xml files