Country names fix