diff --git a/README.md b/README.md
index 432b4f4..42b804f 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Matomo Browser Injector helps you to try out [Matomo](https://matomo.org/), the
 
 ### Usage:
 * open the domain, where you want to include the tracking code localy
-* click on the Matomo Browser Injector icon in your toolbar and enter the URL to your piwik instance and the ID of your website
+* click on the Matomo Browser Injector icon in your toolbar and enter the URL to your Matomo instance and the ID of your website
 * if you want to try out advanced features you can enable the expert mode where you can freely modify the tracking code
 
 This extention is in an early development state and may include backward-incompatible changes in future versions.
@@ -21,6 +21,6 @@ If you notice any bugs or have wishes for features open an issue on the github r
 https://github.com/Findus23/matomo-injector
 
 
-Licended under [the MIT License](https://github.com/Findus23/piwik-injector/blob/master/LICENSE) and based on the work of [hromadadan](https://github.com/guzart/customjs) and [xcv58](https://github.com/xcv58/Custom-JavaScript-for-Websites-2)
+Licended under [the MIT License](https://github.com/Findus23/matomo-injector/blob/master/LICENSE) and based on the work of [hromadadan](https://github.com/guzart/customjs) and [xcv58](https://github.com/xcv58/Custom-JavaScript-for-Websites-2)
 
 ![screenshot](docs/screenshot_chrome_1.png)
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 539a94a..bddb70d 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -84,7 +84,7 @@
     "description": "label for checkbox"
   },
   "matomo_url_title": {
-    "message": "the URL to your matomo instance without trailing matomo.php or matomo.js",
+    "message": "the URL to your matomo instance without trailing piwik.php or piwik.js",
     "description": "title text of matomo URL input"
   },
   "matomo_url_placeholder": {
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index 2e40b09..997093a 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -1,14 +1,14 @@
 {
-    "piwik_url_placeholder": {
-        "message": "piwik URL",
-        "description": "placeholder text of piwik URL input"
+    "matomo_url_placeholder": {
+        "message": "matomo URL",
+        "description": "placeholder text of matomo URL input"
     },
     "goto_host_title": {
         "message": "Allez au site sélectionné",
         "description": "message if a currently not opened webpage is opened"
     },
     "site_id_title": {
-        "message": "l'id de votre site dans Piwik",
+        "message": "l'id de votre site dans Matomo",
         "description": "title text of site ID input"
     },
     "goto_host": {
@@ -40,12 +40,12 @@
         "description": "checkbox on settings page"
     },
     "extension_tags": {
-        "message": "piwik, analytics, javascript, debugging, injecting, open source, analyse, audience",
+        "message": "matomo, analytics, javascript, debugging, injecting, open source, analyse, audience",
         "description": "tags for Firefox addon description (maximum 20)"
     },
-    "piwik_url_title": {
-        "message": "indiquez l'URL de votre installation de Piwik sans le piwik.php ou piwik.js",
-        "description": "title text of piwik URL input"
+    "matomo_url_title": {
+        "message": "indiquez l'URL de votre installation de Matomo sans le piwik.php ou piwik.js",
+        "description": "title text of matomo URL input"
     },
     "extension_screenshot_2": {
         "message": "Les prochaines visites sur ce nom de domaine seront enregistrées...",
@@ -68,7 +68,7 @@
         "description": "label of host selection dropdown"
     },
     "extension_description": {
-        "message": "Piwik Browser Injector vous permet d'injecter le code de suivi de Piwik (la solution d'analyse d'audience la plus utilisée du marché) sans vous ayez besoin d'accéder au code source de la page. Cela vous permet de pouvoir remonter dans une de vos installations de Piwik, le traffic d'un site en local.",
+        "message": "Matomo Browser Injector vous permet d'injecter le code de suivi de Matomo (la solution d'analyse d'audience la plus utilisée du marché) sans vous ayez besoin d'accéder au code source de la page. Cela vous permet de pouvoir remonter dans une de vos installations de Matomo, le traffic d'un site en local.",
         "description": "a short description shown in the extension list; should be pretty short, but descriptive"
     },
     "save": {
@@ -76,16 +76,16 @@
         "description": "save-button text"
     },
     "extension_screenshot_3": {
-        "message": "... et géré par Piwik",
-        "description": "description for the third screenshot (https://github.com/Findus23/piwik-injector/blob/master/docs/screenshot_firefox_3.png)"
+        "message": "... et géré par Matomo",
+        "description": "description for the third screenshot (https://github.com/Findus23/matomo-injector/blob/master/docs/screenshot_firefox_3.png)"
     },
     "enabled_badge_title": {
-        "message": "Le site est actuellement modifié par Piwik Browser Injector.",
+        "message": "Le site est actuellement modifié par Matomo Browser Injector.",
         "description": "title text of attention icon on every page where extention is enabled."
     },
     "extension_screenshot_1": {
-        "message": "Ajoutez le code de Piwik à chaque site internet sans accéder au code source",
-        "description": "description for the first screenshot (https://github.com/Findus23/piwik-injector/blob/master/docs/screenshot_firefox_1.png)"
+        "message": "Ajoutez le code de Matomo à chaque site internet sans accéder au code source",
+        "description": "description for the first screenshot (https://github.com/Findus23/matomo-injector/blob/master/docs/screenshot_firefox_1.png)"
     },
     "expert_mode_label": {
         "message": "Mode expert",
@@ -104,11 +104,11 @@
         "description": "title text of draft remove button"
     },
     "extension_name": {
-        "message": "Piwik Browser Injector",
+        "message": "Matomo Browser Injector",
         "description": "name of the extension"
     },
     "enable_description": {
         "message": "activer",
         "description": "label for checkbox"
     }
-}
\ No newline at end of file
+}
diff --git a/js/popup.js b/js/popup.js
index b69c326..e975d6c 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -142,7 +142,7 @@ document.addEventListener('DOMContentLoaded', function() {
       "_paq.push(['enableLinkTracking']);\n" +
       "(function() {\n" +
       "  var u=\"{{MATOMOURL}}\";\n" +
-      "  _paq.push(['setTrackerUrl', u+'matomo.php']);\n" +
+      "  _paq.push(['setTrackerUrl', u+'piwik.php']);\n" +
       "  _paq.push(['setSiteId', '{{SITEID}}']);\n" +
       "  var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];\n" +
       "  g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);\n" +