diff --git a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
index 78b91bb90e..9ebd69c829 100644
--- a/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
+++ b/lib/Alchemy/Phrasea/Core/Configuration/RegistryFormManipulator.php
@@ -102,8 +102,8 @@ class RegistryFormManipulator
                 'keywords' => null,
                 'description' => null,
                 'analytics' => null,
-                'mamoto-url' => null,
-                'mamoto-id' => null,
+                'matomo-analytics-url' => null,
+                'matomo-analytics-id' => null,
                 'allow-indexation' => true,
                 'home-presentation-mode' => 'GALLERIA',
                 'default-subdef-url-ttl' => 7200,
diff --git a/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php b/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php
index 99526167d6..767c91a782 100644
--- a/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php
+++ b/lib/Alchemy/Phrasea/Form/Configuration/GeneralFormType.php
@@ -38,10 +38,10 @@ class GeneralFormType extends AbstractType
         $builder->add('analytics', 'text', [
             'label'         => 'Google Analytics identifier',
         ]);
-        $builder->add('matomo-url', 'text', [
+        $builder->add('matomo-analytics-url', 'text', [
             'label'         => 'Matomo Analytics url',
         ]);
-        $builder->add('matomo-id', 'text', [
+        $builder->add('matomo-analytics-id', 'text', [
             'label'         => 'Matomo Analytics identifier',
         ]);
         $builder->add('allow-indexation', 'checkbox', [
diff --git a/templates/web/common/indexfloat.html.twig b/templates/web/common/indexfloat.html.twig
index a5f6aad392..25cbf79bc3 100644
--- a/templates/web/common/indexfloat.html.twig
+++ b/templates/web/common/indexfloat.html.twig
@@ -25,6 +25,6 @@
         </div>
     </div>
     {% include 'common/analytics.html.twig' %}
-    {% include 'common/mamoto_analytics.html.twig' %}
+    {% include 'common/matomo_analytics.html.twig' %}
   </body>
 </html>
diff --git a/templates/web/common/matomo_analytics.html.twig b/templates/web/common/matomo_analytics.html.twig
index affad06a56..5c1e3251ac 100644
--- a/templates/web/common/matomo_analytics.html.twig
+++ b/templates/web/common/matomo_analytics.html.twig
@@ -1,14 +1,14 @@
-{% if app['conf'].get(['registry', 'general', 'matomo-url']) != '' %}
-{% if app['conf'].get(['registry', 'general', 'matomo-id']) != '' %}
+{% if app['conf'].get(['registry', 'general', 'matomo-analytics-url']) != '' %}
+{% if app['conf'].get(['registry', 'general', 'matomo-analytics-id']) != '' %}
     <!-- Matomo -->
     <script type="text/javascript">
         var _paq = window._paq || [];
         _paq.push(['trackPageView']);
         _paq.push(['enableLinkTracking']);
         (function() {
-            var u="//{{ app['conf'].get(['registry', 'general', 'matomo-url']) }}/";
+            var u="//{{ app['conf'].get(['registry', 'general', 'matomo-analytics-url']) }}/";
             _paq.push(['setTrackerUrl', u+'matomo.php']);
-            _paq.push(['setSiteId',  {{ app['conf'].get(['registry', 'general', 'matomo-id']) }}]);
+            _paq.push(['setSiteId',  {{ app['conf'].get(['registry', 'general', 'matomo-analytics-id']) }}]);
             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);
         })();
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-with-hosts.yml b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-with-hosts.yml
index 8e0b322dce..adcc5c8165 100644
--- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-with-hosts.yml
+++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-with-hosts.yml
@@ -193,6 +193,8 @@ registry:
         keywords: ''
         description: ''
         analytics: ''
+        matomo-analytics-url: ''
+        matomo-analytics-id: ''
         allow-indexation: true
         home-presentation-mode: COOLIRIS
     modules: