diff --git a/README.md b/README.md
index 35ff53b..cddd085 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Try it, it's easy to setup! No database needed
 
 ## Setup
 
-* `git clone git@github.com:piwik/github-issues-mirror.git`
+* `git clone git@github.com:matomo-org/github-issues-mirror.git`
 * `cd github-issues-mirror/src`
 * `curl -s https://getcomposer.org/installer | php`
 * `php composer.phar install`
diff --git a/src/config/config.example.php b/src/config/config.example.php
index 599a0d0..c78ac39 100644
--- a/src/config/config.example.php
+++ b/src/config/config.example.php
@@ -1,20 +1,20 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
 /**
  * Will be displayed in the UI.
  */
-define('PROJECT_NAME', 'Piwik');
+define('PROJECT_NAME', 'Matomo');
 
 /**
  * Emails will be sent to this address in case anything goes wrong during the import.
  */
-define('PROJECT_EMAIL', 'developer@piwik.org');
+define('PROJECT_EMAIL', 'developer@matomo.org');
 
 /**
  * You can create a new application on the application settings page: https://github.com/settings/applications/new .
@@ -23,7 +23,7 @@ define('PROJECT_EMAIL', 'developer@piwik.org');
  */
 define('GITHUB_CLIENT_ID', '');
 define('GITHUB_CLIENT_SECRET', '');
-define('GITHUB_ORGANIZATION', 'piwik');
+define('GITHUB_ORGANIZATION', 'matomo-org');
 define('GITHUB_REPOSITORY', 'piwik');
 define('NUMBER_OF_ISSUES_PER_PAGE', 100);
 
@@ -35,12 +35,12 @@ define('DEBUG_ENABLED', false);
 
 /**
  * Set list of file extensions that should be disallowed in links
- * see https://github.com/piwik/github-issues-mirror/issues/5
+ * see https://github.com/matomo-org/github-issues-mirror/issues/5
  */
 define('FORBIDDEN_EXTENSIONS', ['swf', 'js', 'html', 'htm']);
 
 /**
  * If you want to enable piwik tracking enter the URL to your piwik instance and the ID of the website here
  */
-define('PIWIK_URL', false);
-define('PIWIK_ID', false);
+define('MATOMO_URL', false);
+define('MATOMO_ID', false);
diff --git a/src/helpers/Filesystem.php b/src/helpers/Filesystem.php
index 90bd82d..c9bb923 100644
--- a/src/helpers/Filesystem.php
+++ b/src/helpers/Filesystem.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
diff --git a/src/helpers/GithubImporter.php b/src/helpers/GithubImporter.php
index caea038..387b1e1 100755
--- a/src/helpers/GithubImporter.php
+++ b/src/helpers/GithubImporter.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
diff --git a/src/helpers/Issue.php b/src/helpers/Issue.php
index 54a0d4b..1190d2e 100755
--- a/src/helpers/Issue.php
+++ b/src/helpers/Issue.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
diff --git a/src/helpers/Mail.php b/src/helpers/Mail.php
index 3f7bf85..560b4ff 100755
--- a/src/helpers/Mail.php
+++ b/src/helpers/Mail.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
diff --git a/src/helpers/Markdown.php b/src/helpers/Markdown.php
index b063a56..7c7cdb7 100755
--- a/src/helpers/Markdown.php
+++ b/src/helpers/Markdown.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
@@ -40,9 +40,9 @@ class Markdown extends \Parsedown
 
 
     /**
-     * <a href="http://issues.piwik.org/attachments/1199/swelen_dateslider.swf">swelen_dateslider.swf</a>
+     * <a href="http://issues.matomo.org/attachments/1199/swelen_dateslider.swf">swelen_dateslider.swf</a>
      * to
-     * <a href="http://issues.piwik.org/">swelen_dateslider.swf</a>
+     * <a href="http://issues.matomo.org/">swelen_dateslider.swf</a>
      * @param $html
      * @return string html
      */
diff --git a/src/helpers/Page.php b/src/helpers/Page.php
index 88efa53..963da21 100755
--- a/src/helpers/Page.php
+++ b/src/helpers/Page.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
diff --git a/src/helpers/Twig.php b/src/helpers/Twig.php
index c55b6ef..6a4b9fc 100755
--- a/src/helpers/Twig.php
+++ b/src/helpers/Twig.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
diff --git a/src/public/index.php b/src/public/index.php
index fc9372b..a47bba9 100644
--- a/src/public/index.php
+++ b/src/public/index.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
@@ -39,8 +39,8 @@ $container['view'] = function ($container) {
     $view->getEnvironment()->addGlobal('projectName', PROJECT_NAME);
     $view->getEnvironment()->addGlobal('githubOrganization', GITHUB_ORGANIZATION);
     $view->getEnvironment()->addGlobal('githubRepository', GITHUB_REPOSITORY);
-    $view->getEnvironment()->addGlobal('piwikURL', PIWIK_URL);
-    $view->getEnvironment()->addGlobal('piwikID', PIWIK_ID);
+    $view->getEnvironment()->addGlobal('matomoURL', MATOMO_URL);
+    $view->getEnvironment()->addGlobal('matomoID', MATOMO_ID);
 
     return $view;
 };
diff --git a/src/routes/page.php b/src/routes/page.php
index 05f9382..1b136fb 100644
--- a/src/routes/page.php
+++ b/src/routes/page.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
diff --git a/src/tasks/import_github_issues.php b/src/tasks/import_github_issues.php
index ec0630b..d99db8a 100644
--- a/src/tasks/import_github_issues.php
+++ b/src/tasks/import_github_issues.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Piwik - free/libre analytics platform
+ * Matomo - free/libre analytics platform
  *
- * @link http://piwik.org
+ * @link https://matomo.org/
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
diff --git a/src/templates/layout.twig b/src/templates/layout.twig
index 63d7539..8ca0543 100644
--- a/src/templates/layout.twig
+++ b/src/templates/layout.twig
@@ -20,22 +20,22 @@
 <div class="container" style="margin-bottom: 20px;">
     <div class="row">
         <div class="col-md-6">
-            Powered by <a target="_blank" href="https://github.com/piwik/github-issues-mirror">GitHub Issue Mirror</a>
+            Powered by <a target="_blank" href="https://github.com/matomo-org/github-issues-mirror">GitHub Issue Mirror</a>
         </div>
     </div>
 </div>
 
-{% if piwikURL and piwikID %}
-    <!-- Piwik -->
+{% if matomoURL and matomoID %}
+    <!-- Matomo -->
     <script type="text/javascript">
         var _paq = _paq || [];
         /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
         _paq.push(['trackPageView']);
         _paq.push(['enableLinkTracking']);
         (function () {
-            var u = "{{ piwikURL }}";
+            var u = "{{ matomoURL }}";
             _paq.push(['setTrackerUrl', u + 'piwik.php']);
-            _paq.push(['setSiteId', '{{ piwikID }}']);
+            _paq.push(['setSiteId', '{{ matomoID }}']);
             var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
             g.type = 'text/javascript';
             g.async = true;
@@ -44,7 +44,7 @@
             s.parentNode.insertBefore(g, s);
         })();
     </script>
-    <!-- End Piwik Code -->
+    <!-- End Matomo Code -->
 {% endif %}
 
 </body>