Changes to convert country name strings to ISO-2 codes