diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index b56e8d48f6..d1ce3ec11c 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -4,7 +4,7 @@
 	{{ .Content }}
 {{end}}
 
-{{ if or (eq .Kind "taxonomy") (eq .Kind "taxonomyTerm") }}
+{{ if or (eq .Kind "taxonomy") (eq .Kind "term") }}
 <ul>
 	{{ range .Pages }}
 		<li><a href="{{.RelPermalink}}">{{.Title}}</a></li>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 114f3620ed..6b23395374 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -93,8 +93,8 @@
         <div id="body-inner">
           {{if and (not .IsHome) (not .Params.chapter) }}
             <h1>
-              {{ if eq .Kind "taxonomy" }}
-                {{.Kind}} ::
+              {{ if or (eq .Kind "taxonomy") (eq .Kind "term") }}
+                {{.Data.Singular}} ::
               {{ end }}
               {{.Title}}
             </h1>