diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 119b7f8..c7ce0bd 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -2,7 +2,7 @@
   {{ partial "header.html" . }}
   <main>
   {{ partial "date.html" . }}
-  {{ partial "tags_list_page.html" . }}
+  {{ partial "tags/page.html" . }}
   <!-- content -->
   <div class="e-content">
     {{ .Content }}
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 34b49f7..8133c8e 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -2,7 +2,7 @@
   {{ partial "header.html" . }}
   <main>
   {{ partial "search.html" . }}
-  {{ partial "tags_list_all.html" . }}
+  {{ partial "tags/all.html" . }}
   <!-- contents -->
   <div id="contentsList">
     {{ $listPageDateFormat := .Site.Params.listPageDateFormat | default "January, 2006"}}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 202dfa0..b14c38d 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -10,7 +10,7 @@
     {{ .Scratch.Set "beforeDateString" "Published on "}}
     {{ partial "date.html" . }}
     {{ partial "reading_time.html" . }}
-    {{ partial "tags_list_page.html" . }}
+    {{ partial "tags/page.html" . }}
     <!-- content -->
     <div class="e-content">
       {{ .Content }}
diff --git a/layouts/partials/tags_list_all.html b/layouts/partials/tags/all.html
similarity index 100%
rename from layouts/partials/tags_list_all.html
rename to layouts/partials/tags/all.html
diff --git a/layouts/partials/tags_list_page.html b/layouts/partials/tags/page.html
similarity index 100%
rename from layouts/partials/tags_list_page.html
rename to layouts/partials/tags/page.html
diff --git a/layouts/tags/list.html b/layouts/tags/list.html
index 28ddf3a..9258f6a 100644
--- a/layouts/tags/list.html
+++ b/layouts/tags/list.html
@@ -2,7 +2,7 @@
   {{ partial "header.html" . }}
   <main>
   {{ partial "search.html" . }}
-  {{ partial "tags_list_all.html" . }}
+  {{ partial "tags/all.html" . }}
   <!-- contents -->
   <div id="contentsList">
     {{ $listPageDateFormat := .Site.Params.listPageDateFormat | default "January, 2006"}}
diff --git a/layouts/tags/terms.html b/layouts/tags/terms.html
index c764368..8941263 100644
--- a/layouts/tags/terms.html
+++ b/layouts/tags/terms.html
@@ -1,7 +1,7 @@
 {{ define "main"}}
   {{ partial "header.html" . }}
   <main>
-    {{ partial "tags_list_all.html" . }}
+    {{ partial "tags/all.html" . }}
   </main>
   {{ partial "footer.html" . }}
 {{ end }}