diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 2897ab6..d6e2617 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -8,7 +8,7 @@
 {{- partial "meta.html" . -}}
 {{- partialCached "meta_cache.html" . -}}
 {{ block "header" . }}{{ end }}
-{{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "piwik.html" . }}{{ end -}}
+{{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "matomo.html" . }}{{ end -}}
 </head>
 
 <body>
diff --git a/layouts/partials/piwik.html b/layouts/partials/matomo.html
similarity index 77%
rename from layouts/partials/piwik.html
rename to layouts/partials/matomo.html
index a929e38..efa3712 100644
--- a/layouts/partials/piwik.html
+++ b/layouts/partials/matomo.html
@@ -1,14 +1,14 @@
 <!-- Matomo -->
 <script type="text/javascript">
-  var _paq = _paq || [];
+  var _paq = window._paq || [];
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
     var u="//{{ .Site.Params.piwikTrackerUrl }}/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '{{ .Site.Params.piwikSiteID }}']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
 <!-- End Matomo Code -->