Added a few more name mappings