Not all countries are countries. Some are territories
Merge remote branch 'origin/fix-country-terminology'