diff --git a/data/countries.txt b/data/countries.txt
index 96b72d86b9..2b997fb34e 100644
--- a/data/countries.txt
+++ b/data/countries.txt
@@ -244,6 +244,10 @@
     "Caribisch Nederland", 
     "Nederland", 
     "Venezuela"
+   ],
+   "country_name_synonyms": [
+     "Aruba",
+     "Curacao"
    ]
   }, 
   {
@@ -360,6 +364,9 @@
     "Anguilla", 
     "France", 
     "Nederland"
+   ],
+   "country_name_synonyms": [
+     "Sint Maarten"
    ]
   }, 
   {
@@ -998,6 +1005,9 @@
   }, 
   {
    "id": "Belarus", 
+   "country_name_synonyms": [
+     "Belaruś"
+   ],
    "g": [
     {
      "id": "Belarus_Vitebsk Region", 
@@ -2606,6 +2616,9 @@
    ], 
    "affiliations": [
     "Cabo Verde"
+   ],
+   "country_name_synonyms": [
+     "Cabo Verde"
    ]
   }, 
   {
@@ -2787,10 +2800,16 @@
     "Pointe-Noire", 
     "Pool", 
     "Sangha"
+   ],
+   "country_name_synonyms": [
+     "Republic of the Congo"
    ]
   }, 
   {
    "id": "Congo-Kinshasa", 
+   "country_name_synonyms": [
+     "Democratic Republic of the Congo"
+   ],
    "g": [
     {
      "id": "Congo-Kinshasa_West", 
@@ -2940,6 +2959,9 @@
   }, 
   {
    "id": "Czech Republic", 
+   "country_name_synonyms": [
+     "Czechia"
+   ],
    "g": [
     {
      "id": "Czech_Praha", 
@@ -3146,6 +3168,10 @@
     "Vall\u00e9e du Bandama", 
     "Woroba", 
     "Yamoussoukro"
+   ],
+   "country_name_synonyms": [
+     "Côte d'Ivoire",
+     "Ivory Coast"
    ]
   }, 
   {
@@ -7011,6 +7037,9 @@
       "Lazio", 
       "Palmarola", 
       "Ventotene"
+     ],
+     "country_name_synonyms": [
+       "Vatican City"
      ]
     }, 
     {
@@ -8347,6 +8376,9 @@
    ], 
    "affiliations": [
     "Lesotho"
+   ],
+   "country_name_synonyms": [
+     "Lesotho"
    ]
   }, 
   {
@@ -8613,6 +8645,9 @@
     "\u0408\u0443\u0433\u043e\u0438\u0441\u0442\u043e\u0447\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d", 
     "\u041f\u0435\u043b\u0430\u0433\u043e\u043d\u0438\u0441\u043a\u0438 \u0420\u0435\u0433\u0438\u043e\u043d", 
     "\u0421\u0435\u0432\u0435\u0440\u043e\u0438\u0441\u0442\u043e\u0447\u0435\u043d \u0420\u0435\u0433\u0438\u043e\u043d"
+   ],
+   "country_name_synonyms": [
+     "North Macedonia"
    ]
   }, 
   {
@@ -9722,6 +9757,9 @@
   }, 
   {
    "id": "People's Republic of China", 
+   "country_name_synonyms": [
+     "China"
+   ],
    "g": [
     {
      "id": "China_Anhui", 
@@ -9782,6 +9820,9 @@
       "\u4e2d\u56fd", 
       "\u5e7f\u4e1c\u7701", 
       "\u6d77\u5357\u7701"
+     ],
+     "country_name_synonyms": [
+      "Hong Kong"
      ]
     }, 
     {
@@ -10339,6 +10380,9 @@
    ], 
    "affiliations": [
     "Pitcairn Islands"
+   ],
+   "country_name_synonyms": [
+     "Pitcairn"
    ]
   }, 
   {
@@ -10659,6 +10703,9 @@
    ], 
    "affiliations": [
     "Republika e Kosov\u00ebs"
+   ],
+   "country_name_synonyms": [
+     "Kosovo"
    ]
   }, 
   {
@@ -12054,6 +12101,10 @@
     "AS", 
     "S\u0101moa", 
     "United States of America"
+   ],
+   "country_name_synonyms": [
+     "American Samoa",
+     "Sāmoa"
    ]
   }, 
   {
@@ -12479,6 +12530,9 @@
    "affiliations": [
     "Freezland Rock", 
     "South Georgia and South Sandwich Islands"
+   ],
+   "country_name_synonyms": [
+     "South Georgia and South Sandwich Islands"
    ]
   }, 
   {
@@ -12855,6 +12909,9 @@
       "Area C"
      ]
     }
