diff --git a/docs/4.x/ab-tests.md b/docs/4.x/ab-tests.md
index 1b1a8ca68..cd4382497 100644
--- a/docs/4.x/ab-tests.md
+++ b/docs/4.x/ab-tests.md
@@ -8,12 +8,12 @@ subGuides:
 ---
 # A/B Testing - Experiments
 
-This section contains guides that will help you run experiments (A/B tests) on your websites and apps using Piwik.
+This section contains guides that will help you run experiments (A/B tests) on your websites and apps using Matomo.
 
-[A/B Testing](https://www.ab-tests.net/) is a plugin for Piwik that can be purchased on 
-the [Piwik Marketplace](https://plugins.piwik.org/AbTesting). It is developed by [InnoCraft](https://www.innocraft.com), 
-the makers of Piwik. If you want to learn more about this plugin we recommend to have a look at the developer guides, 
-the [A/B Testing User Guide](https://piwik.org/docs/ab-testing/) and the [A/B Testing FAQs](https://piwik.org/faq/ab-testing/).
+[A/B Testing](https://www.ab-tests.net/) is a plugin for Matomo that can be purchased on 
+the [Matomo Marketplace](https://plugins.matomo.org/AbTesting). It is developed by [InnoCraft](https://www.innocraft.com), 
+the makers of Matomo. If you want to learn more about this plugin we recommend to have a look at the developer guides, 
+the [A/B Testing User Guide](https://matomo.org/docs/ab-testing/) and the [A/B Testing FAQs](https://matomo.org/faq/ab-testing/).
 
 An A/B test lets you compare different versions and see which variation makes you more successful. 
 A/B tests are also known as experiments or split tests. In an A/B test you show two or more different variations to your 
@@ -24,6 +24,6 @@ way lets you take data-driven decisions that maximise your success.
 This section contains the following developer guides that will help you running experiments:
 
 * **Websites (JavaScript)**: Run experiments on your website in the browser. Follow the [website implementation guide](/guides/ab-tests/browser) when you use the Piwik JavaScript Tracker on your website.  
-* **Websites (Server-side)**: Run experiments server-side by using any A/B testing framework of your choice by following the [server side implementation guide](/guides/ab-tests/server) as long as you are also using the Piwik JavaScript tracker (works with [PHP](https://github.com/matomo-org/piwik-php-tracker), [Java](https://github.com/matomo-org/piwik-java-tracker), [C#](https://github.com/matomo-org/piwik-dotnet-tracker), [Python](https://github.com/matomo-org/piwik-python-tracker/tree/dev), ...).
-* **Mobile, Desktop Apps & Games**: Run experiments using any A/B testing framework of your choice by following the [apps implementation guide](/guides/ab-tests/apps) when you are using a Piwik Tracker SDK (eg [Android SDK](https://github.com/matomo-org/piwik-sdk-android), [iOS SDK](https://github.com/matomo-org/piwik-sdk-ios), [C#](https://github.com/matomo-org/piwik-dotnet-tracker), [PHP](https://github.com/matomo-org/piwik-php-tracker), [Java](https://github.com/matomo-org/piwik-java-tracker), [Python](https://github.com/matomo-org/piwik-python-tracker/tree/dev)) to track your application.
+* **Websites (Server-side)**: Run experiments server-side by using any A/B testing framework of your choice by following the [server side implementation guide](/guides/ab-tests/server) as long as you are also using the Piwik JavaScript tracker (works with [PHP](https://github.com/matomo-org/matomo-php-tracker), [Java](https://github.com/matomo-org/piwik-java-tracker), [C#](https://github.com/matomo-org/piwik-dotnet-tracker), [Python](https://github.com/matomo-org/piwik-python-tracker/tree/dev), ...).
+* **Mobile, Desktop Apps & Games**: Run experiments using any A/B testing framework of your choice by following the [apps implementation guide](/guides/ab-tests/apps) when you are using a Piwik Tracker SDK (eg [Android SDK](https://github.com/matomo-org/matomo-sdk-android), [iOS SDK](https://github.com/matomo-org/matomo-sdk-ios), [C#](https://github.com/matomo-org/piwik-dotnet-tracker), [PHP](https://github.com/matomo-org/piwik-php-tracker), [Java](https://github.com/matomo-org/piwik-java-tracker), [Python](https://github.com/matomo-org/piwik-python-tracker/tree/dev)) to track your application.
 * **Campaigns & Email Marketing**: Track how different campaigns affect the browsing behaviour on your website by following the [campaign implementation guide](/guides/ab-tests/campaign).
diff --git a/docs/4.x/ab-tests/apps.md b/docs/4.x/ab-tests/apps.md
index ea8fa4e22..01b6a2d83 100644
--- a/docs/4.x/ab-tests/apps.md
+++ b/docs/4.x/ab-tests/apps.md
@@ -5,17 +5,17 @@ title: Mobile & Desktop Apps
 # Running an A/B test experiment in an app eg. Android, iOS, desktop app or games 
 
 You can run experiments in apps by using any A/B testing framework of your choice if you are tracking your users 
-via one of the Piwik SDKs (eg [Android SDK](https://github.com/matomo-org/piwik-sdk-android), 
-[iOS SDK](https://github.com/matomo-org/piwik-sdk-ios), [C#](https://github.com/matomo-org/piwik-dotnet-tracker), 
-[PHP](https://github.com/matomo-org/piwik-php-tracker), [Java](https://github.com/matomo-org/piwik-java-tracker), 
-[Python](https://github.com/matomo-org/piwik-python-tracker/tree/dev)). 
+via one of the Piwik SDKs (eg [Android SDK](https://github.com/matomo-org/matomo-sdk-android), 
+[iOS SDK](https://github.com/matomo-org/matomo-sdk-ios), [C#](https://github.com/matomo-org/piwik-dotnet-tracker), 
+[PHP](https://github.com/matomo-org/matomo-php-tracker), [Java](https://github.com/matomo-org/piwik-java-tracker), 
+[Python](https://github.com/matomo-org/matomo-python-tracker/tree/dev)). 
 
 This guide requires that you track your application via a [Piwik Tracking SDK](/guides/tracking-api-clients), 
-via the [Tracking HTTP API](/api-reference/tracking-api) or any other [Piwik Tracking Integration](https://piwik.org/integrate).
+via the [Tracking HTTP API](/api-reference/tracking-api) or any other [Piwik Tracking Integration](https://matomo.org/integrate).
  
 ## Creating an experiment
 
-First you need to create an A/B test experiment in Piwik: read the [A/B testing user guide](https://piwik.org/docs/ab-testing/) to learn more.
+First you need to create an A/B test experiment in Piwik: read the [A/B testing user guide](https://matomo.org/docs/ab-testing/) to learn more.
 
 When you are asked on which target pages the experiment should be activated, we recommend selecting "Visitors enter this experiment on any page".
 
@@ -50,7 +50,7 @@ $experiment->trackVariationActivation($piwikPhpTracker);
 ### Sending the name of the activated variation to Piwik
 
 So far you have created and implemented the experiment, so users get to see different versions of your app. 
-Now you need to let Piwik know which variation was activated for your current user by tracking a [Piwik event](https://piwik.org/docs/event-tracking/):
+Now you need to let Piwik know which variation was activated for your current user by tracking a [Piwik event](https://matomo.org/docs/event-tracking/):
 
 ```php
 // example tracking request via PHP Piwik Tracker
diff --git a/docs/4.x/ab-tests/browser.md b/docs/4.x/ab-tests/browser.md
index 3e5e05d1c..6d40dedb8 100644
--- a/docs/4.x/ab-tests/browser.md
+++ b/docs/4.x/ab-tests/browser.md
@@ -12,28 +12,28 @@ and what to do when an experiment is finished.
 
 ## Creating an experiment
 
-Read the [A/B testing user guide](https://piwik.org/docs/ab-testing/) to learn more about creating an A/B test experiment.
+Read the [A/B testing user guide](https://matomo.org/docs/ab-testing/) to learn more about creating an A/B test experiment.
 
 ## Embedding the A/B Testing JavaScript framework
 
-The [A/B Testing plugin](https://www.ab-tests.net) directly adds the JavaScript A/B testing framework to your Piwik JavaScript tracker file `/piwik.js` 
+The [A/B Testing plugin](https://www.ab-tests.net) directly adds the JavaScript A/B testing framework to your Matomo JavaScript tracker file `/matomo.js` 
 and is therefore loaded automatically with the [Piwik JavaScript Tracking Code](/guides/tracking-javascript-guide).
 
-This will work by default as long as the file `piwik.js` in your Piwik directory is writable by the webserver/PHP.
+This will work by default as long as the file `matomo.js` in your Piwik directory is writable by the webserver/PHP.
  
 To check whether this works by default for you, login into Piwik as a Super User, go to Administration, and open the "System Check" report. 
-If the System Check displays a warning for "Writable Piwik.js" then [learn below in the FAQ how to solve this](#how-do-i-include-the-ab-testing-framework-when-my-piwikjs-file-is-not-writable).
+If the System Check displays a warning for "Writable Matomo.js" then [learn below in the FAQ how to solve this](#how-do-i-include-the-ab-testing-framework-when-my-matomojs-file-is-not-writable).
 
 
-### Loading piwik.js synchronously as early as possible
+### Loading matomo.js synchronously as early as possible
 
 To prevent any flickering / flashing of content when you run your experiments, you need to make sure to load the 
-`piwik.js` tracker file as early as possible. Edit your JavaScript tracking code as follows:
+`matomo.js` tracker file as early as possible. Edit your JavaScript tracking code as follows:
 
-* Move the Piwik Tracking Code that loads the `piwik.js` file into the HTML `<head>`
+* Move the Piwik Tracking Code that loads the `matomo.js` file into the HTML `<head>`
 * Load the file synchronously instead of asynchronously by:
-  1. Removing the two lines containing: `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);`
-  2. Adding the following line after the closing `</script>` element: `<script type="text/javascript" src="//$yourPiwikDomain/piwik.js"></script>`
+  1. Removing the two lines containing: `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+'matomo.js'; s.parentNode.insertBefore(g,s);`
+  2. Adding the following line after the closing `</script>` element: `<script type="text/javascript" src="//$yourPiwikDomain/matomo.js"></script>`
   3. Your JavaScript tracker code should look like this:
     
     ```html
@@ -43,11 +43,11 @@ To prevent any flickering / flashing of content when you run your experiments, y
       // [...]
       (function() {
         var u = "//$yourPiwikDomain/";
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
+        _paq.push(['setTrackerUrl', u+'matomo.php']);
         _paq.push(['setSiteId', 'X']);
       })();
     </script>
-    <script type="text/javascript" src="//$yourPiwikDomain/piwik.js">
+    <script type="text/javascript" src="//$yourMatomoDomain/matomo.js">
     ```
     
 In the case where you are using the [`SitesManager.getJavascriptTag` API](/api-reference/reporting-api#SitesManager) to embed the tracking code automatically into your website, 
@@ -107,7 +107,7 @@ _paq.push(['AbTesting::create', {
       }
       return false;
   },
-  piwikTracker: Piwik.getAsyncTracker(piwikUrl, piwikSiteId),
+  piwikTracker: Matomo.getAsyncTracker(matomoUrl, matomoSiteId),
   variations: [
         // [...]
         {
@@ -135,7 +135,7 @@ _paq.push(['AbTesting::create', {
 
 To summarize what we've learnt so far:
 
-* To prevent flickering/flashing of the content, the `piwik.js` file is loaded synchronously as early as possible.
+* To prevent flickering/flashing of the content, the `matomo.js` file is loaded synchronously as early as possible.
 * the Piwik generated experiment's code is copied and paste into the website.
 
 Now you need to actually implement what is supposed to happen when a variation of your experiment gets activated. 
@@ -180,7 +180,7 @@ If you are running multiple tests on the same page, you can activate multiple va
 
 ### Tracking a goal manually
 
-When comparing different variations it is often needed to [track goals](https://piwik.org/docs/tracking-goals-web-analytics/) 
+When comparing different variations it is often needed to [track goals](https://matomo.org/docs/tracking-goals-web-analytics/) 
 in order to decide which of the variations is the most successful. When you configure your experiment, you can assign 
 multiple goals as a "success metric". These goals are usually converted automatically without having to do anything, but 
 you can also track a goal conversion manually like this: 
@@ -213,7 +213,7 @@ Should you want to exclude Safari when running A/B tests, you can add the follow
 // works from A/B testing 3.2.18
 _paq.push(['AbTesting::disableWhenItp']);
 // or 
-Piwik.AbTesting.disableWhenItp();
+Matomo.AbTesting.disableWhenItp();
 ```
 
 Make sure to call this method before you define any experiment.
@@ -238,10 +238,10 @@ variation. This is known as flickering or flashing of content.
 
 To prevent this flickering, it is important to place the experiment tracking code at the right position in your website source code. 
 
-#### Load piwik.js synchronously
+#### Load matomo.js synchronously
 
-As already mentioned earlier in this guide: it is highly recommended to load the `piwik.js` file 
-[synchronously](#loading-piwikjs-synchronously-as-early-as-possible) in the HTML `<head>`.
+As already mentioned earlier in this guide: it is highly recommended to load the `matomo.js` file 
+[synchronously](#loading-matomojs-synchronously-as-early-as-possible) in the HTML `<head>`.
 
 #### Deciding where to place the experiment code
 
@@ -381,7 +381,7 @@ is stored in a cookie for up to 365 days.
 Yes, please see below the different ways this can be achieved:
 
 1. When you create your experiment in the UI, under the section “Redirects”, for each variation (including the “Original” variation) you can can enter the Page URL to redirect to and test. ([learn more in this FAQ](https://matomo.org/faq/ab-testing/faq_22493/)). This is the easiest way to compare the performance of different page URLs. Note that a page redirect will be triggered in JavaScript, which will cause a small delay before the page is reloaded and showing the variation, therefore for optimal performance we recommend to use server side redirects (see below).
-2. Alternatively, you can compare different pages URLs by running an experiment on your [server](https://developer.piwik.org/guides/ab-tests/server#redirects). 
+2. Alternatively, you can compare different pages URLs by running an experiment on your [server](https://developer.matomo.org/guides/ab-tests/server#redirects). 
 **Server side redirects** are recommended for performance reasons: they have the advantage that they are more SEO friendly and faster to load for your users.
 It is highly recommended to send your users to a different page URL via an HTTP 302 redirect (temporary) and not via a 301 (permanent). 
 This way search engines know the redirect is temporary and that they should keep the original URL in their search index. 
@@ -411,7 +411,7 @@ has been created, you can force a custom variation like this:
 ```html
 <script>
 function forceExperiment() {
-  var Experiment = Piwik.AbTesting.Experiment;
+  var Experiment = Matomo.AbTesting.Experiment;
   
   var myExperiment = new Experiment({
     // [...]
@@ -432,11 +432,11 @@ function forceExperiment() {
   myExperiment.forceVariation('blueVariation');
   // this will call the activate method for the blue variation.
 }
-if ('object' === typeof Piwik && 'object' === typeof Piwik.AbTesting) {
-    // if piwik.js was embedded before this code
+if ('object' === typeof Piwik && 'object' === typeof Matomo.AbTesting) {
+    // if matomo.js was embedded before this code
     forceExperiment();
 } else {
-    // if piwik.js is loaded after this code
+    // if matomo.js is loaded after this code
     window.piwikAbTestingAsyncInit = forceExperiment;   
 }
 </script>
@@ -449,9 +449,9 @@ server and afterwards force the same variation in the client.
 ### How do I know when the A/B Testing framework has been loaded and initialized?
 
 The A/B Testing framework executes a method `window.piwikAbTestingAsyncInit` as soon as it has been loaded. When you 
-specify such a method, you can be sure that variables like `Piwik.AbTesting` are available. If you load the `piwik.js`
-file synchronously as recommended, you can be sure that `Piwik.AbTesting` will be defined just after the include of 
-`piwik.js`
+specify such a method, you can be sure that variables like `Matomo.AbTesting` are available. If you load the `matomo.js`
+file synchronously as recommended, you can be sure that `Matomo.AbTesting` will be defined just after the include of 
+`matomo.js`
 
 ### Can I integrate the A/B Tests when I use a framework like Angular, Ember, ReactJS?
 
@@ -459,7 +459,7 @@ Yes, you can run your A/B tests in any popular JavaScript framework.
 We recommend [creating your experiment without _paq.push](#how-do-i-implement-an-experiment-without-using-_paqpush) as follows:
  
 ```js
-var Experiment = Piwik.AbTesting.Experiment;
+var Experiment = Matomo.AbTesting.Experiment;
 
 var myExperiment = new Experiment({
   // [...]
@@ -492,7 +492,7 @@ experiment as follows:
 ```html
 <script>
 function createExperiment() {
-  var Experiment = Piwik.AbTesting.Experiment;
+  var Experiment = Matomo.AbTesting.Experiment;
     
   var myExperiment = new Experiment({
     name: 'theExperimentName',
@@ -520,11 +520,11 @@ function createExperiment() {
   }
 }
 
-if ('object' === typeof Piwik && 'object' === typeof Piwik.AbTesting) {
-    // if piwik.js was embedded before this code
+if ('object' === typeof Piwik && 'object' === typeof Matomo.AbTesting) {
+    // if matomo.js was embedded before this code
     createExperiment();
 } else {
-    // if piwik.js is loaded after this code
+    // if matomo.js is loaded after this code
     window.piwikAbTestingAsyncInit = createExperiment;   
 }
   
@@ -535,12 +535,12 @@ The method `getActivatedVariationName` will either return the name of the activa
 if the original version is supposed to be shown or null if the visitor is not supposed to participate in the experiment 
 at all.
 
-### How do I include the A/B testing framework when my `piwik.js` file is not writable?
+### How do I include the A/B testing framework when my `matomo.js` file is not writable?
  
-When your Settings > System Check reports that "The Piwik JavaScript tracker file `piwik.js` is not writable 
+When your Settings > System Check reports that "The Piwik JavaScript tracker file `matomo.js` is not writable 
 which means other plugins cannot extend the JavaScript tracker." then you have two options to solve this issue:
 
-1. Make the `piwik.js` file writable, for example by executing `chmod a+w piwik.js` or `chown $phpuser piwik.js` (replace `$phpuser` with actual username) in your Piwik directory. 
+1. Make the `matomo.js` file writable, for example by executing `chmod a+w piwik.js` or `chown $phpuser piwik.js` (replace `$phpuser` with actual username) in your Piwik directory. 
 We recommend running the [Piwik console](/guides/piwik-on-the-command-line) command `./console custom-piwik-js:update` after you have made the file writable.
 2. or Load the A/B Testing framework manually in your website by adding in all your pages in the `<head>`: 
    `<script src="//$yourPiwikDomain/plugins/AbTesting/tracker.min.js">`
@@ -548,9 +548,9 @@ We recommend running the [Piwik console](/guides/piwik-on-the-command-line) comm
 Please note there are a few disadvantages to include the A/B testing framework file manually:
 
 * An additional HTTP request is needed to load your website which increases your page load time
-* If your `piwik.js` ever becomes writable, the A/B Testing framework would be loaded twice (in such a case the tracker notices it was already initialized and won't initialize again)
+* If your `matomo.js` ever becomes writable, the A/B Testing framework would be loaded twice (in such a case the tracker notices it was already initialized and won't initialize again)
 
-If possible, we recommend making the `piwik.js` file writable.
+If possible, we recommend making the `matomo.js` file writable.
 
 
 ### My A/B test experiment is not working, how do I debug it?
@@ -566,6 +566,6 @@ your browser. It is recommended to call this method as early as possible to capt
 
 ## What to read next
 
-Learn more about running experiments in the [A/B Testing User Guide](https://piwik.org/docs/ab-testing/), the [A/B Testing FAQs](https://piwik.org/faq/ab-testing/)
+Learn more about running experiments in the [A/B Testing User Guide](https://matomo.org/docs/ab-testing/), the [A/B Testing FAQs](https://matomo.org/faq/ab-testing/)
 and the [A/B testing website](https://www.ab-tests.net/).
 
diff --git a/docs/4.x/ab-tests/campaign.md b/docs/4.x/ab-tests/campaign.md
index fc79c3fa3..773d64f44 100644
--- a/docs/4.x/ab-tests/campaign.md
+++ b/docs/4.x/ab-tests/campaign.md
@@ -11,7 +11,7 @@ In this guide you will learn how to create an experiment and implement it in you
  
 ## Creating an experiment
 
-First you need to create an A/B test experiment in Piwik: read the [A/B testing user guide](https://piwik.org/docs/ab-testing/) to learn more.
+First you need to create an A/B test experiment in Piwik: read the [A/B testing user guide](https://matomo.org/docs/ab-testing/) to learn more.
 
 When you are asked on which target pages the experiment should be activated, we recommend selecting "Visitors enter this experiment on any page".
 
@@ -79,7 +79,7 @@ The IDs are also shown in the "Embed code" area when you edit an experiment in t
 
 ## Using A/B tests along with the standard Piwik campaign tracking
 
-Measuring the impact of your campaigns using experiments complements the existing built-in Piwik [Campaign Tracking](https://piwik.org/docs/tracking-campaigns/).
+Measuring the impact of your campaigns using experiments complements the existing built-in Piwik [Campaign Tracking](https://matomo.org/docs/tracking-campaigns/).
 
 We recommend creating experiments to measure your marketing campaigns as it will provide you additional value such as:
 
@@ -97,14 +97,14 @@ We recommend tagging your campaign URLs with both the standard Campaign Tracking
  
 The standard campaign parameters are:
 
-* `pk_campaign` - The campaign name
-* `pk_kwd` - The campaign keyword. This parameter is optional.
+* `matomo_campaign` - The campaign name
+* `matomo_kwd` - The campaign keyword. This parameter is optional.
 
 For example, when the `original` version for experiment `buyNowColor` was shown, and you are sending an Email marketing 
 campaign `SummerDeals`, the URL you link in your emails will be:
 
 ```
-https://example.org/landingpage?pk_abe=buyNowColor&pk_abv=original&pk_campaign=SummerDeals
+https://example.org/landingpage?pk_abe=buyNowColor&pk_abv=original&matomo_campaign=SummerDeals
 ```
 
 
diff --git a/docs/4.x/ab-tests/server.md b/docs/4.x/ab-tests/server.md
index 5345a6d65..e4e624819 100644
--- a/docs/4.x/ab-tests/server.md
+++ b/docs/4.x/ab-tests/server.md
@@ -10,7 +10,7 @@ or test different fonts or different features that need to run a different code
 
 ## Creating an experiment
 
-First you need to create an A/B test experiment in Piwik: read the [A/B testing user guide](https://piwik.org/docs/ab-testing/) to learn more.
+First you need to create an A/B test experiment in Piwik: read the [A/B testing user guide](https://matomo.org/docs/ab-testing/) to learn more.
 
 When you are asked on which target pages the experiment should be activated, we recommend selecting "Visitors enter this experiment on any page".
 
diff --git a/docs/4.x/angularjs-getting-started.md b/docs/4.x/angularjs-getting-started.md
index 13e266827..00a16e8eb 100644
--- a/docs/4.x/angularjs-getting-started.md
+++ b/docs/4.x/angularjs-getting-started.md
@@ -17,7 +17,7 @@ With using AngularJS we are trying to achieve different goals:
 * Getting rid of jQuery soup [[0]](http://programming.oreilly.com/2014/01/keeping-jquery-in-check.html) [[1]](https://martinfowler.com/bliki/SegregatedDOM.html) and reducing complexity in our frontend
 * More reusable code (models, services, filters, directives, ...)
 * Shift some work from the server side into client side
-* Faster response (especially once we can use AngularJS routing and [AMD](http://requirejs.org/docs/whyamd.html)). If you are not familiar with AMD -> please ignore for now
+* Faster response (especially once we can use AngularJS routing and [AMD](https://requirejs.org/docs/whyamd.html)). If you are not familiar with AMD -> please ignore for now
 
 ## Before you start using AngularJS
 I recommend watching some videos and read a few resources about the benefits and best practices of AngularJS. It is important to understand how AngularJS works and especially to be aware of pitfalls and best practices.
@@ -29,13 +29,11 @@ I recommend watching some videos and read a few resources about the benefits and
 * [Common Pitfalls](https://docs.angularjs.org/misc/faq#common-pitfalls)
 * [Considering Speed and Slowness in AngularJS](https://www.exratione.com/2013/12/considering-speed-and-slowness-in-angularjs/)
 * [The Hitchhiker’s Guide to the Directive](https://amitgharat.wordpress.com/2013/06/08/the-hitchhikers-guide-to-the-directive/)
-* [Build custom directives with AngularJS](http://www.ng-newsletter.com/posts/directives.html)
-* [When to use directives, controllers or services in AngularJS](http://kirkbushell.me/when-to-use-directives-controllers-or-services-in-angular/)
 
 
 ## Some random notes and tips
 * It is very important to understand AngularJS Scopes.
-  * [Nested Scopes in AngularJS](http://jimhoskins.com/2012/12/14/nested-scopes-in-angularjs.html)
+  * [Nested Scopes in AngularJS](https://jimhoskins.com/2012/12/14/nested-scopes-in-angularjs.html)
   * [Scope Hierarchies](https://docs.angularjs.org/guide/scope#scope-hierarchies)
   * [The Hitchhiker’s Guide to the Directive](https://amitgharat.wordpress.com/2013/06/08/the-hitchhikers-guide-to-the-directive/)
 
@@ -118,8 +116,8 @@ Filenames are always lower case and words are separated by dashes. In general, w
 
 ### Related links
 * [https://docs.google.com/document/d/1XXMvReO8-Awi1EZXAXS4PzDzdNvV6pGcuaF4Q9821Es/pub](https://docs.google.com/document/d/1XXMvReO8-Awi1EZXAXS4PzDzdNvV6pGcuaF4Q9821Es/pub)
-* [http://cliffmeyers.com/blog/2013/4/21/code-organization-angularjs-javascript](http://cliffmeyers.com/blog/2013/4/21/code-organization-angularjs-javascript)
-* [http://joelhooks.com/blog/2013/05/22/lessons-learned-kicking-off-an-angularjs-project/](http://joelhooks.com/blog/2013/05/22/lessons-learned-kicking-off-an-angularjs-project/)
+* [https://cliffmeyers.com/blog/2013/4/21/code-organization-angularjs-javascript](https://cliffmeyers.com/blog/2013/4/21/code-organization-angularjs-javascript)
+* [https://joelhooks.com/blog/2013/05/22/lessons-learned-kicking-off-an-angularjs-project/](https://joelhooks.com/blog/2013/05/22/lessons-learned-kicking-off-an-angularjs-project/)
 * [https://gocardless.com/blog/building-a-large-angular-application/](https://gocardless.com/blog/building-a-large-angular-application/)
 * [https://www.artandlogic.com/blog/2013/05/ive-been-doing-it-wrong-part-1-of-3/](https://www.artandlogic.com/blog/2013/05/ive-been-doing-it-wrong-part-1-of-3/)
 
@@ -141,12 +139,12 @@ They make use of different components
 We are currently not using AngularJS Routing. The goal is to use it in long term to get rid of piwikBroadcast and many other classes.
 
 ## Testing
-We use [Karma](https://karma-runner.github.io) + [Chai](http://chaijs.com) + [Mocha] (https://mochajs.org/) to write unit tests. Read more about it here: [https://github.com/matomo-org/matomo/blob/master/tests/angularjs/README.md](https://github.com/matomo-org/matomo/blob/master/tests/angularjs/README.md)
+We use [Karma](https://karma-runner.github.io) + [Chai](https://chaijs.com) + [Mocha] (https://mochajs.org/) to write unit tests. Read more about it here: [https://github.com/matomo-org/matomo/blob/master/tests/angularjs/README.md](https://github.com/matomo-org/matomo/blob/master/tests/angularjs/README.md)
 
 ## How to document
 TBD
 
-Might be interesting link: [Docular](http://grunt-docular.com/)
+Might be interesting link: [Docular](https://grunt-docular.com/)
 
 ## Plugin architecture
 AngularJS dependency injection allows plugins to overwrite or extend whatever whey want, for instance a directive. A plugin architecture comes therefore more or less out of the box.
@@ -159,13 +157,13 @@ More to come!
 
 ### Further Learning AngularJS Links
 * [Recipes with Angular.js](https://leanpub.com/recipes-with-angular-js/read)
-* [Angular Basics Guide](http://www.angularbasics.co.uk/)
+* [Angular Basics Guide](https://www.angularbasics.co.uk/)
 * [Huge AngularJS related link collection](https://github.com/jmcunningham/AngularJS-Learning)
 * [Google Chrome extension for AngularJS](https://chrome.google.com/webstore/detail/angularjs-batarang/ighdmehidhipcmcojjgiloacoafjmpfk?hl=en). It helps you for instance to get insights into scopes
 * [PHPStorm extension for AngularJS](https://plugins.jetbrains.com/plugin/6971-angularjs)
-* [Improving ng-repeat Performance with track by](http://www.codelord.net/2014/04/15/improving-ng-repeat-performance-with-track-by/)
-* [Debugging AngularJS Apps from the Console](http://ionicframework.com/blog/angularjs-console/)
+* [Improving ng-repeat Performance with track by](https://www.codelord.net/2014/04/15/improving-ng-repeat-performance-with-track-by/)
+* [Debugging AngularJS Apps from the Console](https://ionicframework.com/blog/angularjs-console/)
 
 ### AngularJS modules
 * https://bower.io/search/?q=angularjs#!%2Fsearch%2Fangular
-* http://ngmodules.org/
+* https://ngmodules.org/
diff --git a/docs/4.x/archiving.md b/docs/4.x/archiving.md
index 710db9ac7..f294aa95a 100644
--- a/docs/4.x/archiving.md
+++ b/docs/4.x/archiving.md
@@ -45,7 +45,7 @@ By default, archive data is calculated and cached **on-demand**. When a specific
 
 ### Pre-archiving
 
-When tracking a website with a lot of traffic, the archiving on-demand might take too much time. In those situations, archiving on demand must be disabled and [pre-archiving needs to run in background at a scheduled time](https://piwik.org/docs/setup-auto-archiving/).
+When tracking a website with a lot of traffic, the archiving on-demand might take too much time. In those situations, archiving on demand must be disabled and [pre-archiving needs to run in background at a scheduled time](https://matomo.org/docs/setup-auto-archiving/).
 
 Pre-archiving can be run for every site and period (except custom date ranges) using the `core:archive` console command:
 
@@ -63,7 +63,7 @@ Log data is aggregated into archive data for each:
 
 - site
 - period: day, week, month, year or custom date range (custom date ranges cannot be pre-archived)
-- [segment](https://piwik.org/docs/segmentation/)
+- [segment](https://matomo.org/docs/segmentation/)
 
 Archiving logic (i.e. the way of aggregating log data) is defined by plugins. All reports defined by a plugin are archived together rather than individually.
 
diff --git a/docs/4.x/content-tracking.md b/docs/4.x/content-tracking.md
index 6dcdb00c5..c53cae69d 100644
--- a/docs/4.x/content-tracking.md
+++ b/docs/4.x/content-tracking.md
@@ -41,7 +41,7 @@ Example for tracking all content blocks:
 
 ```javascript
 var _paq = window._paq || [];
-_paq.push(['setTrackerUrl', 'piwik.php']);
+_paq.push(['setTrackerUrl', 'matomo.php']);
 _paq.push(['setSiteId', 1]);
 _paq.push(['enableLinkTracking']);
 _paq.push(['trackPageView']);
@@ -62,13 +62,13 @@ Once you have initialized the tracker you have to tag HTML blocks to declare the
 
 The following attributes and their corresponding CSS classes are used for this and explained in detail in the next chapters:
 
-| Selector                                                               | Description                                         |
-| ---------------------------------------------------------------------- | --------------------------------------------------- |
-| `[data-track-content]` or `.piwikTrackContent`                         | Defines a content block                             |
-| `[data-content-name=""]`                                               | Defines the name of the content block               |
-| `[data-content-piece=""]` or `.piwikContentPiece`                      | Defines the content piece                           |
-| `[data-content-target=""]` or `.piwikContentTarget`                    | Defines the content target                          |
-| `[data-content-ignoreinteraction]` or `.piwikContentIgnoreInteraction` | Declares to not automatically track the interaction |
+| Selector                                                                | Description                                         |
+| ----------------------------------------------------------------------- | --------------------------------------------------- |
+| `[data-track-content]` or `.matomoTrackContent`                         | Defines a content block                             |
+| `[data-content-name=""]`                                                | Defines the name of the content block               |
+| `[data-content-piece=""]` or `.matomoContentPiece`                      | Defines the content piece                           |
+| `[data-content-target=""]` or `.matomoContentTarget`                    | Defines the content target                          |
+| `[data-content-ignoreinteraction]` or `.matomoContentIgnoreInteraction` | Declares to not automatically track the interaction |
 
 
 You can use either **HTML attributes** or **CSS classes** to tag content.
@@ -92,7 +92,7 @@ Here we are defining a content block having the name "My Product Name". The used
 
 #### How to define a block of content?
 
-Defining a content block is mandatory in order to track any content. For each ad, banner or any other content you want to track you will have to create a content block. You can use either the attribute `data-track-content` or the CSS class `piwikTrackContent`. The attribute does not require any value.
+Defining a content block is mandatory in order to track any content. For each ad, banner or any other content you want to track you will have to create a content block. You can use either the attribute `data-track-content` or the CSS class `matomoTrackContent`. The attribute does not require any value.
 
 Examples:
 
@@ -103,7 +103,7 @@ Examples:
 // content target = ""
 
 // or
-<img src="img-en.jpg" class="piwikTrackContent"/>
+<img src="img-en.jpg" class="matomoTrackContent"/>
 // content name   = absolutePath(img-en.jpg)
 // content piece  = absoluteUrl(img-en.jpg)
 // content target = ""
@@ -115,7 +115,7 @@ As you can see in these examples we do detect the content piece and name automat
 
 * The simplest scenario is to provide an HTML attribute `data-content-piece="foo"` including a value anywhere within the content block or in the content block element itself.
 * If there is no such attribute we will check whether the content piece element is media (audio, video, image, pdf, ...) and we will try to find the URL of the media automatically.
- * To find the content piece element we will search for an element having the attribute `data-content-piece` or the CSS class `piwikContentPiece`. This attribute/class can be specified anywhere within a content block. If we do not find any specific content piece element we will use the content block element.
+ * To find the content piece element we will search for an element having the attribute `data-content-piece` or the CSS class `matomoContentPiece`. This attribute/class can be specified anywhere within a content block. If we do not find any specific content piece element we will use the content block element.
  * In case of video or audio elements, when there are multiple sources defined, we will choose the URL of the first source.
  * We will automatically build a fully qualified URL of the source in case we find one. This allows you to see a preview in the UI and to know exactly which media was displayed in case relative paths are used.
 * If we haven't found anything we will fall back to use the value "Unknown". In such a case you should set the attribute `data-content-piece` telling us explicitly what the content is.
@@ -123,45 +123,45 @@ As you can see in these examples we do detect the content piece and name automat
 Examples:
 
 ```html
-<a href="http://www.example.com" data-track-content>
+<a href="https://www.example.com" data-track-content>
     <img src="img-en.jpg" data-content-piece="img.jpg"/>
 </a>
 // content name   = img.jpg
 // content piece  = img.jpg
-// content target = http://www.example.com
+// content target = https://www.example.com
 ```
 
 As you can see a specific value for the content piece is defined which can be useful if your text or images are different for each language. This time we can also automatically detect the content target since we have set the content block on an `a` element. More about this later. The `data-content-piece` attribute can be set on any element, even in the `a` element.
 
 
 ```html
-<a href="http://www.example.com" data-track-content>
+<a href="https://www.example.com" data-track-content>
     <img src="img-en.jpg" data-content-piece/>
 </a>
 
 // or
-<a href="http://www.example.com" data-track-content>
-    <img src="img-en.jpg" class="piwikContentPiece"/>
+<a href="https://www.example.com" data-track-content>
+    <img src="img-en.jpg" class="matomoContentPiece"/>
 </a>
 // content name   = absolutePath(img-en.jpg)
 // content piece  = absoluteUrl(img-en.jpg)
-// content target = http://www.example.com
+// content target = https://www.example.com
 ```
 
 In these examples we were able to detect the name and the piece of the content automatically based on the `src` attribute. We will automatically build a fully qualified URL for the image.
 
 ```html
-<a href="http://www.example.com" data-track-content>
+<a href="https://www.example.com" data-track-content>
     <p data-content-piece>Lorem ipsum dolor sit amet</p>
 </a>
 
 // or
-<a href="http://www.example.com" data-track-content>
-    <p class="piwikContentPiece">Lorem ipsum dolor sit amet</p>
+<a href="https://www.example.com" data-track-content>
+    <p class="matomoContentPiece">Lorem ipsum dolor sit amet</p>
 </a>
 // content name   = Unknown
 // content piece  = Unknown
-// content target = http://www.example.com
+// content target = https://www.example.com
 ```
 
 As the content piece element is not media we cannot detect the content automatically. In such a case you have to define the `data-content-piece` attribute and set a value to it. We do not use the text of this element because
@@ -174,12 +174,12 @@ As the content piece element is not media we cannot detect the content automatic
 Better:
 
 ```html
-<a href="http://www.example.com" data-track-content>
+<a href="https://www.example.com" data-track-content>
     <p data-content-piece="My content">Lorem ipsum dolor sit amet...</p>
 </a>
 // content name   = My content
 // content piece  = My content
-// content target = http://www.example.com
+// content target = https://www.example.com
 ```
 
 #### How do we detect the content name?
@@ -217,37 +217,37 @@ This example is the way to go by defining a `data-content-name` attribute anywhe
 If no content name is set, it will default to the content piece in case there is one. As the image has the same domain as the current page only the absolute path of the image will be used as a name.
 
 ```html
-<img src="http://www.example.com/path/img-en.jpg" data-track-content/>
+<img src="https://www.example.com/path/img-en.jpg" data-track-content/>
 // content name   = /path/img-en.jpg
-// content piece  = http://www.example.com/path/img-en.jpg
+// content piece  = https://www.example.com/path/img-en.jpg
 // content target = ""
 ```
 
 If content piece contains a domain that is the same as the current website's domain we will remove it.
 
 ```html
-<a href="http://www.example.com" data-track-content>Lorem ipsum...</a>
+<a href="https://www.example.com" data-track-content>Lorem ipsum...</a>
 // content name   = Unknown
 // content piece  = Unknown
-// content target = http://www.example.com
+// content target = https://www.example.com
 ```
 
 In case there is no content name, no content piece and no title set anywhere it will default to "Unknown". To get a useful content name you should set either the `data-content-name` or a `title` attribute.
 
 ```html
-<a href="http://www.example.com" data-track-content title="Block Title">
+<a href="https://www.example.com" data-track-content title="Block Title">
     <span title="Inner Title" data-content-piece>Lorem ipsum...</span>
 </a>
 // content name   = Block Title
 // content piece  = Unknown
-// content target = http://www.example.com
+// content target = https://www.example.com
 ```
 
 In case there is no content name and no content piece we will fall back to the `title` attribute of the content block. The `title` attribute of the block element takes precendence over the piece element in this example.
 
 #### How do we detect the content target element?
 
-The content target element will be used to find a URL as this element is usually a link or a button. We detect the target element either by the attribute `data-content-target` or by the class `.piwikContentTarget`. If no such element can be found we will fall back to the content block element.
+The content target element will be used to find a URL as this element is usually a link or a button. We detect the target element either by the attribute `data-content-target` or by the class `.matomoContentTarget`. If no such element can be found we will fall back to the content block element.
 
 #### How do we detect the content target?
 
@@ -258,19 +258,19 @@ The content target element will be used to find a URL as this element is usually
 Examples:
 
 ```html
-<a href="http://www.example.com" data-track-content>Click me</a>
+<a href="https://www.example.com" data-track-content>Click me</a>
 // content name   = Unknown
 // content piece  = Unknown
-// content target = "http://www.example.com"
+// content target = "https://www.example.com"
 ```
 
 As no specific target element is set, we will read the `href` attribute of the content block.
 
 ```html
-<a onclick="location.href='http://www.example.com'" data-content-target="http://www.example.com" data-track-content>Click me</a>
+<a onclick="location.href='https://www.example.com'" data-content-target="http://www.example.com" data-track-content>Click me</a>
 // content name   = Unknown
 // content piece  = Unknown
-// content target = "http://www.example.com"
+// content target = "https://www.example.com"
 ```
 
 No `href` attribute is set as the link will be executed via JavaScript. Therefore, a `data-content-target` attribute with a value has to be specified.
@@ -286,22 +286,22 @@ As there is neither a `data-content-target` attribute nor a `href` attribute we
 
 ```html
 <div data-track-content>
-    <input type="submit" data-content-target="http://www.example.com"/>
+    <input type="submit" data-content-target="https://www.example.com"/>
 </div>
 // content name   = Unknown
 // content piece  = Unknown
-// content target = "http://www.example.com"
+// content target = "https://www.example.com"
 ```
 
 As the `data-content-target` attribute is set with a value, we can detect the content target.
 
 ```html
 <div data-track-content>
-    <a href="http://www.example.com" class="piwikContentTarget">Click me</a>
+    <a href="https://www.example.com" class="matomoContentTarget">Click me</a>
 </div>
 // content name   = Unknown
 // content piece  = Unknown
-// content target = "http://www.example.com"
+// content target = "https://www.example.com"
 ```
 
 As the target element has a `href` attribute we can detect the content target automatically.
@@ -309,38 +309,38 @@ As the target element has a `href` attribute we can detect the content target au
 ### Putting it all together
 
 ```html
-<a href="http://ad.example.com" data-track-content>
-    <img src="http://www.example.com/path/xyz.jpg" data-content-piece />
+<a href="https://ad.example.com" data-track-content>
+    <img src="https://www.example.com/path/xyz.jpg" data-content-piece />
 </a>
 // content name   = /path/xyz.jpg
-// content piece  = http://www.example.com/path/xyz.jpg
-// content target = http://ad.example.com
+// content piece  = https://www.example.com/path/xyz.jpg
+// content target = https://ad.example.com
 ```
 
 A typical example for a content block that displays a banner ad.
 
 ```html
-<a href="http://ad.example.com" data-track-content data-content-name="My Ad">
+<a href="https://ad.example.com" data-track-content data-content-name="My Ad">
     Lorem ipsum....
 </a>
 // content name   = My Ad
 // content piece  = Unknown
-// content target = http://ad.example.com
+// content target = https://ad.example.com
 ```
 
 A typical example for a content block that displays a text ad.
 
 ```html
 <div data-track-content data-content-name="My Ad">
-    <img src="http://www.example.com/path/xyz.jpg" data-content-piece />
+    <img src="https://www.example.com/path/xyz.jpg" data-content-piece />
     <a href="/anylink" data-content-target>Add to shopping cart</a>
 </div>
 // content name   = My Ad
-// content piece  = http://www.example.com/path/xyz.jpg
+// content piece  = https://www.example.com/path/xyz.jpg
 // content target = /anylink
 ```
 
-A typical example for a content block that displays an image - which is the content piece - and a call to action link - which is the content target - below. We would replace the `href=/anylink` with a link to piwik.php of your Piwik installation which will in turn redirect the user to the actual target to actually track the interaction.
+A typical example for a content block that displays an image - which is the content piece - and a call to action link - which is the content target - below. We would replace the `href=/anylink` with a link to matomo.php of your Piwik installation which will in turn redirect the user to the actual target to actually track the interaction.
 
 #### How to debug / test whether all content blocks will be detected correctly?
 
@@ -362,15 +362,15 @@ The way we track interactions varies based on the type of the link.
 
 ##### Links to the same domain
 
-In case we detect a link element having an `href` attribute to the same domain as the current page we will replace the `href` attribute with a link to the `piwik.php` tracker URL. Whenever a user clicks on such a link we will first send the user to the `piwik.php` of your Piwik installation and then redirect the user from there to the actual page. This makes sure to track an interaction even if someone opens the URL with a right click.
+In case we detect a link element having an `href` attribute to the same domain as the current page we will replace the `href` attribute with a link to the `matomo.php` tracker URL. Whenever a user clicks on such a link we will first send the user to the `matomo.php` of your Piwik installation and then redirect the user from there to the actual page. This makes sure to track an interaction even if someone opens the URL with a right click.
 
 If the URL of the replaced `href` attribute changes meanwhile by your code we will respect the new link.
 
-Note: The referrer information will get lost when redirecting from piwik.php to your page. If you depend on this you need to disable automatic tracking of an interaction see below.
+Note: The referrer information will get lost when redirecting from matomo.php to your page. If you depend on this you need to disable automatic tracking of an interaction see below.
 
 ##### Outlinks and downloads
 
-Outlinks and downloads are handled as before via XHR. If a user clicks on a download or outlink we will track this action as usual along with some information related to the content interaction. If link tracking is not enabled we will track downloads having the same domain via `piwik.php` and all others via XHR.
+Outlinks and downloads are handled as before via XHR. If a user clicks on a download or outlink we will track this action as usual along with some information related to the content interaction. If link tracking is not enabled we will track downloads having the same domain via `matomo.php` and all others via XHR.
 
 Tracking via XHR can delay loading a new page by a few hundred ms as we have to track the outlink before moving the user to the new page.
 
@@ -380,15 +380,15 @@ Anchor and all other kind of links will be tracked using an XHR.
 
 #### How to prevent the automatic tracking of an interaction?
 
-Maybe you do not want us to track any interaction automatically as explained before. To do so you can either set the attribute `data-content-ignoreinteraction` or the CSS class `piwikContentIgnoreInteraction` on the content target element. In single page application you might have to disable automatic tracking of an interaction as otherwise a page reload and a redirect would occur.
+Maybe you do not want us to track any interaction automatically as explained before. To do so you can either set the attribute `data-content-ignoreinteraction` or the CSS class `matomoContentIgnoreInteraction` on the content target element. In single page application you might have to disable automatic tracking of an interaction as otherwise a page reload and a redirect would occur.
 
 Examples
 
 ```html
-<a href="http://outlink.example.com" class="piwikTrackContent piwikContentIgnoreInteraction">Add to shopping cart</a>
+<a href="https://outlink.example.com" class="matomoTrackContent matomoContentIgnoreInteraction">Add to shopping cart</a>
 //
 <div data-track-content>
-    <a href="http://outlink.example.com" data-content-target data-content-ignoreinteraction>Add to shopping cart</a>
+    <a href="https://outlink.example.com" data-content-target data-content-ignoreinteraction>Add to shopping cart</a>
 </div>
 ```
 
diff --git a/docs/4.x/controllers.md b/docs/4.x/controllers.md
index 1a3031ced..44de4929b 100644
--- a/docs/4.x/controllers.md
+++ b/docs/4.x/controllers.md
@@ -26,7 +26,7 @@ Here's how you do both:
 
 ### Adding controller methods as menu items
 
-To add menu items in Piwik, read [the following guide](https://piwik.org/blog/2014/09/add-new-page-menu-item-piwik-introducing-piwik-platform/).
+To add menu items in Piwik, read [the following guide](https://matomo.org/blog/2014/09/add-new-page-menu-item-piwik-introducing-piwik-platform/).
 
 ### Invoking controller methods via AJAX
 
diff --git a/docs/4.x/custom-reports.md b/docs/4.x/custom-reports.md
index 2ac7c13e4..039795657 100644
--- a/docs/4.x/custom-reports.md
+++ b/docs/4.x/custom-reports.md
@@ -5,11 +5,11 @@ category: Develop
 
 In our [Setting up](/guides/getting-started-part-1) guide you set up your development environment and created a new plugin. In this guide, we'll make that plugin show a custom report.
 
-**Did you know?** You can create new custom reports in only seconds without any developer knowledge with the [Custom Reports premium feature](https://plugins.piwik.org/CustomReports).
+**Did you know?** You can create new custom reports in only seconds without any developer knowledge with the [Custom Reports premium feature](https://plugins.matomo.org/CustomReports).
 
 ## Adding a new report
 
-We're going to create a new report that shows the browsers used for the most recent visits. We'll be using data returned by the [Live!](https://piwik.org/docs/real-time/#the-real-time-live-widget) plugin so we won't have to do much processing ourselves.
+We're going to create a new report that shows the browsers used for the most recent visits. We'll be using data returned by the [Live!](https://matomo.org/docs/real-time/#the-real-time-live-widget) plugin so we won't have to do much processing ourselves.
 
 <div markdown="1" class="alert alert-warning">
 **On reports and metrics**
@@ -123,7 +123,7 @@ public function getLastVisitsByBrowser($idSite, $period, $date, $segment = false
 <div markdown="1" class="alert alert-warning">
 **API parameters**
 
-Every API method that serves a report or a metric will have the parameters listed above. This is because all analytics data describes log data that is tracked for a certain website and during a certain period. A [segment](https://piwik.org/docs/segmentation/) can be provided to further reduce the data that is analyzed, but it's optional (which is why the parameter defaults to `false`).
+Every API method that serves a report or a metric will have the parameters listed above. This is because all analytics data describes log data that is tracked for a certain website and during a certain period. A [segment](https://matomo.org/docs/segmentation/) can be provided to further reduce the data that is analyzed, but it's optional (which is why the parameter defaults to `false`).
 
 The website is determined by the `$idSite` parameter and the period by both the `$period` and `$date` parameters. The segment is determined by the value in the `$segment` parameter.
 </div>
diff --git a/docs/4.x/database-schema.md b/docs/4.x/database-schema.md
index e3a0dd924..6b4d798cc 100644
--- a/docs/4.x/database-schema.md
+++ b/docs/4.x/database-schema.md
@@ -30,7 +30,7 @@ All log data is persisted in a similar way: new data is constantly added to the
 
 **Visit** data is updated while visits are active. So until a visit ends it is possible that Piwik will try to update it.
 
-Log data is read when calculating analytics data and old data will sometimes be deleted (via the [data purging feature](https://piwik.org/docs/managing-your-databases-size/)).
+Log data is read when calculating analytics data and old data will sometimes be deleted (via the [data purging feature](https://matomo.org/docs/managing-your-databases-size/)).
 
 Backends must ensure that inserting new log data is as fast as possible and aggregating log data is not too slow (though obviously, faster is better).
 
@@ -90,7 +90,7 @@ Each visit contains the following information:
 - `config_gears`: <!-- TODO what is this? -->
 - `config_silverlight`: whether the visitor's browser can run silverlight programs or not
 - `config_cookie`: whether the visitor's browser has cookies enabled or not
-- `location_ip`: the IP address of the computer that the visit was made from. Can be [anonymized](https://piwik.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)
+- `location_ip`: the IP address of the computer that the visit was made from. Can be [anonymized](https://matomo.org/docs/privacy/#step-1-automatically-anonymize-visitor-ips)
 - `location_browser_lang`: a string describing the language used in the visitor's browser
 - `location_country`: a two character string describing the country the visitor was located in while visiting the site. Set by the [UserCountry](https://github.com/matomo-org/matomo/tree/master/plugins/UserCountry) plugin.
 - `location_region`: a two character string describing the region of the country the visitor was in. Set by the [UserCountry](https://github.com/matomo-org/matomo/tree/master/plugins/UserCountry) plugin.
@@ -139,7 +139,7 @@ Visit actions contain the following information:
 - `custom_var_v4`: the custom variable value of the fourth slot for page custom variables
 - `custom_var_k5`: the custom variable name of the  slot for page custom variables
 - `custom_var_v5`: the custom variable value of the  slot for page custom variables
-- `custom_float`: an unspecified float field, mainly used to store the [Custom Event](http://piwik.org/docs/event-tracking/) value, as well as store the [time it took the server](https://piwik.org/docs/page-speed/) to serve this action
+- `custom_float`: an unspecified float field, mainly used to store the [Custom Event](https://matomo.org/docs/event-tracking/) value, as well as store the [time it took the server](https://matomo.org/docs/page-speed/) to serve this action
 
 #### Table details
 
@@ -171,10 +171,10 @@ Action types are persisted in the `log_action` table and contain the following i
   - **Piwik\Tracker\Action::TYPE\_ECOMMERCE\_ITEM\_NAME = 6**: the action is the name of an ecommerce item that is sold on the site.
   - **Piwik\Tracker\Action::TYPE\_ECOMMERCE\_ITEM\_CATEGORY = 7**: the action is the name of an ecommerce item category that is used on the site.
   - **Piwik\Tracker\Action::TYPE_SITE_SEARCH = 8**: the action type is a site search action.
-  - **Piwik\Tracker\Action::TYPE_EVENT_CATEGORY = 10**: the action is an event category (see [Tracking Events](https://piwik.org/docs/event-tracking/) user guide)
+  - **Piwik\Tracker\Action::TYPE_EVENT_CATEGORY = 10**: the action is an event category (see [Tracking Events](https://matomo.org/docs/event-tracking/) user guide)
   - **Piwik\Tracker\Action::TYPE_EVENT_ACTION = 11**: the action is an event category
   - **Piwik\Tracker\Action::TYPE_EVENT_NAME = 12**: the action is an event name
-  - **Piwik\Tracker\Action::TYPE_CONTENT_NAME = 13**:  the action is a content name (see [Content Tracking](https://piwik.org/docs/content-tracking/) user guide and [developer guide](https://developer.piwik.org/guides/content-tracking))
+  - **Piwik\Tracker\Action::TYPE_CONTENT_NAME = 13**:  the action is a content name (see [Content Tracking](https://matomo.org/docs/content-tracking/) user guide and [developer guide](https://developer.matomo.org/guides/content-tracking))
   - **Piwik\Tracker\Action::TYPE_CONTENT_PIECE = 14**: the action is a content piece
   - **Piwik\Tracker\Action::TYPE_CONTENT_TARGET = 15**: the action is a content target
   - **Piwik\Tracker\Action::TYPE_CONTENT_INTERACTION = 16**: the action is a content interaction
@@ -275,7 +275,7 @@ Piwik creates two types of archive tables, one for each type of archive data. Th
 In `archive_numeric` tables:
 
 - the `index_idsite_dates_period` index is used when querying archive data. It lets Piwik quickly query archive data for any site and period, and for data that was archived past a certain date-time.
-- the `index_period_archived` index is used when [purging archive data](https://piwik.org/docs/managing-your-databases-size/). It allows Piwik to quickly find archive data for a specific period that is old enough to be purged.
+- the `index_period_archived` index is used when [purging archive data](https://matomo.org/docs/managing-your-databases-size/). It allows Piwik to quickly find archive data for a specific period that is old enough to be purged.
 
 In `archive_blob` tables:
 
@@ -391,10 +391,10 @@ Users can be allowed and disallowed access to websites. Piwik persists each user
 
 Piwik defines 4 types of permissions:
 
-- [**view permission**](https://piwik.org/faq/general/faq_70/#faq_70): applies to a specific site
-- [**write permission**](https://piwik.org/faq/general/faq_26910/#faq_70): applies to a specific site
-- [**admin permission**](https://piwik.org/faq/general/faq_69/#faq_69): applies to a specific site
-- [**super user permission**](https://piwik.org/faq/general/faq_35/#faq_35): applies to **whole Piwik** (all sites)
+- [**view permission**](https://matomo.org/faq/general/faq_70/#faq_70): applies to a specific site
+- [**write permission**](https://matomo.org/faq/general/faq_26910/#faq_70): applies to a specific site
+- [**admin permission**](https://matomo.org/faq/general/faq_69/#faq_69): applies to a specific site
+- [**super user permission**](https://matomo.org/faq/general/faq_35/#faq_35): applies to **whole Piwik** (all sites)
 
 The following information is stored in the `access` table:
 
@@ -438,5 +438,5 @@ Some options should be loaded on every non-tracking request. These options have
 * To learn **how log data is aggregated** see our [Archiving](/guides/archiving) guide and take a look at the [LogAggregator](/api-reference/Piwik/DataAccess/LogAggregator) class.
 * To learn **how archive data is cached** see our [Archive Data](/guides/archive-data) guide.
 * To learn **about Piwik's logging utility** see this section in our [Getting started extending Piwik](/guides/getting-started-part-1) guide.
-* To learn **about database backed sessions** read [this FAQ entry](https://piwik.org/faq/how-to-install/faq_133/).
+* To learn **about database backed sessions** read [this FAQ entry](https://matomo.org/faq/how-to-install/faq_133/).
 * To learn **how plugins can persist data** read the [Extending the Database](/guides/extending-database) guide.
diff --git a/docs/4.x/dimensions.md b/docs/4.x/dimensions.md
index 4695f0d15..66f7849cb 100644
--- a/docs/4.x/dimensions.md
+++ b/docs/4.x/dimensions.md
@@ -32,7 +32,7 @@ public function onNewVisit(Request $request, Visitor $visitor, $action)
 }
 ```
 
-Whenever you send a `sport_activity_type` parameter with any tracking request and the tracker detected a new visitor, this information will be recorded in the database and can be used to create new reports or to extend existing reports and API methods. An example tracking URL could look like this `piwik.php?idsite=1&sport_activity_type=running`
+Whenever you send a `sport_activity_type` parameter with any tracking request and the tracker detected a new visitor, this information will be recorded in the database and can be used to create new reports or to extend existing reports and API methods. An example tracking URL could look like this `matomo.php?idsite=1&sport_activity_type=running`
 
 Optionally, you can overwrite any initial value that was written when a new visit was detected by implementing the method `onExistingVisit`. You can use this for example for counters, to store the time of the last action etc:
 
@@ -71,7 +71,7 @@ public function onNewAction(Request $request, Visitor $visitor, Action $action)
 }
 ```
 
-A tracking request could be done like this: `piwik.php?idsite=1&sport_activity_type=running&speed=50`.
+A tracking request could be done like this: `matomo.php?idsite=1&sport_activity_type=running&speed=50`.
 
 Of course, you can add any custom behaviour like limiting the max speed etc.
 
diff --git a/docs/4.x/enrich-js-tracker.md b/docs/4.x/enrich-js-tracker.md
index c87805b16..3f121c183 100644
--- a/docs/4.x/enrich-js-tracker.md
+++ b/docs/4.x/enrich-js-tracker.md
@@ -23,15 +23,15 @@ To enrich the tracker create a file named `tracker.js` in your Matomo plugin dir
         winodw._paq.push(['disableCookies']);
     }
 
-    if ('object' === typeof window.Piwik) {
+    if ('object' === typeof window.Matomo) {
         init();
     } else {
         // tracker might not be loaded yet
-        if ('object' !== typeof window.piwikPluginAsyncInit) {
-            window.piwikPluginAsyncInit = [];
+        if ('object' !== typeof window.matomoPluginAsyncInit) {
+            window.matomoPluginAsyncInit = [];
         }
 
-        window.piwikPluginAsyncInit.push(init);
+        window.matomoPluginAsyncInit.push(init);
     }
 
 })(); 
@@ -42,7 +42,7 @@ To enrich the tracker create a file named `tracker.js` in your Matomo plugin dir
 In order to test your tracker integration, execute the following console command within your root Matomo directory.
 
 ```bash
-./console custom-piwik-js:update --ignore-minified
+./console custom-matomo-js:update --ignore-minified
 ```
 
 This will merge the content of your `tracker.js` file with the JS tracker template from `$matomoRootDir/js/piwik.min.js` and save the
@@ -58,13 +58,13 @@ You can add additional tracking methods for example to disable your feature, to
 ```js
 function init() {
     var enableTracker = true;
-    Piwik.MyPlugin = {
+    Matomo.MyPlugin = {
         disableTracking: function () {
             enableTracker = false;
         }
     };
     
-    Piwik.on('TrackerSetup', function (tracker) {
+    Matomo.on('TrackerSetup', function (tracker) {
         tracker.MyPlugin = {
             trackme: function () {
                 if (enableTracker) {
@@ -100,7 +100,7 @@ parameters server side, store the value in a dimension and provide new reports b
 
 ```js
 function init() {
-    Piwik.addPlugin('MyPlugin', {
+    Matomo.addPlugin('MyPlugin', {
         log: function () {
             // add additional tracking parameters to a page view tracking request
             var canvas = document.createElement('canvas');
@@ -119,7 +119,7 @@ function init() {
         unload: function() {
             // executed when the user is leaving the page
             // can be useful to send for example any not yet sent tracking request
-            var trackers = Piwik.getAsyncTrackers();
+            var trackers = Matomo.getAsyncTrackers();
             for (var i = 0; i < trackers.length; i++) {
                 trackers[i].trackRequest('ping=1');
             }
@@ -132,16 +132,16 @@ Other event names are `ecommerce`, `sitesearch`, `link`, `contentInteraction`, `
 
 ### Useful methods:
 
-* `Piwik.JSON` get access to the JSON object
-* `Piwik.DOM.onReady(callback)` calls the `callback` method when the DOM is ready but not yet loaded
-* `Piwik.DOM.onLoad(callback)` calls the `callback` method when the DOM is fully loaded
-* `Piwik.DOM.isNodeVisible(htmlNode)` checks if the given HTML element is visible within the viewport right now
-* `Piwik.DOM.addEventListener(element, eventType, callback, useCapture)` listen to an event without needing to worry about cross browser support
-* `Piwik.on(eventName, callback)` listen to a Matomo JS tracker event
-* `Piwik.off(eventName, callback)` stop listening to a Matomo JS tracker event
-* `Piwik.trigger(eventName, params, context)` Triggers the given event and passes the parameters to all handlers. If no context is given, the callback will be executed in the `window` context.
-* `Piwik.addPlugin(pluginName, pluginObject)` listen to tracker plugin events see example above
-* `Piwik.getAsyncTrackers()` get an array of all created async tracker instances
+* `Matomo.JSON` get access to the JSON object
+* `Matomo.DOM.onReady(callback)` calls the `callback` method when the DOM is ready but not yet loaded
+* `Matomo.DOM.onLoad(callback)` calls the `callback` method when the DOM is fully loaded
+* `Matomo.DOM.isNodeVisible(htmlNode)` checks if the given HTML element is visible within the viewport right now
+* `Matomo.DOM.addEventListener(element, eventType, callback, useCapture)` listen to an event without needing to worry about cross browser support
+* `Matomo.on(eventName, callback)` listen to a Matomo JS tracker event
+* `Matomo.off(eventName, callback)` stop listening to a Matomo JS tracker event
+* `Matomo.trigger(eventName, params, context)` Triggers the given event and passes the parameters to all handlers. If no context is given, the callback will be executed in the `window` context.
+* `Matomo.addPlugin(pluginName, pluginObject)` listen to tracker plugin events see example above
+* `Matomo.getAsyncTrackers()` get an array of all created async tracker instances
 * For a [list of all tracker specific methods click here](/api-reference/tracking-javascript)
 
 ### Minifying the tracker
@@ -165,16 +165,16 @@ creating a file `tests/javascript/index.php` within your plugin directory. A tes
 test("Matomo MyPlugin", function() {
     expect(2);
 
-    equal( typeof Piwik.MyPlugin, 'object', 'MyPlugin' );
+    equal( typeof Matomo.MyPlugin, 'object', 'MyPlugin' );
 
-    var MyPlugin = Piwik.MyPlugin;
+    var MyPlugin = Matomo.MyPlugin;
     equal( typeof MyPlugin.disableTracking, 'object', 'MyPlugin.disableTracking' );
 });
 
 test("Matomo MyPlugin enriches tracker", function() {
     expect(2);
 
-    var tracker = Piwik.getAsyncTracker();
+    var tracker = Matomo.getAsyncTracker();
 
     equal( typeof tracker.MyPlugin, 'object', 'MyPlugin' );
     equal( typeof tracker.MyPlugin.trackme, 'function', 'Tracker MyPlugin.trackme');
diff --git a/docs/4.x/events.md b/docs/4.x/events.md
index def0914ff..68ad49279 100644
--- a/docs/4.x/events.md
+++ b/docs/4.x/events.md
@@ -18,7 +18,7 @@ The complete list of events posted by Piwik Core is [here](/api-reference/events
 
 ## Handling events
 
-Events are **handled** by registering a callback by name in the [`Plugin::registerEvents()`](/api-reference/Piwik/Plugin#getlisthooksregistered) method of the plugin descriptor class (`YourPluginName.php`), for example:
+Events are **handled** by registering a callback by name in the [`Plugin::registerEvents()`](/api-reference/Piwik/Plugin#registerevents) method of the plugin descriptor class (`YourPluginName.php`), for example:
 
 ```php
 class MyPlugin extends \Piwik\Plugin
diff --git a/docs/4.x/expose-api-methods.md b/docs/4.x/expose-api-methods.md
index e0b2123e3..823a75e6b 100644
--- a/docs/4.x/expose-api-methods.md
+++ b/docs/4.x/expose-api-methods.md
@@ -4,7 +4,7 @@ title: API Methods
 ---
 # Exposing API Methods
 
-This guide explains how to expose new API methods in the [HTTP Reporting API](https://developer.piwik.org/api-reference/reporting-api) by creating an API module. The Reporting API allows third party applications to access analytics data and manipulate miscellaneous data (such as users or websites) through HTTP requests.
+This guide explains how to expose new API methods in the [HTTP Reporting API](https://developer.matomo.org/api-reference/reporting-api) by creating an API module. The Reporting API allows third party applications to access analytics data and manipulate miscellaneous data (such as users or websites) through HTTP requests.
 
 ### What is it good for?
 
diff --git a/docs/4.x/form-analytics.md b/docs/4.x/form-analytics.md
index 5a3135293..40830ba54 100644
--- a/docs/4.x/form-analytics.md
+++ b/docs/4.x/form-analytics.md
@@ -10,7 +10,7 @@ subGuides:
 This section contains guides that will help you track your online web forms using Piwik. 
 
 [Form Analytics](https://www.form-analytics.net) is a plugin for Piwik that can be purchased 
-on the [Piwik Marketplace](https://plugins.piwik.org/premium) soon. It adds over 50 new metrics to your Piwik, several 
+on the [Piwik Marketplace](https://plugins.matomo.org/premium) soon. It adds over 50 new metrics to your Piwik, several 
  new segments, more than 10 new reports, real time reports, and widgets that you can add to your dashboard. This way
   you can understand much better how your visitors use your web and application forms to increase your conversions.
 Form Analytics is developed by [InnoCraft](https://www.innocraft.com), the makers of Piwik. 
diff --git a/docs/4.x/form-analytics/faq.md b/docs/4.x/form-analytics/faq.md
index 689d4c15b..4d85b31c0 100644
--- a/docs/4.x/form-analytics/faq.md
+++ b/docs/4.x/form-analytics/faq.md
@@ -4,7 +4,7 @@ title: Developer FAQ
 ---
 # Form Analytics Developer FAQ
 
-This page is the Developer FAQ for [Form Analytics](https://www.form-analytics.net/). You may also be interested in the [Form Analytics User FAQs](https://piwik.org/faq/form-analytics/).
+This page is the Developer FAQ for [Form Analytics](https://www.form-analytics.net/). You may also be interested in the [Form Analytics User FAQs](https://matomo.org/faq/form-analytics/).
 
 ## I have a single page website or a web application, how can I re-scan the DOM to find new forms or form fields that were added after the initial page load, for example via Ajax / XHR? 
 
diff --git a/docs/4.x/form-analytics/reference.md b/docs/4.x/form-analytics/reference.md
index e8ca5d437..54b896274 100644
--- a/docs/4.x/form-analytics/reference.md
+++ b/docs/4.x/form-analytics/reference.md
@@ -6,11 +6,11 @@ title: JavaScript Tracker API Reference
 
 This guide is the JavaScript Tracker API Reference for [Form Analytics](https://www.form-analytics.net/).
 
-You may also be interested in the Form Analytics [Reporting HTTP API Reference](https://developer.piwik.org/api-reference/reporting-api#FormAnalytics). 
+You may also be interested in the Form Analytics [Reporting HTTP API Reference](https://developer.matomo.org/api-reference/reporting-api#FormAnalytics). 
 
 ## Calling Form Analytics tracker methods
 
-In the `piwik.js` tracker we differentiate between two kind of methods:
+In the `matomo.js` tracker we differentiate between two kind of methods:
 
 * Calling a **tracker instance method** affects only a specific Piwik tracker instance. In the docs you can 
   identify a tracker method when the method name contains a single dot (`.`), for example 
@@ -21,16 +21,16 @@ In the `piwik.js` tracker we differentiate between two kind of methods:
 In most cases only one Piwik tracker will be used so the only difference is how you call that method:
 
 * Tracker methods are called via `_paq.push(['FormAnalytics.$methodName']);` or on a tracker instance directly eg. 
-  `Piwik.getAsyncTracker().FormAnalytics.$methodName()`.
-* Static methods are called via `_paq.push(['FormAnalytics::$methodName']);` or directly on the `Piwik.FormAnalytics` object,
-  eg. `Piwik.FormAnalytics.$methodName()`.
+  `Matomo.getAsyncTracker().FormAnalytics.$methodName()`.
+* Static methods are called via `_paq.push(['FormAnalytics::$methodName']);` or directly on the `Matomo.FormAnalytics` object,
+  eg. `Matomo.FormAnalytics.$methodName()`.
 
 If you do not want to use the `_paq.push` methods, you may define a `window.piwikFormAnalyticsAsyncInit` method 
 that is called as soon as the form tracker has been initialized:
 
 ```js
 window.piwikFormAnalyticsAsyncInit = function () {
-    Piwik.FormAnalytics.disableFormAnalytics();
+    Matomo.FormAnalytics.disableFormAnalytics();
 };
 ```
 
@@ -49,8 +49,8 @@ Example:
 _paq.push(['FormAnalytics::scanForForms']);
 _paq.push(['FormAnalytics::scanForForms', document.getElementById('test')]);
 // or 
-Piwik.FormAnalytics.scanForForms();
-Piwik.FormAnalytics.scanForForms(document.getElementById('test'));
+Matomo.FormAnalytics.scanForForms();
+Matomo.FormAnalytics.scanForForms(document.getElementById('test'));
 ```
 
 ### `trackForm(formElement)`
@@ -114,7 +114,7 @@ enabled in production.
 
 Allows you to set the tracker instances the tracker should use when tracking your forms. Can be either
  a single tracker instance, or an array of Piwik tracker instances. This is useful when you are working with multiple Piwik
- tracker instances using `Piwik.getTracker` instead of `Piwik.addTracker`. 
+ tracker instances using `Matomo.getTracker` instead of `Matomo.addTracker`. 
  
 ### `setTrackingTimer(delayInMilliSeconds)`
 
@@ -138,7 +138,7 @@ Example:
 _paq.push(['FormAnalytics.disable']); 
 
 // or if you are using multiple Piwik trackers and only want to disable it for a specific tracker:
-var tracker = Piwik.getTracker(piwikUrl, piwikSiteId);
+var tracker = Matomo.getTracker(matomoUrl, matomoSiteId);
 tracker.FormAnalytics.disable();
 ```
 
@@ -153,4 +153,4 @@ Detects if the tracking of forms is currently enabled or disabled for this track
 
 ## What to read next
 
-You may be interested in the [Form Analytics HTTP API Reference](https://developer.piwik.org/api-reference/reporting-api#FormAnalytics).
+You may be interested in the [Form Analytics HTTP API Reference](https://developer.matomo.org/api-reference/reporting-api#FormAnalytics).
diff --git a/docs/4.x/form-analytics/setup.md b/docs/4.x/form-analytics/setup.md
index 98f6a98bb..e132f4c54 100644
--- a/docs/4.x/form-analytics/setup.md
+++ b/docs/4.x/form-analytics/setup.md
@@ -11,10 +11,10 @@ In this guide you will learn how to get [Form Analytics](https://www.form-analyt
 If you have already embedded the [Piwik JavaScript Tracking Code](/guides/tracking-javascript-guide) into your website,
 the Form Analytics will automatically start tracking the usage of your web forms. 
 
-The tracker code for forms is automatically added into your Piwik JavaScript tracker file `/piwik.js` as long as the file `piwik.js` in your Piwik directory is writable by the webserver/PHP.
+The tracker code for forms is automatically added into your Matomo JavaScript tracker file `/matomo.js` as long as the file `matomo.js` in your Piwik directory is writable by the webserver/PHP.
  
-To check whether this works by default for you, login into Piwik as a Super User, go to Administration, and open the "System Check" report. 
-If the System Check displays a warning for "Writable Piwik.js" then [learn below how to solve this](#when-the-piwikjs-in-your-piwik-directory-file-is-not-writable).
+To check whether this works by default for you, login into Matomo as a Super User, go to Administration, and open the "System Check" report. 
+If the System Check displays a warning for "Writable Matomo.js" then [learn below how to solve this](#when-the-matomojs-in-your-piwik-directory-file-is-not-writable).
 
 ## Tracking Forms
 
@@ -74,24 +74,24 @@ If you do not want a form to be tracked, you can specify a `data-matomo-ignore`
 If set, it will not even send any tracking requests for this form to your Piwik. This is useful if you want to exclude
 for example forms that are shown on each page like a search or a newsletter sign up form.
 
-## When the `piwik.js` in your Piwik directory file is not writable
+## When the `matomo.js` in your Piwik directory file is not writable
  
-When your Settings > System Check reports that "The Piwik JavaScript tracker file `piwik.js` is not writable 
+When your Settings > System Check reports that "The Piwik JavaScript tracker file `matomo.js` is not writable 
 which means other plugins cannot extend the JavaScript tracker." then you have two options to solve this issue:
 
-1. Make the `piwik.js` file writable, for example by executing `chmod a+w piwik.js` or `chown $phpuser piwik.js` (replace `$phpuser` with actual username) in your Piwik directory. 
+1. Make the `matomo.js` file writable, for example by executing `chmod a+w piwik.js` or `chown $phpuser piwik.js` (replace `$phpuser` with actual username) in your Piwik directory. 
 We recommend running the [Piwik console](/guides/piwik-on-the-command-line) command `./console custom-piwik-js:update` after you have made the file writable.
 2. or Load the FormAnalytics tracker file manually in your website by adding in all your pages ideally in the `<head>`: 
-   `<script src="https://your-piwik-domain/plugins/FormAnalytics/tracker.min.js">`
+   `<script src="https://your-matomo-domain/plugins/FormAnalytics/tracker.min.js">`
 
 #### Are there any disadvantages of including the file manually?
 
 Yes, there are:
 
 * An additional HTTP request is needed to load your website which increases your page load time
-* If your `piwik.js` ever becomes writable, the FormAnalytics tracker would be loaded twice (in such a case the tracker notices it was already initialized and won't track everything twice)
+* If your `matomo.js` ever becomes writable, the FormAnalytics tracker would be loaded twice (in such a case the tracker notices it was already initialized and won't track everything twice)
 
-If possible, we recommend making the `piwik.js` file writable.
+If possible, we recommend making the `matomo.js` file writable.
 
 ## What to read next
 
diff --git a/docs/4.x/getting-started-part-1.md b/docs/4.x/getting-started-part-1.md
index b76fe9f82..98edd324f 100644
--- a/docs/4.x/getting-started-part-1.md
+++ b/docs/4.x/getting-started-part-1.md
@@ -29,7 +29,7 @@ There are many resources on the internet to help you learn PHP. We recommend rea
 
 All the functionality you see when you use Piwik is provided by **_Piwik Plugins_**. The core of Piwik (termed _**Piwik Core**_) only contains tools for those plugins.
 
-If you want to add more functionality to Piwik, create your own plugin then distribute it on the [Piwik Marketplace](https://plugins.piwik.org) so that others can use it.
+If you want to add more functionality to Piwik, create your own plugin then distribute it on the [Piwik Marketplace](https://plugins.matomo.org) so that others can use it.
 
 _Note: If you want to integrate another piece of software with Piwik and you only need to know how to track visits or how to retrieve reports, read more about [Integrating Piwik in your application](/integration)._
 
@@ -42,7 +42,7 @@ You can accomplish the following by creating a plugin:
 - show existing reports in a new way
 - send scheduled reports through new mediums or in new formats
 
-These are only a few of the possibilities — it is not possible to categorize all the existing plugins' functionality simply because of the vast differences in their use cases. For example, the [Annotations](https://matomo.org/docs/annotations/) plugin lets users add notes for dates without requiring modifications to **Piwik Core**. The DBStats plugin will show users statistics about their MySQL database. The [Dashboard](https://matomo.org/docs/piwik-tour/#dashboard-widgets) plugin provides a configurable way to view multiple reports at once.
+These are only a few of the possibilities — it is not possible to categorize all the existing plugins' functionality simply because of the vast differences in their use cases. For example, the [Annotations](https://matomo.org/docs/annotations/) plugin lets users add notes for dates without requiring modifications to **Piwik Core**. The DBStats plugin will show users statistics about their MySQL database. The [Dashboard](https://matomo.org/docs/matomo-tour/#dashboard-widgets) plugin provides a configurable way to view multiple reports at once.
 
 **Whatever ideas your imagination cooks up, we think you can implement them with Piwik.**
 
diff --git a/docs/4.x/heatmap-session-recording.md b/docs/4.x/heatmap-session-recording.md
index b1cad0ab6..44282c775 100644
--- a/docs/4.x/heatmap-session-recording.md
+++ b/docs/4.x/heatmap-session-recording.md
@@ -15,9 +15,9 @@ Heatmaps let you view visually all clicks, mouse moves, and scroll activities of
 Session recordings let you view all activities such as clicks, mouse movements, scrolls, window resizes, page changes, and form interactions of a real visitor on a certain page. You can replay these interactions in a video to see exactly how a visitor interacted with your website. This way you understand their expectations, problems they may have, usage patterns, and more.
 
 [Heatmap & Session Recording](https://www.heatmap-analytics.com) is a plugin for Piwik that can be purchased 
-on the [Piwik Marketplace](https://plugins.piwik.org/HeatmapSessionRecording).
+on the [Piwik Marketplace](https://plugins.matomo.org/HeatmapSessionRecording).
 It is developed by [InnoCraft](https://www.innocraft.com), the makers of Piwik. 
 If you want to learn more about this plugin we recommend having a look at the developer guides, 
-the [Heatmap User Guide](https://piwik.org/docs/heatmaps/), [Session Recording User Guide](https://piwik.org/docs/session-recording/), and the [Heatmap & Session Recording FAQs](https://piwik.org/faq/heatmap-session-recording/).
+the [Heatmap User Guide](https://matomo.org/docs/heatmaps/), [Session Recording User Guide](https://matomo.org/docs/session-recording/), and the [Heatmap & Session Recording FAQs](https://matomo.org/faq/heatmap-session-recording/).
 
 We recommend to start with the [setting up Heatmap & Session Recording guide](/guides/heatmap-session-recording/setup).
diff --git a/docs/4.x/heatmap-session-recording/faq.md b/docs/4.x/heatmap-session-recording/faq.md
index b4032bed3..bd66aa409 100644
--- a/docs/4.x/heatmap-session-recording/faq.md
+++ b/docs/4.x/heatmap-session-recording/faq.md
@@ -3,7 +3,7 @@ category: Integrate
 ---
 # Developer FAQ
 
-This page is the Developer FAQ for [Heatmap & Session Recording](https://www.heatmap-analytics.com/). You may also be interested in the [Heatmap & Session Recording User FAQs](https://piwik.org/faq/heatmap-session-recording/).
+This page is the Developer FAQ for [Heatmap & Session Recording](https://www.heatmap-analytics.com/). You may also be interested in the [Heatmap & Session Recording User FAQs](https://matomo.org/faq/heatmap-session-recording/).
 
 ## How do I prevent the capturing of keystrokes when recording a session? 
 
@@ -44,7 +44,7 @@ will be stopped.
 
 To solve this issue it is recommended to either:
 
-* [track events](https://piwik.org/docs/event-tracking/) instead of tracking page views,
+* [track events](https://matomo.org/docs/event-tracking/) instead of tracking page views,
 * or to disable the automatic detection of new page views by calling the following method: `_paq.push(['HeatmapSessionRecording::disableAutoDetectNewPageView']);`
 
 To learn more about the detection of page views, have a look at the [disableAutoDetectNewPageView() API reference](/guides/heatmap-session-recording/reference#disableautodetectnewpageview).
@@ -103,33 +103,33 @@ Using `_paq.push` for multiple trackers is a good and simple way when you want t
 
 ```js
 // configuration of first tracker
-_paq.push(['setTrackerUrl', 'https://example.com/piwik.php']);
+_paq.push(['setTrackerUrl', 'https://example.com/matomo.php']);
 _paq.push(['setSiteId', 1]);
 // configuration of second tracker
-_paq.push(['addTracker', 'https://example.com/piwik.php', 2]);
+_paq.push(['addTracker', 'https://example.com/matomo.php', 2]);
 ```
 
 If you are working with Piwik tracker instances because you want to configure each tracker instance differently and track
 different data into each Piwik, you may need to set the tracker instances manually:
 
 ```js
-window.piwikAsyncInit = function () {
-    var piwikTracker1 = Piwik.getTracker('https://example.com/piwik.php', 1);
-    var piwikTracker2 = Piwik.getTracker('https://example.com/piwik.php', 2);
-    var piwikTracker3 = Piwik.getTracker('https://example.com/piwik.php', 3);
+window.matomoAsyncInit = function () {
+    var matomoTracker1 = Matomo.getTracker('https://example.com/matomo.php', 1);
+    var matomoTracker2 = Matomo.getTracker('https://example.com/matomo.php', 2);
+    var matomoTracker3 = Matomo.getTracker('https://example.com/matomo.php', 3);
 
-    if (Piwik.HeatmapSessionRecording) {
-        Piwik.HeatmapSessionRecording.setPiwikTrackers([piwikTracker1, piwikTracker2, piwikTracker3]);
+    if (Matomo.HeatmapSessionRecording) {
+        Matomo.HeatmapSessionRecording.setPiwikTrackers([matomoTracker1, matomoTracker2, matomoTracker3]);
 
         // You can customize the tracking like this:
-        piwikTracker2.HeatmapSessionRecording.disable();
-        piwikTracker3.HeatmapSessionRecording.addConfig({heatmap: {id:5}});
+        matomoTracker2.HeatmapSessionRecording.disable();
+        matomoTracker3.HeatmapSessionRecording.addConfig({heatmap: {id:5}});
     }
 }
 ```
 
 It is important to define these methods in your website before the Piwik tracker file is loaded. Otherwise, the 
-`piwikAsyncInit` method will never be called.
+`matomoAsyncInit` method will never be called.
 
 ## How do I disable the recording of mouse and touch movements?
 
@@ -153,7 +153,7 @@ Piwik needs to detect on each page whether a heatmap or a session recording is s
 issues an HTTP request to a file named `plugins/HeatmapSessionRecording/configs.php` on each page view. This request
 should be very fast as no database connection will be needed and the script is optimized for performance.
 
-Starting from Piwik 3.0.5, if your `piwik.js` is writable, it will execute this request on each page view only when actually a heatmap or session recording is configured to reduce server load. Find out if your `piwik.js` is writable by going to Administration, and open the "System Check" report. If the System Check displays a warning for "Writable Piwik.js" then [learn how to solve this](/guides/heatmap-session-recording/setup#when-the-piwikjs-in-your-piwik-directory-file-is-not-writable).
+Starting from Piwik 3.0.5, if your `matomo.js` is writable, it will execute this request on each page view only when actually a heatmap or session recording is configured to reduce server load. Find out if your `piwik.js` is writable by going to Administration, and open the "System Check" report. If the System Check displays a warning for "Writable Matomo.js" then [learn how to solve this](/guides/heatmap-session-recording/setup#when-the-matomojs-in-your-piwik-directory-file-is-not-writable).
  
 If you always want to prevent such a request to your server, for example to reduce the load on your server, you need to call a 
 method `HeatmapSessionRecording.addConfig()` or disable the tracking completely using `HeatmapSessionRecording.disable()`.
@@ -166,14 +166,14 @@ feature, call `tracker.HeatmapSessionRecording.disable();` as follows:
 
 ```js
 // configuration of first tracker which has the plugin installed
-_paq.push(['setTrackerUrl', 'https://example.com/piwik.php']);
+_paq.push(['setTrackerUrl', 'https://example.com/matomo.php']);
 _paq.push(['setSiteId', 1]);
 // configuration of second tracker which does not have the plugin installed
-_paq.push(['addTracker', 'https://not-supported-piwik.com/piwik.php', 2]);
+_paq.push(['addTracker', 'https://not-supported-piwik.com/matomo.php', 2]);
 
-window.piwikAsyncInit = function () {
+window.matomoAsyncInit = function () {
     // will never issue an HTTP request to configs.php for this Piwik instance
-    var tracker = Piwik.getAsyncTracker('https://not-supported-piwik.com/piwik.php', 2);
+    var tracker = Matomo.getAsyncTracker('https://not-supported-piwik.com/matomo.php', 2);
     if (tracker.HeatmapSessionRecording) {
         tracker.HeatmapSessionRecording.disable();
     }
@@ -194,25 +194,25 @@ To take a screenshot from a certain page, you need to open the page in your brow
 
 ## Is it possible to not use the `paq.push` methods and instead call the `HeatmapSessionRecording` tracker methods directly?
 
-Yes, you can be sure that the `Piwik.HeatmapSessionRecording` object is available as soon as the callback method 
+Yes, you can be sure that the `Matomo.HeatmapSessionRecording` object is available as soon as the callback method 
 `window.piwikHeatmapSessionRecordingAsyncInit` is called.
 
-In the `piwik.js` tracker we differentiate between two kind of methods:
+In the `matomo.js` tracker we differentiate between two kind of methods:
 
 * Calling a **tracker instance method** affects only a specific tracker instance. In the docs you can 
   identify a tracker method when the method name contains a single dot (`.`). For example `HeatmapSessionRecording.disable` 
   refers to a tracker method tracker that can be called like `tracker.HeatmapSessionRecording.disable()`.
 * Calling a **static method** affects all created tracker instances. In the docs you can identify a static method when 
   the method name contains `::`. For example `HeatmapSessionRecording::disableCaptureKeystrokes` refers to a static method 
-  `Piwik.HeatmapSessionRecording.disableCaptureKeystrokes()`.
+  `Matomo.HeatmapSessionRecording.disableCaptureKeystrokes()`.
 
 ```js
 window.piwikHeatmapSessionRecordingAsyncInit = function () {
     // static method
-    Piwik.HeatmapSessionRecording.disableCaptureKeystrokes();
+    Matomo.HeatmapSessionRecording.disableCaptureKeystrokes();
      
     // tracker method
-    var tracker = Piwik.getAsyncTracker(); 
+    var tracker = Matomo.getAsyncTracker(); 
     tracker.HeatmapSessionRecording.disable();
 };
 ```
@@ -225,7 +225,7 @@ The tracker method `disable` can be used to disable the tracking only for a spec
 ```js
 window.piwikHeatmapSessionRecordingAsyncInit = function () {
     // get tracker instance if you do not have a reference to the tracker instance yet
-    var tracker = Piwik.getAsyncTracker(piwikSiteUrl, piwikSiteId); 
+    var tracker = Matomo.getAsyncTracker(piwikSiteUrl, piwikSiteId); 
     tracker.HeatmapSessionRecording.disable();
 };
 ```
diff --git a/docs/4.x/heatmap-session-recording/reference.md b/docs/4.x/heatmap-session-recording/reference.md
index e7d58b54c..fbb88f87a 100644
--- a/docs/4.x/heatmap-session-recording/reference.md
+++ b/docs/4.x/heatmap-session-recording/reference.md
@@ -6,11 +6,11 @@ title: JavaScript Tracker API Reference
 
 This guide is the JavaScript Tracker API Reference for [Heatmap & Session Recording](https://www.heatmap-analytics.com/).
 
-You may also be interested in the Heatmap & Session Recording [Reporting HTTP API Reference](https://developer.piwik.org/api-reference/reporting-api#HeatmapSessionRecording). 
+You may also be interested in the Heatmap & Session Recording [Reporting HTTP API Reference](https://developer.matomo.org/api-reference/reporting-api#HeatmapSessionRecording). 
 
 ## Calling Heatmap & Session Recording tracker methods
 
-In the `piwik.js` tracker we differentiate between two methods:
+In the `matomo.js` tracker we differentiate between two methods:
 
 * Calling a **tracker instance method** affects only a specific Piwik tracker instance. In the docs you can 
   identify a tracker method when the method name contains a single dot (`.`), for example 
@@ -21,30 +21,30 @@ In the `piwik.js` tracker we differentiate between two methods:
 In most cases only one Piwik tracker will be used so the only difference is how you call that method:
 
 * Tracker methods are called via `_paq.push(['HeatmapSessionRecording.$methodName']);` or on a tracker instance directly eg. 
-  `Piwik.getAsyncTracker().HeatmapSessionRecording.$methodName();`
-* Static methods are called via `_paq.push(['HeatmapSessionRecording::$methodName']);` or directly on the `Piwik.HeatmapSessionRecording` object,
-  eg. `Piwik.HeatmapSessionRecording.$methodName()`.
+  `Matomo.getAsyncTracker().HeatmapSessionRecording.$methodName();`
+* Static methods are called via `_paq.push(['HeatmapSessionRecording::$methodName']);` or directly on the `Matomo.HeatmapSessionRecording` object,
+  eg. `Matomo.HeatmapSessionRecording.$methodName()`.
 
 If you do not want to use the `_paq.push` methods, you need to define a `window.piwikHeatmapSessionRecordingAsyncInit` method 
 that is called as soon as the media tracker has been initialized:
 
 ```js
 window.piwikHeatmapSessionRecordingAsyncInit = function () {
-    Piwik.HeatmapSessionRecording.disable();
+    Matomo.HeatmapSessionRecording.disable();
 };
 ```
 
 If you access a `HeatmapSessionRecording` property directly without using `_paq`, we recommend to check if the variable actually exists. Sometimes the Heatmap & Session Recording tracking code may not be available when currently no heatmaps and no session recordings are configured:
 
 ```js
-window.piwikAsyncInit = function () {
-    var tracker = Piwik.getAsyncTracker('piwik.php', 2);		     
+window.matomoAsyncInit = function () {
+    var tracker = Matomo.getAsyncTracker('matomo.php', 2);		     
     if (tracker.HeatmapSessionRecording) {
         tracker.HeatmapSessionRecording.disable();
     }
     
-    if (Piwik.HeatmapSessionRecording) {
-        Piwik.HeatmapSessionRecording.disable();
+    if (Matomo.HeatmapSessionRecording) {
+        Matomo.HeatmapSessionRecording.disable();
     }
 }
 ```
@@ -70,7 +70,7 @@ Example:
 ```js
 _paq.push(['HeatmapSessionRecording::disableAutoDetectNewPageView']);
 // or 
-Piwik.HeatmapSessionRecording.disableAutoDetectNewPageView();
+Matomo.HeatmapSessionRecording.disableAutoDetectNewPageView();
 ```
 
 ### `enableAutoDetectNewPageView()`
@@ -87,7 +87,7 @@ Example:
 ```js
 _paq.push(['HeatmapSessionRecording::disableRecordMovements']);
 // or
-Piwik.HeatmapSessionRecording.disableRecordMovements();
+Matomo.HeatmapSessionRecording.disableRecordMovements();
 ```
 
 ### `enableRecordMovements()`
@@ -111,7 +111,7 @@ Example:
 ```js
 _paq.push(['HeatmapSessionRecording::setMaxCaptureTime', 60 * 30]);
 // or 
-Piwik.HeatmapSessionRecording.setMaxCaptureTime(60 * 30);
+Matomo.HeatmapSessionRecording.setMaxCaptureTime(60 * 30);
 ```
 
 ### `setMaxTextInputLength(maxLengthCharacters)`
@@ -122,7 +122,7 @@ Example:
 ```js
 _paq.push(['HeatmapSessionRecording::setMaxTextInputLength', 100000]);
 // or 
-Piwik.HeatmapSessionRecording.setMaxTextInputLength(100000);
+Matomo.HeatmapSessionRecording.setMaxTextInputLength(100000);
 ```
 
 ### `disableCaptureKeystrokes()`
@@ -182,13 +182,13 @@ enabled in production.
 
 Allows you to set the tracker instances to be used when tracking heatmap and session activities. Can be either
  a single tracker instance, or an array of Piwik tracker instances. This is useful when you are working with multiple Piwik
- tracker instances using `Piwik.getTracker` instead of `Piwik.addTracker`. 
+ tracker instances using `Matomo.getTracker` instead of `Matomo.addTracker`. 
  
 ### `getPiwikTrackers()`
 
 Returns an array of Piwik tracker instances that are used by the Heatmap and Session Recording plugin. By default, 
-this will return the same as `Piwik.getAsyncTrackers()` and will return all tracker instances that were created eg 
-via `Piwik.addTracker` or `_paq.push(['addTracker']);` unless custom Piwik tracker instances were set via `setPiwikTrackers()`.
+this will return the same as `Matomo.getAsyncTrackers()` and will return all tracker instances that were created eg 
+via `Matomo.addTracker` or `_paq.push(['addTracker']);` unless custom Piwik tracker instances were set via `setPiwikTrackers()`.
 
 ## Tracker methods
 
@@ -207,7 +207,7 @@ Example:
 _paq.push(['HeatmapSessionRecording.disable']); 
 
 // or if you are using multiple Piwik trackers and only want to disable it for a specific tracker:
-var tracker = Piwik.getAsyncTracker(piwikUrl, piwikSiteId);
+var tracker = Matomo.getAsyncTracker(matomoUrl, matomoSiteId);
 tracker.HeatmapSessionRecording.disable();
 ```
 
@@ -230,7 +230,7 @@ By default, Heatmap & Session Recording configures itself by issuing an HTTP req
  based on its URL. As a benefit of this, it saves you an HTTP request on each page view. 
  
 Please note that if you generate heatmaps and record sessions regularly, it will add quite an effort on your side to manage the manual tracking using `addConfig()`.
-Another possibility would be to call the [Heatmap & Session Recording Reporting API](https://developer.piwik.org/api-reference/reporting-api#HeatmapSessionRecording)
+Another possibility would be to call the [Heatmap & Session Recording Reporting API](https://developer.matomo.org/api-reference/reporting-api#HeatmapSessionRecording)
 via HTTP to receive all configured heatmaps and session recordings and embed a config automatically into your website based
 on this. You could cache this information on your server for a fast performance and not having to do anything manually.
  
@@ -270,4 +270,4 @@ reached the number of page views you want.
 
 ## What to read next
 
-You may be interested in the [Heatmap & Session Recording HTTP Reporting API Reference](https://developer.piwik.org/api-reference/reporting-api#HeatmapSessionRecording).
+You may be interested in the [Heatmap & Session Recording HTTP Reporting API Reference](https://developer.matomo.org/api-reference/reporting-api#HeatmapSessionRecording).
diff --git a/docs/4.x/heatmap-session-recording/setup.md b/docs/4.x/heatmap-session-recording/setup.md
index 028275734..8fa1eb8e8 100644
--- a/docs/4.x/heatmap-session-recording/setup.md
+++ b/docs/4.x/heatmap-session-recording/setup.md
@@ -12,11 +12,11 @@ in various ways.
 
 If you have already embedded the [Piwik JavaScript Tracking Code](/guides/tracking-javascript-guide) into your website,
 the Heatmap & Session Recording will automatically start tracking user activities. The tracking code is directly added 
-in your Piwik JavaScript tracker file `/piwik.js` as long as the file `piwik.js` in your Piwik directory is writable 
+in your Piwik JavaScript tracker file `/matomo.js` as long as the file `matomo.js` in your Piwik directory is writable 
 by the webserver/PHP.
 
 To check whether this works by default for you, login into Piwik as a Super User, go to Administration, and open the "System Check" report. 
-If the System Check displays a warning for "Writable Piwik.js" then [learn below how to solve this](#when-the-piwikjs-in-your-piwik-directory-file-is-not-writable).
+If the System Check displays a warning for "Writable Matomo.js" then [learn below how to solve this](#when-the-matomojs-in-your-piwik-directory-file-is-not-writable).
 
 ## Configuring Heatmaps & Session Recordings
 
@@ -86,24 +86,24 @@ Alternatively, you can mask a set of form fields within your web page by specify
 To force that no keystrokes will be recorded even when enabled in the UI, call `_paq.push(['HeatmapSessionRecording::disableCaptureKeystrokes']);`
 If disabled, no text entered into any form field will be sent to Piwik, not even masked form fields.
 
-## When the `piwik.js` in your Piwik directory file is not writable
+## When the `matomo.js` in your Piwik directory file is not writable
  
-When your Settings > System Check reports that "The Piwik JavaScript tracker file `piwik.js` is not writable 
+When your Settings > System Check reports that "The Piwik JavaScript tracker file `matomo.js` is not writable 
 which means other plugins cannot extend the JavaScript tracker." then you have two options to solve this issue:
 
-1. Make the `piwik.js` file writable, for example by executing `chmod a+w piwik.js` or `chown $phpuser piwik.js` (replace `$phpuser` with actual username) in your Piwik directory. 
+1. Make the `matomo.js` file writable, for example by executing `chmod a+w piwik.js` or `chown $phpuser piwik.js` (replace `$phpuser` with actual username) in your Piwik directory. 
 We recommend running the [Piwik console](/guides/piwik-on-the-command-line) command `./console custom-piwik-js:update` after you have made the file writable.
 2. or Load the HeatmapSessionRecording tracker file manually in your website by adding in all your pages ideally in the `<head>`: 
-   `<script src="https://your-piwik-domain/plugins/HeatmapSessionRecording/tracker.min.js">`
+   `<script src="https://your-matomo-domain/plugins/HeatmapSessionRecording/tracker.min.js">`
 
 #### Are there any disadvantages of including the file manually?
 
 Yes, there are:
 
 * An additional HTTP request is needed to load your website which increases your page load time
-* If your `piwik.js` ever becomes writable, the HeatmapSessionRecording tracker would be loaded twice (in such a case the tracker notices it was already initialized and won't track everything twice)
+* If your `matomo.js` ever becomes writable, the HeatmapSessionRecording tracker would be loaded twice (in such a case the tracker notices it was already initialized and won't track everything twice)
 
-If possible, we recommend making the `piwik.js` file writable.
+If possible, we recommend making the `matomo.js` file writable.
 
 ## What to read next
 
diff --git a/docs/4.x/how-piwik-works.md b/docs/4.x/how-piwik-works.md
index 2e970bf42..ccd2df9c6 100644
--- a/docs/4.x/how-piwik-works.md
+++ b/docs/4.x/how-piwik-works.md
@@ -40,7 +40,7 @@ Plugins are not just targeted at 3rd party developers who want to customize Piwi
 As a result, there are two kinds of plugins:
 
 - **default plugins** provide Piwik's base features: they are included in the repository and in the distribution
-- **optional plugins** can be installed manually (by copying them in the `plugins/` folder) or through [Piwik's MarketPlace](https://plugins.piwik.org/) in the web interface
+- **optional plugins** can be installed manually (by copying them in the `plugins/` folder) or through [Matomo's MarketPlace](https://plugins.matomo.org/) in the web interface
 
 ## The codebase
 
@@ -55,8 +55,10 @@ tests/
 vendor/         # Libraries installed by Composer
 console         # Entry point for the CLI interface
 index.php       # Entry point for the web application and the HTTP reporting API
+matomo.php      # Entry point for the HTTP tracking API
 piwik.php       # Entry point for the HTTP tracking API
 piwik.js        # JavaScript tracker to be included in websites
+matomo.js       # JavaScript tracker to be included in websites
 ```
 
 Piwik uses [Composer](https://getcomposer.org/) to install its dependencies (PHP libraries) into the `vendor/` directory.
@@ -101,7 +103,7 @@ The `Piwik\Plugin\API\Controller` class will be called, and it will dispatch the
 
 This HTTP API lets the JavaScript tracker **submit analytics data** to be saved in Piwik.
 
-Its entry point is different from Piwik's web application and HTTP reporting API: it is through the `piwik.php` file.
+Its entry point is different from Piwik's web application and HTTP reporting API: it is through the `matomo.php` file.
 
 Read more about this in the ["The Tracking HTTP API" reference](/api-reference/tracking-api).
 
diff --git a/docs/4.x/javascript-extended.md b/docs/4.x/javascript-extended.md
index c87cc00cf..782f9d74c 100644
--- a/docs/4.x/javascript-extended.md
+++ b/docs/4.x/javascript-extended.md
@@ -7,7 +7,7 @@ category: DevelopInDepth
 
 ### UIControl
 
-`UIControl` is meant to be the base type for all JavaScript widget classes. These classes manage and attach behavior to an element. Examples of classes that extend from UIControl include **[DataTable](#classes-DataTable)** (the base of all [report visualization](/guides/visualizing-report-data) JavaScript classes) and **VisitorProfileControl** (used to manage the [visitor profile](https://piwik.org/docs/user-profile/)).
+`UIControl` is meant to be the base type for all JavaScript widget classes. These classes manage and attach behavior to an element. Examples of classes that extend from UIControl include **[DataTable](#classes-DataTable)** (the base of all [report visualization](/guides/visualizing-report-data) JavaScript classes) and **VisitorProfileControl** (used to manage the [visitor profile](https://matomo.org/docs/user-profile/)).
 
 `UIControl` allows descendants to clean up resources, provides a mechanism for server side code to send information to the UI and provides a method for listening to dashboard widget resize events.
 
@@ -223,5 +223,5 @@ To learn more about extending the class, see our [Visualizing Report Data](https
 ## Learn more
 
 * To learn **about creating new report visualizations** read our [Visualizing Report Data](/guides/visualizing-report-data) guide.
-* To learn **more about the asset merging system** read this [blog post](https://piwik.org/blog/2010/07/making-piwik-ui-faster/) by the system's author.
+* To learn **more about the asset merging system** read this [blog post](https://matomo.org/blog/2010/07/making-piwik-ui-faster/) by the system's author.
 * To learn **more about theming** read our [Theming](/guides/theming) guide.
diff --git a/docs/4.x/logging.md b/docs/4.x/logging.md
index 5c530efde..e09d442c3 100644
--- a/docs/4.x/logging.md
+++ b/docs/4.x/logging.md
@@ -13,26 +13,34 @@ Logging is the action of recording events which happen while Piwik is running. I
 - let users monitor the health of their Piwik installation by being able to know when minor or major errors happen
 - help users debug problems by having a detailed account of events leading to an error
 
-To log messages, Piwik uses the standardized `Psr\Log\LoggerInterface` ([PSR-3 standard](http://www.php-fig.org/psr/psr-3/)). This PHP standard lets Piwik developers use the standard interface, leaving the possibility to switch from and to *any* compatible PHP logger.
+To log messages, Piwik uses the standardized `Psr\Log\LoggerInterface` ([PSR-3 standard](https://www.php-fig.org/psr/psr-3/)). This PHP standard lets Piwik developers use the standard interface, leaving the possibility to switch from and to *any* compatible PHP logger.
 
 The PSR-3 implementation that Piwik has chosen is [Monolog](https://github.com/Seldaek/monolog). Monolog is a robust and very customizable logger used by Symfony, Silex, Laravel…
 
 ## How to log messages
 
-To log messages, you need to get an instance of the logger. To do this, you can use dependency injection by injecting `Psr\Log\LoggerInterface` or you can retrieve the logger from the container:
+To log messages, you need to get an instance of the logger. To do this, you can use dependency injection by injecting `Psr\Log\LoggerInterface`:
 
 ```php
-$logger = StaticContainer::getContainer()->get('Psr\Log\LoggerInterface');
+private $logger;
+
+public function __construct(\Psr\Log\LoggerInterface $logger) {
+    $this->logger = $logger;
+}
+public function myMethod() {
+    $this->logger->info('This is an info');
+}
+
 ```
 
 You can then log messages using any severity level:
 
 ```php
-$logger->error('This is an error');
-$logger->warning('This is a warning');
-$logger->notice('This is a notice');
-$logger->info('This is an info');
-$logger->debug('This is a debug message');
+$this->logger->error('This is an error');
+$this->logger->warning('This is a warning');
+$this->logger->notice('This is a notice');
+$this->logger->info('This is an info');
+$this->logger->debug('This is a debug message');
 ```
 
 Each of these messages will or will not be logged according to the log level configured by the user in their `config.php.ini`. Developers should not log conditionally according to the current log level: they should simply log and let the system figure it all out.
@@ -45,7 +53,7 @@ If your error message is a string constructed dynamically, you should **not** lo
 $logger->info('The configuration option ' . $name . ' has an invalid value ' . $value);
 ```
 
-Instead, you should use the standardized log format (described in the [PSR-3 standard](http://www.php-fig.org/psr/psr-3/)):
+Instead, you should use the standardized log format (described in the [PSR-3 standard](https://www.php-fig.org/psr/psr-3/)):
 
 ```php
 $logger->info('The configuration option {name} has an invalid value {value}', array(
@@ -75,7 +83,7 @@ If you want to log an exception, you should follow PSR-3's standard **by using t
 
 ```php
 try {
-    $httpClient->post('http://example.com/_abc_123', $data);
+    $httpClient->post('https://example.com/_abc_123', $data);
 } catch (RequestException $e) {
     $logger->error('Cannot backup data, will try again later', array('exception' => $e));
 }
@@ -85,4 +93,4 @@ In this example, we log to `error` level, but we caught the exception: the curre
 
 ### Viewing logs
 
-To view the logs, we recommend using our [LogViewer plugin](https://plugins.piwik.org/LogViewer): learn more in [How do I view Piwik application logs?](https://piwik.org/faq/how-to/faq_20991/)
+To view the logs, we recommend using our [LogViewer plugin](https://plugins.matomo.org/LogViewer): learn more in [How do I view Piwik application logs?](https://matomo.org/faq/how-to/faq_20991/)
diff --git a/docs/4.x/media-analytics.md b/docs/4.x/media-analytics.md
index e4ac5507c..012e0642d 100644
--- a/docs/4.x/media-analytics.md
+++ b/docs/4.x/media-analytics.md
@@ -12,9 +12,9 @@ subGuides:
 This section contains guides that will help you track your video and audio using Piwik.
 
 [Media Analytics](https://www.media-analytics.net) is a plugin for Piwik that can be purchased
-on the [Piwik Marketplace](https://plugins.piwik.org/MediaAnalytics).
-It is developed by [InnoCraft](https://www.innocraft.com), the makers of Piwik.
+on the [Matomo Marketplace](https://plugins.matomo.org/MediaAnalytics).
+It is developed by [InnoCraft](https://www.innocraft.com), the makers of Matomo.
 If you want to learn more about this plugin we recommend having a look at the developer guides, 
-the [Media Analytics User Guide](https://piwik.org/docs/media-analytics/) and the [Media Analytics FAQs](https://piwik.org/faq/media-analytics/).
+the [Media Analytics User Guide](https://matomo.org/docs/media-analytics/) and the [Media Analytics FAQs](https://matomo.org/faq/media-analytics/).
 
 We recommend to start with the [setting up Media Analytics guide](/guides/media-analytics/setup).
diff --git a/docs/4.x/media-analytics/custom-player.md b/docs/4.x/media-analytics/custom-player.md
index 48c8fcf1b..55d5bfd1b 100644
--- a/docs/4.x/media-analytics/custom-player.md
+++ b/docs/4.x/media-analytics/custom-player.md
@@ -8,10 +8,10 @@ In this guide we will learn how you can implement [Media Analytics](https://www.
  
 ## Tracking a new media player in the browser
 
-The Media Analytics plugin currently supports out of the box the HTML5, Vimeo and YouTube media players (more details: [list of all supported media players](https://piwik.org/faq/media-analytics/faq_22380/)). If you are using
+The Media Analytics plugin currently supports out of the box the HTML5, Vimeo and YouTube media players (more details: [list of all supported media players](https://matomo.org/faq/media-analytics/faq_22380/)). If you are using
  a different media player for your videos and audio, you can measure them by registering your own player. 
 
-If you need help implementing Media Analytics for your media player or if you wish to share your implementation with us, [please contact us](https://piwik.org/support/).
+If you need help implementing Media Analytics for your media player or if you wish to share your implementation with us, [please contact us](https://matomo.org/support/).
 If you work with us. we will be able to maintain it and ensure it always works in the future.
 
 ### The raw skeleton
@@ -23,7 +23,7 @@ Let's start by adding the raw skeleton for a media player to your website tracki
  
 ```js
 window.piwikMediaAnalyticsAsyncInit = function () {
-    var MA = Piwik.MediaAnalytics;
+    var MA = Matomo.MediaAnalytics;
     
     function MyPlayer(node, mediaType) {
         // in this class we track interactions with the player
@@ -69,7 +69,7 @@ MyPlayer.scanForMedia = function (documentOrHTMLElement) {
 ### Tracking the media data
 
 Now that we detect media within a web page we need to implement the actual tracking. The basic concept behind this is 
-to create a `Piwik.MediaAnalytics.MediaTracker` instance that lets you call methods like `play`, `pause` or `seek` which 
+to create a `Matomo.MediaAnalytics.MediaTracker` instance that lets you call methods like `play`, `pause` or `seek` which 
 reflect what is currently happening in the player.
 
 ```js
@@ -192,7 +192,7 @@ function MyPlayer (node, mediaType) {
 
 For more information about all the available methods have a look at the [Media Analytics JavaScript Tracker API reference](/guides/media-analytics/reference).
 
-Once you have added support for your custom player analytics, please [contact us](https://piwik.org/support/), and we will try to help you maintain it in the future.
+Once you have added support for your custom player analytics, please [contact us](https://matomo.org/support/), and we will try to help you maintain it in the future.
 
 ## Tracking a new player in mobile apps and desktop apps
 
@@ -222,7 +222,7 @@ These HTTP Tracking API parameters can be used to track the usage of media:
 When tracking a media impression it is important to set the parameter `ma_st` to `0`:
 
 ```
-https://yourpiwikdomain/piwik.php?ma_st=0ma_id=8C1gOQ9CPOiQfzft&ma_ti=MediaName&ma_pn=playerName&ma_mt=video&ma_re=https%3A%2F%2Fplayer.example.org%2Fvideo%2F1111111&idsite=1&rec=1&r=077275&h=15&m=33&s=48&url=http%3A%2F%2Fexample.piwik&...
+https://yourpiwikdomain/matomo.php?ma_st=0ma_id=8C1gOQ9CPOiQfzft&ma_ti=MediaName&ma_pn=playerName&ma_mt=video&ma_re=https%3A%2F%2Fplayer.example.org%2Fvideo%2F1111111&idsite=1&rec=1&r=077275&h=15&m=33&s=48&url=http%3A%2F%2Fexample.piwik&...
 ```
 
 ### Example request to track a media progress 
@@ -231,7 +231,7 @@ When tracking a media progress it is important to send the same media unique id
 As soon as a new video or audio is playing you need to reset all parameters and generate a new `ma_id`.
 
 ```
-https://yourpiwikdomain/piwik.php?ma_st=5&ma_ttp=12&ma_fs=1&ma_w=500&ma_h=300&ma_ps=34&ma_le=100ma_id=8C1gOQ9CPOiQfzft&ma_ti=MediaName&ma_pn=playerName&ma_mt=video&ma_re=https%3A%2F%2Fplayer.example.org%2Fvideo%2F1111111&idsite=1&rec=1&r=077275&h=15&m=33&s=48&url=http%3A%2F%2Fexample.piwik&...
+https://yourpiwikdomain/matomo.php?ma_st=5&ma_ttp=12&ma_fs=1&ma_w=500&ma_h=300&ma_ps=34&ma_le=100ma_id=8C1gOQ9CPOiQfzft&ma_ti=MediaName&ma_pn=playerName&ma_mt=video&ma_re=https%3A%2F%2Fplayer.example.org%2Fvideo%2F1111111&idsite=1&rec=1&r=077275&h=15&m=33&s=48&url=http%3A%2F%2Fexample.piwik&...
 ```
 
 While a media is playing we recommend sending an update regularly, for example every 5 seconds. Most of the parameters
@@ -246,7 +246,7 @@ and more. They usually allow you to set custom tracking parameters like this:
 
 ```php
 $phpTracker->setCustomTrackingParameter('ma_st', 0);
-$phpTracker->setCustomTrackingParameter('ma_re', 'http://example.org/media.mp4');
+$phpTracker->setCustomTrackingParameter('ma_re', 'https://example.org/media.mp4');
 $phpTracker->setCustomTrackingParameter('ma_ti', 'Media title');
 ...
 ```
@@ -256,5 +256,5 @@ $phpTracker->setCustomTrackingParameter('ma_ti', 'Media title');
 
 Now that you've learnt how to implement analytics tracking of your custom Media player, you may want 
 to learn more about the [Media Analytics JavaScript API](/guides/media-analytics/reference), 
-or read the Media Analytics [User FAQs](https://piwik.org/faq/media-analytics/) 
+or read the Media Analytics [User FAQs](https://matomo.org/faq/media-analytics/) 
  or the [Developer FAQs](/guides/media-analytics/faq).
diff --git a/docs/4.x/media-analytics/faq.md b/docs/4.x/media-analytics/faq.md
index 8a4eca3a6..75ef8522e 100644
--- a/docs/4.x/media-analytics/faq.md
+++ b/docs/4.x/media-analytics/faq.md
@@ -3,7 +3,7 @@ category: Integrate
 ---
 # Developer FAQ
 
-This page is the Developer FAQ for [Media Analytics](https://www.media-analytics.net/). You may also be interested in the [Media Analytics User FAQs](https://piwik.org/faq/media-analytics/).
+This page is the Developer FAQ for [Media Analytics](https://www.media-analytics.net/). You may also be interested in the [Media Analytics User FAQs](https://matomo.org/faq/media-analytics/).
 
 ## How do I enable video analytics for Youtube videos? 
 
@@ -74,59 +74,59 @@ Using `_paq.push` for multiple trackers is a good and simple way when you want t
 
 ```js
 // configuration of first tracker
-_paq.push(['setTrackerUrl', 'http://example.com/piwik.php']);
+_paq.push(['setTrackerUrl', 'https://example.com/matomo.php']);
 _paq.push(['setSiteId', 1]);
 // configuration of second tracker
-_paq.push(['addTracker', 'http://example.com/piwik.php', 2]);
+_paq.push(['addTracker', 'https://example.com/matomo.php', 2]);
 ```
 
 If you are working with Piwik tracker instances because you want to configure each tracker instance differently and track
 different data into each Piwik, you need to set the tracker instances manually:
 
 ```js
-window.piwikAsyncInit = function () {
+window.matomoAsyncInit = function () {
     // This works from Piwik 2.17.1. Before 2.17.1 you need to define a method
-    // `window.piwikMediaAnalyticsAsyncInit` instead of `window.piwikAsyncInit`.
+    // `window.piwikMediaAnalyticsAsyncInit` instead of `window.matomoAsyncInit`.
     
-    var piwikTracker1 = Piwik.getTracker('http://example.com/piwik.php', 1);
-    var piwikTracker2 = Piwik.getTracker('http://example.com/piwik.php', 2);
-    var piwikTracker3 = Piwik.getTracker('http://example.com/piwik.php', 3);
+    var matomoTracker1 = Matomo.getTracker('https://example.com/matomo.php', 1);
+    var matomoTracker2 = Matomo.getTracker('https://example.com/matomo.php', 2);
+    var matomoTracker3 = Matomo.getTracker('https://example.com/matomo.php', 3);
 
-    Piwik.MediaAnalytics.setPiwikTrackers([piwikTracker1, piwikTracker2, piwikTracker3]);
+    Matomo.MediaAnalytics.setPiwikTrackers([matomoTracker1, matomoTracker2, matomoTracker3]);
 
     // Media Analytics tracking is enabled by default, you can customize the tracking like this:
-    piwikTracker2.MediaAnalytics.disableTrackProgress();
-    piwikTracker3.MediaAnalytics.disableTrackEvents();
+    matomoTracker2.MediaAnalytics.disableTrackProgress();
+    matomoTracker3.MediaAnalytics.disableTrackEvents();
 }
 ```
 
-It is important to define these methods before the Piwik tracker file is loaded. Otherwise, your `piwikAsyncInit` 
+It is important to define these methods before the Piwik tracker file is loaded. Otherwise, your `matomoAsyncInit` 
 or `piwikMediaAnalyticsAsyncInit` method will never be called.
 
 ## Is it possible to not use the "paq.push" methods and instead call the MediaAnalytics tracker methods directly?
 
 Yes. To initialize the Media tracker you need to define a callback method `window.piwikMediaAnalyticsAsyncInit`
 which will be executed as soon as the media tracker is initialized. As soon as this callback is called, you can be sure
-that the `Piwik.MediaAnalytics` object is defined.
+that the `Matomo.MediaAnalytics` object is defined.
 
-In the `piwik.js` tracker we differentiate between two kind of methods:
+In the `matomo.js` tracker we differentiate between two kind of methods:
 
 * Calling a **tracker instance method** affects only a specific tracker instance. In the docs you can 
   identify a tracker method when the method name contains a single dot (`.`). For example `MediaAnalytics.disableTrackEvents` 
   refers to a tracker method tracker that can be called like `tracker.MediaAnalytics.disableTrackEvents()`.
 * Calling a **static method** affects all created tracker instances. In the docs you can identify a static method when 
   the method name contains `::`. For example `MediaAnalytics::removePlayer` refers to a static method 
-  `Piwik.MediaAnalytics.removePlayer()`.
+  `Matomo.MediaAnalytics.removePlayer()`.
 
 ```js
 window.piwikMediaAnalyticsAsyncInit = function () {
     // static methods
     var intervalInSeconds = 2;
-    Piwik.MediaAnalytics.removePlayer('youtube'); 
-    Piwik.MediaAnalytics.setPingInterval(intervalInSeconds);
+    Matomo.MediaAnalytics.removePlayer('youtube'); 
+    Matomo.MediaAnalytics.setPingInterval(intervalInSeconds);
      
     // tracker methods
-    var tracker = Piwik.getAsyncTracker(); 
+    var tracker = Matomo.getAsyncTracker(); 
     // get tracker instance if you do not have a reference to the tracker instance yet
     tracker.MediaAnalytics.disableTrackEvents();
 };
@@ -141,7 +141,7 @@ for a specific tracker instance like this:
 ```js
 window.piwikMediaAnalyticsAsyncInit = function () {
     // get tracker instance if you do not have a reference to the tracker instance yet
-    var tracker = Piwik.getAsyncTracker(piwikSiteUrl, piwikSiteId); 
+    var tracker = Matomo.getAsyncTracker(matomoSiteUrl, piwikSiteId); 
     tracker.MediaAnalytics.disableTrackEvents();
     tracker.MediaAnalytics.disableTrackProgress();
 };
diff --git a/docs/4.x/media-analytics/options.md b/docs/4.x/media-analytics/options.md
index e146a33c6..88f04cbdf 100644
--- a/docs/4.x/media-analytics/options.md
+++ b/docs/4.x/media-analytics/options.md
@@ -41,7 +41,7 @@ If you want to track a custom title that is different to your video title, you c
 ```js 
 playerInstance.setup({
     playlist: [{
-        file: "http://example.org/actualUrl.mp4",
+        file: "https://example.org/actualUrl.mp4",
         title: "My Video",
         matomoTitle: "My custom Video title"
     }
@@ -58,8 +58,8 @@ You can provide a custom title when you use flowplayer for tracking purposes by
 flowplayer("#player", {
     clip: {
         sources: [
-            {type: "application/x-mpegurl", src: "http://example.org/actualUrl.m3u8"},
-            {type: "video/mp4", src: "http://example.org/actualUrl.mp4" }
+            {type: "application/x-mpegurl", src: "https://example.org/actualUrl.m3u8"},
+            {type: "video/mp4", src: "https://example.org/actualUrl.mp4" }
         ],
         title: "Javascript setup",
         matomoTitle: "My custom Video title"
@@ -79,8 +79,8 @@ By default, the HTTP URL of a media is fetched from the player API or read in th
 To do this you can define a custom resource via the `data-matomo-resource` (recommended) or the `data-piwik-resource` HTML attribute. For example:
 
 ```html
-<video src="http://example.org/actualUrl.mp4"
-       data-matomo-resource="http://example.org/trackedUrl.mp4"></video>
+<video src="https://example.org/actualUrl.mp4"
+       data-matomo-resource="https://example.org/trackedUrl.mp4"></video>
 ```
 
 ### JW Player
@@ -91,9 +91,9 @@ If your resource URL is for example user dependent, and you always want to track
 ```js 
 playerInstance.setup({
     playlist: [{
-        file: "http://example.org/actualUrl.mp4",
+        file: "https://example.org/actualUrl.mp4",
         title: "My Video",
-        matomoResource: "http://example.org/trackedUrl.mp4"
+        matomoResource: "https://example.org/trackedUrl.mp4"
     }
 });
 ```
@@ -108,11 +108,11 @@ You can provide a custom resource URL when you use flowplayer by specifying a `m
 flowplayer("#player", {
     clip: {
         sources: [
-            {type: "application/x-mpegurl", src: "http://example.org/actualUrl.m3u8"},
-            {type: "video/mp4", src: "http://example.org/actualUrl.mp4" }
+            {type: "application/x-mpegurl", src: "https://example.org/actualUrl.m3u8"},
+            {type: "video/mp4", src: "https://example.org/actualUrl.mp4" }
         ],
         title: "Javascript setup",
-        matomoResource: "http://example.org/trackedUrl"
+        matomoResource: "https://example.org/trackedUrl"
     }
 });
 ```
@@ -169,7 +169,7 @@ method. If you do not use the `_paq` variable, you can disable the media tracker
  
 ```js
 window.piwikMediaAnalyticsAsyncInit = function () {
-    Piwik.MediaAnalytics.disableMediaAnalytics();
+    Matomo.MediaAnalytics.disableMediaAnalytics();
 };
 ```
 
@@ -219,5 +219,5 @@ It is recommended to call this method as early as possible, for example just aft
 
 If you use a player other than Youtube / Vimeo / HTML5 / JwPlayer / Flowplayer / Video.js, learn about [tracking your Custom Video Players](/guides/media-analytics/custom-player). 
 Or you may want to learn more about the [Media Analytics JavaScript API](/guides/media-analytics/reference), 
- read the [Media Analytics User Guide](https://piwik.org/docs/media-analytics/), 
- the Media Analytics [User FAQs](https://piwik.org/faq/media-analytics/) or the [Developer FAQs](/guides/media-analytics/faq).
+ read the [Media Analytics User Guide](https://matomo.org/docs/media-analytics/), 
+ the Media Analytics [User FAQs](https://matomo.org/faq/media-analytics/) or the [Developer FAQs](/guides/media-analytics/faq).
diff --git a/docs/4.x/media-analytics/reference.md b/docs/4.x/media-analytics/reference.md
index d30889105..16ddb934c 100644
--- a/docs/4.x/media-analytics/reference.md
+++ b/docs/4.x/media-analytics/reference.md
@@ -6,11 +6,11 @@ title: JavaScript Tracker API Reference
 
 This guide is the JavaScript Tracker API Reference for [Media Analytics](https://www.media-analytics.net/).
 
-You may also be interested in the Media Analytics [Reporting HTTP API Reference](https://developer.piwik.org/api-reference/reporting-api#MediaAnalytics). 
+You may also be interested in the Media Analytics [Reporting HTTP API Reference](https://developer.matomo.org/api-reference/reporting-api#MediaAnalytics). 
 
 ## Calling MediaAnalytics tracker methods
 
-In the `piwik.js` tracker we differentiate between two kind of methods:
+In the `matomo.js` tracker we differentiate between two kind of methods:
 
 * Calling a **tracker instance method** affects only a specific Piwik tracker instance. In the docs you can 
   identify a tracker method when the method name contains a single dot (`.`), for example 
@@ -21,17 +21,17 @@ In the `piwik.js` tracker we differentiate between two kind of methods:
 In most cases only one Piwik tracker will be used so the only difference is how you call that method:
 
 * Tracker methods are called via `_paq.push(['MediaAnalytics.$methodName']);` or on a tracker instance directly eg. 
-  `Piwik.getAsyncTracker().MediaAnalytics.$methodName();`
+  `Matomo.getAsyncTracker().MediaAnalytics.$methodName();`
   
-* Static methods are called via `_paq.push(['MediaAnalytics::$methodName']);` or directly on the `Piwik.MediaAnalytics` object,
-  eg. `Piwik.MediaAnalytics.$methodName()`.
+* Static methods are called via `_paq.push(['MediaAnalytics::$methodName']);` or directly on the `Matomo.MediaAnalytics` object,
+  eg. `Matomo.MediaAnalytics.$methodName()`.
 
 If you do not want to use the `_paq.push` methods, you need to define a `window.piwikMediaAnalyticsAsyncInit` method 
 that is called as soon as the media tracker has been initialized:
 
 ```js
 window.piwikMediaAnalyticsAsyncInit = function () {
-    Piwik.MediaAnalytics.removePlayer('youtube'); 
+    Matomo.MediaAnalytics.removePlayer('youtube'); 
 };
 ```
 
@@ -48,8 +48,8 @@ Example:
 _paq.push(['MediaAnalytics::scanForMedia']);
 _paq.push(['MediaAnalytics::scanForMedia', document.getElementById('test')]);
 // or 
-Piwik.MediaAnalytics.scanForMedia();
-Piwik.MediaAnalytics.scanForMedia(document.getElementById('test'));
+Matomo.MediaAnalytics.scanForMedia();
+Matomo.MediaAnalytics.scanForMedia(document.getElementById('test'));
 ```
 
 ### `setPingInterval(pingIntervalInSeconds)`
@@ -67,7 +67,7 @@ If you do not want to track any media of a certain player, you can disable that
 
 Allows you to track a [custom media player](/guides/media-analytics/custom-player). This is useful if you are using a 
 media player that is not yet supported by the MediaAnalytics plugin. We might also be able to support new players within 
-this plugin, [let us know which media player you use](https://piwik.org/support).
+this plugin, [let us know which media player you use](https://matomo.org/support).
 
 ### `disableMediaAnalytics()`
 
@@ -94,12 +94,12 @@ enabled in production.
 
 Allows you to set the tracker instances the tracker should use when tracking the progress and events of Media. Can be either
  a single tracker instance, or an array of Piwik tracker instances. This is useful when you are working with multiple Piwik
- tracker instances using `Piwik.getTracker` instead of `Piwik.addTracker`. 
+ tracker instances using `Matomo.getTracker` instead of `Piwik.addTracker`. 
  
 ### `getPiwikTrackers()`
 
 Returns an array of Piwik tracker instances that are used by the Media Analytics plugin. By default, this will return the same
-as `Piwik.getAsyncTrackers()` and will return all tracker instances that were created eg via `Piwik.addTracker` or 
+as `Matomo.getAsyncTrackers()` and will return all tracker instances that were created eg via `Piwik.addTracker` or 
 `_paq.push(['addTracker']);` unless custom Piwik tracker instances were set via `setPiwikTrackers()`.
 
 ### `setMediaTitleFallback()`
@@ -123,7 +123,7 @@ via the `addPlayer()` method.
 * `mediaType.VIDEO` -  Defines the current media is a video
 * `mediaType.AUDIO` -  Defines the current media is an audio
 
-You can access this property as follows: `Piwik.MediaAnalytics.mediaType.VIDEO`.
+You can access this property as follows: `Matomo.MediaAnalytics.mediaType.VIDEO`.
 
 ### `element`
 
@@ -139,7 +139,7 @@ You can access this property as follows: `Piwik.MediaAnalytics.mediaType.VIDEO`.
 ### `disableTrackEvents()`
 
 Disables the tracking of events like `play`, `pause` or `resume` while still tracking the media usage. When calling 
-this method no events for your media will be shown in "Actions => Events" and neither in the [Visits log](https://piwik.org/docs/user-profile/).
+this method no events for your media will be shown in "Actions => Events" and neither in the [Visits log](https://matomo.org/docs/user-profile/).
 
 Example:
 
@@ -148,7 +148,7 @@ Example:
 _paq.push(['MediaAnalytics.disableTrackEvents']); 
 
 // or if you are using multiple Piwik trackers and only want to disable it for a specific tracker:
-var tracker = Piwik.getAsyncTracker(piwikUrl, piwikSiteId);
+var tracker = Matomo.getAsyncTracker(matomoUrl, matomoSiteId);
 tracker.MediaAnalytics.disableTrackEvents();
 ```
 
@@ -178,5 +178,5 @@ Detect if the tracking of progress is currently enabled or disabled. Returns a b
 ## What to read next
 
 You may be interested in the [Media Analytics HTTP Tracking API Reference](/guides/media-analytics/custom-player#media-analytics-http-tracking-api-reference),
- or the [Reporting HTTP API Reference](https://developer.piwik.org/api-reference/reporting-api#MediaAnalytics).
+ or the [Reporting HTTP API Reference](https://developer.matomo.org/api-reference/reporting-api#MediaAnalytics).
  If you use a player other than Youtube / Vimeo / HTML5 / JwPlayer / Flowplayer / Video.js, learn about [implementing analytics for your Custom Video Player](/guides/media-analytics/custom-player).
diff --git a/docs/4.x/media-analytics/setup.md b/docs/4.x/media-analytics/setup.md
index 0febd6421..f35dcab5d 100644
--- a/docs/4.x/media-analytics/setup.md
+++ b/docs/4.x/media-analytics/setup.md
@@ -11,10 +11,10 @@ in particular: HTML5 videos and audios, Youtube videos and Vimeo videos. Support
 
 If you have already embedded the [Piwik JavaScript Tracking Code](/guides/tracking-javascript-guide) into your website,
 the Media Analytics will automatically start tracking the usage of video and audio. 
-The video player tracking code is directly added in your Piwik JavaScript tracker file `/piwik.js` as long as the file `piwik.js` in your Piwik directory is writable by the webserver/PHP.
+The video player tracking code is directly added in your Matomo JavaScript tracker file `/matomo.js` as long as the file `matomo.js` in your Piwik directory is writable by the webserver/PHP.
  
 To check whether this works by default for you, login into Piwik as a Super User, go to Administration, and open the "System Check" report. 
-If the System Check displays a warning for "Writable Piwik.js" then [learn below how to solve this](#when-the-piwikjs-in-your-piwik-directory-file-is-not-writable).
+If the System Check displays a warning for "Writable Matomo.js" then [learn below how to solve this](#when-the-matomojs-in-your-piwik-directory-file-is-not-writable).
 
 ## Tracking HTML5 videos
 
@@ -57,7 +57,7 @@ If you use the JavaScript embed method, we recommend specifying a title in the `
 flowplayer("#player", {
     clip: {
         sources: [
-            {type: "video/mp4", src: "http://example.org/actualUrl.mp4"}
+            {type: "video/mp4", src: "https://example.org/actualUrl.mp4"}
         ],
         title: "My Video Title"
     }
@@ -117,24 +117,24 @@ window.onYouTubeIframeAPIReady = function () {
 
 To not break your website the media tracker will not overwrite your `onYouTubeIframeAPIReady` method.
 
-## When the `piwik.js` in your Piwik directory file is not writable
+## When the `matomo.js` in your Piwik directory file is not writable
  
-When your Settings > System Check reports that "The Piwik JavaScript tracker file `piwik.js` is not writable 
+When your Settings > System Check reports that "The Piwik JavaScript tracker file `matomo.js` is not writable 
 which means other plugins cannot extend the JavaScript tracker." then you have two options to solve this issue:
 
-1. Make the `piwik.js` file writable, for example by executing `chmod a+w piwik.js` or `chown $phpuser piwik.js` (replace `$phpuser` with actual username) in your Piwik directory. 
+1. Make the `matomo.js` file writable, for example by executing `chmod a+w piwik.js` or `chown $phpuser piwik.js` (replace `$phpuser` with actual username) in your Piwik directory. 
 We recommend running the [Piwik console](/guides/piwik-on-the-command-line) command `./console custom-piwik-js:update` after you have made the file writable.
 2. or Load the MediaAnalytics tracker file manually in your website by adding in all your pages ideally in the `<head>`: 
-   `<script src="https://your-piwik-domain/plugins/MediaAnalytics/tracker.min.js">`
+   `<script src="https://your-matomo-domain/plugins/MediaAnalytics/tracker.min.js">`
 
 #### Are there any disadvantages of including the file manually?
 
 Yes, there are:
 
 * An additional HTTP request is needed to load your website which increases your page load time
-* If your `piwik.js` ever becomes writable, the MediaAnalytics tracker would be loaded twice (in such a case the tracker notices it was already initialized and won't track everything twice)
+* If your `matomo.js` ever becomes writable, the MediaAnalytics tracker would be loaded twice (in such a case the tracker notices it was already initialized and won't track everything twice)
 
-If possible, we recommend making the `piwik.js` file writable.
+If possible, we recommend making the `matomo.js` file writable.
 
 ## What to read next
 
diff --git a/docs/4.x/menus.md b/docs/4.x/menus.md
index 3c04be588..aa4e8b861 100644
--- a/docs/4.x/menus.md
+++ b/docs/4.x/menus.md
@@ -3,7 +3,7 @@ category: Develop
 ---
 # Menus
 
-Piwik contains 3 menus:
+Matomo contains 3 menus:
 
 - the **top menu** (top-right of the page)
 
diff --git a/docs/4.x/migrate-piwik-2-to-3.md b/docs/4.x/migrate-piwik-2-to-3.md
index 620f154ce..08816fc33 100644
--- a/docs/4.x/migrate-piwik-2-to-3.md
+++ b/docs/4.x/migrate-piwik-2-to-3.md
@@ -78,7 +78,7 @@ The same applies to the FAQ which used to be defined in a `## FAQ` section withi
 
 ### Your plugin's Support options
 
-The support tab is no longer managed in the readme file either. Instead, the support tab on your plugin page is now generated from the ["support" section in your plugin.json](https://developer.piwik.org/guides/distributing-your-plugin#pluginjson-file).
+The support tab is no longer managed in the readme file either. Instead, the support tab on your plugin page is now generated from the ["support" section in your plugin.json](https://developer.matomo.org/guides/distributing-your-plugin#pluginjson-file).
 
 
 ### Your plugin's license
@@ -180,14 +180,14 @@ As you can see the API hasn't changed too much. [Learn more about the new plugin
 
 ## Reports
 
-If your plugin creates a custom [Report](https://developer.piwik.org/guides/custom-reports), you should rename the property `$category` to `$categoryId`.
+If your plugin creates a custom [Report](https://developer.matomo.org/guides/custom-reports), you should rename the property `$category` to `$categoryId`.
 (In your code, replace `$this->category` by `$this->categoryId`).
 
 If you have defined a widget or if you have added your report to a reporting page you need to follow the next steps:
 
 ### Creating a widget
 
-In the past it was possible to [create a widget](https://developer.piwik.org/guides/widgets) like this:
+In the past it was possible to [create a widget](https://developer.matomo.org/guides/widgets) like this:
 
 ```php
 $this->widgetTitle = 'Live_RealTimeVisitorCount';
@@ -276,4 +276,4 @@ Next you should update the related Twig template file (if there is any) and repl
 ## Summary
 
 In this guide we have seen which steps to take to migrate your Piwik plugin to be compatible with our newest Piwik 3.
-If you need further help for converting your plugin to Piwik 3, head over to the [Piwik developers community forums](https://forum.piwik.org/c/plugins-platform).
+If you need further help for converting your plugin to Piwik 3, head over to the [Piwik developers community forums](https://forum.matomo.org/c/plugins-platform).
diff --git a/docs/4.x/pages.md b/docs/4.x/pages.md
index f40d94293..b454535b8 100644
--- a/docs/4.x/pages.md
+++ b/docs/4.x/pages.md
@@ -54,7 +54,7 @@ Using a Twig template to generate your page is optional: you can also generate a
 
 Now that your page is created, you can access it at the following URL: [/index.php?module=MyPlugin&action=index&…](http://localhost:8000/index.php?module=MyPlugin&action=index&idSite=1&period=day&date=yesterday). It should look like this:
 
-![](https://piwik.org/wp-content/uploads/2014/09/action_example.png)
+![](https://matomo.org/wp-content/uploads/2014/09/action_example.png)
 
 ## Creating an admin page
 
@@ -77,7 +77,7 @@ If you would like to add the admin menu on the left you have to modify the follo
 
 The result should look like this:
 
-![](https://piwik.org/wp-content/uploads/2014/09/action_admin_example.png)
+![](https://matomo.org/wp-content/uploads/2014/09/action_admin_example.png)
 
 Note: if you just want **to make your plugin configurable** you should [use the Plugin Settings instead](/guides/plugin-settings).
 
diff --git a/docs/4.x/permissions.md b/docs/4.x/permissions.md
index bbf45dccc..2ce2a7915 100644
--- a/docs/4.x/permissions.md
+++ b/docs/4.x/permissions.md
@@ -9,19 +9,19 @@ Permissions define what a user can see or do in Piwik.
 
 Piwik defines 4 types of permissions:
 
-- [**view permission**](https://piwik.org/faq/general/faq_70/): applies to a specific site
+- [**view permission**](https://matomo.org/faq/general/faq_70/): applies to a specific site
 
     With that permission, a user can view the reports for a given site.
 
-- [**write permission**](https://piwik.org/faq/general/faq_26910/): applies to a specific site
+- [**write permission**](https://matomo.org/faq/general/faq_26910/): applies to a specific site
 
     With that permission, a user can view the reports for a given site, and create, update and delete entities for the website, such as [Goals](https://matomo.org/docs/tracking-goals-web-analytics/), [Funnels](https://matomo.org/docs/funnels/), [Forms](https://matomo.org/docs/form-analytics/), [A/B Tests](https://matomo.org/docs/ab-testing/), [Heatmaps](https://matomo.org/docs/heatmaps/?), [Session Recordings](https://matomo.org/docs/session-recording/), etc. 
 
-- [**admin permission**](https://piwik.org/faq/general/faq_69/): applies to a specific site
+- [**admin permission**](https://matomo.org/faq/general/faq_69/): applies to a specific site
 
     With that permission, a user can view and configure a given site (name, URLs, timezone, etc.). They can also grant other users the "view" or "admin" permission.
 
-- [**super user permission**](https://piwik.org/faq/general/faq_35/): applies to **whole Piwik** (all sites)
+- [**super user permission**](https://matomo.org/faq/general/faq_35/): applies to **whole Piwik** (all sites)
 
     With that permission, a user can view and configure all sites. They can also perform all administrative tasks such as add new sites, add users, change user permissions, activate and deactivate plugins or install new ones from the Marketplace.
 
@@ -34,7 +34,7 @@ Usually, plugins should check permissions before:
 
 Sometimes you may also need to verify permissions before registering menu items or widgets.
 
-To check a user's permissions, you need to `use` the [`Piwik\Piwik`](https://developer.piwik.org/api-reference/Piwik/Piwik) class:
+To check a user's permissions, you need to `use` the [`Piwik\Piwik`](https://developer.matomo.org/api-reference/Piwik/Piwik) class:
 
 - methods starting with `check` throw an exception when the expected condition is not met
 
diff --git a/docs/4.x/piwik-on-the-command-line.md b/docs/4.x/piwik-on-the-command-line.md
index c574ce58a..e9047c231 100644
--- a/docs/4.x/piwik-on-the-command-line.md
+++ b/docs/4.x/piwik-on-the-command-line.md
@@ -57,4 +57,4 @@ Plugins can extend the command line tool by creating their own commands. To do s
 
 This will create a folder named `Commands` within your plugin along with a PHP file which represents the actual command. You can add an unlimited number of commands to a plugin.
 
-To learn how to flesh out your command, you can read the [Symfony Console documentation](http://symfony.com/doc/current/components/console/index.html).
+To learn how to flesh out your command, you can read the [Symfony Console documentation](https://symfony.com/doc/current/components/console/index.html).
diff --git a/docs/4.x/piwiks-reporting-api.md b/docs/4.x/piwiks-reporting-api.md
index e4f80cd72..1ba8b4e46 100644
--- a/docs/4.x/piwiks-reporting-api.md
+++ b/docs/4.x/piwiks-reporting-api.md
@@ -69,10 +69,10 @@ This is the list of filters in the order in which they are applied:
 1. **Flattener**: Merges an entire `DataTable` hierarchy into one `DataTable`, adding rows of subtables to their parent rows.
     - `flat`: set to `1` to apply the filter
 2. **[Pattern](/api-reference/Piwik/DataTable/Filter/Pattern)**: Removes rows of a `DataTable` that do not match a regex pattern.
-    - `filter_pattern`: [regular expression](http://www.phpliveregex.com) (the filter is applied if set)
+    - `filter_pattern`: [regular expression](https://www.phpliveregex.com) (the filter is applied if set)
     - `filter_column`: column to apply the regex pattern to (`label` column by default)
 3. **[PatternRecursive](/api-reference/Piwik/DataTable/Filter/PatternRecursive)**: Removes rows of a `DataTable` for which the row and all subtables of the row do not match a regex pattern.
-    - `filter_pattern_recursive`: [regular expression](http://www.phpliveregex.com) (the filter is applied if set)
+    - `filter_pattern_recursive`: [regular expression](https://www.phpliveregex.com) (the filter is applied if set)
     - `filter_column_recursive`: column to apply the regex pattern to (`label` column by default)
 4. **[ExcludeLowPopulation](/api-reference/Piwik/DataTable/Filter/ExcludeLowPopulation)**: Removes all rows that contain a specific column whose value is lower than a minimum threshold value.
     - `filter_excludelowpop`: column to filter (the filter is applied if set)
@@ -142,7 +142,7 @@ Report metadata can also be used within Piwik for features that operate on repor
 
 ### Row Evolution
 
-Matomo's [row evolution feature](https://demo.matomo.org/index.php?module=CoreHome&action=index&idSite=62&period=day&date=yesterday#module=UserSettings&action=index&idSite=7&period=day&date=yesterday&popover=RowAction$3ARowEvolution$3AUserSettings.getConfiguration$3A0$3AWindows$25207$2520$252F$2520Chrome$2520$252F$25201920x1080) that is available through the UI is also available through the Reporting API. Third party applications can use the **API.getRowEvolution** method to get both [single row evolution data](https://demo.piwik.org/index.php?module=API&method=API.getRowEvolution&idSite=7&period=day&date=2013-11-01,2013-11-25&apiModule=UserSettings&apiAction=getOS&label=Windows+7) or [multi-row evolution data](https://demo.piwik.org/index.php?module=API&method=API.getRowEvolution&idSite=7&period=day&date=2013-11-01,2013-11-25&apiModule=UserSettings&apiAction=getOS).
+Matomo's [row evolution feature](https://demo.matomo.org/index.php?module=CoreHome&action=index&idSite=62&period=day&date=yesterday#module=UserSettings&action=index&idSite=7&period=day&date=yesterday&popover=RowAction$3ARowEvolution$3AUserSettings.getConfiguration$3A0$3AWindows$25207$2520$252F$2520Chrome$2520$252F$25201920x1080) that is available through the UI is also available through the Reporting API. Third party applications can use the **API.getRowEvolution** method to get both [single row evolution data](https://demo.matomo.org/index.php?module=API&method=API.getRowEvolution&idSite=7&period=day&date=2013-11-01,2013-11-25&apiModule=UserSettings&apiAction=getOS&label=Windows+7) or [multi-row evolution data](https://demo.matomo.org/index.php?module=API&method=API.getRowEvolution&idSite=7&period=day&date=2013-11-01,2013-11-25&apiModule=UserSettings&apiAction=getOS).
 
 ### Bulk API Requests
 
diff --git a/docs/4.x/reporting-api-clients.md b/docs/4.x/reporting-api-clients.md
index 0713feedc..34e6641a4 100644
--- a/docs/4.x/reporting-api-clients.md
+++ b/docs/4.x/reporting-api-clients.md
@@ -8,7 +8,7 @@ previous: querying-the-reporting-api
 
 **Read this guide if**
 
-* you'd like to know **which client libraries are available to use [Piwik's Reporting HTTP API](https://developer.piwik.org/guides/reporting-introduction) from your application**
+* you'd like to know **which client libraries are available to use [Piwik's Reporting HTTP API](https://developer.matomo.org/guides/reporting-introduction) from your application**
 
 ## Client libraries for Reporting API
 
@@ -18,15 +18,15 @@ You can use directly Piwik's codebase to call the reporting API. Learn more in [
 
 ### Ruby client
 
-A Ruby client for the reporting API is available on Github: [github.com/matomo-org/piwik-ruby-api](https://github.com/matomo-org/piwik-ruby-api).
+A Ruby client for the reporting API is available on Github: [github.com/matomo-org/matomo-ruby-api](https://github.com/matomo-org/piwik-ruby-api).
 
 ### Python client
 
-A complete Python client implementation of the reporting API is available on Github at [github.com/matomo-org/piwik-python-api](https://github.com/matomo-org/piwik-python-api).
+A complete Python client implementation of the reporting API is available on Github at [github.com/matomo-org/matomo-python-api](https://github.com/matomo-org/piwik-python-api).
 
 ### C# client
 
-A C# client implementation of the reporting API is available on Github at [github.com/matomo-org/piwik-dotnet-api](https://github.com/matomo-org/piwik-dotnet-api).
+A C# client implementation of the reporting API is available on Github at [github.com/matomo-org/matomo-dotnet-api](https://github.com/matomo-org/piwik-dotnet-api).
 
 ### NodeJS client
 
@@ -43,4 +43,4 @@ If you're looking instead for client libraries to use Matomo Tracking HTTP API a
 
 ## Learn more
 
-You can view the complete list of clients and integrations of Piwik at [piwik.org/integrate/](https://piwik.org/integrate/).
+You can view the complete list of clients and integrations of Piwik at [matomo.org/integrate/](https://matomo.org/integrate/).
diff --git a/docs/4.x/reporting-api-metadata.md b/docs/4.x/reporting-api-metadata.md
index ef966c02a..58281be32 100644
--- a/docs/4.x/reporting-api-metadata.md
+++ b/docs/4.x/reporting-api-metadata.md
@@ -26,12 +26,12 @@ For example, if you want to display the top five countries that visitors come fr
 *   User countries report: `&apiModule=UserCountry&apiAction=getCountry`
 *   Truncated to 5 rows: `&filter_truncate=5`
 *   Labels can be translated into a specific language. As with other API calls, you can use the parameter `&language=xx` (replacing xx with the translation code).
-The URL would be [https://demo.piwik.org/?module=API&method=API.getProcessedReport&idSite=3&date=yesterday&period=day&apiModule=UserCountry&apiAction=getCountry&language=en&format=xml&token_auth=anonymous&filter_truncate=5](https://demo.piwik.org/?module=API&method=API.getProcessedReport&idSite=3&date=yesterday&period=day&apiModule=UserCountry&apiAction=getCountry&format=xml&token_auth=anonymous&filter_truncate=5&language=en)
+The URL would be [https://demo.matomo.org/?module=API&method=API.getProcessedReport&idSite=3&date=yesterday&period=day&apiModule=UserCountry&apiAction=getCountry&language=en&format=xml&token_auth=anonymous&filter_truncate=5](https://demo.matomo.org/?module=API&method=API.getProcessedReport&idSite=3&date=yesterday&period=day&apiModule=UserCountry&apiAction=getCountry&format=xml&token_auth=anonymous&filter_truncate=5&language=en)
 
 The returned XML is:
 
 ```xml
-{@include escape http://demo.piwik.org/?module=API&method=API.getProcessedReport&idSite=3&date=yesterday&period=day&apiModule=UserCountry&apiAction=getCountry&format=xml&token_auth=anonymous&filter_truncate=5&language=en}
+{@include escape https://demo.matomo.org/?module=API&method=API.getProcessedReport&idSite=3&date=yesterday&period=day&apiModule=UserCountry&apiAction=getCountry&format=xml&token_auth=anonymous&filter_truncate=5&language=en}
 ```
 
 ## List and Definition of 'metadata' Response Attributes
@@ -47,55 +47,55 @@ The returned XML is:
 
 ## Listing all the Metadata API Functions
 
-The API method **API.getReportMetadata** can be called to request the full list of API functions returning web analytics reports - [see the example output on the Piwik demo](https://demo.piwik.org/?module=API&method=API.getReportMetadata&format=xml&idSite=3&token_auth=anonymous).
+The API method **API.getReportMetadata** can be called to request the full list of API functions returning web analytics reports - [see the example output on the Piwik demo](https://demo.matomo.org/?module=API&method=API.getReportMetadata&format=xml&idSite=3&token_auth=anonymous).
 
 There are two types of reports in Piwik, and each have a slightly different format.
 
 *   **Simple metrics reports**
 
-    Simple Metrics reports simply contain a list of metrics and their values. For example, VisitsSummary.get returns the main metrics (visits, pages, unique visitors) for the specified website ([example URL](https://demo.piwik.org/?module=API&method=API.getMetadata&idSite=3&apiModule=VisitsSummary&apiAction=get&format=xml&token_auth=anonymous)).
+    Simple Metrics reports simply contain a list of metrics and their values. For example, VisitsSummary.get returns the main metrics (visits, pages, unique visitors) for the specified website ([example URL](https://demo.matomo.org/?module=API&method=API.getMetadata&idSite=3&apiModule=VisitsSummary&apiAction=get&format=xml&token_auth=anonymous)).
 
     ```xml
-    {@include escape http://demo.piwik.org/?module=API&method=API.getMetadata&idSite=3&apiModule=VisitsSummary&apiAction=get&format=xml&token_auth=anonymous}
+    {@include escape https://demo.matomo.org/?module=API&method=API.getMetadata&idSite=3&apiModule=VisitsSummary&apiAction=get&format=xml&token_auth=anonymous}
     ```
 
 *   **Reports with dimensions**
 
     Most reports, however, will have a 'dimension' entry in the returned array. Reports with dimensions will display a list of metrics for each 'dimension'. For example, the list of visits, pages, time on site will be output for each keyword.
 
-    Example of a report with dimensions metadata ([example URL](https://demo.piwik.org/?module=API&method=API.getMetadata&idSite=3&apiModule=Referrers&apiAction=getKeywords&format=xml&token_auth=anonymous)):
+    Example of a report with dimensions metadata ([example URL](https://demo.matomo.org/?module=API&method=API.getMetadata&idSite=3&apiModule=Referrers&apiAction=getKeywords&format=xml&token_auth=anonymous)):
 
     ```xml
-    {@include escape http://demo.piwik.org/?module=API&method=API.getMetadata&idSite=3&apiModule=Referrers&apiAction=getKeywords&format=xml&token_auth=anonymous}
+    {@include escape https://demo.matomo.org/?module=API&method=API.getMetadata&idSite=3&apiModule=Referrers&apiAction=getKeywords&format=xml&token_auth=anonymous}
     ```
 
 ## Static Image Graphs
 
-In the metadata output, the field &lt;imageGraphUrl&gt; is a URL that will generate a static PNG graph plotting data for the requested report. Static PNG graphs are used, for example, in the [Piwik mobile app](https://piwik.org/mobile/) and in [email reports](https://piwik.org/docs/email-reports/). These static image graphs can also be used in any custom dashboard, web page, monitoring page, email, etc. As opposed to the [Piwik Widgets](https://piwik.org/docs/embed-piwik-report/), static image graphs do not require JavaScript or HTML, since the URL returns a PNG image.
+In the metadata output, the field &lt;imageGraphUrl&gt; is a URL that will generate a static PNG graph plotting data for the requested report. Static PNG graphs are used, for example, in the [Piwik mobile app](https://matomo.org/mobile/) and in [email reports](https://matomo.org/docs/email-reports/). These static image graphs can also be used in any custom dashboard, web page, monitoring page, email, etc. As opposed to the [Piwik Widgets](https://matomo.org/docs/embed-piwik-report/), static image graphs do not require JavaScript or HTML, since the URL returns a PNG image.
 
 In the following examples, to see the URL used to generate the image, right-click on the image and select "view image" to see the full URL.
 
 *   Example: Graph Plotting Visits over the Last 30 Days
 
-    ![](https://demo.piwik.org/index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=VisitsSummary&apiAction=get&token_auth=anonymous&graphType=evolution&period=day&date=previous30&width=500&height=250)
+    ![](https://demo.matomo.org/index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=VisitsSummary&apiAction=get&token_auth=anonymous&graphType=evolution&period=day&date=previous30&width=500&height=250)
 
 URL: `index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=VisitsSummary&apiAction=get&token_auth=anonymous&graphType=evolution&period=day&date=previous30&width=500&height=250`
 
 *   Example: Horizontal Bar Graph Plotting Browsers for the Current Month
 
-    ![](https://demo.piwik.org/index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=DevicesDetection&apiAction=getBrowsers&token_auth=anonymous&graphType=horizontalBar&period=month&date=today&width=500&height=250)
+    ![](https://demo.matomo.org/index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=DevicesDetection&apiAction=getBrowsers&token_auth=anonymous&graphType=horizontalBar&period=month&date=today&width=500&height=250)
 
 URL: `index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=DevicesDetection&apiAction=getBrowsers&token_auth=anonymous&graphType=horizontalBar&period=month&date=today&width=500&height=250`
 
 *   Example: Horizontal Bar Graph Plotting Countries for the Current Week
 
-    ![](https://demo.piwik.org/index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=UserCountry&apiAction=getCountry&token_auth=anonymous&graphType=horizontalBar&period=month&date=today&width=500&height=250)
+    ![](https://demo.matomo.org/index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=UserCountry&apiAction=getCountry&token_auth=anonymous&graphType=horizontalBar&period=month&date=today&width=500&height=250)
 
 URL: `index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=UserCountry&apiAction=getCountry&token_auth=anonymous&graphType=horizontalBar&period=month&date=today&width=500&height=250`
 
 *   Example: Graph Plotting User Screen Resolutions for the Current Month
 
-    ![](https://demo.piwik.org/index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=Resolution&apiAction=getResolution&token_auth=anonymous&graphType=verticalBar&period=month&date=today&width=500&height=250)
+    ![](https://demo.matomo.org/index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=Resolution&apiAction=getResolution&token_auth=anonymous&graphType=verticalBar&period=month&date=today&width=500&height=250)
 
 URL: `index.php?module=API&method=ImageGraph.get&idSite=3&apiModule=Resolution&apiAction=getResolution&token_auth=anonymous&graphType=verticalBar&period=month&date=today&width=500&height=250`
 
diff --git a/docs/4.x/reporting-api-segmentation.md b/docs/4.x/reporting-api-segmentation.md
index 5540ae7e1..8566447a5 100644
--- a/docs/4.x/reporting-api-segmentation.md
+++ b/docs/4.x/reporting-api-segmentation.md
@@ -14,7 +14,7 @@ Segmentation can be applied to most API functions. The **segment** parameter con
 
 For example, you can request the "Best Keywords" report processed for all visits where "Country is Germany AND Browser is Firefox" by doing the following request:
 
-    http://piwik.example.org/index.php
+    https://matomo.example.org/index.php
     ?token_auth=yourTokenHere
     &format=xml
     &date=2011-01-11
@@ -23,7 +23,7 @@ For example, you can request the "Best Keywords" report processed for all visits
     &module=API&method=Referrers.getKeywords
     &segment=browserCode==FF;countryCode==DE
 
-Example URL of top countries used by visits landing on the page: [virtual-drums.com/](http://www.virtual-drums.com/): [demo.piwik.org/?module=API&method=**UserCountry.getCountry**&idSite=3&date=yesterday&period=day&format=xml&filter_truncate=5&language=en**&segment=entryPageUrl==http%3A%2F%2Fwww.virtual-drums.com%2F**](https://demo.matomo.org/?module=API&method=UserCountry.getCountry&idSite=3&date=yesterday&period=day&format=xml&filter_truncate=5&language=en&segment=entryPageUrl==http%3A%2F%2Fwww.virtual-drums.com%2F)
+Example URL of top countries used by visits landing on the page: [virtual-drums.com/](https://www.virtual-drums.com/): [demo.matomo.org/?module=API&method=**UserCountry.getCountry**&idSite=3&date=yesterday&period=day&format=xml&filter_truncate=5&language=en**&segment=entryPageUrl==http%3A%2F%2Fwww.virtual-drums.com%2F**](https://demo.matomo.org/?module=API&method=UserCountry.getCountry&idSite=3&date=yesterday&period=day&format=xml&filter_truncate=5&language=en&segment=entryPageUrl==http%3A%2F%2Fwww.virtual-drums.com%2F)
 
 Let's take a look at the segment string.
 
@@ -61,7 +61,7 @@ will select "Visitors from Search engines AND (Keyword is Piwik OR Keyword is an
 
 ## List of segments
 
-{@include https://demo2.piwik.org/index.php?module=API&action=listSegments&language=en}
+{@include https://demo2.matomo.org/index.php?module=API&action=listSegments&language=en}
 
 ### Segment values must be URL encoded
 
diff --git a/docs/4.x/reporting-api-tutorial.md b/docs/4.x/reporting-api-tutorial.md
index 41aa0a0cf..bacf48eef 100644
--- a/docs/4.x/reporting-api-tutorial.md
+++ b/docs/4.x/reporting-api-tutorial.md
@@ -11,9 +11,9 @@ This tutorial will show you how easy it is to request the **yesterday's top 10 k
 
 To build the URL of the API call, you need:
 
-- your Piwik base URL (replace demo.piwik.org with the URL and path of your Piwik server
+- your Piwik base URL (replace demo.matomo.org with the URL and path of your Piwik server
 
-    **https://demo.piwik.org/?module=API**
+    **https://demo.matomo.org/?module=API**
 
 - the name of the method you want to call. It has the format _moduleName.methodToCall_ (see the list on [API Methods](/api-reference/reporting-api#api-method-list)). You need to request the last keywords from the plugin Referrers:
 
@@ -41,29 +41,29 @@ To build the URL of the API call, you need:
 
     **filter_limit=10**
 
-The final url is **[https://demo.piwik.org/?module=API&method=Referrers.getKeywords&idSite=3&date=yesterday&period=day&format=xml&filter_limit=10](https://demo.piwik.org/?module=API&method=Referrers.getKeywords&idSite=3&date=yesterday&period=day&format=xml&filter_limit=10)**
+The final url is **[https://demo.matomo.org/?module=API&method=Referrers.getKeywords&idSite=3&date=yesterday&period=day&format=xml&filter_limit=10](https://demo.matomo.org/?module=API&method=Referrers.getKeywords&idSite=3&date=yesterday&period=day&format=xml&filter_limit=10)**
 
 ## XML Output
 
 Here is the output of this request:
 
 ```xml
-{@include escape http://demo.piwik.org/?module=API&method=Referrers.getKeywords&idSite=3&date=yesterday&period=day&format=xml&filter_limit=10}
+{@include escape https://demo.matomo.org/?module=API&method=Referrers.getKeywords&idSite=3&date=yesterday&period=day&format=xml&filter_limit=10}
 ```
 
 ## Other examples
 
 *   XML of the visits of the last 10 days, one entry per day
-[https://demo.piwik.org/?module=API&method=VisitsSummary.getVisits&idSite=3&period=day&date=last10&format=xml](https://demo.piwik.org/?module=API&method=VisitsSummary.getVisits&idSite=3&period=day&date=last10&format=xml)
+[https://demo.matomo.org/?module=API&method=VisitsSummary.getVisits&idSite=3&period=day&date=last10&format=xml](https://demo.matomo.org/?module=API&method=VisitsSummary.getVisits&idSite=3&period=day&date=last10&format=xml)
 
 *   XML containing keywords from the last 3 weeks, one entry per week
-[https://demo.piwik.org/?module=API&method=Referrers.getKeywords&idSite=3&period=week&date=last3&format=xml](https://demo.piwik.org/?module=API&method=Referrers.getKeywords&idSite=3&period=week&date=last3&format=xml)
+[https://demo.matomo.org/?module=API&method=Referrers.getKeywords&idSite=3&period=week&date=last3&format=xml](https://demo.matomo.org/?module=API&method=Referrers.getKeywords&idSite=3&period=week&date=last3&format=xml)
 
 *   XML containing the keywords from the last 3 days which match the pattern "piwik"
-[https://demo.piwik.org/?module=API&method=Referrers.getKeywords&idSite=3&period=day&date=last3&format=xml&filter_column=label&filter_pattern=piwik](https://demo.piwik.org/?module=API&method=Referrers.getKeywords&idSite=3&period=day&date=last3&format=xml&filter_column=label&filter_pattern=piwik)
+[https://demo.matomo.org/?module=API&method=Referrers.getKeywords&idSite=3&period=day&date=last3&format=xml&filter_column=label&filter_pattern=piwik](https://demo.matomo.org/?module=API&method=Referrers.getKeywords&idSite=3&period=day&date=last3&format=xml&filter_column=label&filter_pattern=piwik)
 
 *   RSS feed containing the top 30 keywords for the last 3 weeks,  ordered by the number of actions people did when coming from these  keywords
-[https://demo.piwik.org/?module=API&method=Referrers.getKeywords&idSite=3&period=week&date=last3&format=rss&filter_limit=30&filter_sort_column=3](https://demo.piwik.org/?module=API&method=Referrers.getKeywords&idSite=3&period=week&date=last3&format=rss&filter_limit=30&filter_sort_column=3)
+[https://demo.matomo.org/?module=API&method=Referrers.getKeywords&idSite=3&period=week&date=last3&format=rss&filter_limit=30&filter_sort_column=3](https://demo.matomo.org/?module=API&method=Referrers.getKeywords&idSite=3&period=week&date=last3&format=rss&filter_limit=30&filter_sort_column=3)
 You can get the data in one of these formats: XML, JSON, HTML, CSV, TSV, etc. See the [API Reference](/api-reference/reporting-api) for the documentation.
 
 There are also functions for Websites, Users, Goals, PDF Reports (create, update, delete operations) and a lot more, such as: adding Annotations, creating custom Segments,
diff --git a/docs/4.x/reporting-api.md b/docs/4.x/reporting-api.md
index 85e51328b..2608926ec 100644
--- a/docs/4.x/reporting-api.md
+++ b/docs/4.x/reporting-api.md
@@ -59,7 +59,7 @@ _referrerName==Google,referrerName==Bing;country==IN_
 *   **format**; defines the format of the output
 
     *   xml
-    *   json (if you want to do [cross domain request in ajax](http://bob.pythonmac.org/archives/2005/12/05/remote-json-jsonp/) and get json data, you can wrap the json data around a function call by using the **jsoncallback** parameter)
+    *   json (if you want to do [cross domain request in ajax](https://bob.pythonmac.org/archives/2005/12/05/remote-json-jsonp/) and get json data, you can wrap the json data around a function call by using the **jsoncallback** parameter)
     *   csv (comma-separated values)
     *   tsv (tab-separated values, similar to CSV but loads properly in Excel)
     *   html
@@ -118,7 +118,7 @@ There are also generic filters you can choose to apply on all APIs that return w
 
 Some parameters can optionally accept arrays. For example, the urls parameter of SitesManager.addSite, SitesManager.addSiteAliasUrls, and SitesManager.updateSite allows for an array of urls to be passed. To pass an array add the bracket operators and an index to the parameter name in the get request. So, to call SitesManager.addSite with two urls you would use the following array:
 
-[https://demo.piwik.org/?module=API&method=SitesManager.addSite&siteName=new%20example%20website&urls[0]=http://example.org&urls[1]=http://example-alias.org](http://demo.piwik.org/?module=API&method=SitesManager.addSite&siteName=new%20example%20website&urls[0]=http://example.org&urls[1]=http://example-alias.org)
+[https://demo.matomo.org/?module=API&method=SitesManager.addSite&siteName=new%20example%20website&urls[0]=https://example.org&urls[1]=https://example-alias.org](https://demo.matomo.org/?module=API&method=SitesManager.addSite&siteName=new%20example%20website&urls[0]=https://example.org&urls[1]=https://example-alias.org)
 
 ### Advanced Users: Send multiple API Requests at once
 
@@ -126,7 +126,7 @@ Sometimes it is necessary to call the Piwik API a few times to get the data need
 
 To issue a bulk request, call the API.getBulkRequest method and pass the API methods & parameters (each request must be [URL Encoded](https://secure.php.net/manual/en/function.urlencode.php)) you wish to call in the 'urls' query parameter. For example, to call VisitsSummary.get & VisitorInterest.getNumberOfVisitsPerVisitDuration at the same time, you can use:
 
-    https://demo.piwik.org/?module=API&method=API.getBulkRequest&format=json&urls[0]=method%3dVisitsSummary.get%26idSite%3d3%26date%3d2012-03-06%26period%3dday&urls[1]=method%3dVisitorInterest.getNumberOfVisitsPerVisitDuration%26idSite%3d3%26date%3d2012-03-06%26period%3dday
+    https://demo.matomo.org/?module=API&method=API.getBulkRequest&format=json&urls[0]=method%3dVisitsSummary.get%26idSite%3d3%26date%3d2012-03-06%26period%3dday&urls[1]=method%3dVisitorInterest.getNumberOfVisitsPerVisitDuration%26idSite%3d3%26date%3d2012-03-06%26period%3dday
 
 Notice that urls[0] is the url-encoded call to VisitsSummary.get by itself and that urls[1] is what you would use to call VisitorInterest.getNumberOfVisitsPerVisitDuration by itself. The &format is specified only once (format=xml and format=json are supported for bulk requests).
 
@@ -134,7 +134,7 @@ The API Response will be an array containing the formatted result of each indivi
 
 You can also issue the Bulk request as a HTTP POST request to work around any request URI size limitations:
 
-    curl -i -X POST -d 'module=API&method=API.getBulkRequest&format=json&urls[0]=method%3dVisitsSummary.get%26idSite%3d3%26date%3d2012-03-06%26period%3dday&urls[1]=method%3dVisitorInterest.getNumberOfVisitsPerVisitDuration%26idSite%3d3%26date%3d2012-03-06%26period%3dday' https://demo.piwik.org/index.php
+    curl -i -X POST -d 'module=API&method=API.getBulkRequest&format=json&urls[0]=method%3dVisitsSummary.get%26idSite%3d3%26date%3d2012-03-06%26period%3dday&urls[1]=method%3dVisitorInterest.getNumberOfVisitsPerVisitDuration%26idSite%3d3%26date%3d2012-03-06%26period%3dday' https://demo.matomo.org/index.php
 
 
 ## Authenticate to the API via token_auth parameter
@@ -157,7 +157,7 @@ Here is a list of metrics returned by the API and their definition.
 
 *   `nb_uniq_visitors` - Number of unique visitors
 *   `nb_visits` - Number of Visits (30 min of inactivity considered a new visit)
-*   `nb_users` - Number of unique active users (visitors with a known [User ID](https://piwik.org/docs/user-id/)). If you are not using User ID then this metric will be set to zero.
+*   `nb_users` - Number of unique active users (visitors with a known [User ID](https://matomo.org/docs/user-id/)). If you are not using User ID then this metric will be set to zero.
 *   `nb_actions` - Number of actions (page views, outlinks and downloads)
 *   `sum_visit_length` - Total time spent, in seconds
 *   `bounce_count` - Number of visits that bounced (viewed only one page)
@@ -196,8 +196,8 @@ Here is a list of metrics returned by the API and their definition.
 *   `abandoned_carts` - This value is only set if the request contains '&abandonedCarts=1'. In this case, "orders" metrics will not be returned. It is the total number of abandoned carts which contained this Product SKU/Name/Category at least once.
 *   `avg_price` - The average revenue for this Product/Category.
 *   `avg_quantity` - The average quantity for this Product/Category.
-*   `nb_visits` - This value appears only if you have set up ['Ecommerce Product/Category page tracking'](https://piwik.org/docs/ecommerce-analytics/#toc-tracking-product-page-views-category-page-views-optional). The number of visits on the Product/Category page.
-*   `conversion_rate` - This value appears only if you have set up ['Ecommerce Product/Category page tracking'](https://piwik.org/docs/ecommerce-analytics/#toc-tracking-product-page-views-category-page-views-optional). The conversion rate is the number of orders (or abandoned_carts if the request contains '&abandonedCarts=1') containing this product/category divided by number of visits on the product/category page.
+*   `nb_visits` - This value appears only if you have set up ['Ecommerce Product/Category page tracking'](https://matomo.org/docs/ecommerce-analytics/#toc-tracking-product-page-views-category-page-views-optional). The number of visits on the Product/Category page.
+*   `conversion_rate` - This value appears only if you have set up ['Ecommerce Product/Category page tracking'](https://matomo.org/docs/ecommerce-analytics/#toc-tracking-product-page-views-category-page-views-optional). The conversion rate is the number of orders (or abandoned_carts if the request contains '&abandonedCarts=1') containing this product/category divided by number of visits on the product/category page.
 
 #### Event tracking metrics, appearing in Events API calls
 
@@ -210,7 +210,7 @@ Here is a list of metrics returned by the API and their definition.
 
 #### Glossary
 
-All the commonly used terms in Piwik Analytics are documented in the [Glossary](https://glossary.piwik.org) including all metrics and reports.
+All the commonly used terms in Piwik Analytics are documented in the [Glossary](https://glossary.matomo.org) including all metrics and reports.
 
 ## API Method List
 
diff --git a/docs/4.x/scheduled-tasks.md b/docs/4.x/scheduled-tasks.md
index 9c0f71d4e..a7dcc7090 100644
--- a/docs/4.x/scheduled-tasks.md
+++ b/docs/4.x/scheduled-tasks.md
@@ -111,7 +111,7 @@ Remember that manually testing your scheduled task is just the first step: addin
 
 ## Which tasks are registered and when is the next execution time of my task?
 
-The [TasksTimetable plugin](https://plugins.piwik.org/TasksTimetable) from the Marketplace can answer this question for you. Simply install and activate the plugin with one click by going to *Settings > Marketplace > Get new functionality*. It will add a new admin menu item under *Settings* named *Scheduled Tasks*.
+The [TasksTimetable plugin](https://plugins.matomo.org/TasksTimetable) from the Marketplace can answer this question for you. Simply install and activate the plugin with one click by going to *Settings > Marketplace > Get new functionality*. It will add a new admin menu item under *Settings* named *Scheduled Tasks*.
 
 ## Read more
 
diff --git a/docs/4.x/tagmanager/testing.md b/docs/4.x/tagmanager/testing.md
index d01a1e576..535cba06f 100644
--- a/docs/4.x/tagmanager/testing.md
+++ b/docs/4.x/tagmanager/testing.md
@@ -14,7 +14,7 @@ The tests will create a database named `tracker_tests` and store various trackin
 
 ## Running PHP tests
 
-To run a test, either open `http://matomo.example.com/tests/javascript/` in a browser or execute `phantomjs testrunner.js` on the command line. You can download PhantomJS here: [http://phantomjs.org/](http://phantomjs.org/)
+To run a test, either open `https://matomo.example.com/tests/javascript/` in a browser or execute `phantomjs testrunner.js` on the command line. You can download PhantomJS here: [http://phantomjs.org/](http://phantomjs.org/)
 
 ## Creating a test
 
@@ -52,7 +52,7 @@ The main methods you will need to create tests are:
 * `strictEqual(expected, actual, message)` strict comparison of a value
 * `deepEqual(expected, actual, message)` expecting an object (or array)
 
-You can find more information in the [QUnit API Documentation](http://api.qunitjs.com/)
+You can find more information in the [QUnit API Documentation](https://api.qunitjs.com/)
 
 ## Testing a tag
 
diff --git a/docs/4.x/tests-travis-extended.md b/docs/4.x/tests-travis-extended.md
index 8655c9722..4bbdd4310 100644
--- a/docs/4.x/tests-travis-extended.md
+++ b/docs/4.x/tests-travis-extended.md
@@ -34,7 +34,7 @@ Below is the list of all supported environment variables:
     
   * **PROTECTED\_ARTIFACTS**
 
-    This variable controls whether build artifacts will be uploaded to a password protected folder on builds-artifacts.piwik.org. If you are building a plugin and need your artifacts protected, please [contact the Piwik team](https://piwik.org/contact/) to learn more.
+    This variable controls whether build artifacts will be uploaded to a password protected folder on builds-artifacts.matomo.org. If you are building a plugin and need your artifacts protected, please [contact the Piwik team](https://matomo.org/contact/) to learn more.
 
     By default, artifacts for plugins are stored in a public folder. To change this behavior, set `PROTECTED_ARTIFACTS=1` as a global environment variable, eg:
 
diff --git a/docs/4.x/tests-travis.md b/docs/4.x/tests-travis.md
index d37473768..40c141846 100644
--- a/docs/4.x/tests-travis.md
+++ b/docs/4.x/tests-travis.md
@@ -50,7 +50,7 @@ Below is the list of all supported environment variables:
 
   * **PIWIK\_TEST\_TARGET**
 
-   This variable can be used to specify an exact Piwik version number / branch or the `maximum_supported_piwik` the test should run against. By specifying `maximum_supported_piwik` your tests will automatically run against the highest supported Piwik version number in your `plugin.json`. If no maximum Piwik version is specified, the tests will automatically run against the latest beta. To specify a max version in `plugin.json` you can eg specify `"require": {"piwik": ">=2.15.0-rc1,<=2.15.1-b11"}`. In this case max supported version is `2.15.1-b11`. For more information on how to specify supported Piwik versions in your plugin have a look at the [distributing your Piwik plugin](https://developer.piwik.org/guides/distributing-your-plugin#prepare-your-plugin) guide.
+   This variable can be used to specify an exact Piwik version number / branch or the `maximum_supported_piwik` the test should run against. By specifying `maximum_supported_piwik` your tests will automatically run against the highest supported Piwik version number in your `plugin.json`. If no maximum Piwik version is specified, the tests will automatically run against the latest beta. To specify a max version in `plugin.json` you can eg specify `"require": {"piwik": ">=2.15.0-rc1,<=2.15.1-b11"}`. In this case max supported version is `2.15.1-b11`. For more information on how to specify supported Piwik versions in your plugin have a look at the [distributing your Piwik plugin](https://developer.matomo.org/guides/distributing-your-plugin#prepare-your-plugin) guide.
 
     This variable should be set as a global environment variable, eg:
 
diff --git a/docs/4.x/tests-ui.md b/docs/4.x/tests-ui.md
index cff197d6b..a67b40121 100644
--- a/docs/4.x/tests-ui.md
+++ b/docs/4.x/tests-ui.md
@@ -5,11 +5,11 @@ next: tests-travis
 ---
 # UI Tests
 
-Some might know a UI test under the term 'CSS test' or 'screenshot test'. When we speak of UI tests we mean automated tests that capture a screenshot of a URL and then compare the result with an expected image. If the images are not exactly the same the test will fail. For more information read our blog post about [UI Testing](https://piwik.org/blog/2013/10/our-latest-improvement-to-qa-screenshot-testing/).
+Some might know a UI test under the term 'CSS test' or 'screenshot test'. When we speak of UI tests we mean automated tests that capture a screenshot of a URL and then compare the result with an expected image. If the images are not exactly the same the test will fail. For more information read our blog post about [UI Testing](https://matomo.org/blog/2013/10/our-latest-improvement-to-qa-screenshot-testing/).
 
 **What is a UI test good for?**
 
-We use them to test our PHP Controllers, Twig templates, CSS, and indirectly test our JavaScript. We usually don't write Unit or Integration tests for our controllers. For example, we use UI tests to ensure that the installation, the login and the update process works as expected. We also have tests for most pages, reports, settings, etc. This increases the quality of our product and saves us a lot of time as it is easy to write and maintain such tests. All UI tests are executed on [Travis](https://travis-ci.org/matomo-org/matomo) after each commit and compared with [our expected screenshots](https://github.com/matomo-org/piwik-ui-tests).
+We use them to test our PHP Controllers, Twig templates, CSS, and indirectly test our JavaScript. We usually don't write Unit or Integration tests for our controllers. For example, we use UI tests to ensure that the installation, the login and the update process works as expected. We also have tests for most pages, reports, settings, etc. This increases the quality of our product and saves us a lot of time as it is easy to write and maintain such tests. All UI tests are executed on [Travis](https://travis-ci.org/matomo-org/matomo) after each commit and compared with [our expected screenshots](https://github.com/matomo-org/matomo-ui-tests).
 
 ## Requirements
 
@@ -51,12 +51,12 @@ If your development environment's PHP executable isn't named `php`
 or your dev Piwik install isn't at `http://localhost/` you may need to copy that file to
 `tests/UI/config.js` and edit the contents of this file.
 
-For example if Piwik is set up at `http://localhost/piwik` modify the config.js such as:
+For example if Piwik is set up at `http://localhost/matomo` modify the config.js such as:
 ```
-exports.piwikUrl = "http://localhost/piwik/";
+exports.piwikUrl = "http://localhost/matomo/";
 exports.phpServer = {
     HTTP_HOST: 'localhost',
-    REQUEST_URI: '/piwik/',
+    REQUEST_URI: '/matomo/',
     REMOTE_ADDR: '127.0.0.1'
 };
 
@@ -64,7 +64,7 @@ exports.phpServer = {
 
 ## Creating a UI test
 
-We start by using the [Piwik Console](https://developer.piwik.org/guides/piwik-on-the-command-line) to create a new UI test:
+We start by using the [Piwik Console](https://developer.matomo.org/guides/piwik-on-the-command-line) to create a new UI test:
 
 ```bash
 ./console generate:test --testtype ui
@@ -89,7 +89,7 @@ describe("WidgetizePage", function () {
 
 ### What is happening here?
 
-This example declares a new set of [specs](https://en.wikipedia.org/wiki/Behavior-driven_development#Behavioural_specifications) by calling the method `describe(name, callback)` and within that a new spec by calling the method `it(description, func)`. Within the spec we load a URL and once loaded capture a screenshot of the whole page. The captured screenshot will be saved under the defined `screenshotName`. You might have noticed we write our UI tests in [BDD](http://en.wikipedia.org/wiki/Behavior-driven_development) style.
+This example declares a new set of [specs](https://en.wikipedia.org/wiki/Behavior-driven_development#Behavioural_specifications) by calling the method `describe(name, callback)` and within that a new spec by calling the method `it(description, func)`. Within the spec we load a URL and once loaded capture a screenshot of the whole page. The captured screenshot will be saved under the defined `screenshotName`. You might have noticed we write our UI tests in [BDD](https://en.wikipedia.org/wiki/Behavior-driven_development) style.
 
 ### Capturing only a part of the page
 It is good practice to not always capture the full page. For example many pages contain a menu and if you change that menu, all your screenshot tests would fail. To avoid this you would instead have a separate test for your menu. To capture only a part of the page simply specify a [jQuery selector](https://api.jquery.com/category/selectors/) and use `page.$` to get the element to capture, or call `page.screenshotSelector`:
@@ -142,7 +142,7 @@ At some point your UI test will fail, for example due to expected CSS changes. T
 
 ## Writing a UI test in depth
 
-UI screenshot tests are run directly by Puppeteer and are written using [mocha](https://mochajs.org/) and [chai](http://chaijs.com).
+UI screenshot tests are run directly by Puppeteer and are written using [mocha](https://mochajs.org/) and [chai](https://chaijs.com).
 
 All test files should have \_spec.js file name suffixes (for example, `ActionsDataTable_spec.js`). Since screenshots can take a while to capture, you will want to override mocha's default timeout like this:
 
@@ -235,7 +235,7 @@ The following are examples of test environment manipulation:
 
 On top of calling API, controllers, and setting up INI options you can also register dependency injection configuration. This allows to replace a service or a configuration value in order to mock or simulate a behavior.
 
-To do this, you need to implement `provideContainerConfig()` in a fixture class and return [a valid DI configuration](http://php-di.org/doc/definition.html). For example:
+To do this, you need to implement `provideContainerConfig()` in a fixture class and return [a valid DI configuration](https://php-di.org/doc/definition.html). For example:
 
 ```php
 class FailUpdateHttpsFixture extends Fixture
@@ -264,4 +264,4 @@ describe("PiwikUpdater", function () {
 ## Learn more
 
 Check out this blog post to learn more about Screenshot Tests in Piwik:
-[QA Screenshot Testing blog post](https://piwik.org/blog/2013/10/our-latest-improvement-to-qa-screenshot-testing/)
+[QA Screenshot Testing blog post](https://matomo.org/blog/2013/10/our-latest-improvement-to-qa-screenshot-testing/)
diff --git a/docs/4.x/tests.md b/docs/4.x/tests.md
index fe576b127..450c9425a 100644
--- a/docs/4.x/tests.md
+++ b/docs/4.x/tests.md
@@ -34,4 +34,4 @@ Piwik Core contains a suite of tests used to make sure that Piwik works properly
 
 - **System tests** test Piwik's [Reporting API](/guides/piwiks-reporting-api) and [archiving logic](/guides/archiving) by tracking visits and checking that the output of certain API queries matches the expected output.
 
-- **UI tests** test Piwik's twig templates, JavaScript and CSS by tracking visits, generating screenshots of URLs with [phantomjs](http://phantomjs.org/) and comparing expected screenshots with generated ones.
+- **UI tests** test Piwik's twig templates, JavaScript and CSS by tracking visits, generating screenshots of URLs with [phantomjs](https://phantomjs.org/) and comparing expected screenshots with generated ones.
diff --git a/docs/4.x/theming.md b/docs/4.x/theming.md
index 5c1c0649d..a5c7baa7f 100644
--- a/docs/4.x/theming.md
+++ b/docs/4.x/theming.md
@@ -93,7 +93,7 @@ Every theme has one main file that contains all of your theme's styling override
 
 Generated themes will already have a file configured, so you don't need to set this property. The file is called `theme.less` and is located in the `stylesheets/` directory of your theme.
 
-You can put your entire theme into this one file if you want, but the result might not be easy to read and to maintain. Instead, you should group the styles based on the part of Piwik they modify and place them in separate LESS files. You can then [`@import`](http://lesscss.org/features/#import-directives-feature) them in `theme.less`.
+You can put your entire theme into this one file if you want, but the result might not be easy to read and to maintain. Instead, you should group the styles based on the part of Piwik they modify and place them in separate LESS files. You can then [`@import`](https://lesscss.org/features/#import-directives-feature) them in `theme.less`.
 
 ### Adding JavaScript files
 
@@ -197,7 +197,7 @@ Here is a list of all named colors in Piwik:
   * **ticks**: The color of x-axis gridlines and x-axis ticks.
   * **single-metric-label**: The color of the series name label if only **one** series is displayed. If you don't care about whether there's one series displayed or not, set this color to the one you used in **series1**.
 
-* _Namespace_: **realtime-map**: contains colors for the [Realtime Visitors Map](https://piwik.org/docs/real-time-visitor-world-map/).
+* _Namespace_: **realtime-map**: contains colors for the [Realtime Visitors Map](https://matomo.org/docs/real-time-visitor-world-map/).
 
   * **white-bg**: The background color for the map when using the _light theme_.
   * **white-fill**: The country/region fill color for the map when using the _light theme_.
@@ -213,7 +213,7 @@ Here is a list of all named colors in Piwik:
   * **symbol-animate-fill**: The starting fill color to use when animating the appearance of a new visit. The ending fill color is always the visit's normal color.
   <!-- TODO: hue of visit color is not themable still -->
 
-* _Namespace_: **visitor-map**: contains colors for the [Visitors Map](https://piwik.org/docs/visitors-map/).
+* _Namespace_: **visitor-map**: contains colors for the [Visitors Map](https://matomo.org/docs/visitors-map/).
 
   * **no-data-color**: The fill color for countries that have no visits.
   * **one-country-color**: The fill color for countries that have visits, if only one country received visits.
diff --git a/docs/4.x/tracking-api-clients.md b/docs/4.x/tracking-api-clients.md
index c6ee253c9..55fe47549 100644
--- a/docs/4.x/tracking-api-clients.md
+++ b/docs/4.x/tracking-api-clients.md
@@ -11,7 +11,7 @@ category: Integrate
 
 ## JavaScript SDK
 
-If you are building websites, you can use our powerful JavaScript SDK to measure all aspects of your website experience. Learn more: [JavaScript tracking client.](https://developer.piwik.org/guides/tracking-javascript-guide)
+If you are building websites, you can use our powerful JavaScript SDK to measure all aspects of your website experience. Learn more: [JavaScript tracking client.](https://developer.matomo.org/guides/tracking-javascript-guide)
 
 ## Mobile SDKs
 
@@ -21,13 +21,13 @@ Use the SDKs below for mobile app and product analytics with Matomo.
 
 If you are building iOS apps, Apple tvOs or macOS apps, you can use the Swift PiwikTracker client (or the older Objective-C PiwikTracker) to send tracking data to your Piwik server.
 
-Learn more and download Piwik iOS SDK on Github at [github.com/matomo-org/piwik-sdk-ios](https://github.com/matomo-org/piwik-sdk-ios).
+Learn more and download Piwik iOS SDK on Github at [github.com/matomo-org/matomo-sdk-ios](https://github.com/matomo-org/piwik-sdk-ios).
 
 ### Android SDK
 
 If you are building Android apps (for Android smartphones, tablets, Fire TVs, etc.), you can use the Android Java client to send tracking data to your Piwik server.
 
-Learn more and download Piwik Android SDK on Github at [github.com/matomo-org/piwik-sdk-android](https://github.com/matomo-org/piwik-sdk-android).
+Learn more and download Piwik Android SDK on Github at [github.com/matomo-org/matomo-sdk-android](https://github.com/matomo-org/piwik-sdk-android).
 
 ### Appcelerator Titanium Module
 
@@ -41,15 +41,15 @@ Use the clients below for server-side analytics and app tracking with Matomo.
 
 ### PHP client
 
-Learn more about our Piwik Tracking API PHP client on Github: [github.com/matomo-org/piwik-php-tracker](https://github.com/matomo-org/piwik-php-tracker).
+Learn more about our Piwik Tracking API PHP client on Github: [github.com/matomo-org/matomo-php-tracker](https://github.com/matomo-org/piwik-php-tracker).
 
 ### Java client
 
-A Java client for the Piwik Tracking API is available on Github: [github.com/matomo-org/piwik-java-tracker](https://github.com/matomo-org/piwik-java-tracker#readme).
+A Java client for the Piwik Tracking API is available on Github: [github.com/matomo-org/matomo-java-tracker](https://github.com/matomo-org/piwik-java-tracker#readme).
 
 ### C# client
 
-A C# client implementation of the Tracking API is available on Github at [github.com/matomo-org/piwik-dotnet-tracker](https://github.com/matomo-org/piwik-dotnet-tracker#piwik-c-tracking-api).
+A C# client implementation of the Tracking API is available on Github at [github.com/matomo-org/matomo-dotnet-tracker](https://github.com/matomo-org/piwik-dotnet-tracker#piwik-c-tracking-api).
 
 ### Other clients
 
diff --git a/docs/4.x/tracking-api.md b/docs/4.x/tracking-api.md
index fb530e146..87090d326 100644
--- a/docs/4.x/tracking-api.md
+++ b/docs/4.x/tracking-api.md
@@ -3,7 +3,7 @@ category: API Reference
 ---
 # Tracking HTTP API
 
-To track page views, events, visits, you have to send a HTTP request (GET or POST) to your Tracking HTTP API endpoint, for example, **http://your-piwik-domain.example/piwik.php** with the correct query parameters set.
+To track page views, events, visits, you have to send a HTTP request (GET or POST) to your Tracking HTTP API endpoint, for example, **https://your-matomo-domain.example/matomo.php** with the correct query parameters set.
 
 ## Supported Query Parameters
 
@@ -18,7 +18,7 @@ _Note: all parameters values that are strings (such as 'url', 'action\_name', et
 
 ### Recommended parameters
 
-* `action_name` **(recommended)** &mdash; The title of the action being tracked. It is possible to [use slashes / to set one or several](https://piwik.org/faq/how-to/#faq_62) [categories for this action](https://piwik.org/faq/how-to/#faq_62). For example, **Help / Feedback** will create the Action **Feedback** in the category **Help**.
+* `action_name` **(recommended)** &mdash; The title of the action being tracked. It is possible to [use slashes / to set one or several](https://matomo.org/faq/how-to/#faq_62) [categories for this action](https://matomo.org/faq/how-to/#faq_62). For example, **Help / Feedback** will create the Action **Feedback** in the category **Help**.
 * `url` **(recommended)** &mdash; The full URL for the current action.
 * `_id` **(recommended)** &mdash; The unique visitor ID, must be a 16 characters hexadecimal string. Every unique visitor must be assigned a different ID and this ID must not change after it is assigned. If this value is not set Piwik will still track visits, but the unique visitors metric might be less accurate.
 * `rand` **(recommended)** &mdash; Meant to hold a random value that is generated before each request. Using it helps avoid the tracking request being cached by the browser or a proxy.
@@ -29,12 +29,12 @@ _Note: all parameters values that are strings (such as 'url', 'action\_name', et
 _(We recommend that these parameters be used if the information is available and relevant to your use case.)_
 
 * `urlref` &mdash; The full HTTP Referrer URL. This value is used to determine how someone got to your website (ie, through a website, search engine or campaign).
-* `_cvar` &mdash; Visit scope [custom variables](https://piwik.org/docs/custom-variables/). This is a JSON encoded string of the custom variable array (see below for an example value).
+* `_cvar` &mdash; Visit scope [custom variables](https://matomo.org/docs/custom-variables/). This is a JSON encoded string of the custom variable array (see below for an example value).
 * `_idvc` &mdash; The current count of visits for this visitor. To set this value correctly, it would be required to store the value for each visitor in your application (using sessions or persisting in a database). Then you would manually increment the counts by one on each new visit or "session", depending on how you choose to define a visit. This value is used to populate the report _Visitors > Engagement > Visits by visit number_.
 * `_viewts` &mdash; The UNIX timestamp of this visitor's previous visit. This parameter is used to populate the report _Visitors > Engagement > Visits by days since last visit_.
 * `_idts` &mdash; The UNIX timestamp of this visitor's first visit. This could be set to the date where the user first started using your software/app, or when he/she created an account. This parameter is used to populate the _Goals > Days to Conversion_ report.
-* `_rcn` &mdash; The Campaign name (see [Tracking Campaigns](https://piwik.org/docs/tracking-campaigns/)). Used to populate the _Referrers > Campaigns_ report. _Note: this parameter will only be used for the first pageview of a visit._
-* `_rck` &mdash; The Campaign Keyword (see [Tracking Campaigns](https://piwik.org/docs/tracking-campaigns/)). Used to populate the _Referrers > Campaigns_ report (clicking on a campaign loads all keywords for this campaign). _Note: this parameter will only be used for the first pageview of a visit._
+* `_rcn` &mdash; The Campaign name (see [Tracking Campaigns](https://matomo.org/docs/tracking-campaigns/)). Used to populate the _Referrers > Campaigns_ report. _Note: this parameter will only be used for the first pageview of a visit._
+* `_rck` &mdash; The Campaign Keyword (see [Tracking Campaigns](https://matomo.org/docs/tracking-campaigns/)). Used to populate the _Referrers > Campaigns_ report (clicking on a campaign loads all keywords for this campaign). _Note: this parameter will only be used for the first pageview of a visit._
 * `res` &mdash; The resolution of the device the visitor is using, eg **1280x1024**.
 * `h` &mdash; The current hour (local time).
 * `m` &mdash; The current minute (local time).
@@ -43,28 +43,28 @@ _(We recommend that these parameters be used if the information is available and
 * `cookie`  &mdash; when set to 1, the visitor's client is known to support cookies.
 
 * `ua` &mdash; An override value for the **User-Agent** HTTP header field. The user agent is used to detect the operating system and browser used.
-* `lang` &mdash; An override value for the **Accept-Language** HTTP header field. This value is used to detect the visitor's country if [GeoIP](https://piwik.org/faq/troubleshooting/#faq_65) is not enabled.
-* `uid` &mdash; defines the [User ID](https://piwik.org/docs/user-id/) for this request. User ID is any non-empty unique string identifying the user (such as an email address or an username). To access this value, users must be logged-in in your system so you can fetch this user ID from your system, and pass it to Piwik. The User ID appears in the visits log, the Visitor profile, and you can [Segment](https://developer.piwik.org/api-reference/segmentation) reports for one or several User ID (`userId` segment). When specified, the User ID will be "enforced". This means that if there is no recent visit with this User ID, a new one will be created. If a visit is found in the last 30 minutes with your specified User ID, then the new action will be recorded to this existing visit.
+* `lang` &mdash; An override value for the **Accept-Language** HTTP header field. This value is used to detect the visitor's country if [GeoIP](https://matomo.org/faq/troubleshooting/#faq_65) is not enabled.
+* `uid` &mdash; defines the [User ID](https://matomo.org/docs/user-id/) for this request. User ID is any non-empty unique string identifying the user (such as an email address or an username). To access this value, users must be logged-in in your system so you can fetch this user ID from your system, and pass it to Piwik. The User ID appears in the visits log, the Visitor profile, and you can [Segment](https://developer.matomo.org/api-reference/segmentation) reports for one or several User ID (`userId` segment). When specified, the User ID will be "enforced". This means that if there is no recent visit with this User ID, a new one will be created. If a visit is found in the last 30 minutes with your specified User ID, then the new action will be recorded to this existing visit.
 * `cid` &mdash; defines the visitor ID for this request. You must set this value to exactly a 16 character hexadecimal string (containing only characters 01234567890abcdefABCDEF). We recommended setting the User ID via `uid` rather than use this `cid`.
-* `new_visit` &mdash; If set to 1, will force a new visit to be created for this action. This feature is also [available in JavaScript](https://piwik.org/faq/how-to/#faq_187).
-* `dimension[0-999]` &mdash; A Custom Dimension value for a specific Custom Dimension ID (requires Piwik 2.15.1 + [Custom Dimensions plugin](https://plugins.piwik.org/CustomDimensions) see the [Custom Dimensions guide](https://piwik.org/docs/custom-dimensions/)). If Custom Dimension ID is `2` use `dimension2=dimensionValue` to send a value for this dimension. The configured Custom Dimension has to be in scope "Visit".
+* `new_visit` &mdash; If set to 1, will force a new visit to be created for this action. This feature is also [available in JavaScript](https://matomo.org/faq/how-to/#faq_187).
+* `dimension[0-999]` &mdash; A Custom Dimension value for a specific Custom Dimension ID (requires Piwik 2.15.1 + [Custom Dimensions plugin](https://plugins.matomo.org/CustomDimensions) see the [Custom Dimensions guide](https://matomo.org/docs/custom-dimensions/)). If Custom Dimension ID is `2` use `dimension2=dimensionValue` to send a value for this dimension. The configured Custom Dimension has to be in scope "Visit".
 
 ### Optional Action info (measure Page view, Outlink, Download, Site search)
 
-* `cvar` &mdash; Page scope [custom variables](https://piwik.org/docs/custom-variables/). This is a JSON encoded string of the custom variable array (see below for an example value).
+* `cvar` &mdash; Page scope [custom variables](https://matomo.org/docs/custom-variables/). This is a JSON encoded string of the custom variable array (see below for an example value).
 * `link` &mdash; An external URL the user has opened. Used for tracking outlink clicks. We recommend to also set the **url** parameter to this same value.
 * `download` &mdash; URL of a file the user has downloaded. Used for tracking downloads. We recommend to also set the **url** parameter to this same value.
-* `search` &mdash; The Site Search keyword. When specified, the request will not be tracked as a normal pageview but will instead be tracked as a [Site Search](https://piwik.org/docs/site-search/) request.
+* `search` &mdash; The Site Search keyword. When specified, the request will not be tracked as a normal pageview but will instead be tracked as a [Site Search](https://matomo.org/docs/site-search/) request.
 * `search_cat` &mdash; when **search** is specified, you can optionally specify a search category with this parameter.
 * `search_count` &mdash; when **search** is specified, we also recommend setting the search\_count to the number of search results displayed on the results page. When keywords are tracked with &search_count=0 they will appear in the "No Result Search Keyword" report.
 * `pv_id` &mdash; Accepts a six character unique ID that identifies which actions were performed on a specific page view. When a page was viewed, all following tracking requests (such as events) during that page view should use the same pageview ID. Once another page was viewed a new unique ID should be generated. Use `[0-9a-Z]` as possible characters for the unique ID.
-* `idgoal` &mdash; If specified, the tracking request will trigger a conversion for the [goal](https://piwik.org/docs/tracking-goals-web-analytics/) of the website being tracked with this ID.
+* `idgoal` &mdash; If specified, the tracking request will trigger a conversion for the [goal](https://matomo.org/docs/tracking-goals-web-analytics/) of the website being tracked with this ID.
 * `revenue` &mdash; A monetary value that was generated as revenue by this goal conversion. Only used if **idgoal** is specified in the request.
-* `gt_ms` &mdash; The amount of time it took the server to generate this action, in milliseconds. This value is used to process the [Page speed report](https://piwik.org/docs/page-speed/) **Avg. generation time** column in the Page URL and Page Title reports, as well as a site wide running average of the speed of your server. _Note: when using the JavaScript tracker this value is set to the time for server to generate response + the time for client to download response._
+* `gt_ms` &mdash; The amount of time it took the server to generate this action, in milliseconds. This value is used to process the [Page speed report](https://matomo.org/docs/page-speed/) **Avg. generation time** column in the Page URL and Page Title reports, as well as a site wide running average of the speed of your server. _Note: when using the JavaScript tracker this value is set to the time for server to generate response + the time for client to download response._
 * `cs` &mdash; The charset of the page being tracked. Specify the charset if the data you send to Piwik is encoded in a different character set than the default `utf-8`.
-* `dimension[0-999]` &mdash; A Custom Dimension value for a specific Custom Dimension ID (requires Piwik 2.15.1 + [Custom Dimensions plugin](https://plugins.piwik.org/CustomDimensions) see the [Custom Dimensions guide](https://piwik.org/docs/custom-dimensions/)). If Custom Dimension ID is `2` use `dimension2=dimensionValue` to send a value for this dimension. The configured Custom Dimension has to be in scope "Action".
+* `dimension[0-999]` &mdash; A Custom Dimension value for a specific Custom Dimension ID (requires Piwik 2.15.1 + [Custom Dimensions plugin](https://plugins.matomo.org/CustomDimensions) see the [Custom Dimensions guide](https://matomo.org/docs/custom-dimensions/)). If Custom Dimension ID is `2` use `dimension2=dimensionValue` to send a value for this dimension. The configured Custom Dimension has to be in scope "Action".
 
-### Optional [Event Tracking](https://piwik.org/docs/event-tracking/) info
+### Optional [Event Tracking](https://matomo.org/docs/event-tracking/) info
 * `e_c` &mdash; The event category. Must not be empty. (eg. Videos, Music, Games...)
 * `e_a` &mdash; The event action. Must not be empty. (eg. Play, Pause, Duration, Add Playlist, Downloaded, Clicked...)
 * `e_n` &mdash; The event name.  (eg. a Movie name, or Song name, or File name...)
@@ -72,7 +72,7 @@ _(We recommend that these parameters be used if the information is available and
 
 Note: Trailing and leading whitespaces will be trimmed from parameter values for `e_c`, `e_a` and `e_n`. Strings filled with whitespaces will be considered as (invalid) empty values.
 
-### Optional [Content Tracking](https://piwik.org/docs/content-tracking/) info
+### Optional [Content Tracking](https://matomo.org/docs/content-tracking/) info
 * `c_n` &mdash; The name of the content. For instance 'Ad Foo Bar'
 * `c_p` &mdash; The actual content piece. For instance the path to an image, video, audio, any text
 * `c_t` &mdash; The target of the content. For instance the URL of a landing page
@@ -80,7 +80,7 @@ Note: Trailing and leading whitespaces will be trimmed from parameter values for
 
 To track a content impression set `c_n` and optionally `c_p` and `c_t`. To track a content interaction set `c_i` and `c_n` and optionally `c_p` and `c_t`. To map an interaction to an impression make sure to set the same value for `c_n` and `c_p`. It is recommended to set a value for `c_p`.
 
-### Optional [Ecommerce](https://piwik.org/docs/ecommerce-analytics/) info
+### Optional [Ecommerce](https://matomo.org/docs/ecommerce-analytics/) info
 
 Use the following values to record a cart and/or an ecommerce order.
 
@@ -108,7 +108,7 @@ The following parameters require that you set `&token_auth=` to the token\_auth
 * `token_auth` &mdash; 32 character authorization key used to authenticate the API request. We recommend to create a user specifically for accessing the Tracking API, and give the user only *write* permission on the website(s).
 * `cip` &mdash; Override value for the visitor IP (both IPv4 and IPv6 notations supported).
 * `cdt` &mdash; Override for the datetime of the request (normally the current time is used). This can be used to record visits and page views in the past. The expected format is either a datetime such as: `2011-04-05 00:11:42` (remember to URL encode the value!), or a valid UNIX timestamp such as `1301919102`. The datetime must be sent in UTC timezone.
- _Note: if you record data in the past, you will need to [force Piwik to re-process reports for the past dates](https://piwik.org/faq/how-to/#faq_59)._
+ _Note: if you record data in the past, you will need to [force Piwik to re-process reports for the past dates](https://matomo.org/faq/how-to/#faq_59)._
  If you set `cdt` to a datetime older than 24 hours then `token_auth` must be set. If you set `cdt` with a datetime in the last 24 hours then you don't need to pass `token_auth`.
 * `country` &mdash; An override value for the country. Should be set to the two letter country code of the visitor (lowercase), eg **fr**, **de**, **us**.
 * `region` &mdash; An override value for the region. Should be set to a ISO 3166-2 region code, which are used by [MaxMind's](https://www.maxmind.com?rId=piwik) and [DB-IP's](https://db-ip.com/db/?refid=mtm) GeoIP2 databases. See [here](https://www.iso.org/obp/ui/#search/code/) for a list of them for every country.
@@ -119,7 +119,7 @@ The following parameters require that you set `&token_auth=` to the token\_auth
 ### Media Analytics parameters
 
 Analytics for your Media content (video players and audio players) can be recorded
-using the premium [Media Analytics](https://plugins.piwik.org/MediaAnalytics) plugin's HTTP Tracking API parameters.
+using the premium [Media Analytics](https://plugins.matomo.org/MediaAnalytics) plugin's HTTP Tracking API parameters.
 
 Activity and consumption of your videos and audios can be measured via the parameters `ma_id`, `ma_ti`, `ma_re`,
 `ma_mt` , `ma_pn`, `ma_st`, `ma_le`, `ma_ps`, `ma_ttp`, `ma_w`, `ma_h`, `ma_fs`, `ma_se`.
@@ -139,13 +139,13 @@ Learn more in the [Media Analytics HTTP Tracking API Reference](/guides/media-an
 
 ## Tracking Bots
 
-By default Piwik does not track bots. If you use the Tracking HTTP API directly, you may be interested in tracking bot requests. To enable Bot Tracking in Piwik, set the parameter `&bots=1` in your requests to piwik.php.
+By default Piwik does not track bots. If you use the Tracking HTTP API directly, you may be interested in tracking bot requests. To enable Bot Tracking in Piwik, set the parameter `&bots=1` in your requests to `matomo.php`.
 
 ## Example Tracking Request
 
-Here is an example of a real tracking request used by the [Piwik Mobile app](https://piwik.org/mobile/) when anonymously tracking Mobile App usage:
+Here is an example of a real tracking request used by the [Matomo Mobile app](https://matomo.org/mobile/) when anonymously tracking Mobile App usage:
 
-    http://piwik-server/piwik.php?_cvar={"1":["OS","iphone 5.0"],"2":["Piwik Mobile Version","1.6.2"],"3":["Locale","en::en"],"4":["Num Accounts","2"]}&action_name=View settings&url=http://mobileapp.piwik.org/window/settings &idsite=8876&rand=351459&h=18&m=13&s=3 &rec=1&apiv=1&cookie=1&urlref=http://iphone.mobileapp.piwik.org&_id=af344a398df83874 &_idvc=19&res=320×480&
+    https://matomo-server/matomo.php?_cvar={"1":["OS","iphone 5.0"],"2":["Piwik Mobile Version","1.6.2"],"3":["Locale","en::en"],"4":["Num Accounts","2"]}&action_name=View settings&url=http://mobileapp.matomo.org/window/settings &idsite=8876&rand=351459&h=18&m=13&s=3 &rec=1&apiv=1&cookie=1&urlref=https://iphone.mobileapp.piwik.org&_id=af344a398df83874 &_idvc=19&res=320×480&
 
 _Note: for clarity, parameter values are not URL encoded in this example._
 
@@ -153,7 +153,7 @@ _Note: for clarity, parameter values are not URL encoded in this example._
 
 ## Bulk Tracking
 
-Some applications such as the [Piwik log importer](https://piwik.org/log-analytics/), have to track many visits, sometimes tens, hundreds, thousands or even more all at once. Tracking these requests with one HTTP request per visit or action can result in _enormous_ delays due to the amount of time it takes to send an HTTP request, Using the bulk tracking feature, however, these requests can be sent all at once making the application far more efficient.
+Some applications such as the [Piwik log importer](https://matomo.org/log-analytics/), have to track many visits, sometimes tens, hundreds, thousands or even more all at once. Tracking these requests with one HTTP request per visit or action can result in _enormous_ delays due to the amount of time it takes to send an HTTP request, Using the bulk tracking feature, however, these requests can be sent all at once making the application far more efficient.
 
 To send a bulk tracking request, an HTTP POST must be made with a JSON object to the Piwik tracking endpoint. The object must contain the following properties:
 
@@ -167,28 +167,28 @@ This is an example of the payload of a bulk tracking request:
 
     {
        "requests": [
-          "?idsite=1&url=http://example.org&action_name=Test bulk log Pageview&rec=1",
-          "?idsite=1&url=http://example.net/test.htm&action_name=Another bul k page view&rec=1"
+          "?idsite=1&url=https://example.org&action_name=Test bulk log Pageview&rec=1",
+          "?idsite=1&url=https://example.net/test.htm&action_name=Another bul k page view&rec=1"
        ],
        "token_auth": "33dc3f2536d3025974cccb4b4d2d98f4"
     }
 
 Here is the command to send this request to Piwik using curl (without `token_auth` which is optional in this case):
 
-    curl -i -X POST -d '{"requests":["?idsite=1&url=http://example.org&action_name=Test bulk log Pageview&rec=1","?idsite=1&url=http://example.net/test.htm&action_name=Another bulk page view&rec=1"]}' http://piwik.example.com/piwik.php
+    curl -i -X POST -d '{"requests":["?idsite=1&url=https://example.org&action_name=Test bulk log Pageview&rec=1","?idsite=1&url=http://example.net/test.htm&action_name=Another bulk page view&rec=1"]}' https://matomo.example.com/matomo.php
 
 This will track **two** actions using only **one** HTTP request to Piwik.
 
 ## Debugging the Tracker
 
-To verify that your data is being tracked properly, you can enable debug logging in the Piwik tracking file, **piwik.php**.
+To verify that your data is being tracked properly, you can enable debug logging in the Piwik tracking file, **matomo.php**.
 
 **Tracking requests will then output the tracking log messages rather than displaying a 1*1 transparent GIF beacon. For security reasons, this should not be done in production or only for a very short time frame.**
 
 
 Follow these steps to enable and view debug logging for the tracker:
 
-1. In your config file `path/to/piwik/config/config.ini.php`, write the following:
+1. In your config file `path/to/matomo/config/config.ini.php`, write the following:
 
         [Tracker]
         debug = 1
@@ -199,9 +199,9 @@ Since Matomo 3.10 to enable the profiling of SQL queries you additionally need t
         enable_sql_profiler = 1
         
 2. Look at the HTTP requests that are sent to Piwik.
-    * If the requests take place in a browser, you can use a tool like the [Firebug](https://getfirebug.com/) to see all requests to **piwik.php**.
+    * If the requests take place in a browser, you can use a tool like the [Firebug](https://getfirebug.com/) to see all requests to **matomo.php**.
     * If the requests are triggered from your app or software directly, you can output or log the output of tracking requests and to view the debug messages.
-    * You can also [log messages to file or database](https://piwik.org/faq/troubleshooting/faq_115/) (requires at least Piwik 2.15.0).
+    * You can also [log messages to file or database](https://matomo.org/faq/troubleshooting/faq_115/) (requires at least Piwik 2.15.0).
 
 If you receive too many tracking requests and the log gets spammed by these requests or if you want to only debug some specific requests you can alternatively enable `debug_on_demand` in `config.ini.php`:
 
@@ -214,5 +214,5 @@ In this case messages will be only logged for Tracker requests that have a URL p
 ## Learn more
 
 * For **a list of tracking clients** see this [page](/guides/tracking-api-clients).
-* To learn more **about geolocation** read the [GeoIP user docs](https://piwik.org/docs/geo-locate/).
-* To learn **about Piwik's JavaScript tracker** read our [documentation for the tracker](https://piwik.org/docs/javascript-tracking/).
+* To learn more **about geolocation** read the [GeoIP user docs](https://matomo.org/docs/geo-locate/).
+* To learn **about Piwik's JavaScript tracker** read our [documentation for the tracker](https://matomo.org/docs/javascript-tracking/).
diff --git a/docs/4.x/tracking-javascript-guide.md b/docs/4.x/tracking-javascript-guide.md
index 38e32a0da..5845aa436 100644
--- a/docs/4.x/tracking-javascript-guide.md
+++ b/docs/4.x/tracking-javascript-guide.md
@@ -29,7 +29,7 @@ The tracking code looks as follows:
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', {$IDSITE}]);
     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 -->
@@ -37,9 +37,9 @@ The tracking code looks as follows:
 
 In your tracking code, `{$MATOMO_URL}` would be replaced by your Piwik URL and `{$IDSITE}` would be replaced by the idsite of the website you are tracking in Piwik.
 
-This code might look a bit strange to those of you familiar with JavaScript, but that is because it is made to run asynchronously. In other words, browsers will not wait for the `piwik.js` file to be downloaded in order to show your page.
+This code might look a bit strange to those of you familiar with JavaScript, but that is because it is made to run asynchronously. In other words, browsers will not wait for the `matomo.js` file to be downloaded in order to show your page.
 
-For asynchronous tracking, configuration and tracking calls are pushed onto the global `_paq` array for execution, independent of the asynchronous loading of `piwik.js`. The format is:
+For asynchronous tracking, configuration and tracking calls are pushed onto the global `_paq` array for execution, independent of the asynchronous loading of `matomo.js`. The format is:
 
 ```javascript
 _paq.push([ 'API_method_name', parameter_list ]);
@@ -59,7 +59,7 @@ _paq.push(['setCustomVariable','1','VisitorType','Member']);
 _paq.push([ function() { var customVariable = this.getCustomVariable(1); }]);
 ```
 
-You can push to the `_paq` array even after the `piwik.js` file has been loaded and run.
+You can push to the `_paq` array even after the `matomo.js` file has been loaded and run.
 
 If your Piwik tracking code doesn't look like this one, you may be using the deprecated version.
 Older versions still work as expected and will track your visitors, but we highly recommend that you update your pages to use the most recent tracking code.
@@ -105,7 +105,7 @@ To track any user interaction or click with Piwik, you can manually call the Jav
 <a href="#" onclick="_paq.push(['trackEvent', 'Menu', 'Freedom']);">Freedom page</a>
 ```
 
-You can learn more about [Tracking Events](https://piwik.org/docs/event-tracking/#tracking-events) in the user guide.
+You can learn more about [Tracking Events](https://matomo.org/docs/event-tracking/#tracking-events) in the user guide.
 
 ### Manually trigger goal conversions
 
@@ -132,7 +132,7 @@ You can also register a conversion for this goal with a custom revenue. For exam
 _paq.push(['trackGoal', 1, <?php echo $cart->getCartValue(); ?>]);
 ```
 
-Find more information about goal tracking in Piwik in the [**Tracking Goals**](https://piwik.org/docs/tracking-goals-web-analytics/) documentation.
+Find more information about goal tracking in Piwik in the [**Tracking Goals**](https://matomo.org/docs/tracking-goals-web-analytics/) documentation.
 
 ### Accurately measure the time spent on each page
 
@@ -163,13 +163,13 @@ Note: When testing the heart beat timer, remember to make sure the browser tab h
 
 ## Ecommerce tracking
 
-Piwik allows for advanced and powerful Ecommerce tracking. Check out the [Ecommerce Analytics](https://piwik.org/docs/ecommerce-analytics/) documentation for more information about Ecommerce reports and how to set up Ecommerce tracking.
+Piwik allows for advanced and powerful Ecommerce tracking. Check out the [Ecommerce Analytics](https://matomo.org/docs/ecommerce-analytics/) documentation for more information about Ecommerce reports and how to set up Ecommerce tracking.
 
 ## Internal search tracking
 
-Piwik offers advanced [Site Search Analytics](https://piwik.org/docs/site-search/) feature, letting you track how your visitors use your internal website search engine. By default, Piwik can read URL parameters that will contain the search keyword. However, you can also record the site search keyword manually using the JavaScript function `trackSiteSearch(...)`
+Piwik offers advanced [Site Search Analytics](https://matomo.org/docs/site-search/) feature, letting you track how your visitors use your internal website search engine. By default, Piwik can read URL parameters that will contain the search keyword. However, you can also record the site search keyword manually using the JavaScript function `trackSiteSearch(...)`
 
-In your website, in standard pages, you would typically have a call to record Page views via `piwikTracker.trackPageView()`. On your search result page, you would call **instead** `piwikTracker.trackSiteSearch(keyword, category, searchCount)` function to record the internal search request. Note: the 'keyword' parameter is required, but category and searchCount are optional.
+In your website, in standard pages, you would typically have a call to record Page views via `matomoTracker.trackPageView()`. On your search result page, you would call **instead** `piwikTracker.trackSiteSearch(keyword, category, searchCount)` function to record the internal search request. Note: the 'keyword' parameter is required, but category and searchCount are optional.
 
 ```javascript
 _paq.push(['trackSiteSearch',
@@ -185,11 +185,11 @@ _paq.push(['trackSiteSearch',
 // _paq.push(['trackPageView']);
 ```
 
-We also highly recommend to set the searchCount parameter, as Piwik will specifically report "No Result Keywords", ie. Keywords that were searched, but did not return any result. It is usually very interesting to know what users search for but can't find (yet?) on your website. Learn more about [Site Search Analytics in the User Doc](https://piwik.org/docs/site-search/).
+We also highly recommend to set the searchCount parameter, as Piwik will specifically report "No Result Keywords", ie. Keywords that were searched, but did not return any result. It is usually very interesting to know what users search for but can't find (yet?) on your website. Learn more about [Site Search Analytics in the User Doc](https://matomo.org/docs/site-search/).
 
 ## Custom variables
 
-Custom variables are a powerful feature that enable you to track custom values for each visit, and/or each page view. Please see the [Tracking custom variables](https://piwik.org/docs/custom-variables/) documentation page for general information.
+Custom variables are a powerful feature that enable you to track custom values for each visit, and/or each page view. Please see the [Tracking custom variables](https://matomo.org/docs/custom-variables/) documentation page for general information.
 
 You can set up up to 5 custom variables (name and value) for each visit to your website, and/or up to 5 custom variables for each page view. If you set a custom variable to a visitor, when he comes back one hour or two days later, it will be a new visit and his/her custom variables will be empty.
 
@@ -198,7 +198,7 @@ There are two "scopes" which you can set your custom variables to. The "scope" i
 - when scope = "visit", the custom variable's name and value will be stored in the visit in the database. You can therefore store up to 5 custom variables of scope "visit" for each visit.
 - when scope = "page", the custom variable's name and value will be stored for the page view being tracked. You can therefore store up to 5 custom variables of scope "page" for each page view.
 
-The "index" parameter is the custom variable slot index, an integer from 1 to 5. (note: [read this FAQ](https://piwik.org/faq/how-to/faq_17931/) if you need more than the default 5 slots).
+The "index" parameter is the custom variable slot index, an integer from 1 to 5. (note: [read this FAQ](https://matomo.org/faq/how-to/faq_17931/) if you need more than the default 5 slots).
 
 Custom variable statistics are reported in Piwik under **Visitors &gt; custom variables**. Both custom variables of scope "visit" and "page" are aggregated in this report.
 
@@ -307,7 +307,7 @@ _paq.push(['trackPageView']);
 
 ## Custom Dimensions
 
-[Custom Dimensions](https://piwik.org/docs/custom-dimensions/) are a powerful feature that enable you to track custom values for each visit, and/or each action (page view, outlink, download). This feature is not shipped with Piwik directly but can be installed as a plugin via the [Piwik Marketplace (CustomDimensions plugin)](https://plugins.piwik.org/CustomDimensions). Before you can use a Custom Dimension you need to install the plugin and configure at least one dimension, see the [Custom Dimensions guide](https://piwik.org/docs/custom-dimensions/). You will get a numeric ID for each configured Custom Dimension which can be used to set a value for it.
+[Custom Dimensions](https://matomo.org/docs/custom-dimensions/) are a powerful feature that enable you to track custom values for each visit, and/or each action (page view, outlink, download). This feature is not shipped with Piwik directly but can be installed as a plugin via the [Piwik Marketplace (CustomDimensions plugin)](https://plugins.matomo.org/CustomDimensions). Before you can use a Custom Dimension you need to install the plugin and configure at least one dimension, see the [Custom Dimensions guide](https://matomo.org/docs/custom-dimensions/). You will get a numeric ID for each configured Custom Dimension which can be used to set a value for it.
 
 ### Tracking a Custom Dimension across tracking requests
 
@@ -362,7 +362,7 @@ This function can be used to get the value of a Custom Dimension. It will only w
 
 ## User ID
 
-[User ID](https://piwik.org/docs/user-id/) is a feature in Piwik that lets you connect together a given user's data collected from multiple devices and multiple browsers. There are two steps to implementing User ID:
+[User ID](https://matomo.org/docs/user-id/) is a feature in Piwik that lets you connect together a given user's data collected from multiple devices and multiple browsers. There are two steps to implementing User ID:
 
 - You must assign a unique and persistent non-empty string that represents each logged-in user. Typically, this ID will be an email address or a username provided by your authentication system.
 - You must set the user ID for each pageview, otherwise the pageview will be tracked without the user ID set.  
@@ -419,7 +419,7 @@ _paq.push(['appendToTrackingUrl', '']);
 
 ## Content Tracking
 
-There are several ways to track content impressions and interactions manually, semi-automatically and automatically. Please be aware that content impressions will be tracked using bulk tracking which will always send a `POST` request, even if `GET` is configured which is the default. For more details have a look at the [in-depth guide to Content Tracking](https://developer.piwik.org/guides/content-tracking).
+There are several ways to track content impressions and interactions manually, semi-automatically and automatically. Please be aware that content impressions will be tracked using bulk tracking which will always send a `POST` request, even if `GET` is configured which is the default. For more details have a look at the [in-depth guide to Content Tracking](https://developer.matomo.org/guides/content-tracking).
 
 ### Track all content impressions within a page
 
@@ -487,10 +487,10 @@ You should use the methods `trackContentImpression(contentName, contentPiece, co
 Example
 
 ```javascript
-_paq.push(['trackContentImpression', 'Content Name', 'Content Piece', 'http://www.example.com']);
+_paq.push(['trackContentImpression', 'Content Name', 'Content Piece', 'https://www.example.com']);
 
 div.addEventListener('click', function () {
-    _paq.push(['trackContentInteraction', 'tabActivated', 'Content Name', 'Content Piece', 'http://www.example.com']);
+    _paq.push(['trackContentInteraction', 'tabActivated', 'Content Name', 'Content Piece', 'https://www.example.com']);
 });
 ```
 
@@ -533,7 +533,7 @@ _paq.push(['trackPageView']);
 
 To accurately track a visitor across different domain names into a single visit within one Piwik website, we need to set up what is called Cross Domain linking. Cross domain tracking in Piwik makes sure that when the visitor visits multiple websites and domain names, the visitor data will be stored in the same visit and that the visitor ID is reused across domain names. A typical use case where cross domain is needed is, for example, when an ecommerce online store is on `www.awesome-shop.com` and the ecommerce shopping cart technology is on another domain such as `secure.cart.com`.
 
-Cross domain linking uses a combination of the two tracker methods `setDomains` and `enableCrossDomainLinking`. Learn how to set up cross-domain linking in our guide: [How do I accurately measure a same visitor across multiple domain names (cross domain linking)?](https://piwik.org/faq/how-to/faq_23654/)
+Cross domain linking uses a combination of the two tracker methods `setDomains` and `enableCrossDomainLinking`. Learn how to set up cross-domain linking in our guide: [How do I accurately measure a same visitor across multiple domain names (cross domain linking)?](https://matomo.org/faq/how-to/faq_23654/)
 
 
 ### Tracking subdirectories of a domain in separate websites
@@ -597,7 +597,7 @@ Notes:
 * since the wildcard can match several paths, calls to `setCookieDomain` or `setCookiePath` are omitted to ensure tracking cookie is correctly shared for all pages matching the wildcard.
 
 
-For more information about tracking websites and subdomains in Piwik, see the FAQ: [How to configure Piwik to monitor several websites, domains and sub-domains](https://piwik.org/faq/new-to-piwik/#faq_104)
+For more information about tracking websites and subdomains in Piwik, see the FAQ: [How to configure Piwik to monitor several websites, domains and sub-domains](https://matomo.org/faq/new-to-piwik/#faq_104)
 
 ## Download and Outlink tracking
 
@@ -644,7 +644,7 @@ Learn more about this use case [Tracking subdirectories of a domain in separate
 If you want to force Piwik to consider a link as an outlink (links to the current domain or to one of the alias domains), you can add the 'piwik_link' css class to the link:
 
 ```html
-<a href='http://mysite.com/partner/' class='piwik_link'>Link I want to track as an outlink</a>
+<a href='https://mysite.com/partner/' class='piwik_link'>Link I want to track as an outlink</a>
 ```
 
 Note: you can customize and rename the CSS class used to force a click to be recorded as an outlink:
@@ -661,7 +661,7 @@ _paq.push(['trackPageView']);
 Alternatively, you can use JavaScript to manually trigger a click on an outlink (it will work the same for page views or file downloads). In this example, custom outlink is trigged when the email address is clicked:
 
 ```html
-<a href="mailto:namexyz@mydomain.co.uk" target="_blank" onClick="_paq.push(['trackLink', 'http://mydomain.co.uk/mailto/Agent namexyz', 'link']);">namexyz@mydomain.co.uk </a>
+<a href="mailto:namexyz@mydomain.co.uk" target="_blank" onClick="_paq.push(['trackLink', 'https://mydomain.co.uk/mailto/Agent namexyz', 'link']);">namexyz@mydomain.co.uk </a>
 ```
 
 ### Tracking file downloads
@@ -698,10 +698,10 @@ _paq.push(['trackPageView']);
 
 ### Recording a click as a download
 
-If you want to force Piwik to consider a link as a download, you can add the 'piwik_download' css class to the link:
+If you want to force Piwik to consider a link as a download, you can add the `matomo_download` or `piwik_download` css class to the link:
 
 ```html
-<a href='last.php' class='piwik_download'>Link I want to track as a download</a>
+<a href='last.php' class='matomo_download'>Link I want to track as a download</a>
 ```
 
 Note: you can customize and rename the CSS class used to force a click to be recorded as a download:
@@ -718,7 +718,7 @@ _paq.push(['trackPageView']);
 Alternatively, you can use JavaScript to manually trigger a click on a download. In this example, custom download is trigged when the link is clicked:
 
 ```html
-<a href="https://secure.example.com/this-is-a-file-url" target="_blank" onClick="_paq.push(['trackLink', 'http://mydomain.co.uk/mailto/Agent namexyz', 'download']);">Download</a>
+<a href="https://secure.example.com/this-is-a-file-url" target="_blank" onClick="_paq.push(['trackLink', 'https://mydomain.co.uk/mailto/Agent namexyz', 'download']);">Download</a>
 ```
 
 ### Changing the Pause Timer
@@ -753,14 +753,14 @@ _paq.push(['setIgnoreClasses', "no-tracking"]);
 _paq.push(['trackPageView']);
 ```
 
-This will result in clicks on a link `<a href='http://example.com' class='no-tracking'>Test</a>` not being counted.
+This will result in clicks on a link `<a href='https://example.com' class='no-tracking'>Test</a>` not being counted.
 
 #### Disabling for a specific link
 
-If you want to ignore download or outlink tracking on a specific link, you can add the 'piwik_ignore' css class to it:
+If you want to ignore download or outlink tracking on a specific link, you can add the `matomo_ignore` or 'piwik_ignore' css class to it:
 
 ```html
-<a href='http://builds.piwik.org/latest.zip' class='piwik_ignore'>File I don't want to track as a download</a>
+<a href='https://builds.matomo.org/latest.zip' class='matomo_ignore'>File I don't want to track as a download</a>
 ```
 
 ## Asking for consent
@@ -931,7 +931,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
 
 ## Multiple Piwik trackers
 
-By default, the Piwik JavaScript Tracking code collects your analytics data into one Piwik server. The Piwik service URL is specified in your JavaScript Tracking code (for example: `var u="//piwik.example.org";`). In some cases, you may want to track your analytics data into more than just one Piwik server or into multiple websites on the same Piwik server.
+By default, the Piwik JavaScript Tracking code collects your analytics data into one Piwik server. The Piwik service URL is specified in your JavaScript Tracking code (for example: `var u="//matomo.example.org";`). In some cases, you may want to track your analytics data into more than just one Piwik server or into multiple websites on the same Piwik server.
 
 *If you haven't upgraded yet to Piwik 2.16.2 or later, please upgrade now! (Instructions for 2.16.1 or older versions are found below.)*
 
@@ -941,21 +941,21 @@ You may need to collect a duplicate of your web analytics data into the same Piw
 
 #### Recommended solution: use RollUp Reporting plugin
 
-When you need to duplicate data into another website, or consolidate several websites into one or more groups (called RollUps) the recommended solution is to use the [RollUp Reporting premium plugin](https://plugins.piwik.org/RollUpReporting). Using this plugin has several advantages over the other solution as you can easily group one or more websites together, and the RollUps do not cause the tracking data to be duplicated which improves overall performance.
+When you need to duplicate data into another website, or consolidate several websites into one or more groups (called RollUps) the recommended solution is to use the [RollUp Reporting premium plugin](https://plugins.matomo.org/RollUpReporting). Using this plugin has several advantages over the other solution as you can easily group one or more websites together, and the RollUps do not cause the tracking data to be duplicated which improves overall performance.
 
 #### Alternative solution: duplicate the tracking data
 
 Alternatively to using the RollUp Reporting plugin you can duplicate the tracking data. To duplicate the data you can call `addTracker` with a Piwik URL and your website ID where to duplicate the data:
 
 ```js
-  var u="//piwik.example.org/";
+  var u="//matomo.example.org/";
   _paq.push(['setTrackerUrl', u+'matomo.php']);
   _paq.push(['setSiteId', '1']);
 
   // We will also collect the website data into Website ID = 7
   var websiteIdDuplicate = 7;
   // The data will be duplicated into `piwik.example.org/matomo.php`
-  _paq.push(['addTracker', piwikUrl = u+'matomo.php', websiteIdDuplicate]);
+  _paq.push(['addTracker', u+'matomo.php', websiteIdDuplicate]);
   // Your data is now tracked in both website ID 1 and website 7 into your piwik.example.org server!
 ```
 
@@ -972,7 +972,7 @@ The example below shows how to use `addTracker`  method to track the same analyt
   _paq.push(['enableLinkTracking']);
 
   (function() {
-    var u="//piwik.example.org/";
+    var u="//matomo.example.org/";
     _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '1']);
 
@@ -985,14 +985,14 @@ The example below shows how to use `addTracker`  method to track the same analyt
     // That's it!
 
     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>
 ```
 
 ### Customise one of the tracker object instances
 
-Note: by default any tracker added via `addTracker` is configured the same as the main default tracker object (regarding cookies, custom dimensions, user id, download & link tracking, domains and sub-domains, etc.). If you want to configure one of the Piwik tracker object instances that was added via `addTracker`, you may call the `Piwik.getAsyncTracker(optionalPiwikUrl, optionalPiwikSiteId)`  method. This method returns the tracker instance object which you can configure differently than the main JavaScript tracker object instance.
+Note: by default any tracker added via `addTracker` is configured the same as the main default tracker object (regarding cookies, custom dimensions, user id, download & link tracking, domains and sub-domains, etc.). If you want to configure one of the Piwik tracker object instances that was added via `addTracker`, you may call the `Matomo.getAsyncTracker(optionalMatomoUrl, optionalPiwikSiteId)`  method. This method returns the tracker instance object which you can configure differently than the main JavaScript tracker object instance.
 
 ### Duplicate the tracking data when calling the JavaScript API directly (not via `_paq.push`)
 
@@ -1000,27 +1000,27 @@ It is possible to track your analytics data into either a different website ID o
 
 ```html
 <script type="text/javascript">
-    window.piwikAsyncInit = function () {
+    window.matomoAsyncInit = function () {
         try {
-            var piwikTracker = Piwik.getTracker("http://URL_1/matomo.php", 1);
-            piwikTracker.trackPageView();
-            var piwik2 = Piwik.getTracker("http://URL_2/matomo.php", 4);
+            var matomoTracker = Matomo.getTracker("https://URL_1/matomo.php", 1);
+            matomoTracker.trackPageView();
+            var piwik2 = Matomo.getTracker("https://URL_2/matomo.php", 4);
             piwik2.trackPageView();
         } catch( err ) {}
     };
 </script>
 ```
 
-The `piwikAsyncInit()` method will be executed once the Piwik tracker is loaded and initialized. In earlier versions you must load Piwik synchronous.
+The `matomoAsyncInit()` method will be executed once the Piwik tracker is loaded and initialized. In earlier versions you must load Piwik synchronous.
 
 Note that you can also set the website ID and the Piwik tracker URL manually, instead of setting them in the getTracker call:
 
 ```javascript
-// we replace Piwik.getTracker("http://example.com/piwik/", 12)
-var piwikTracker = Piwik.getTracker();
-piwikTracker.setSiteId( 12 );
-piwikTracker.setTrackerUrl( "http://example.com/piwik/" );
-piwikTracker.trackPageView();
+// we replace Matomo.getTracker("https://example.com/matomo/", 12)
+var matomoTracker = Matomo.getTracker();
+matomoTracker.setSiteId( 12 );
+matomoTracker.setTrackerUrl( "https://example.com/matomo/" );
+matomoTracker.trackPageView();
 ```
 
 ## JavaScript Tracker Reference
@@ -1029,13 +1029,13 @@ View all features of the Tracking client in the [JavaScript Tracker Reference](/
 
 ## Frequently Asked Questions
 
-If you have any question about JavaScript Tracking in Piwik, [please search the website](https://piwik.org/), or [ask in the forums](https://forum.piwik.org).
+If you have any question about JavaScript Tracking in Piwik, [please search the website](https://matomo.org/), or [ask in the forums](https://forum.matomo.org).
 
-- [How do enable tracking for users without JavaScript?](https://piwik.org/faq/how-to/#faq_176)
-- [How does Piwik track downloads?](https://piwik.org/faq/new-to-piwik/#faq_47)
-- [How to track single-page websites and web applications](https://piwik.org/blog/2017/02/how-to-track-single-page-websites-using-piwik-analytics/)
-- [How to track error pages and get the list of 404 and referrers urls.](https://piwik.org/faq/how-to/#faq_60)
-- [How can I set custom groups of pages (structure) so that page view are aggregated by categories?](https://piwik.org/faq/how-to/#faq_62)
-- [How do I set up Piwik to track multiple websites without revealing the Piwik server URL footprint in JS?](https://piwik.org/faq/how-to/#faq_132)
-- [How do I customise the piwik.js being loaded on all my websites?](https://piwik.org/faq/how-to/faq_19087/)
-- [How do I disable all tracking cookies used by Piwik in the javascript code?](https://piwik.org/faq/general/#faq_157)
+- [How do enable tracking for users without JavaScript?](https://matomo.org/faq/how-to/#faq_176)
+- [How does Piwik track downloads?](https://matomo.org/faq/new-to-piwik/#faq_47)
+- [How to track single-page websites and web applications](https://matomo.org/blog/2017/02/how-to-track-single-page-websites-using-piwik-analytics/)
+- [How to track error pages and get the list of 404 and referrers urls.](https://matomo.org/faq/how-to/#faq_60)
+- [How can I set custom groups of pages (structure) so that page view are aggregated by categories?](https://matomo.org/faq/how-to/#faq_62)
+- [How do I set up Piwik to track multiple websites without revealing the Piwik server URL footprint in JS?](https://matomo.org/faq/how-to/#faq_132)
+- [How do I customise the matomo.js being loaded on all my websites?](https://matomo.org/faq/how-to/faq_19087/)
+- [How do I disable all tracking cookies used by Piwik in the javascript code?](https://matomo.org/faq/general/#faq_157)
diff --git a/docs/4.x/tracking-javascript.md b/docs/4.x/tracking-javascript.md
index fd2156759..5dec7dd6e 100644
--- a/docs/4.x/tracking-javascript.md
+++ b/docs/4.x/tracking-javascript.md
@@ -11,8 +11,8 @@ Read also the **[JavaScript Tracking Client](/guides/tracking-javascript-guide)*
 
 ### Requesting the Tracker Instance from the Piwik Class
 
-*   `Piwik.getTracker( trackerUrl, siteId )` - Get a new instance of the Tracker
-*   `Piwik.getAsyncTracker( optionalPiwikUrl, optionalPiwikSiteId )` - Get the internal instance of the Tracker used for asynchronous tracking
+*   `Matomo.getTracker( trackerUrl, siteId )` - Get a new instance of the Tracker
+*   `Matomo.getAsyncTracker( optionalMatomoUrl, optionalMatomoSiteId )` - Get the internal instance of the Tracker used for asynchronous tracking
 
 ### Using the Tracker Object
 
@@ -31,9 +31,9 @@ Read also the **[JavaScript Tracking Client](/guides/tracking-javascript-guide)*
 *    `ping()` - Send a ping request. Ping requests do not track new actions. If they are sent within the standard visit length, they will extend the existing visit and the current last action for the visit. If sent after the standard visit length, ping requests will create a new visit using the last action in the last known visit. See also `enableHeartBeatTimer`.
 *   `enableHeartBeatTimer( delayInSeconds )` - Install a Heart beat timer that will regularly send requests to Piwik in order to better measure the time spent on the page. These requests will be sent only when the user is actively viewing the page (when the tab is active and in focus). These requests will not track additional actions or pageviews. By default, `delayInSeconds` is set to 15 seconds. See also `ping` and the [developer guide](https://developer.matomo.org/guides/tracking-javascript-guide#accurately-measure-the-time-spent-on-each-page).
 *   `enableLinkTracking( enable )` - Install link tracking on all applicable link elements. Set the enable parameter to true to use pseudo click-handler (treat middle click and open contextmenu as left click). A right click (or any click that opens the context menu) on a link will be tracked as clicked even if "Open in new tab" is not selected. If "false" (default), nothing will be tracked on open context menu or middle click.
-* `enableCrossDomainLinking()` - Enable cross domain linking. By default, the visitor ID that identifies a unique visitor is stored in the browser's first party cookies. This means the cookie can only be accessed by pages on the same domain. If you own multiple domains and would like to track all the actions and pageviews of a specific visitor into the same visit, you may enable [cross domain linking (learn more)](https://piwik.org/faq/how-to/faq_23654/) . Whenever a user clicks on a link it will append a URL parameter `pk_vid` to the clicked URL which forwards the current visitor ID value to the page of the different domain.
+* `enableCrossDomainLinking()` - Enable cross domain linking. By default, the visitor ID that identifies a unique visitor is stored in the browser's first party cookies. This means the cookie can only be accessed by pages on the same domain. If you own multiple domains and would like to track all the actions and pageviews of a specific visitor into the same visit, you may enable [cross domain linking (learn more)](https://matomo.org/faq/how-to/faq_23654/) . Whenever a user clicks on a link it will append a URL parameter `pk_vid` to the clicked URL which forwards the current visitor ID value to the page of the different domain.
 * `setCrossDomainLinkingTimeout( timeout )` - Set the cross domain linking timeout (in seconds). By default, the two visits across domains will be linked together when the link is clicked and the page is loaded within a 180 seconds timeout window.`
-* `getCrossDomainLinkingUrlParameter()` - Get the query parameter to append to links to handle cross domain linking. Use this to add cross domain support for links that are added to the DOM dynamically.  [Learn more about cross domain linking](https://piwik.org/faq/how-to/faq_23654/). 
+* `getCrossDomainLinkingUrlParameter()` - Get the query parameter to append to links to handle cross domain linking. Use this to add cross domain support for links that are added to the DOM dynamically.  [Learn more about cross domain linking](https://matomo.org/faq/how-to/faq_23654/). 
 
 ### Configuration of the Tracker Object
 
@@ -42,21 +42,22 @@ Read also the **[JavaScript Tracking Client](/guides/tracking-javascript-guide)*
 *   `setCustomUrl( string )` - Override the page's reported URL
 *   `setReferrerUrl( string )` - Override the detected Http-Referer
 *   `setSiteId( integer )` - Specify the website ID. Redundant: can be specified in `getTracker()` constructor.
-*   `setApiUrl( string )` - Specify the Piwik HTTP API URL endpoint. Points to the root directory of piwik, e.g. http://piwik.example.org/ or https://example.org/piwik/. This function is only useful when the 'Overlay' report is not working. By default, you do not need to use this function.
+*   `setApiUrl( string )` - Specify the Piwik HTTP API URL endpoint. Points to the root directory of piwik, e.g. https://matomo.example.org/ or https://example.org/matomo/. This function is only useful when the 'Overlay' report is not working. By default, you do not need to use this function.
 *   `setTrackerUrl( string )` - Specify the Piwik server URL. Redundant: can be specified in `getTracker()` constructor.
-* `getPiwikUrl()` - Return the Piwik server URL.
-* `getCurrentUrl()` - Return the current url of the page that is currently being visited. If a custom URL was set before calling this method, the custom URL will be returned.
-*   `setDownloadClasses( string | array )` - Set classes to be treated as downloads (in addition to piwik_download)
+*   `getMatomoUrl()` - Return the Matomo server URL.
+*   `getPiwikUrl()` - Deprecated, use `getMatomoUrl()` instead. 
+*   `getCurrentUrl()` - Return the current url of the page that is currently being visited. If a custom URL was set before calling this method, the custom URL will be returned.
+*   `setDownloadClasses( string | array )` - Set classes to be treated as downloads (in addition to matomo_download)
 *   `setDownloadExtensions( string | array )` - Set list of file extensions to be recognized as downloads. Example: 'doc' or ['doc', 'xls']
 *   `addDownloadExtensions( string | array )` - Specify additional file extensions to be recognized as downloads. Example: 'doc' or ['doc', 'xls']
 *   `removeDownloadExtensions( string | array )` - Specify file extensions to be removed from the list of download file extensions. Example: 'doc' or ['doc', 'xls']
-*   `setIgnoreClasses( string | array )` - Set classes to be ignored if present in link (in addition to piwik_ignore)
+*   `setIgnoreClasses( string | array )` - Set classes to be ignored if present in link (in addition to matomo_ignore and piwik_ignore)
 *   `setLinkClasses( string | array )` - Set classes to be treated as outlinks (in addition to piwik_link)
 *   `setLinkTrackingTimer( integer )` - Set delay for link tracking in milliseconds.
-*  `getLinkTrackingTimer()` - Get delay for link tracking (in milliseconds).
+*   `getLinkTrackingTimer()` - Get delay for link tracking (in milliseconds).
 *   `discardHashTag( bool )` - Set to true to not record the hash tag (anchor) portion of URLs
 *   `setGenerationTimeMs(generationTime)` - By default Piwik uses the browser DOM Timing API to accurately determine the time it takes to generate and download the page. You may overwrite the value by specifying a milliseconds value here.
-*   `appendToTrackingUrl(appendToUrl)` - Append a custom string to the end of the HTTP request to piwik.php?
+*   `appendToTrackingUrl(appendToUrl)` - Append a custom string to the end of the HTTP request to matomo.php?
 *   `setDoNotTrack( bool )` - Set to true to not track users who opt out of tracking using Mozilla's (proposed) Do Not Track setting.
 *   `killFrame()` - Enable a frame-buster to prevent the tracked web page from being framed/iframed.
 *   `redirectFile( url )` - Force the browser load the live URL if the tracked web page is loaded from a local file (e.g., saved to someone's desktop).
@@ -64,32 +65,32 @@ Read also the **[JavaScript Tracking Client](/guides/tracking-javascript-guide)*
 *   `getVisitorId()` - Return the 16 characters ID for the visitor
 *   `getVisitorInfo()` - Return the visitor cookie contents in an array
 *   `getAttributionInfo()` - Return the visitor attribution array (Referer information and / or Campaign name &amp; keyword).
-    Attribution information is used by Piwik to credit the correct referrer ([first or last referrer](https://piwik.org/faq/general/#faq_106)) used when a user triggers a goal conversion.
+    Attribution information is used by Piwik to credit the correct referrer ([first or last referrer](https://matomo.org/faq/general/#faq_106)) used when a user triggers a goal conversion.
 
     You can also use any of the following functions to get specific attributes of data:
 
-    *   `piwikTracker.getAttributionCampaignName()`
-    *   `piwikTracker.getAttributionCampaignKeyword()`
-    *   `piwikTracker.getAttributionReferrerTimestamp()`
-    *   `piwikTracker.getAttributionReferrerUrl()`
+    *   `matomoTracker.getAttributionCampaignName()`
+    *   `matomoTracker.getAttributionCampaignKeyword()`
+    *   `matomoTracker.getAttributionReferrerTimestamp()`
+    *   `matomoTracker.getAttributionReferrerUrl()`
 
 *   `getUserId()` - Return the User ID string if it was set.
-*   `setUserId( userId )` -  Sets a [User ID](https://piwik.org/docs/user-id/) to this user (such as an email address or a username).
+*   `setUserId( userId )` -  Sets a [User ID](https://matomo.org/docs/user-id/) to this user (such as an email address or a username).
 *   `resetUserId` - Clears (un-set) the User ID.
 *   `setCustomVariable (index, name, value, scope)` - Set a custom variable.
 *   `deleteCustomVariable (index, scope)` - Delete a custom variable.
 *   `getCustomVariable (index, scope)` - Retrieve a custom variable.
 *   `storeCustomVariablesInCookie()` -  When called then the Custom Variables of scope "visit" will be stored (persisted) in a first party cookie for the duration of the visit. This is useful if you want to call `getCustomVariable` later in the visit. (by default custom variables are not stored on the visitor's computer.)
-*   `setCustomDimension (customDimensionId, customDimensionValue)` - Set a custom dimension. (requires [Custom Dimensions plugin](https://plugins.piwik.org/CustomDimensions))
-*   `deleteCustomDimension (customDimensionId)` - Delete a custom dimension. (requires [Custom Dimensions plugin](https://plugins.piwik.org/CustomDimensions))
-*   `getCustomDimension (customDimensionId)` - Retrieve a custom dimension. (requires [Custom Dimensions plugin](https://plugins.piwik.org/CustomDimensions))
-*   `setCampaignNameKey(name)` - Set campaign name parameter(s). (Help: [Customize Campaign name parameter names](https://piwik.org/faq/how-to/#faq_120))
-*   `setCampaignKeywordKey(keyword)` - Set campaign keyword parameter(s). (Help: [Customize Campaign keyword parameter names](https://piwik.org/faq/how-to/#faq_120))
+*   `setCustomDimension (customDimensionId, customDimensionValue)` - Set a custom dimension. (requires [Custom Dimensions plugin](https://plugins.matomo.org/CustomDimensions))
+*   `deleteCustomDimension (customDimensionId)` - Delete a custom dimension. (requires [Custom Dimensions plugin](https://plugins.matomo.org/CustomDimensions))
+*   `getCustomDimension (customDimensionId)` - Retrieve a custom dimension. (requires [Custom Dimensions plugin](https://plugins.matomo.org/CustomDimensions))
+*   `setCampaignNameKey(name)` - Set campaign name parameter(s). (Help: [Customize Campaign name parameter names](https://matomo.org/faq/how-to/#faq_120))
+*   `setCampaignKeywordKey(keyword)` - Set campaign keyword parameter(s). (Help: [Customize Campaign keyword parameter names](https://matomo.org/faq/how-to/#faq_120))
 *   `setConversionAttributionFirstReferrer( bool )` - Set to true to attribute a conversion to the first referrer. By default, conversion is attributed to the most recent referrer.
 
 ### Ecommerce
 
-Piwik provides [ecommerce analytics](https://piwik.org/docs/ecommerce-analytics/) that let you measure items added to carts, and learn detailed metrics about abandoned carts and purchased orders.
+Piwik provides [ecommerce analytics](https://matomo.org/docs/ecommerce-analytics/) that let you measure items added to carts, and learn detailed metrics about abandoned carts and purchased orders.
 
 *   `setEcommerceView( productSKU, productName, categoryName, price )` - Set the current page view as a product or category page view. When you call `setEcommerceView` it must be followed by a call to `trackPageView` to record the product or category page view.
 *   `addEcommerceItem( productSKU, [productName], [productCategory], [price], [quantity] )` - Add a product into the ecommerce order. Must be called for each product in the order.
@@ -115,7 +116,7 @@ You can use these methods to build your own consent form/pages. [Learn more abou
 Piwik uses first party cookies to keep track of some user information over time. Consideration must be given to retention times and avoiding conflicts with other cookies, trackers, and apps.
 
 *   `disableCookies()` - Disable all first party cookies. Existing Piwik cookies for this websites will be deleted on the next page view.
-*   `deleteCookies()` - Delete the tracking cookies currently currently set (this is useful when [creating new visits](https://piwik.org/faq/how-to/#faq_187))
+*   `deleteCookies()` - Delete the tracking cookies currently currently set (this is useful when [creating new visits](https://matomo.org/faq/how-to/#faq_187))
 *   `hasCookies()` - Return whether cookies are enabled and supported by this browser.
 *   `setCookieNamePrefix( prefix )` - the default prefix is '_pk_'.
 *   `setCookieDomain( domain )` - the default is the document domain; if your website can be visited at both www.example.com and example.com, you would use: `tracker.setCookieDomain('.example.com');` or `tracker.setCookieDomain('*.example.com');`
@@ -128,17 +129,17 @@ Piwik uses first party cookies to keep track of some user information over time.
 ### Advanced uses
 
 *   `addListener( element )` - Add click listener to a specific link element. When clicked, Piwik will log the click automatically.
-*   `setRequestMethod( method )` - Set the request method to either "GET" or "POST". (The default is "GET".) To use the POST request method, either 1) the Piwik host is the same as the tracked website host (Piwik installed in the same domain as your tracked website), or 2) if Piwik is not installed on the same host as your website, you need to [enable CORS (Cross domain requests) as explained in this FAQ](https://piwik.org/faq/how-to/faq_18694/).
+*   `setRequestMethod( method )` - Set the request method to either "GET" or "POST". (The default is "GET".) To use the POST request method, either 1) the Piwik host is the same as the tracked website host (Piwik installed in the same domain as your tracked website), or 2) if Piwik is not installed on the same host as your website, you need to [enable CORS (Cross domain requests) as explained in this FAQ](https://matomo.org/faq/how-to/faq_18694/).
 *   `setCustomRequestProcessing( function )` - Set a function that will process the request content. The function will be called once the request (query parameters string) has been prepared, and before the request content is sent.
 *   `setRequestContentType( contentType )` - Set request Content-Type header value. Applicable when "POST" request method is used via `setRequestMethod`.
 * `disableQueueRequest()` - Disable the feature which groups together multiple tracking requests and send them as a bulk POST request. Disabling this feature is useful when you want to be able to [replay all logs](https://matomo.org/faq/log-analytics-tool/faq_19221/): one must use `disableQueueRequest` to disable this behaviour to later be able to replay logged Matomo logs (otherwise a subset of the requests wouldn't be able to be replayed).
 
-## Unit Tests Covering piwik.js
+## Unit Tests Covering matomo.js
 
-The Piwik JavaScript Tracking API is covered by an extensive JavaScript unit test suite to ensure that the code quality is as high as possible, and that we never break this functionality. Tests are written using QUnit. To run the tests, simply checkout the [Piwik Git repository](https://piwik.org/participate/contributing-with-git/) and go to `/path/to/piwik/tests/javascript/`. Tests are run inside your browser.
+The Piwik JavaScript Tracking API is covered by an extensive JavaScript unit test suite to ensure that the code quality is as high as possible, and that we never break this functionality. Tests are written using QUnit. To run the tests, simply checkout the [Piwik Git repository](https://matomo.org/participate/contributing-with-git/) and go to `/path/to/matomo/tests/javascript/`. Tests are run inside your browser.
 
-The Piwik JavaScript API has been tested with numerous web browsers. To maximize coverage, we use services like [crossbrowsertesting.com](https://crossbrowsertesting.com/) and [browsershots.org](http://browsershots.org/).
+The Piwik JavaScript API has been tested with numerous web browsers. To maximize coverage, we use services like [crossbrowsertesting.com](https://crossbrowsertesting.com/) and [browsershots.org](https://browsershots.org/).
 
-## Minify piwik.js
+## Minify matomo.js
 
-The piwik.js is minified to reduce the size that your website visitors will have to download. The YUI Compressor is used to minify the JavaScript ([more information](https://github.com/matomo-org/matomo/blob/master/js/README.md#introduction)). You can find the original non minified version in [/js/piwik.js](https://github.com/matomo-org/matomo/blob/master/js/piwik.js#L1).
+The matomo.js is minified to reduce the size that your website visitors will have to download. The YUI Compressor is used to minify the JavaScript ([more information](https://github.com/matomo-org/matomo/blob/master/js/README.md#introduction)). You can find the original non minified version in [/js/piwik.js](https://github.com/matomo-org/matomo/blob/master/js/piwik.js#L1).
diff --git a/docs/4.x/translations.md b/docs/4.x/translations.md
index ec058abab..32e17aac7 100644
--- a/docs/4.x/translations.md
+++ b/docs/4.x/translations.md
@@ -54,7 +54,7 @@ To replace a key with translated text, Piwik will look into the JSON file for th
 
 ### Reusing translations
 
-As mentioned Piwik comes with quite a lot of translations. You can and should reuse them but you are supposed to be aware that a translation key might be removed or renamed in the future. It is also possible that a translation key was added in a recent version and therefore is not available in older versions of Piwik. We do not currently announce any of such changes. Still, 99% of the translation keys do not change and it is therefore usually a good idea to reuse existing translations. Especially when you or your company would otherwise not be able to provide them. To find any existing translation keys go to <span style="font-variant: small-caps">Settings =&gt; Translation search</span> in your Piwik installation. The menu item will only appear if the [development mode](https://developer.piwik.org/guides/getting-started-part-1#enable-development-mode) is enabled.
+As mentioned Piwik comes with quite a lot of translations. You can and should reuse them but you are supposed to be aware that a translation key might be removed or renamed in the future. It is also possible that a translation key was added in a recent version and therefore is not available in older versions of Piwik. We do not currently announce any of such changes. Still, 99% of the translation keys do not change and it is therefore usually a good idea to reuse existing translations. Especially when you or your company would otherwise not be able to provide them. To find any existing translation keys go to <span style="font-variant: small-caps">Settings =&gt; Translation search</span> in your Piwik installation. The menu item will only appear if the [development mode](https://developer.matomo.org/guides/getting-started-part-1#enable-development-mode) is enabled.
 
 ## Translations in PHP
 
@@ -67,7 +67,7 @@ $translatedText = Piwik::translate('MyPlugin_BlogPost');
 or
 
 ```php
-$translatedText = Piwik::translate('MyPlugin_MyParagraphWithALink', '<a href="http:://piwik.org">', '</a>');
+$translatedText = Piwik::translate('MyPlugin_MyParagraphWithALink', '<a href="https://matomo.org">', '</a>');
 // where the key "MyPlugin_MyParagraphWithALink" could look like this:
 // "My paragraph has a %1$slink%2$s."
 ```
@@ -83,7 +83,7 @@ To translate text in Twig templates, use the `translate` filter. For example,
 or
 
 ```twig
-{{ 'MyPlugin_MyParagraphWithALink'|translate('<a href="https://piwik.org">', '</a>') }}
+{{ 'MyPlugin_MyParagraphWithALink'|translate('<a href="https://matomo.org">', '</a>') }}
 ```
 
 ## Translation in JavaScript
@@ -117,15 +117,15 @@ var translatedText = _pk_translate('MyPlugin_BlogPost');
 
 ## Contributing translations to Piwik
 
-Did you know you can contribute [translations](https://piwik.org/translations/) to Piwik? In case you want to improve an existing translation, translate a missing one or add a new language go to [Piwik Translations and sign up for an account](https://www.transifex.com/piwik/piwik/).
+Did you know you can contribute [translations](https://matomo.org/translations/) to Piwik? In case you want to improve an existing translation, translate a missing one or add a new language go to [Piwik Translations and sign up for an account](https://www.transifex.com/matomo-org/matomo/).
 
 
 ## Getting translations for your plugin
 
 
-As long as you are [developing an open source plugin](https://developer.piwik.org/develop) hosted on Github, you may get in touch with us ([translations@matomo.org](mailto:translations@matomo.org?subject=Getting my Piwik plugin translated in other languages)) in order to get your plugin translated by the Piwik translators community.
+As long as you are [developing an open source plugin](https://developer.matomo.org/develop) hosted on Github, you may get in touch with us ([translations@matomo.org](mailto:translations@matomo.org?subject=Getting my Piwik plugin translated in other languages)) in order to get your plugin translated by the Piwik translators community.
 
-You will need an account on [Transifex.com](http://transifex.com/). If you use Transifex with a social login, please ensure to set a password in your account settings. This will be required for fetching new translations into your plugin repository.
+You will need an account on [Transifex.com](https://transifex.com/). If you use Transifex with a social login, please ensure to set a password in your account settings. This will be required for fetching new translations into your plugin repository.
 
 ### Importing your plugin’s strings in the translation platform
 
@@ -133,7 +133,7 @@ While doing the initial setup for your plugin, we will import your english trans
 
 ### How to fetch your plugins translations into your repository
 
-As soon as we have set up your plugin within [our Piwik project on Transifex](https://www.transifex.com/projects/p/piwik/) and there are new translations available, you will be able to update your plugin translations using the Piwik console. You will need a locally installed Piwik with [development mode enabled](https://developer.piwik.org/guides/getting-started-part-1#enable-development-mode), and your plugin installed. To update the translations go to the Piwik directory on your development box and execute the following command:
+As soon as we have set up your plugin within [our Piwik project on Transifex](https://www.transifex.com/projects/p/matomo-org/) and there are new translations available, you will be able to update your plugin translations using the Piwik console. You will need a locally installed Piwik with [development mode enabled](https://developer.matomo.org/guides/getting-started-part-1#enable-development-mode), and your plugin installed. To update the translations go to the Piwik directory on your development box and execute the following command:
 
 ```bash
 ./console translations:update -u {YourTransifexUserName} -p {YourTransifexPassword} -P {YourPluginName}
diff --git a/docs/4.x/views.md b/docs/4.x/views.md
index 7f3435b99..9bc107c76 100644
--- a/docs/4.x/views.md
+++ b/docs/4.x/views.md
@@ -48,4 +48,4 @@ Piwik has a UI demo page available. This page is intended to show all the UI com
 1. Go to the Administration page (gear icon)
 2. In the navigation menu, under _Development_, select  _UI Demo_
 
-Note: The _Development_ menu section will only appear if the [development mode](https://developer.piwik.org/guides/getting-started-part-1#enable-development-mode) is enabled.
+Note: The _Development_ menu section will only appear if the [development mode](https://developer.matomo.org/guides/getting-started-part-1#enable-development-mode) is enabled.
diff --git a/docs/4.x/visualizing-report-data.md b/docs/4.x/visualizing-report-data.md
index 3e1026d01..0e8c4ef68 100644
--- a/docs/4.x/visualizing-report-data.md
+++ b/docs/4.x/visualizing-report-data.md
@@ -21,9 +21,9 @@ Users can switch visualizations by clicking on one of the icons displayed below
 
 ![](/img/report-visualizations.png)
 
-These icons are called **footer icons**. Not all visualizations have to be available in this manner. For example, the [Visit Log](https://piwik.org/docs/real-time/) uses its own visualization, but since it can only use data from one report (`Live.getLastVisitsDetails`) it is not available in the footer of other reports.
+These icons are called **footer icons**. Not all visualizations have to be available in this manner. For example, the [Visit Log](https://matomo.org/docs/real-time/) uses its own visualization, but since it can only use data from one report (`Live.getLastVisitsDetails`) it is not available in the footer of other reports.
 
-To learn more about the controls that surround a visualization in most report displays, [read the user documentation for report visualizations](https://piwik.org/docs/piwik-tour/#a-look-at-a-piwik-report).
+To learn more about the controls that surround a visualization in most report displays, [read the user documentation for report visualizations](https://matomo.org/docs/matomo-tour/#a-look-at-a-piwik-report).
 
 ### Using ViewDataTable
 
@@ -123,7 +123,7 @@ public function addWidgets()
 
 Piwik users will then be able to see and select **myReport** in the widget selector.
 
-*Note: Any controller method can be embedded in the dashboard, not just reports. So if you have a popup that you'd like to make available as a dashboard widget, you can use [WidgetsList.addWidgets](/api-reference/events#widgetslistaddwidgets) to do so. This is exactly how we made the [Visitor Profile](https://piwik.org/docs/user-profile/) available in the dashboard.*
+*Note: Any controller method can be embedded in the dashboard, not just reports. So if you have a popup that you'd like to make available as a dashboard widget, you can use [WidgetsList.addWidgets](/api-reference/events#widgetslistaddwidgets) to do so. This is exactly how we made the [Visitor Profile](https://matomo.org/docs/user-profile/) available in the dashboard.*
 
 ## Core report visualizations
 
@@ -144,7 +144,7 @@ You can use these visualizations when creating [ViewDataTable](/api-reference/Pi
 
 Plugins can provide their own visualizations, either for use within the plugin or as a new visualization that can be applied to any report.
 
-The [Treemap Visualization](https://plugins.piwik.org/TreemapVisualization) plugin is an example of a plugin providing a visualization that can be used for any report.
+The [Treemap Visualization](https://plugins.matomo.org/TreemapVisualization) plugin is an example of a plugin providing a visualization that can be used for any report.
 
 ### Extending ViewDataTable
 
@@ -217,7 +217,7 @@ Visualizations can also create their own [RequestConfig](/api-reference/Piwik/Vi
 
 If needed, custom visualizations can alter what data is loaded by the base `ViewDataTable` class.
 
-The evolution graph visualization does this to get reports for the last N periods so it can display data over time. The [treemap visualization](https://plugins.piwik.org/TreemapVisualization) does this to get data for last period so the percent change of each row can be displayed.
+The evolution graph visualization does this to get reports for the last N periods so it can display data over time. The [treemap visualization](https://plugins.matomo.org/TreemapVisualization) does this to get data for last period so the percent change of each row can be displayed.
 
 To change what data is loaded, visualizations can alter the request using the [`$request_parameters_to_modify`](/api-reference/Piwik/ViewDataTable/RequestConfig#request_parameters_to_modify) property. This can be done in the [`Visualization::beforeLoadDataTable()`](/api-reference/Piwik/Plugin/Visualization#beforeloaddatatable) method. For example:
 
diff --git a/docs/4.x/working-with-piwiks-ui.md b/docs/4.x/working-with-piwiks-ui.md
index 86aca3aca..f7b5c698c 100644
--- a/docs/4.x/working-with-piwiks-ui.md
+++ b/docs/4.x/working-with-piwiks-ui.md
@@ -15,7 +15,7 @@ Piwik uses the following JavaScript libraries:
 
 * [jQuery](https://jquery.com/) and [jQuery UI](https://jqueryui.com/)
 * [AngularJS](https://angularjs.org/)
-* [jqPlot](http://www.jqplot.com/)
+* [jqPlot](https://www.jqplot.com/)
 * A couple of other libraries are used see our [bower dependencies](https://github.com/matomo-org/matomo/blob/master/bower.json)
 
 **Include new JS libraries only if they are vital to your plugin.** If many plugins decide to use a custom library, the UI will slow down and plugins might get problems when different plugins load different versions of those libraries.
@@ -47,7 +47,7 @@ public function getJavaScriptFiles(&$files)
 
 ### Asset merging and compiling
 
-In production environments, Piwik will concatenate all JavaScript files into one and minify it. [LESS](http://lesscss.org/) files will be compiled into CSS and merged into one CSS file. Piwik does not merge and minify JavaScript and CSS files on every request as it takes a long time to do this. They are only merged on certain events, such as when enabling a new plugin.
+In production environments, Piwik will concatenate all JavaScript files into one and minify it. [LESS](https://lesscss.org/) files will be compiled into CSS and merged into one CSS file. Piwik does not merge and minify JavaScript and CSS files on every request as it takes a long time to do this. They are only merged on certain events, such as when enabling a new plugin.
 
 To make sure your changes will be actually visible and executed you need to enable the development mode in case you have not done yet:
 
@@ -201,6 +201,6 @@ For example:
 ## Learn more
 
 * To learn **about creating new report visualizations** read our [Visualizing Report Data](/guides/visualizing-report-data) guide.
-* To learn **more about the asset merging system** read this [blog post](https://piwik.org/blog/2010/07/making-piwik-ui-faster/) by the system's author.
+* To learn **more about the asset merging system** read this [blog post](https://matomo.org/blog/2010/07/making-piwik-ui-faster/) by the system's author.
 * To learn **more about theming** read our [Theming](/guides/theming) guide.
 * To learn **more about UI components and styles** read our [Views](/guides/views) guide.