intrinsic mappings use the short name, instead of the class name.
Migrated from D8148 (view on Phabricator)