diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/res/res_country_data.xml
index 86978437404..95b83a5fa52 100644
--- a/odoo/addons/base/res/res_country_data.xml
+++ b/odoo/addons/base/res/res_country_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="ad" model="res.country">
-            <field name="name">Andorra, Principality of</field>
+            <field name="name">Andorra</field>
             <field name="code">ad</field>
             <field file="base/static/img/country_flags/ad.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
@@ -17,7 +17,7 @@
             <field eval="971" name="phone_code" />
         </record>
         <record id="af" model="res.country">
-            <field name="name">Afghanistan, Islamic State of</field>
+            <field name="name">Afghanistan</field>
             <field name="code">af</field>
             <field file="base/static/img/country_flags/af.png" name="image" type="base64" />
             <field name="currency_id" ref="AFN" />
@@ -51,13 +51,6 @@
             <field name="currency_id" ref="AMD" />
             <field eval="374" name="phone_code" />
         </record>
-        <record id="an" model="res.country">
-            <field name="name">Netherlands Antilles</field>
-            <field name="code">an</field>
-            <field file="base/static/img/country_flags/an.png" name="image" type="base64" />
-            <field name="currency_id" ref="NOK" />
-            <field eval="599" name="phone_code" />
-        </record>
         <record id="ao" model="res.country">
             <field name="name">Angola</field>
             <field name="code">ao</field>
@@ -122,7 +115,7 @@
             <field eval="994" name="phone_code" />
         </record>
         <record id="ba" model="res.country">
-            <field name="name">Bosnia-Herzegovina</field>
+            <field name="name">Bosnia and Herzegovina</field>
             <field name="code">ba</field>
             <field file="base/static/img/country_flags/ba.png" name="image" type="base64" />
             <field name="currency_id" ref="BAM" />
@@ -291,7 +284,7 @@
             <field eval="236" name="phone_code" />
         </record>
         <record id="cd" model="res.country">
-            <field name="name">Congo, Democratic Republic of the</field>
+            <field name="name">Democratic Republic of the Congo</field>
             <field name="code">cd</field>
             <field file="base/static/img/country_flags/cd.png" name="image" type="base64" />
             <field name="currency_id" ref="CDF" />
@@ -313,7 +306,7 @@
             <field eval="41" name="phone_code" />
         </record>
         <record id="ci" model="res.country">
