diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 9bce1c753f..f5ef97da75 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -20,7 +20,7 @@
 <ul class="columnize">
   {{- end }}
   {{- $c:=""}}{{/* display terms of a taxonomy */}}
-  <li><a href="{{ partial "relLangPrettyUglyURL.hugo" (dict "to" .Page.Page) }}">{{ .Title }}</a> ({{ .Len }})</li>
+  <li><a href="{{ partial "relLangPrettyUglyURL.hugo" (dict "to" .Page) }}">{{ .Title }}</a> ({{ .Count }})</li>
   {{- $lastCapital = $capital }}
 {{- end }}
 {{- if ne $lastCapital "" }}
diff --git a/layouts/partials/pageHelper/taxonomyPages.html b/layouts/partials/pageHelper/taxonomyPages.html
index 6174f1bc35..fb9ffe6be8 100644
--- a/layouts/partials/pageHelper/taxonomyPages.html
+++ b/layouts/partials/pageHelper/taxonomyPages.html
@@ -1,14 +1,14 @@
 {{- $pages := slice }}
 {{- range .Data.Terms }}
-  {{- $len := 0 }}
+  {{- $count := 0 }}
   {{- range .Pages }}
     {{- $c:=""}}{{/* count pages of term */}}
     {{- if and .Title .RelPermalink (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
-      {{- $len = add $len 1 }}
+      {{- $count = add $count 1 }}
     {{- end }}
   {{- end }}
-  {{- if $len }}
-    {{- $pages = $pages| append (dict "Title" (default (humanize .Page.Data.Term | strings.Title) .Page.Title) "Page" . "Len" $len )}}
+  {{- if $count }}
+    {{- $pages = $pages| append (dict "Title" (default (humanize .Page.Data.Term | strings.Title) .Page.Title) "Page" .Page "Count" $count )}}
   {{- end }}
 {{- end }}
 {{- $pages = sort $pages ".Title" }}
diff --git a/layouts/partials/topbar/button/next.html b/layouts/partials/topbar/button/next.html
index b36fabd423..9e6efe722e 100644
--- a/layouts/partials/topbar/button/next.html
+++ b/layouts/partials/topbar/button/next.html
@@ -14,7 +14,7 @@
 		{{- if eq .Page.Kind "taxonomy" }}
 			{{- /* go to first term page */}}
 			{{- $pages := partialCached "partials/pageHelper/taxonomyPages.html" . . }}
-			{{- $next = (index $pages 0).Page.Page }}
+			{{- $next = (index $pages 0).Page }}
 		{{- else if eq .Page.Kind "term" }}
 			{{- /* go to next term page */}}
 			{{- $taxonomy_page := .Site.GetPage .Data.Plural }}