diff --git a/locales/en.yml b/locales/en.yml
index d2f8063e6..264e87b79 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -29,17 +29,15 @@ en:
       configuration: Configuring Your Site
       custom_extensions: Custom Extensions
       data_files: Data Files
-      development_optimization: Development Optimization
       dynamic_pages: Dynamic Pages
       file_size_optimization: File Size Optimization
       improving_cacheability: Improving Cacheability
       localization: Localization (i18n)
-      performance_optimization: Performance Optimization
       pretty_urls: Pretty URLs (Directory Indexes)
-      production_optimization: Production Optimization
       project_templates: Project Templates
       rack_middleware: Rack Middleware
       sitemap: The Sitemap
+      template_engine_options: Template Engine Options
   open_source:
     title: Contribute to Open Souce
     service: Add Your Service
diff --git a/locales/jp.yml b/locales/jp.yml
index 5895f51fc..af2eb55ec 100644
--- a/locales/jp.yml
+++ b/locales/jp.yml
@@ -29,17 +29,15 @@ jp:
       configuration: 設定
       custom_extensions: カスタム拡張
       data_files: データファイル
-      development_optimization: 開発の最適化
       dynamic_pages: 動的ページ
       file_size_optimization: ファイルサイズ最適化
       improving_cacheability: キャッシュ機能の改善
       localization: 多言語化 (i18n)
-      performance_optimization: パフォーマンス最適化
       pretty_urls: きれいな URL (ディレクトリインデックス)
-      production_optimization: プロダクションの最適化
       project_templates: プロジェクトテンプレート
       rack_middleware: Rack ミドルウェア
       sitemap: サイトマップ
+      template_engine_options: テンプレートエンジンオプション
   open_source:
     title: オープンソースへの貢献
     service: サービスの追加
diff --git a/netlify.toml b/netlify.toml
index f4993d662..e95b6d6ec 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -253,3 +253,23 @@
   from = "/jp/getting-started/"
   to = "/jp/basics/install"
   status = 301
+
+[[redirects]]
+  from = "/advanced/template_engine_options"
+  to = "/advanced/template-engine-options"
+  status = 301
+
+[[redirects]]
+  from = "/jp/advanced/template_engine_options"
+  to = "/jp/advanced/template-engine-options"
+  status = 301
+
+[[redirects]]
+  from = "/basics/template-engine-options"
+  to = "/advanced/template-engine-options"
+  status = 301
+
+[[redirects]]
+  from = "/jp/basics/template-engine-options"
+  to = "/jp/advanced/template-engine-options"
+  status = 301
diff --git a/source/localizable/basics/template-engine-options.html.markdown b/source/localizable/advanced/template-engine-options.html.markdown
similarity index 100%
rename from source/localizable/basics/template-engine-options.html.markdown
rename to source/localizable/advanced/template-engine-options.html.markdown
diff --git a/source/localizable/basics/template-engine-options.jp.html.markdown b/source/localizable/advanced/template-engine-options.jp.html.markdown
similarity index 100%
rename from source/localizable/basics/template-engine-options.jp.html.markdown
rename to source/localizable/advanced/template-engine-options.jp.html.markdown
diff --git a/source/localizable/basics/templating-language.html.markdown b/source/localizable/basics/templating-language.html.markdown
index b9ac4b13b..f039c937b 100644
--- a/source/localizable/basics/templating-language.html.markdown
+++ b/source/localizable/basics/templating-language.html.markdown
@@ -39,4 +39,4 @@ If we wanted to get fancy, we could add a loop:
 </ul>
 ```
 
-  [see the list]: /basics/template-engine-options/
+  [see the list]: /advanced/template-engine-options/
diff --git a/source/localizable/basics/templating-language.jp.html.markdown b/source/localizable/basics/templating-language.jp.html.markdown
index 9a93780cd..6955efd80 100644
--- a/source/localizable/basics/templating-language.jp.html.markdown
+++ b/source/localizable/basics/templating-language.jp.html.markdown
@@ -39,4 +39,4 @@ Middleman で使うテンプレートはそのファイル名にテンプレー
 </ul>
 ```
 
-  [see the list]: /jp/basics/template-engine-options/
+  [see the list]: /jp/advanced/template-engine-options/
diff --git a/source/partials/_documentation_nav.erb b/source/partials/_documentation_nav.erb
index d06862d3e..7b7fe486f 100644
--- a/source/partials/_documentation_nav.erb
+++ b/source/partials/_documentation_nav.erb
@@ -169,5 +169,11 @@
         "#{locale_prefix}/advanced/custom-extensions/"
       ) %>
     </li>
+    <li class="doc-item">
+      <%= current_link_to(
+        t("navigation.advanced.template_engine_options"),
+        "#{locale_prefix}/advanced/template-engine-options/"
+      ) %>
+    </li>
   </ul>
 </div>