Added a few known name mappings