diff --git a/layouts/partials/widgets/tag_cloud.html b/layouts/partials/widgets/tag_cloud.html
index 2306b088..3b96a006 100644
--- a/layouts/partials/widgets/tag_cloud.html
+++ b/layouts/partials/widgets/tag_cloud.html
@@ -24,7 +24,7 @@
           {{ $tagCount := len $taxonomy.Pages }}
           {{ $weight := div (sub (math.Log $tagCount) (math.Log $min)) (sub (math.Log $max) (math.Log $min)) }}
           {{ $fontSize := add $fontSmall (mul (sub $fontBig $fontSmall) $weight) }}
-          <a href="{{ .Page.RelPermalink }}" style="font-size:{{ $fontSize }}rem">{{ $name }}</a>
+          <a href="{{ .Page.RelPermalink }}" style="font-size:{{ $fontSize }}rem">{{ .Page.Title }}</a>
         {{ end }}
       </div>
     {{ end }}
diff --git a/layouts/shortcodes/list_categories.html b/layouts/shortcodes/list_categories.html
index 3e8a7b8a..7bbf986a 100644
--- a/layouts/shortcodes/list_categories.html
+++ b/layouts/shortcodes/list_categories.html
@@ -1,5 +1,5 @@
 <ul class="list-unstyled">
-  {{ range (site.GetPage "taxonomyTerm" "categories").Pages }}
-  <li><a href="{{.RelPermalink}}">{{.Title}}</a></li>
+  {{ range site.Taxonomies.categories }}
+  <li><a href="{{.Page.RelPermalink}}">{{.Page.Title}}</a></li>
   {{ end }}
 </ul>
\ No newline at end of file
diff --git a/layouts/shortcodes/list_tags.html b/layouts/shortcodes/list_tags.html
index 3e036521..43848128 100644
--- a/layouts/shortcodes/list_tags.html
+++ b/layouts/shortcodes/list_tags.html
@@ -1,5 +1,5 @@
 <ul class="list-unstyled">
-  {{ range (site.GetPage "taxonomyTerm" "tags").Pages }}
-  <li><a href="{{.RelPermalink}}">{{.Title}}</a></li>
+  {{ range site.Taxonomies.tags }}
+  <li><a href="{{.Page.RelPermalink}}">{{.Page.Title}}</a></li>
   {{ end }}
 </ul>
\ No newline at end of file