diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index 5f71eb6a80..a68b224384 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -9,7 +9,7 @@
 {{- if not $title }}
   {{- $title = .Data.Singular | humanize }}
 {{- end }}
-{{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) (.Title | humanize) }}
+{{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) .Title }}
 <h1 id="{{ $title | anchorize }}">{{ $title }}</h1>
 <ul class="columnize">
   {{- range sort .Pages "Title" }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index e27822f112..4973f43674 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -13,6 +13,11 @@
     {{- $title := .Title }}
     {{- if eq $outputFormat "searchpage" }}
       {{- $title = T "Search" }}
+    {{- else if eq .Kind "taxonomy" }}
+      {{- $title = i18n .Data.Plural }}
+      {{- if not $title }}
+        {{- $title = .Data.Plural | humanize }}
+      {{- end }}
     {{- else if eq .Kind "term" }}
       {{- $title = i18n .Data.Singular }}
       {{- if not $title }}
@@ -179,10 +184,15 @@
     {{- if $ispublished }}
       {{- $depth = add $depth 1 }}
       {{- $title := $to.Title }}
-      {{- if eq .Kind "term" }}
-        {{- $title = i18n .Data.Singular }}
+      {{- if eq .Kind "taxonomy" }}
+        {{- $title = i18n $to.Data.Plural }}
         {{- if not $title }}
-          {{- $title = .Data.Singular | humanize }}
+          {{- $title = $to.Data.Plural | humanize }}
+        {{- end }}
+      {{- else if eq .Kind "term" }}
+        {{- $title = i18n $to.Data.Singular }}
+        {{- if not $title }}
+          {{- $title = $to.Data.Singular | humanize }}
         {{- end }}
         {{- $title = printf "%s %s %s" $title (default "::" .Site.Params.titleSeparator) $to.Title }}
       {{- end }}