diff --git a/data/countries.txt b/data/countries.txt
index 96b72d86b9..2a5e0bff34 100644
--- a/data/countries.txt
+++ b/data/countries.txt
@@ -9721,7 +9721,7 @@
    ]
   }, 
   {
-   "id": "People's Republic of China", 
+   "id": "China",
    "g": [
     {
      "id": "China_Anhui", 
@@ -17339,4 +17339,4 @@
    ]
   }
  ]
-}
\ No newline at end of file
+}
diff --git a/data/countries_names.txt b/data/countries_names.txt
index b3f532fa4a..6041fcf15f 100644
--- a/data/countries_names.txt
+++ b/data/countries_names.txt
@@ -5640,6 +5640,37 @@
   he = צ'ילה — דָרוֹם
   sk = Čile — Juh
 
+[China]
+  en = China
+  ru = Китайская Народная Республика
+  ar = الصين
+  cs = Čína
+  da = Kina
+  nl = China
+  fi = Kiina
+  fr = Chine
+  de = China
+  hu = Kína
+  id = Tiongkok
+  it = Cina
+  ja = 中華人民共和国
+  ko = 중화인민공화국
+  nb = Kina
+  pl = Chiny
+  pt = China
+  ro = China
+  es = China
+  sv = Kina
+  th = ประเทศจีน
+  tr = Çin
+  uk = Китай
+  vi = Trung Quốc
+  zh-Hans = 中华人民共和国
+  zh-Hant = 中華人民共和國
+  el = Κίνα
+  he = הרפובליקה העממית של סין
+  sk = Čína
+
 [China_Anhui]
   en = Anhui
   ru = Аньхой
@@ -23527,37 +23558,6 @@
   he = פנסילבניה
   sk = Pensylvánia
 
-[People's Republic of China]
-  en = China
-  ru = Китай
-  ar = الصين
-  cs = Čína
-  da = Kina
-  nl = China
-  fi = Kiina
-  fr = Chine
-  de = China
-  hu = Kína
-  id = Tiongkok
-  it = Cina
-  ja = 中華人民共和国
-  ko = 중화인민공화국
-  nb = Kina
-  pl = Chiny
-  pt = China
-  ro = China
-  es = China
-  sv = Kina
-  th = ประเทศจีน
-  tr = Çin
-  uk = Китай
-  vi = Trung Quốc
-  zh-Hans = 中华人民共和国
-  zh-Hant = 中華人民共和國
-  el = Κίνα
-  he = הרפובליקה העממית של סין
-  sk = Čína
-
 [Peru]
   en = Peru
   ru = Перу
diff --git a/data/hierarchy.txt b/data/hierarchy.txt
index e68ed08c77..2ea7da8639 100644
--- a/data/hierarchy.txt
+++ b/data/hierarchy.txt
@@ -726,7 +726,7 @@ Palau;Q695;pw;en
 Panama;Q804;pa
 Papua New Guinea;Q691;pg;en,ho
 Paraguay;Q733;py;es,gn
-People's Republic of China;Q148;cn;zh
+China;Q148;cn;zh
  China_Anhui;Q40956
  China_Chongqing;Q11725
  China_Fujian;Q41705
diff --git a/data/mwm_names_en.txt b/data/mwm_names_en.txt
index c2d95b4571..f51bad8a39 100644
--- a/data/mwm_names_en.txt
+++ b/data/mwm_names_en.txt
@@ -206,6 +206,7 @@ Chile = Chile
 Chile_Central = Chile — Centre
 Chile_North = Chile — North
 Chile_South = Chile — South
+China = China
 China_Anhui = Anhui
 China_Chongqing = Chongqing
 China_Fujian = Fujian
@@ -828,7 +829,6 @@ Panama = Panama
 Papua New Guinea = Papua New Guinea
 Paraguay = Paraguay
 Pennsylvania = Pennsylvania
-People's Republic of China = People's Republic of China
 Peru = Peru
 Peru_Lima = Lima
 Peru_North = Peru — North