Use updated mapping so closer to UModel produced files
Authored by: philsp 2014-07-22
Parent: [r3398]
Child: [r3400]