Generated with new mapping so closer to the files produced by UModel directly.
Authored by: philsp 2014-07-22
Parent: [r3397]
Child: [r3399]