-            <field name="name">Ivory Coast (Cote D'Ivoire)</field>
+            <field name="name">Côte d'Ivoire</field>
             <field name="code">ci</field>
             <field file="base/static/img/country_flags/ci.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
@@ -564,7 +557,7 @@
             <field eval="995" name="phone_code" />
         </record>
         <record id="gf" model="res.country">
-            <field name="name">French Guyana</field>
+            <field name="name">French Guiana</field>
             <field name="code">gf</field>
             <field name="currency_id" ref="EUR" />
             <field eval="594" name="phone_code" />
@@ -612,7 +605,7 @@
             <field eval="224" name="phone_code" />
         </record>
         <record id="gp" model="res.country">
-            <field name="name">Guadeloupe (French)</field>
+            <field name="name">Guadeloupe</field>
             <field name="code">gp</field>
             <field name="currency_id" ref="EUR" />
             <field eval="590" name="phone_code" />
@@ -646,14 +639,14 @@
             <field eval="502" name="phone_code" />
         </record>
         <record id="gu" model="res.country">
-            <field name="name">Guam (USA)</field>
+            <field name="name">Guam</field>
             <field name="code">gu</field>
             <field file="base/static/img/country_flags/gu.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
             <field eval="0" name="phone_code" />
         </record>
         <record id="gw" model="res.country">
-            <field name="name">Guinea Bissau</field>
+            <field name="name">Guinea-Bissau</field>
             <field name="code">gw</field>
             <field file="base/static/img/country_flags/gw.png" name="image" type="base64" />
             <field name="currency_id" ref="XOF" />
@@ -674,7 +667,7 @@
             <field eval="852" name="phone_code" />
         </record>
         <record id="hm" model="res.country">
-            <field name="name">Heard and McDonald Islands</field>
+            <field name="name">Heard Island and McDonald Islands</field>
             <field name="code">hm</field>
             <field name="currency_id" ref="AUD" />
             <field eval="0" name="phone_code" />
@@ -816,14 +809,14 @@
             <field eval="254" name="phone_code" />
         </record>
         <record id="kg" model="res.country">
-            <field name="name">Kyrgyz Republic (Kyrgyzstan)</field>
+            <field name="name">Kyrgyzstan</field>
             <field name="code">kg</field>
             <field file="base/static/img/country_flags/kg.png" name="image" type="base64" />
             <field name="currency_id" ref="KGS" />
             <field eval="996" name="phone_code" />
         </record>
         <record id="kh" model="res.country">
-            <field name="name">Cambodia, Kingdom of</field>
+            <field name="name">Cambodia</field>
             <field name="code">kh</field>
             <field file="base/static/img/country_flags/kh.png" name="image" type="base64" />
             <field name="currency_id" ref="KHR" />
@@ -844,7 +837,7 @@
             <field eval="269" name="phone_code" />
         </record>
         <record id="kn" model="res.country">
-            <field name="name">Saint Kitts &amp; Nevis Anguilla</field>
+            <field name="name">Saint Kitts and Nevis</field>
             <field name="code">kn</field>
             <field file="base/static/img/country_flags/kn.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
@@ -978,7 +971,7 @@
             <field eval="377" name="phone_code" />
         </record>
         <record id="md" model="res.country">
-            <field name="name">Moldavia</field>
+            <field name="name">Moldova</field>
             <field name="code">md</field>
             <field file="base/static/img/country_flags/md.png" name="image" type="base64" />
             <field name="currency_id" ref="MDL" />
@@ -1054,7 +1047,7 @@
             <field eval="0" name="phone_code" />
         </record>
         <record id="mq" model="res.country">
-            <field name="name">Martinique (French)</field>
+            <field name="name">Martinique</field>
             <field name="code">mq</field>
             <field file="base/static/img/country_flags/mq.png" name="image" type="base64" />
             <field name="currency_id" ref="EUR" />
@@ -1131,7 +1124,7 @@
             <field eval="264" name="phone_code" />
         </record>
         <record id="nc" model="res.country">
-            <field name="name">New Caledonia (French)</field>
+            <field name="name">New Caledonia</field>
             <field name="code">nc</field>
             <field file="base/static/img/country_flags/nc.png" name="image" type="base64" />
             <field name="currency_id" ref="XPF" />
@@ -1194,12 +1187,6 @@
             <field name="currency_id" ref="AUD" />
             <field eval="674" name="phone_code" />
         </record>
-        <record id="nt" model="res.country">
-            <field name="name">Neutral Zone</field>
-            <field name="code">nt</field>
-            <field name="currency_id" ref="IQD" />
-            <field eval="0" name="phone_code" />
-        </record>
         <record id="nu" model="res.country">
             <field name="name">Niue</field>
             <field name="code">nu</field>
@@ -1236,7 +1223,7 @@
             <field eval="51" name="phone_code" />
         </record>
         <record id="pf" model="res.country">
-            <field name="name">Polynesia (French)</field>
+            <field name="name">French Polynesia</field>
             <field name="code">pf</field>
             <field file="base/static/img/country_flags/pf.png" name="image" type="base64" />
             <field name="currency_id" ref="XPF" />
@@ -1279,7 +1266,7 @@
             <field eval="508" name="phone_code" />
         </record>
         <record id="pn" model="res.country">
-            <field name="name">Pitcairn Island</field>
+            <field name="name">Pitcairn Islands</field>
             <field name="code">pn</field>
             <field file="base/static/img/country_flags/pn.png" name="image" type="base64" />
             <field name="currency_id" ref="NZD" />
@@ -1293,7 +1280,7 @@
             <field eval="0" name="phone_code" />
         </record>
         <record id="ps" model="res.country">
-            <field name="name">Palestinian Territory, Occupied</field>
+            <field name="name">State of Palestine</field>
             <field name="code">ps</field>
             <field name="currency_id" ref="ILS" />
             <field eval="0" name="phone_code" />
@@ -1327,7 +1314,7 @@
             <field eval="974" name="phone_code" />
         </record>
         <record id="re" model="res.country">
-            <field name="name">Reunion (French)</field>
+            <field name="name">Réunion</field>
             <field name="code">re</field>
             <field name="currency_id" ref="EUR" />
             <field eval="262" name="phone_code" />
@@ -1403,7 +1390,7 @@
             <field eval="65" name="phone_code" />
         </record>
         <record id="sh" model="res.country">
-            <field name="name">Saint Helena</field>
+            <field name="name">Saint Helena, Ascension and Tristan da Cunha</field>
             <field name="code">sh</field>
             <field file="base/static/img/country_flags/sh.png" name="image" type="base64" />
             <field name="currency_id" ref="SHP" />
@@ -1417,7 +1404,7 @@
             <field eval="386" name="phone_code" />
         </record>
         <record id="sj" model="res.country">
-            <field name="name">Svalbard and Jan Mayen Islands</field>
+            <field name="name">Svalbard and Jan Mayen</field>
             <field name="code">sj</field>
             <field name="currency_id" ref="NOK" />
             <field eval="0" name="phone_code" />
@@ -1472,7 +1459,7 @@
             <field eval="0" name="phone_code" />
         </record>
         <record id="st" model="res.country">
-            <field name="name">Saint Tome (Sao Tome) and Principe</field>
+            <field name="name">São Tomé and Príncipe</field>
             <field name="code">st</field>
             <field file="base/static/img/country_flags/st.png" name="image" type="base64" />
             <field name="currency_id" ref="STD" />
@@ -1576,10 +1563,10 @@
             <field name="currency_id" ref="TOP" />
             <field eval="676" name="phone_code" />
         </record>
-        <record id="tp" model="res.country">
-            <field name="name">East Timor</field>
-            <field name="code">tp</field>
-            <field file="base/static/img/country_flags/tp.png" name="image" type="base64" />
+        <record id="tl" model="res.country">
+            <field name="name">Timor-Leste</field>
+            <field name="code">tl</field>
+            <field file="base/static/img/country_flags/tl.png" name="image" type="base64" />
             <field name="currency_id" ref="USD" />
             <field eval="0" name="phone_code" />
         </record>
@@ -1676,7 +1663,7 @@
             <field eval="379" name="phone_code" />
         </record>
         <record id="vc" model="res.country">
-            <field name="name">Saint Vincent &amp; Grenadines</field>
+            <field name="name">Saint Vincent and the Grenadines</field>
             <field name="code">vc</field>
             <field file="base/static/img/country_flags/vc.png" name="image" type="base64" />
             <field name="currency_id" ref="XCD" />
@@ -1718,7 +1705,7 @@
             <field eval="678" name="phone_code" />
         </record>
         <record id="wf" model="res.country">
-            <field name="name">Wallis and Futuna Islands</field>
+            <field name="name">Wallis and Futuna</field>
             <field name="code">wf</field>
             <field name="currency_id" ref="XPF" />
             <field eval="681" name="phone_code" />
@@ -1743,12 +1730,6 @@
             <field name="currency_id" ref="EUR" />
             <field eval="262" name="phone_code" />
         </record>
-        <record id="yu" model="res.country">
-            <field name="name">Yugoslavia</field>
-            <field name="code">yu</field>
-            <field name="currency_id" ref="YUM" />
-            <field eval="0" name="phone_code" />
-        </record>
         <record id="za" model="res.country">
             <field name="name">South Africa</field>
             <field name="code">za</field>
@@ -1763,12 +1744,6 @@
             <field name="currency_id" ref="ZMK" />
             <field eval="260" name="phone_code" />
         </record>
-        <record id="zr" model="res.country">
-            <field name="name">Zaire</field>
-            <field name="code">zr</field>
-            <field name="currency_id" ref="ZRZ" />
-            <field eval="0" name="phone_code" />
-        </record>
         <record id="zw" model="res.country">
             <field name="name">Zimbabwe</field>
             <field name="code">zw</field>
diff --git a/odoo/addons/base/static/img/country_flags/tp.png b/odoo/addons/base/static/img/country_flags/tp.png
deleted file mode 100644
index 2ec85c15394..00000000000
Binary files a/odoo/addons/base/static/img/country_flags/tp.png and /dev/null differ
diff --git a/odoo/addons/base/tests/test_expression.py b/odoo/addons/base/tests/test_expression.py
index 07a087d0842..2ee7429f90a 100644
--- a/odoo/addons/base/tests/test_expression.py
+++ b/odoo/addons/base/tests/test_expression.py
@@ -537,7 +537,7 @@ class TestExpression(TransactionCase):
         countries = Country.search([('name', '=like', 'Ind__')])
         self.assertTrue(len(countries) == 1, "Must match India only")
         countries = Country.search([('name', '=ilike', 'z%')])
-        self.assertTrue(len(countries) == 3, "Must match only countries with names starting with Z (currently 3)")
+        self.assertTrue(len(countries) == 2, "Must match only countries with names starting with Z (currently 2)")
 
     def test_translate_search(self):
         Country = self.env['res.country']