diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html
index 5225d7d..76ac026 100644
--- a/templates/taxonomy_list.html
+++ b/templates/taxonomy_list.html
@@ -2,15 +2,16 @@
 
 {% block content %}
 {%- set number_of_tags = terms | length -%}
-<h1>{{ macros_translate::translate(key="tags_title", default="Tags", language_strings=language_strings) }}</h1>
+{%- set taxon_name = taxonomy.name -%}
+<h1>{{- macros_translate::translate(key="tags_title", default="$TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</h1>
 
 <p>
-	<small>{{ macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER tags", language_strings=language_strings) }}</small>
+	<small>{{- macros_translate::translate(key="tags", number=number_of_tags, default="$NUMBER $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}</small>
 </p>
 
 <ul class="tags">
-	{%- for tag in terms -%}
-		<li><a href="{{ current_url }}{{ tag.slug }}"><span class="tag">{{ tag.name }}</span><span class="count">{{ tag.pages | length }}</span></a></li>
+	{%- for term in terms -%}
+		<li><a href="{{ current_url }}{{ term.slug }}"><span class="tag">{{ term.name }}</span><span class="count">{{ term.pages | length }}</span></a></li>
 	{%- endfor -%}
 </ul>
 {% endblock content %}
diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html
index ec178e4..e049de0 100644
--- a/templates/taxonomy_single.html
+++ b/templates/taxonomy_single.html
@@ -5,17 +5,17 @@
 {%- set date_locale = macros_translate::translate(key="date_locale", default="en_US", language_strings=language_strings) -%}
 {%- set number_of_posts = term.pages | length -%}
 
-{%- set taxon_name = "taxonomy.name" -%}
+{%- set taxon_name = taxonomy.name -%}
 {%- set term_name = "“" ~ term.name ~ "”" -%}
 <h1>
-	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
+	{{- macros_translate::translate(key="posts_with_tag", default="Posts with $TAXON $TERM", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) | replace(from="$TERM", to=term_name) -}}
 	<a href="{{ current_url ~ 'atom.xml' }}"><i class="icon feed"></i></a>
 </h1>
 
 <p>
 	<small>
 		<a href="{{ get_url(path='tags', lang=lang) }}">
-			{{ macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace (from="$TAXON", to=taxon_name) }}
+			{{- macros_translate::translate(key="all_tags", default="See all $TAXON", language_strings=language_strings) | replace(from="$TAXON", to=taxon_name) -}}
 		</a>
 		<br />
 		{{ macros_translate::translate(key="posts", number=number_of_posts, default="$NUMBER posts", language_strings=language_strings) }}