Add some additional name mappings