[#1][#48] Update mapping xml to use renumbered codes correctly