+   ],
+   "country_name_synonyms": [
+     "Palestinian Territories"
    ]
   }, 
   {
@@ -12963,6 +13020,9 @@
     "Sifundza seManzini", 
     "Sifundza seShiselweni", 
     "Swatini"
+   ],
+   "country_name_synonyms": [
+     "Eswatini"
    ]
   }, 
   {
@@ -13425,6 +13485,9 @@
    "affiliations": [
     "Ciego de \u00c1vila", 
     "The Bahamas"
+   ],
+   "country_name_synonyms": [
+     "Bahamas"
    ]
   }, 
   {
@@ -15204,6 +15267,9 @@
       "Northern Mariana Islands", 
       "MP", 
       "United States of America"
+     ],
+     "country_name_synonyms": [
+      "Guam"
      ]
     }, 
     {
@@ -17339,4 +17405,4 @@
    ]
   }
  ]
-}
\ No newline at end of file
+}
diff --git a/data/countries_synonyms.csv b/data/countries_synonyms.csv
new file mode 100644
index 0000000000..1cc885cd51
--- /dev/null
+++ b/data/countries_synonyms.csv
@@ -0,0 +1,24 @@
+Samoa	American Samoa
+Samoa	Sāmoa
+People's Republic of China	China
+Pitcairn Islands	Pitcairn
+South Georgia and the South Sandwich Islands	South Georgia and South Sandwich Islands
+The Bahamas	Bahamas
+Belarus	Belaruś
+Kingdom of Lesotho	Lesotho
+Swaziland	Eswatini
+Congo-Brazzaville	Republic of the Congo
+Congo-Kinshasa	Democratic Republic of the Congo
+Caribisch Nederland	Aruba
+Caribisch Nederland	Curacao
+Saint Martin	Sint Maarten
+Cape Verde	Cabo Verde
+Cote dIvoire	Côte d'Ivoire
+Cote dIvoire	Ivory Coast
+Palestine Region	Palestinian Territories
+Italy_Lazio	Vatican City
+Republic of Kosovo	Kosovo
+China_Guangdong	Hong Kong
+US_Guam	Guam
+Macedonia	North Macedonia
+Czech Republic	Czechia
diff --git a/map/map_tests/countries_names_tests.cpp b/map/map_tests/countries_names_tests.cpp
index 9c6dc3211b..a5ef3b48ae 100644
--- a/map/map_tests/countries_names_tests.cpp
+++ b/map/map_tests/countries_names_tests.cpp
@@ -32,6 +32,7 @@ UNIT_TEST(CountriesNamesTest)
 {
   Framework f(FrameworkParams(false /* m_enableLocalAds */, false /* m_enableDiffs */));
   auto & storage = f.GetStorage();
+  auto const & synonyms = storage.GetCountryNameSynonyms();
 
   auto handle = search::FindWorld(f.GetDataSource());
   TEST(handle.IsAlive(), ());
@@ -48,32 +49,9 @@ UNIT_TEST(CountriesNamesTest)
                                       StringUtf8Multilang::kDefaultCode,
                                       StringUtf8Multilang::kInternationalCode};
 
-  // todo: (@t.yan) fix names for countries which have separate mwms.
-  set<string> const kIgnoreList = {"China",
-                                   "American Samoa",
-                                   "Sāmoa",
-                                   "Pitcairn",
-                                   "South Georgia and South Sandwich Islands",
-                                   "Lesotho",
-                                   "Eswatini",
-                                   "Republic of the Congo",
-                                   "Democratic Republic of the Congo",
-                                   "Aruba",
-                                   "Sint Maarten",
-                                   "Bahamas",
-                                   "Cabo Verde",
-                                   "Ivory Coast",
-                                   "Palestinian Territories",
-                                   "Turkish Republic Of Northern Cyprus",
-                                   "Nagorno-Karabakh Republic",
-                                   "Vatican City",
-                                   "North Macedonia",
-                                   "Kosovo",
-                                   "Czechia",
+  set<string> const kIgnoreList = {"Turkish Republic Of Northern Cyprus",
                                    "Transnistria",
-                                   "Republic of Belarus",
-                                   "Hong Kong",
-                                   "Guam",
+                                   "Nagorno-Karabakh Republic",
                                    // MAPSME-10611
                                    "Mayorca Residencial",
                                    "Magnolias Residencial"};
@@ -92,7 +70,10 @@ UNIT_TEST(CountriesNamesTest)
                   string name;
                   if (!ft->GetName(langIndex, name))
                     return false;
-                  return storage.IsNode(name) || kIgnoreList.count(name) != 0;
+                  auto const it = synonyms.find(name);
+                  if (it == synonyms.end())
+                    return storage.IsNode(name) || kIgnoreList.count(name) != 0;
+                  return storage.IsNode(it->second);
                 }),
          ("Cannot find countries.txt record for country feature:",
           ft->DebugString(FeatureType::BEST_GEOMETRY)));