Avoiding some country names in favour of more generic terminology where appropriate. (cherry picked from commit 0ca14c61c256af770fe31c0d0cc8b7111f4b988b)
Avoiding some country names in favour of more generic terminology where appropriate. (cherry picked from commit 0ca14c61c256af770fe31c0d0cc8b7111f4b988b)