diff --git a/docs/settings.rst b/docs/settings.rst
index e09a90dc..7ba89a47 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1193,16 +1193,16 @@ free to use them in your themes as well.
    A list of tuples (Title, URL) for additional menu items to appear at the
    beginning of the main menu.
 
-.. data:: PIWIK_URL
+.. data:: MATOMO_URL
 
    URL to your Piwik server - without 'http://' at the beginning.
 
-.. data:: PIWIK_SSL_URL
+.. data:: MATOMO_SSL_URL
 
    If the SSL-URL differs from the normal Piwik-URL you have to include this
    setting too. (optional)
 
-.. data:: PIWIK_SITE_ID
+.. data:: MATOMO_SITE_ID
 
    ID for the monitored website. You can find the ID in the Piwik admin
    interface > Settings > Websites.
diff --git a/pelican/themes/notmyidea/templates/analytics.html b/pelican/themes/notmyidea/templates/analytics.html
index a966c4c2..1cdbf1c1 100644
--- a/pelican/themes/notmyidea/templates/analytics.html
+++ b/pelican/themes/notmyidea/templates/analytics.html
@@ -24,22 +24,22 @@
     })();
     </script>
 {% endif %}
-{% if PIWIK_URL and PIWIK_SITE_ID %}
+{% if MATOMO_URL and MATOMO_SITE_ID %}
     <script type="text/javascript">
-    {% if PIWIK_SSL_URL %}
-        var pkBaseURL = "{{ PIWIK_SSL_URL }}";
+    {% if MATOMO_SSL_URL %}
+        var pkBaseURL = "{{ MATOMO_SSL_URL }}";
     {% else %}
-        var pkBaseURL = "{{ PIWIK_URL }}";
+        var pkBaseURL = "{{ MATOMO_URL }}";
     {% endif %}
     var _paq = _paq || [];
     _paq.push(["trackPageView"]);
     _paq.push(["enableLinkTracking"]);
     (function() {
         var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
-        _paq.push(["setTrackerUrl", u+"piwik.php"]);
-        _paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
+        _paq.push(["setTrackerUrl", u+"matomo.php"]);
+        _paq.push(["setSiteId", "{{ MATOMO_SITE_ID }}"]);
         var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
-        g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+        g.defer=true; g.async=true; g.src=u+"matomo.js"; s.parentNode.insertBefore(g,s);
     })();
     </script>
 {% endif %}