diff --git a/README.md b/README.md
index 63f060e..287fc62 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ To then run it locally `bundle exec jekyll serve`
 If you would like to translate the guide then please open a pull request or open an issue
 if you need some help getting it setup.
 
-* [Japanese/日本語](http://www.sqlstyle.guide/jp/) by [nkurigit](https://github.com/nkurigit)
+* [Japanese/日本語](http://www.sqlstyle.guide/ja/) by [nkurigit](https://github.com/nkurigit)
 * [Simplified Chinese/简体中文](http://www.sqlstyle.guide/zh/) by 
   [wontoncoder](https://github.com/wontoncoder)
 
diff --git a/_config.yml b/_config.yml
index 01b3452..a1608e6 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,3 +15,6 @@ kramdown:
     input: GFM
     hard_wrap: false
     toc_levels: "2,3"
+
+gems:
+    - jekyll-redirect-from
diff --git a/_includes/foot.html b/_includes/foot.html
index 34c6c2b..8f9b8fe 100644
--- a/_includes/foot.html
+++ b/_includes/foot.html
@@ -6,12 +6,12 @@
             <span itemprop="name" alternateName="en" title="English">English</span>
         </a>
         ·
-        <a href="{{ site.url }}/jp" itemprop="availableLanguage" itemscope itemtype="http://schema.org/Language">
-            <span itemprop="name" alternateName="ja" title="Japanese">日本語</span>
+        <a href="{{ site.url }}/ja" itemprop="availableLanguage" itemscope itemtype="http://schema.org/Language">
+            <span itemprop="name" alternateName="ja" title="日本語 (Japanese)" lang="ja">日本語</span>
         </a>
         ·
         <a href="{{ site.url }}/zh" itemprop="availableLanguage" itemscope itemtype="http://schema.org/Language">
-            <span itemprop="name" alternateName="zh" title="Simplified Chinese">简体中文</span>
+            <span itemprop="name" alternateName="zh" title="简体中文 (Simplified Chinese)" lang="zh">简体中文</span>
         </a>
     </nav>
     <p>
diff --git a/_includes/head.html b/_includes/head.html
index ce5c635..0468751 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -8,12 +8,12 @@
                 <span itemprop="name" alternateName="en" title="English">English</span>
             </a>
             ·
-            <a href="{{ site.url }}/jp" itemprop="availableLanguage" itemscope itemtype="http://schema.org/Language">
-                <span itemprop="name" alternateName="ja" title="Japanese">日本語</span>
+            <a href="{{ site.url }}/ja" itemprop="availableLanguage" itemscope itemtype="http://schema.org/Language">
+                <span itemprop="name" alternateName="ja" title="日本語 (Japanese)" lang="ja">日本語</span>
             </a>
             ·
             <a href="{{ site.url }}/zh" itemprop="availableLanguage" itemscope itemtype="http://schema.org/Language">
-                <span itemprop="name" alternateName="zh" title="Simplified Chinese">简体中文</span>
+                <span itemprop="name" alternateName="zh" title="简体中文 (Simplified Chinese)" lang="zh">简体中文</span>
             </a>
         </nav>
     </div>
diff --git a/_includes/sqlstyle.guide.ja.md b/_includes/sqlstyle.guide.ja.md
index 67fd883..f6fddb3 100644
--- a/_includes/sqlstyle.guide.ja.md
+++ b/_includes/sqlstyle.guide.ja.md
@@ -6,10 +6,10 @@
 
 **日本語訳について**  
 
-日本語訳は誤訳や[原文の最新版][sqlstyleguide]に追随していない恐れがあります。誤訳や改善点があれば、GitHubの[issue][]または[pull request][pull]を使用するか、[Twitter][twitter-jp]でお知らせください。  
-翻訳: 久利史之 [@nkuritw][twitter-jp]
+日本語訳は誤訳や[原文の最新版][sqlstyleguide]に追随していない恐れがあります。誤訳や改善点があれば、GitHubの[issue][]または[pull request][pull]を使用するか、[Twitter][twitter-ja]でお知らせください。  
+翻訳: 久利史之 [@nkuritw][twitter-ja]
 
-[twitter-jp]: https://twitter.com/nkuritw
+[twitter-ja]: https://twitter.com/nkuritw
 
 ***
 
@@ -1195,7 +1195,7 @@ ZONE
     "SQL style guide pull requests on GitHub"
 [celko]: https://www.amazon.co.jp/Celkos-Programming-Kaufmann-Management-Systems/dp/0120887975
     "Joe Celko's SQL Programming Style (The Morgan Kaufmann Series in Data Management Systems)"
-[dl-md]: https://raw.githubusercontent.com/treffynnon/sqlstyle.guide/gh-pages/_includes/sqlstyle.guide.jp.md
+[dl-md]: https://raw.githubusercontent.com/treffynnon/sqlstyle.guide/gh-pages/_includes/sqlstyle.guide.ja.md
     "Download the guide in Markdown format"
 [iso-8601]: https://ja.wikipedia.org/wiki/ISO_8601
     "Wikipedia: ISO 8601"
diff --git a/jp/index.md b/ja/index.md
similarity index 77%
rename from jp/index.md
rename to ja/index.md
index db0fbbd..d730e78 100644
--- a/jp/index.md
+++ b/ja/index.md
@@ -1,5 +1,6 @@
 ---
 layout: default
+redirect_from: "/jp"
 ---
 
 * TOC