Add more name mappings.