diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
index ec1c07148f62df..f5da6b575382b6 100644
--- a/files/ja/_redirects.txt
+++ b/files/ja/_redirects.txt
@@ -1339,7 +1339,9 @@
 /ja/docs/Glossary/Global_attribute	/ja/docs/Web/HTML/Global_attributes
 /ja/docs/Glossary/Grid_Rows	/ja/docs/Glossary/Grid_Row
 /ja/docs/Glossary/Header	/ja/docs/Glossary/HTTP_header
+/ja/docs/Glossary/I18N	/ja/docs/Glossary/Internationalization
 /ja/docs/Glossary/Index	/ja/docs/Glossary
+/ja/docs/Glossary/Internationalization_and_localization	/ja/docs/conflicting/Glossary/Internationalization
 /ja/docs/Glossary/POP3	/ja/docs/Glossary/POP
 /ja/docs/Glossary/Reference	/ja/docs/Glossary/Object_reference
 /ja/docs/Glossary/Round_Trip_Time_(RTT)	/ja/docs/Glossary/Round_Trip_Time
diff --git a/files/ja/_wikihistory.json b/files/ja/_wikihistory.json
index a3f88eac697a5a..27b3d3f4cf1d3d 100644
--- a/files/ja/_wikihistory.json
+++ b/files/ja/_wikihistory.json
@@ -992,10 +992,6 @@
     "modified": "2019-03-18T21:42:25.531Z",
     "contributors": ["Uemmra3", "takeru0430"]
   },
-  "Glossary/I18N": {
-    "modified": "2019-03-18T21:35:48.856Z",
-    "contributors": ["hamasaki", "kadokura"]
-  },
   "Glossary/IANA": {
     "modified": "2019-03-18T21:15:23.095Z",
     "contributors": ["Wind1808"]
@@ -1084,9 +1080,9 @@
     "modified": "2019-03-23T22:38:23.483Z",
     "contributors": ["Potappo", "lv7777", "w-volte"]
   },
-  "Glossary/Internationalization_and_localization": {
-    "modified": "2020-05-24T08:29:22.994Z",
-    "contributors": ["dskmori", "Potappo", "dukesan"]
+  "Glossary/Internationalization": {
+    "modified": "2019-03-18T21:35:48.856Z",
+    "contributors": ["hamasaki", "kadokura"]
   },
   "Glossary/Internet": {
     "modified": "2019-03-23T22:38:33.920Z",
@@ -30218,6 +30214,10 @@
     "modified": "2020-07-17T23:22:13.809Z",
     "contributors": ["papparapa", "silverskyvicto"]
   },
+  "conflicting/Glossary/Internationalization": {
+    "modified": "2020-05-24T08:29:22.994Z",
+    "contributors": ["dskmori", "Potappo", "dukesan"]
+  },
   "conflicting/Glossary/Scroll_container": {
     "modified": "2019-03-18T20:53:07.981Z",
     "contributors": ["mfuji09"]
diff --git a/files/ja/glossary/internationalization_and_localization/index.md b/files/ja/conflicting/glossary/internationalization/index.md
similarity index 92%
rename from files/ja/glossary/internationalization_and_localization/index.md
rename to files/ja/conflicting/glossary/internationalization/index.md
index 20e9806e63ba6d..821665812ff88f 100644
--- a/files/ja/glossary/internationalization_and_localization/index.md
+++ b/files/ja/conflicting/glossary/internationalization/index.md
@@ -1,8 +1,7 @@
 ---
 title: Internationalization (国際化)
-slug: Glossary/Internationalization_and_localization
-l10n:
-  sourceCommit: 4a43f2f9af30db0721b0150909615f5fe9b041a4
+slug: conflicting/Glossary/Internationalization
+original_slug: Glossary/Internationalization_and_localization
 ---
 
 **国際化** (しばしば 「[i18n](/ja/docs/Glossary/I18N)」と略される) は、ウェブサイトやウェブアプリケーションを、異なる言語、地域的差異、異なる国や地域による技術的要求に対応させます。 国際化はあなたのウェブアプリケーションを構築するプロセスであり、新しい言語や地域をサポートする場合に、さほど多くの技術的努力を必要とせずに幅広い言語や地域に対応化可能です。また、すべてのコンテンツをレイアウトを壊すことなくアプリケーションを翻訳あるいはローカライズするので、ユーザーは機能を閲覧することができます。
diff --git a/files/ja/glossary/i18n/index.md b/files/ja/glossary/internationalization/index.md
similarity index 95%
rename from files/ja/glossary/i18n/index.md
rename to files/ja/glossary/internationalization/index.md
index 1a8635577df1bd..2344d0a5ebfaa3 100644
--- a/files/ja/glossary/i18n/index.md
+++ b/files/ja/glossary/internationalization/index.md
@@ -1,6 +1,7 @@
 ---
 title: I18N(国際化対応)
-slug: Glossary/I18N
+slug: Glossary/Internationalization
+original_slug: Glossary/I18N
 ---
 
 i18n("internationalization"という 20 文字の単語より)(国際化対応)は、製品やサービスをどんなターゲット文化にも容易に適応させるベストプラクティスです。