more country name mappings