Renames CustomPiwikJs plugin to CustomJsTracker (#15505)

* Renames CustomPiwikJs plugin to CustomTrackerJs

* adds bc for old api class name

* adds update to rename plugin in exisiting config

* update ui tests

* rename again

* remove old events

* improve changelog

* remove bc fallback

* Improve migration

* use tagmanager submodule

* updates UI files

74 files changed, 288 insertions, 610 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4114a8e19b..a058ea81bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)*
 * The deprecated Platform API method `\Piwik\Updates::getMigrationQueries()` has been removed. Use `\Piwik\Updates::getMigrations()` instead
 * The deprecated Platform API method `\Piwik\Updates::executeMigrationQueries()` has been removed. Use `\Piwik\Updates::executeMigrations()` instead
 * The deprecated Platform API method `\Piwik\Updates::update()` has been removed. Use `\Piwik\Updates::doUpdate()` instead
-* Matomo no longer polyills the `JSON` object in the JavaScript tracker. This means IE7 and older, Firefox 3 and older will be no longer suppported in the tracker.
+* Matomo no longer polyfills the `JSON` object in the JavaScript tracker. This means IE7 and older, Firefox 3 and older will be no longer suppported in the tracker.
 * The deprecated Platform API method `\Piwik\Common::json_encode()` has been removed. Use `json_encode()` instead
 * The deprecated Platform API method `\Piwik\Common::json_decode()` has been removed. Use `json_decode()` instead
 * The deprecated Platform API method `\Piwik\Common::getContinentsList()` has been removed. Use `\Piwik\Intl\Data\Provider\RegionDataProvider::getContinentList()` instead
@@ -32,6 +32,11 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)*
 * The deprecated Platform API class `\Piwik\DeviceDetectorFactory` has been removed. Use `\Piwik\DeviceDetector\DeviceDetectorFactory` instead
 * The JavaScript tracker now uses `sendBeacon` by default if supported by the browser. You can disable this by calling the tracker method `disableAlwaysUseSendBeacon`. As a result, callback parameters won't work anymore and a tracking request might not appear in the developer tools.
 * The console option `--piwik-domain` has been removed. Use `--matomo-domain` instead
+* The core plugin `CustomPiwikJs` has been renamed to `CustomJsTracker`
+  * The event `CustomPiwikJs.piwikJsChanged` has been renamed to `CustomJsTracker.trackerJsChanged`
+  * The event `CustomPiwikJs.shouldAddTrackerFile` has been renamed to `CustomJsTracker.shouldAddTrackerFile`
+  * Public API class `Piwik\Plugins\CustomPiwikJs\TrackerUpdater` has been renamed to `Piwik\Plugins\CustomJsTracker\TrackerUpdater`
+  * API method `CustomPiwikJs.doesIncludePluginTrackersAutomatically` has been renamed to `CustomJsTracker.doesIncludePluginTrackersAutomatically`
 
 ## Matomo 3.13.1
 
diff --git a/config/global.ini.php b/config/global.ini.php
index d72afa5961..f4b364da08 100755
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -1012,7 +1012,7 @@ Plugins[] = Intl
 Plugins[] = Marketplace
 Plugins[] = ProfessionalServices
 Plugins[] = UserId
-Plugins[] = CustomPiwikJs
+Plugins[] = CustomJsTracker
 Plugins[] = Tour
 
 [PluginsInstalled]
diff --git a/core/FileIntegrity.php b/core/FileIntegrity.php
index 49762eb60e..5505e7fbfb 100644
--- a/core/FileIntegrity.php
+++ b/core/FileIntegrity.php
@@ -10,8 +10,8 @@
 namespace Piwik;
 
 use Piwik\Container\StaticContainer;
-use Piwik\Plugins\CustomPiwikJs\Exception\AccessDeniedException;
-use Piwik\Plugins\CustomPiwikJs\TrackerUpdater;
+use Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException;
+use Piwik\Plugins\CustomJsTracker\TrackerUpdater;
 
 class FileIntegrity
 {
@@ -372,7 +372,7 @@ class FileIntegrity
             // as trivial because piwik.js might be already updated, or updated on the next request. We cannot define
             // 2 or 3 different filesizes and md5 hashes for one file so we check it here.
 
-            if (Plugin\Manager::getInstance()->isPluginActivated('CustomPiwikJs')) {
+            if (Plugin\Manager::getInstance()->isPluginActivated('CustomJsTracker')) {
                 $trackerUpdater = new TrackerUpdater();
 
                 if ($trackerUpdater->getCurrentTrackerFileContent() === $trackerUpdater->getUpdatedTrackerFileContent()) {
@@ -383,7 +383,7 @@ class FileIntegrity
 
                 try {
                     // the piwik.js tracker file was not updated yet, but may be updated just after the update by
-                    // one of the events CustomPiwikJs is listening to or by a scheduled task.
+                    // one of the events CustomJsTracker is listening to or by a scheduled task.
                     // In this case, we check whether such an update will succeed later and if it will, the file is
                     // valid as well as it will be updated on the next request
                     $trackerUpdater->checkWillSucceed();
diff --git a/core/Updater/Migration/Plugin/Factory.php b/core/Updater/Migration/Plugin/Factory.php
index b6e97b8cd1..f320fb11b8 100644
--- a/core/Updater/Migration/Plugin/Factory.php
+++ b/core/Updater/Migration/Plugin/Factory.php
@@ -58,4 +58,19 @@ class Factory
             'pluginName' => $pluginName
         ));
     }
+
+    /**
+     * Uninstalls the given plugin during an update.
+     *
+     * If the plugin is still active or if any other error occurs it will be ignored.
+     *
+     * @param string $pluginName
+     * @return Uninstall
+     */
+    public function uninstall($pluginName)
+    {
+        return $this->container->make('Piwik\Updater\Migration\Plugin\Uninstall', array(
+            'pluginName' => $pluginName
+        ));
+    }
 }
diff --git a/core/Updater/Migration/Plugin/Uninstall.php b/core/Updater/Migration/Plugin/Uninstall.php
new file mode 100644
index 0000000000..77e95d2f24
--- /dev/null
+++ b/core/Updater/Migration/Plugin/Uninstall.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+namespace Piwik\Updater\Migration\Plugin;
+
+use Piwik\Config;
+use Piwik\Plugin;
+use Piwik\Updater\Migration;
+
+/**
+ * Uninstalls the given plugin during the update
+ */
+class Uninstall extends Migration
+{
+    /**
+     * @var string
+     */
+    private $pluginName;
+
+    /**
+     * @var Plugin\Manager
+     */
+    private $pluginManager;
+
+    public function __construct(Plugin\Manager $pluginManager, $pluginName)
+    {
+        $this->pluginManager = $pluginManager;
+        $this->pluginName = $pluginName;
+    }
+
+    public function __toString()
+    {
+        $domain = Config::getLocalConfigPath() == Config::getDefaultLocalConfigPath() ? '' : Config::getHostname();
+        $domainArg = !empty($domain) ? "--matomo-domain=\"$domain\" " : '';
+
+        return sprintf('./console %splugin:uninstall "%s"', $domainArg, $this->pluginName);
+    }
+
+    public function shouldIgnoreError($exception)
+    {
+        return true;
+    }
+
+    public function exec()
+    {
+        $this->pluginManager->uninstallPlugin($this->pluginName);
+    }
+
+}
diff --git a/core/Updates/2.16.3-b2.php b/core/Updates/2.16.3-b2.php
index 968fcb75d5..0c0afaed86 100644
--- a/core/Updates/2.16.3-b2.php
+++ b/core/Updates/2.16.3-b2.php
@@ -21,7 +21,7 @@ class Updates_2_16_3_b2 extends PiwikUpdates
     public function doUpdate(Updater $updater)
     {
         try {
-            \Piwik\Plugin\Manager::getInstance()->activatePlugin('CustomPiwikJs');
+            \Piwik\Plugin\Manager::getInstance()->activatePlugin('CustomJsTracker');
         } catch (\Exception $e) {
         }
     }
diff --git a/core/Updates/4.0.0-b1.php b/core/Updates/4.0.0-b1.php
index 71b8bc32db..1405911a53 100644
--- a/core/Updates/4.0.0-b1.php
+++ b/core/Updates/4.0.0-b1.php
@@ -9,6 +9,7 @@
 
 namespace Piwik\Updates;
 
+use Piwik\Config;
 use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
 use Piwik\Updater\Migration\Factory as MigrationFactory;
@@ -30,16 +31,24 @@ class Updates_4_0_0_b1 extends PiwikUpdates
 
     public function getMigrations(Updater $updater)
     {
-        $migration1 = $this->migration->db->changeColumnType('log_action', 'name', 'VARCHAR(4096)');
-        $migration2 = $this->migration->db->changeColumnType('log_conversion', 'url', 'VARCHAR(4096)');
+        $migrations = [];
+        $migrations[] = $this->migration->db->changeColumnType('log_action', 'name', 'VARCHAR(4096)');
+        $migrations[] = $this->migration->db->changeColumnType('log_conversion', 'url', 'VARCHAR(4096)');
 
-        $migration3 = $this->migration->plugin->activate('BulkTracking');
+        $customTrackerPluginActive = false;
+        if (in_array('CustomPiwikJs', Config::getInstance()->Plugins['Plugins'])) {
+            $customTrackerPluginActive = true;
+        }
 
-        return array(
-            $migration1,
-            $migration2,
-            $migration3
-        );
+        $migrations[] = $this->migration->plugin->activate('BulkTracking');
+        $migrations[] = $this->migration->plugin->deactivate('CustomPiwikJs');
+        $migrations[] = $this->migration->plugin->uninstall('CustomPiwikJs');
+
+        if ($customTrackerPluginActive) {
+            $migrations[] = $this->migration->plugin->activate('CustomJsTracker');
+        }
+
+        return $migrations;
     }
 
     public function doUpdate(Updater $updater)
diff --git a/plugins/CorePluginsAdmin/Commands/DeactivatePlugin.php b/plugins/CorePluginsAdmin/Commands/DeactivatePlugin.php
index 08e35d1b62..2adb85684a 100644
--- a/plugins/CorePluginsAdmin/Commands/DeactivatePlugin.php
+++ b/plugins/CorePluginsAdmin/Commands/DeactivatePlugin.php
@@ -23,7 +23,7 @@ class DeactivatePlugin extends ConsoleCommand
     {
         $this->setName('plugin:deactivate');
         $this->setDescription('Deactivate a plugin.');
-        $this->addArgument('plugin', InputArgument::IS_ARRAY, 'The plugin name you want to activate. Multiple plugin names can be specified separated by a space.');
+        $this->addArgument('plugin', InputArgument::IS_ARRAY, 'The plugin name you want to deactivate. Multiple plugin names can be specified separated by a space.');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/plugins/CorePluginsAdmin/Commands/UninstallPlugin.php b/plugins/CorePluginsAdmin/Commands/UninstallPlugin.php
new file mode 100644
index 0000000000..8ccf2e2c0a
--- /dev/null
+++ b/plugins/CorePluginsAdmin/Commands/UninstallPlugin.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link https://matomo.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+namespace Piwik\Plugins\CorePluginsAdmin\Commands;
+
+use Piwik\Plugin\ConsoleCommand;
+use Piwik\Plugin\Manager;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * plugin:deactivate console command.
+ */
+class UninstallPlugin extends ConsoleCommand
+{
+    protected function configure()
+    {
+        $this->setName('plugin:uninstall');
+        $this->setDescription('Uninstall a plugin.');
+        $this->addArgument('plugin', InputArgument::IS_ARRAY, 'The plugin name you want to uninstall. Multiple plugin names can be specified separated by a space.');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $pluginManager = Manager::getInstance();
+
+        $plugins = $input->getArgument('plugin');
+
+        foreach ($plugins as $plugin) {
+            if ($pluginManager->isPluginLoaded($plugin)) {
+                $output->writeln(sprintf('<comment>The plugin %s is still active.</comment>', $plugin));
+                continue;
+            }
+
+            $pluginManager->uninstallPlugin($plugin);
+
+            $output->writeln("Uninstalled plugin <info>$plugin</info>");
+        }
+    }
+}
diff --git a/plugins/CustomPiwikJs/.gitignore b/plugins/CustomJsTracker/.gitignore
index 8f30992923..8f30992923 100644
--- a/plugins/CustomPiwikJs/.gitignore
+++ b/plugins/CustomJsTracker/.gitignore
diff --git a/plugins/CustomPiwikJs/API.php b/plugins/CustomJsTracker/API.php
index 54cc728a79..c8349efe2e 100644
--- a/plugins/CustomPiwikJs/API.php
+++ b/plugins/CustomJsTracker/API.php
@@ -6,16 +6,16 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Piwik;
-use Piwik\Plugins\CustomPiwikJs\Exception\AccessDeniedException;
+use Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException;
 
 /**
- * API for plugin CustomPiwikJs
+ * API for plugin CustomJsTracker
  *
- * @method static \Piwik\Plugins\CustomPiwikJs\API getInstance()
+ * @method static \Piwik\Plugins\CustomJsTracker\API getInstance()
  */
 class API extends \Piwik\Plugin\API
 {
@@ -29,7 +29,7 @@ class API extends \Piwik\Plugin\API
         Piwik::checkUserHasSomeAdminAccess();
 
         try {
-            $updater = StaticContainer::get('Piwik\Plugins\CustomPiwikJs\TrackerUpdater');
+            $updater = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater');
             $updater->checkWillSucceed();
             return true;
         } catch (AccessDeniedException $e) {
diff --git a/plugins/CustomPiwikJs/Commands/UpdateTracker.php b/plugins/CustomJsTracker/Commands/UpdateTracker.php
index e01d750808..bddd99136a 100644
--- a/plugins/CustomPiwikJs/Commands/UpdateTracker.php
+++ b/plugins/CustomJsTracker/Commands/UpdateTracker.php
@@ -6,12 +6,12 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\Commands;
+namespace Piwik\Plugins\CustomJsTracker\Commands;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Plugin\ConsoleCommand;
-use Piwik\Plugins\CustomPiwikJs\TrackerUpdater;
-use Piwik\Plugins\CustomPiwikJs\TrackingCode\PluginTrackerFiles;
+use Piwik\Plugins\CustomJsTracker\TrackerUpdater;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -46,7 +46,7 @@ class UpdateTracker extends ConsoleCommand
 
     public function updateTracker($sourceFile, $targetFile, $ignoreMinified)
     {
-        $pluginTrackerFiles = StaticContainer::get('Piwik\Plugins\CustomPiwikJs\TrackingCode\PluginTrackerFiles');
+        $pluginTrackerFiles = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles');
 
         if ($ignoreMinified) {
             if (empty($sourceFile) || $sourceFile === $this->getPathOriginalPiwikJs()) {
@@ -56,7 +56,7 @@ class UpdateTracker extends ConsoleCommand
             $pluginTrackerFiles->ignoreMinified();
         }
 
-        $updater = StaticContainer::getContainer()->make('Piwik\Plugins\CustomPiwikJs\TrackerUpdater', array(
+        $updater = StaticContainer::getContainer()->make('Piwik\Plugins\CustomJsTracker\TrackerUpdater', array(
             'fromFile' => $sourceFile, 'toFile' => $targetFile
         ));
         $updater->setTrackerFiles($pluginTrackerFiles);
diff --git a/plugins/CustomPiwikJs/CustomPiwikJs.php b/plugins/CustomJsTracker/CustomJsTracker.php
index 1be7831212..ebf63933fa 100644
--- a/plugins/CustomPiwikJs/CustomPiwikJs.php
+++ b/plugins/CustomJsTracker/CustomJsTracker.php
@@ -6,13 +6,13 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Log;
 use Piwik\Plugin;
 
-class CustomPiwikJs extends Plugin
+class CustomJsTracker extends Plugin
 {
     public function registerEvents()
     {
@@ -30,8 +30,8 @@ class CustomPiwikJs extends Plugin
     public function updateTracker()
     {
         try {
-            if (Plugin\Manager::getInstance()->isPluginActivated('CustomPiwikJs')) {
-                $trackerUpdater = StaticContainer::get('Piwik\Plugins\CustomPiwikJs\TrackerUpdater');
+            if (Plugin\Manager::getInstance()->isPluginActivated('CustomJsTracker')) {
+                $trackerUpdater = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater');
                 $trackerUpdater->update();
             }
         } catch (\Exception $e) {
diff --git a/plugins/CustomPiwikJs/Diagnostic/PiwikJsCheck.php b/plugins/CustomJsTracker/Diagnostic/TrackerJsCheck.php
index dc01934808..5def5fa717 100644
--- a/plugins/CustomPiwikJs/Diagnostic/PiwikJsCheck.php
+++ b/plugins/CustomJsTracker/Diagnostic/TrackerJsCheck.php
@@ -5,11 +5,11 @@
  * @link https://matomo.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CustomPiwikJs\Diagnostic;
+namespace Piwik\Plugins\CustomJsTracker\Diagnostic;
 
 use Piwik\Filechecks;
 use Piwik\Filesystem;
-use Piwik\Plugins\CustomPiwikJs\File;
+use Piwik\Plugins\CustomJsTracker\File;
 use Piwik\Plugins\Diagnostics\Diagnostic\Diagnostic;
 use Piwik\Plugins\Diagnostics\Diagnostic\DiagnosticResult;
 use Piwik\SettingsPiwik;
@@ -20,7 +20,7 @@ use Piwik\Translation\Translator;
 /**
  * Check Piwik JS is writable
  */
-class PiwikJsCheck implements Diagnostic
+class TrackerJsCheck implements Diagnostic
 {
     /**
      * @var Translator
@@ -54,13 +54,13 @@ class PiwikJsCheck implements Diagnostic
             }
         }
 
-        $label = $this->translator->translate('CustomPiwikJs_DiagnosticPiwikJsWritable', $this->makeFilesTitles($filesToCheck));
+        $label = $this->translator->translate('CustomJsTracker_DiagnosticPiwikJsWritable', $this->makeFilesTitles($filesToCheck));
 
         if (empty($notWritableFiles)) {
             return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK, ''));
         }
 
-        $comment = $this->translator->translate('CustomPiwikJs_DiagnosticPiwikJsNotWritable', $this->makeFilesTitles($notWritableFiles));
+        $comment = $this->translator->translate('CustomJsTracker_DiagnosticPiwikJsNotWritable', $this->makeFilesTitles($notWritableFiles));
 
         if (!SettingsServer::isWindows()) {
             $command = '';
@@ -68,7 +68,7 @@ class PiwikJsCheck implements Diagnostic
                 $realpath = Filesystem::realpath(PIWIK_INCLUDE_PATH . '/' . $notWritableFile);
                 $command .= "<br/><code> chmod +w $realpath<br/> chown ". Filechecks::getUserAndGroup() ." " . $realpath . "</code><br />";
             }
-            $comment .= $this->translator->translate('CustomPiwikJs_DiagnosticPiwikJsMakeWritable', array($this->makeFilesTitles($notWritableFiles), $command));
+            $comment .= $this->translator->translate('CustomJsTracker_DiagnosticPiwikJsMakeWritable', array($this->makeFilesTitles($notWritableFiles), $command));
         }
 
         return array(DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, $comment));
diff --git a/plugins/CustomPiwikJs/Exception/AccessDeniedException.php b/plugins/CustomJsTracker/Exception/AccessDeniedException.php
index f3c89216f1..7cfd6a550e 100644
--- a/plugins/CustomPiwikJs/Exception/AccessDeniedException.php
+++ b/plugins/CustomJsTracker/Exception/AccessDeniedException.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\Exception;
+namespace Piwik\Plugins\CustomJsTracker\Exception;
 
 use Exception;
 
diff --git a/plugins/CustomPiwikJs/File.php b/plugins/CustomJsTracker/File.php
index ffee10ca88..0b8325e902 100644
--- a/plugins/CustomPiwikJs/File.php
+++ b/plugins/CustomJsTracker/File.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
-use Piwik\Plugins\CustomPiwikJs\Exception\AccessDeniedException;
+use Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException;
 
 class File
 {
diff --git a/plugins/CustomPiwikJs/Tasks.php b/plugins/CustomJsTracker/Tasks.php
index 3957a4d823..24427a6d43 100644
--- a/plugins/CustomPiwikJs/Tasks.php
+++ b/plugins/CustomJsTracker/Tasks.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Container\StaticContainer;
 
@@ -19,7 +19,7 @@ class Tasks extends \Piwik\Plugin\Tasks
 
     public function updateTracker()
     {
-        $updater = StaticContainer::get('Piwik\Plugins\CustomPiwikJs\TrackerUpdater');
+        $updater = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater');
         $updater->update();
     }
 }
diff --git a/plugins/CustomPiwikJs/TrackerUpdater.php b/plugins/CustomJsTracker/TrackerUpdater.php
index c5dabad5cc..c301862b90 100644
--- a/plugins/CustomPiwikJs/TrackerUpdater.php
+++ b/plugins/CustomJsTracker/TrackerUpdater.php
@@ -6,19 +6,19 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
-use Piwik\Plugins\CustomPiwikJs\TrackingCode\PiwikJsManipulator;
-use Piwik\Plugins\CustomPiwikJs\TrackingCode\PluginTrackerFiles;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PiwikJsManipulator;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles;
 use Piwik\Piwik;
 
 /**
  * Updates the Piwik JavaScript Tracker "piwik.js" in case plugins extend the tracker.
  *
  * Usage:
- * StaticContainer::get('Piwik\Plugins\CustomPiwikJs\TrackerUpdater')->update();
+ * StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater')->update();
  */
 class TrackerUpdater
 {
@@ -54,7 +54,7 @@ class TrackerUpdater
 
         $this->setFromFile($fromFile);
         $this->setToFile($toFile);
-        $this->trackerFiles = StaticContainer::get('Piwik\Plugins\CustomPiwikJs\TrackingCode\PluginTrackerFiles');
+        $this->trackerFiles = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles');
     }
 
     public function setFromFile($fromFile)
@@ -139,7 +139,7 @@ class TrackerUpdater
                  *
                  * @param string $absolutePath The path to the new piwik.js file.
                  */
-                Piwik::postEvent('CustomPiwikJs.piwikJsChanged', [$savedFile]);
+                Piwik::postEvent('CustomJsTracker.trackerJsChanged', [$savedFile]);
             }
 
         }
@@ -157,7 +157,7 @@ class TrackerUpdater
             if ($file->hasWriteAccess() && !$file->isFileContentSame($newContent)) {
                 $savedFiles = $file->save($newContent);
                 foreach ($savedFiles as $savedFile) {
-                    Piwik::postEvent('CustomPiwikJs.piwikJsChanged', [$savedFile]);
+                    Piwik::postEvent('CustomJsTracker.trackerJsChanged', [$savedFile]);
                 }
             }
         }
diff --git a/plugins/CustomPiwikJs/TrackingCode/JsTestPluginTrackerFiles.php b/plugins/CustomJsTracker/TrackingCode/JsTestPluginTrackerFiles.php
index 773ac03286..7bf8062a8b 100644
--- a/plugins/CustomPiwikJs/TrackingCode/JsTestPluginTrackerFiles.php
+++ b/plugins/CustomJsTracker/TrackingCode/JsTestPluginTrackerFiles.php
@@ -5,7 +5,7 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CustomPiwikJs\TrackingCode;
+namespace Piwik\Plugins\CustomJsTracker\TrackingCode;
 
 /**
  * Used for when running Piwik tracker tests. We simply include all custom tracker files there.
diff --git a/plugins/CustomPiwikJs/TrackingCode/PiwikJsManipulator.php b/plugins/CustomJsTracker/TrackingCode/PiwikJsManipulator.php
index 6e2e4c5500..0fe821c4e6 100644
--- a/plugins/CustomPiwikJs/TrackingCode/PiwikJsManipulator.php
+++ b/plugins/CustomJsTracker/TrackingCode/PiwikJsManipulator.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\TrackingCode;
+namespace Piwik\Plugins\CustomJsTracker\TrackingCode;
 
 use Piwik\Piwik;
 
diff --git a/plugins/CustomPiwikJs/TrackingCode/PluginTrackerFiles.php b/plugins/CustomJsTracker/TrackingCode/PluginTrackerFiles.php
index a3987b2004..e062a73516 100644
--- a/plugins/CustomPiwikJs/TrackingCode/PluginTrackerFiles.php
+++ b/plugins/CustomJsTracker/TrackingCode/PluginTrackerFiles.php
@@ -5,11 +5,11 @@
  * @link    http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CustomPiwikJs\TrackingCode;
+namespace Piwik\Plugins\CustomJsTracker\TrackingCode;
 
 use Piwik\Piwik;
 use Piwik\Plugin;
-use Piwik\Plugins\CustomPiwikJs\File;
+use Piwik\Plugins\CustomJsTracker\File;
 
 class PluginTrackerFiles
 {
@@ -92,7 +92,7 @@ class PluginTrackerFiles
          * @param bool &$shouldAddFile Decides whether the tracker file belonging to the given plugin should be added or not.
          * @param string $pluginName The name of the plugin this file belongs to
          */
-        Piwik::postEvent('CustomPiwikJs.shouldAddTrackerFile', array(&$shouldAddFile, $pluginName));
+        Piwik::postEvent('CustomJsTracker.shouldAddTrackerFile', array(&$shouldAddFile, $pluginName));
 
         return $shouldAddFile;
     }
diff --git a/plugins/CustomPiwikJs/config/config.php b/plugins/CustomJsTracker/config/config.php
index cafd3336ac..88d0d6417a 100644
--- a/plugins/CustomPiwikJs/config/config.php
+++ b/plugins/CustomJsTracker/config/config.php
@@ -2,6 +2,6 @@
 
 return array(
     'diagnostics.optional' => DI\add(array(
-        DI\get('Piwik\Plugins\CustomPiwikJs\Diagnostic\PiwikJsCheck'),
+        DI\get('Piwik\Plugins\CustomJsTracker\Diagnostic\TrackerJsCheck'),
     )),
 );
diff --git a/plugins/CustomPiwikJs/config/tracker.php b/plugins/CustomJsTracker/config/tracker.php
index ca2affec34..ca2affec34 100644
--- a/plugins/CustomPiwikJs/config/tracker.php
+++ b/plugins/CustomJsTracker/config/tracker.php
diff --git a/plugins/CustomPiwikJs/lang/cs.json b/plugins/CustomJsTracker/lang/cs.json
index 0d8fde41a4..6812140b56 100644
--- a/plugins/CustomPiwikJs/lang/cs.json
+++ b/plugins/CustomJsTracker/lang/cs.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Zapisovatelný JavaScript záznam (%s)"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomPiwikJs/lang/da.json b/plugins/CustomJsTracker/lang/da.json
index 5bbbd36784..e73375b481 100644
--- a/plugins/CustomPiwikJs/lang/da.json
+++ b/plugins/CustomJsTracker/lang/da.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "JavaScript-sporingsfiler (%s) skrivbare",
         "DiagnosticPiwikJsMakeWritable": "Vi anbefaler at gøre %1$s skrivbare ved at køre denne kommando: %2$s"
     }
diff --git a/plugins/CustomPiwikJs/lang/de.json b/plugins/CustomJsTracker/lang/de.json
index bf0ae55c02..a01246a60a 100644
--- a/plugins/CustomPiwikJs/lang/de.json
+++ b/plugins/CustomJsTracker/lang/de.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Ermöglicht es jedem Plugin, die Matomo-JavaScript-Tracking-Datei (matomo.js) zu erweitern und neue Funktionalitäts- und Website-Messfunktionen hinzuzufügen.",
         "DiagnosticPiwikJsWritable": "Schreibbarer JavaScript-Tracker (%s)",
         "DiagnosticPiwikJsNotWritable": "Für die Matomo JavaScript-Tracker-Datei %s sind keine Schreibrechte vorhanden , das bedeutet, dass andere Plugins den JavaScript-Tracker nicht erweitern können. In Zukunft könnten sogar einige Kernfunktionen nicht wie erwartet funktionieren.",
diff --git a/plugins/CustomPiwikJs/lang/el.json b/plugins/CustomJsTracker/lang/el.json
index 99c1012731..86b0c82b3b 100644
--- a/plugins/CustomPiwikJs/lang/el.json
+++ b/plugins/CustomJsTracker/lang/el.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Επιτρέπει σε οποιοδήποτε πρόσθετο να επεκτείνει το αρχείο ιχνηλάτησης σε JavaScript του Matomo (matomo.js) και να προσθέτει νέα λειτουργικότητα και δυνατότητες μετρήσεων των ιστοτόπων.",
         "DiagnosticPiwikJsWritable": "Εγγράψιμο Αρχείο Ιχνηλάτησης JavaScript (%s)",
         "DiagnosticPiwikJsNotWritable": "Το αρχείο ιχνηλάτησης της JavaScript του Matomo %s δεν είναι εγγράψιμο, που σημαίνει ότι άλλα πρόσθετα δεν μπορούν να επεκτείνουν την ιχνηλάτηση. Μελλοντικά ενδέχεται ορισμένα χαρακτηριστικά του πυρήνα να μην λειτουργούν όπως πρέπει.",
diff --git a/plugins/CustomPiwikJs/lang/en.json b/plugins/CustomJsTracker/lang/en.json
index 95aab1359b..9d64e174df 100644
--- a/plugins/CustomPiwikJs/lang/en.json
+++ b/plugins/CustomJsTracker/lang/en.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Allows any plugin to extend the Matomo JavaScript Tracking file (matomo.js) and add new functionality and website measurement capabilities.",
         "DiagnosticPiwikJsWritable": "Writable JavaScript Tracker (%s)",
         "DiagnosticPiwikJsNotWritable": "The Matomo JavaScript tracker file %s is not writable which means other plugins cannot extend the JavaScript tracker. In the future even some core features might not work as expected. ",
diff --git a/plugins/CustomPiwikJs/lang/eo.json b/plugins/CustomJsTracker/lang/eo.json
index f7be3f2f08..8e069b7a31 100644
--- a/plugins/CustomPiwikJs/lang/eo.json
+++ b/plugins/CustomJsTracker/lang/eo.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Skribebla Sekvanta JavaSkripto (%s)",
         "DiagnosticPiwikJsNotWritable": "La JavaSkriptan sekvanta dosiero %sne stas skriblebla. Pro tio aliaj kromprogramoj ne povas etendi la JavaSkriptan sekvanto. Estontece eĉ kelkaj kernaj funkcioj povus ne funkcii kiel atendite.",
         "DiagnosticPiwikJsMakeWritable": "Ni rekomendas fari %1$sskribebla per funkciado de ĉi tiu komando: %2$s"
diff --git a/plugins/CustomPiwikJs/lang/es-ar.json b/plugins/CustomJsTracker/lang/es-ar.json
index d2dbe88b3b..6db0d6c3eb 100644
--- a/plugins/CustomPiwikJs/lang/es-ar.json
+++ b/plugins/CustomJsTracker/lang/es-ar.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Permite a cualquier plugin extender el archivo de rastreo vía JavaScript de Matomo (\"matomo.js\"), y agrega nuevas capacidades de medición de funcionalidad y sitios web.",
         "DiagnosticPiwikJsWritable": "Rastreador escribible de JavaScript (%s)",
         "DiagnosticPiwikJsNotWritable": "El archivo rastreador vía JavaScript de Matomo %s no es escribible, lo cual significa que otros plugins no pueden extender el rastreador de JavaScript. En el futuro es posible que incluso funciones centrales no funcionen como lo esperado.",
diff --git a/plugins/CustomPiwikJs/lang/es.json b/plugins/CustomJsTracker/lang/es.json
index 7b801b65b7..cc338858e8 100644
--- a/plugins/CustomPiwikJs/lang/es.json
+++ b/plugins/CustomJsTracker/lang/es.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Permite a cualquier módulo ampliar el archivo de seguimiento Javascript Matomo (matomo.js) y agregar nuevas funcionalidades y capacidades de medición de desempeño a un sitio web.",
         "DiagnosticPiwikJsWritable": "Archivo de seguimiento Javascript con permiso de escritura (%s)",
         "DiagnosticPiwikJsNotWritable": "El archivo Javascript de seguimiento Matomo %s no posee permisos de escritura, lo que significa que los otros módulos no pueden enriquecerlo. Más aun, en un futuro, algunas funciones básicas podrían no funcionar como debieran.",
diff --git a/plugins/CustomPiwikJs/lang/fi.json b/plugins/CustomJsTracker/lang/fi.json
index 500f8d9134..ce556e4dd3 100644
--- a/plugins/CustomPiwikJs/lang/fi.json
+++ b/plugins/CustomJsTracker/lang/fi.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Sallii minkä tahansa liitännäisen laajentaa Matomon JavaScript-seurantatiedostoa (matomo.js) ja lisätä uusia toiminnallisuuksia sekä verkkosivuston mittauskyvykkyyksiä.",
         "DiagnosticPiwikJsWritable": "Kirjoitettava JavaScript-seurain (%s)",
         "DiagnosticPiwikJsMakeWritable": "Suosittelemme, että %1$s asetetaan kirjoitettavaksi suorittamalla seuraava komento: %2$s"
diff --git a/plugins/CustomPiwikJs/lang/fr.json b/plugins/CustomJsTracker/lang/fr.json
index 8105ee5490..d4e8979249 100644
--- a/plugins/CustomPiwikJs/lang/fr.json
+++ b/plugins/CustomJsTracker/lang/fr.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Autorise n'importe quel composant à mettre à jour le fichier de suivi Matomo (matomo.js) et à ajouter de nouvelles fonctionnalités ainsi que des capacités de suivi de site web.",
         "DiagnosticPiwikJsWritable": "Traceur JavaScript inscriptible (%s)",
         "DiagnosticPiwikJsNotWritable": "Le fichier traceur JavaScript Matomo %sinscriptible ce qui veut dit que d'autres composants ne peuvent pas le modifier. Dans le futur il se pourrait même que certaines fonctionnalités principales ne fonctionnent pas comme prévu.",
diff --git a/plugins/CustomPiwikJs/lang/id.json b/plugins/CustomJsTracker/lang/id.json
index 1e2c445b43..9f590870cf 100644
--- a/plugins/CustomPiwikJs/lang/id.json
+++ b/plugins/CustomJsTracker/lang/id.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Pelacak JavaScript yang Dapat Ditulis (\"\/piwik.js\")"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomPiwikJs/lang/it.json b/plugins/CustomJsTracker/lang/it.json
index 3b9df39795..e2d47aa161 100644
--- a/plugins/CustomPiwikJs/lang/it.json
+++ b/plugins/CustomJsTracker/lang/it.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Consente a qualsiasi plug-in di estendere il file di tracking JavaScript di Matomo (matomo.js) e di aggiungere nuove funzionalità e capacità di misurazione del sito web.",
         "DiagnosticPiwikJsWritable": "JavaScript Tracker scrivibile (%s)",
         "DiagnosticPiwikJsNotWritable": "Il file tracker JavaScript di Matomo %s non è scrivibile, il che significa che altri plugin non possono estendere il tracker JavaScript. In futuro anche alcune funzionalità di base potrebbero non funzionare come previsto.",
diff --git a/plugins/CustomPiwikJs/lang/ja.json b/plugins/CustomJsTracker/lang/ja.json
index f0aa33dd4c..dfa58e56c7 100644
--- a/plugins/CustomPiwikJs/lang/ja.json
+++ b/plugins/CustomJsTracker/lang/ja.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "任意のプラグインが Matomo JavaScript Tracking ファイル（ matomo.js ）を拡張し、新しい機能と Web サイトの測定機能を追加することができます。",
         "DiagnosticPiwikJsWritable": "書き込み可能な JavaScript トラッカー（%s）",
         "DiagnosticPiwikJsNotWritable": "Matomo JavaScriptトラッカーファイル %s は書き込み可能ではありません。これは、他のプラグインが JavaScriptトラッカー を拡張できないことを意味します。 将来的には、一部のコア機能も期待どおりに機能しない可能性があります。",
diff --git a/plugins/CustomPiwikJs/lang/nb.json b/plugins/CustomJsTracker/lang/nb.json
index 2be4031638..ce4b6f7f2b 100644
--- a/plugins/CustomPiwikJs/lang/nb.json
+++ b/plugins/CustomJsTracker/lang/nb.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Skrivbar JavaScript-tracker (\"\/piwik.js\")",
         "DiagnosticPiwikJsMakeWritable": "Vi anbefaler å gjøre piwik.js skrivbar ved å kjøre denne kommandoen: %s"
     }
diff --git a/plugins/CustomPiwikJs/lang/nl.json b/plugins/CustomJsTracker/lang/nl.json
index 3641b36930..c91b025cfc 100644
--- a/plugins/CustomPiwikJs/lang/nl.json
+++ b/plugins/CustomJsTracker/lang/nl.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Schrijfbare JavaScript-tracker (%s)",
         "DiagnosticPiwikJsMakeWritable": "We adviseren %1$s schrijfbaar te maken door het volgende commando uit te voeren: %2$s"
     }
diff --git a/plugins/CustomPiwikJs/lang/pl.json b/plugins/CustomJsTracker/lang/pl.json
index 00b352bf7f..fd21f3a1ae 100644
--- a/plugins/CustomPiwikJs/lang/pl.json
+++ b/plugins/CustomJsTracker/lang/pl.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Zapisywalny Traker JavaScript (%s)",
         "DiagnosticPiwikJsMakeWritable": "Zalecamy nadanie dla %1$s uprawnień do zapisu wykonując tą komendę: %2$s"
     }
diff --git a/plugins/CustomPiwikJs/lang/pt-br.json b/plugins/CustomJsTracker/lang/pt-br.json
index 6da26dbeea..328ef53026 100644
--- a/plugins/CustomPiwikJs/lang/pt-br.json
+++ b/plugins/CustomJsTracker/lang/pt-br.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Permite que qualquer plugin estenda o arquivo JavaScript de Rastreamento do Matomo (matomo.js) e adicione novas funcionalidades e recursos de medição de site.",
         "DiagnosticPiwikJsWritable": "Rastreador Javascript gravável (%s)",
         "DiagnosticPiwikJsNotWritable": "O arquivo JavaScript rastreador do Matomo %s não é gravável, o que significa que outros plugins não podem estender o rastreador JavaScript. No futuro até mesmo alguns recursos principais podem não funcionar como esperado.",
diff --git a/plugins/CustomPiwikJs/lang/pt.json b/plugins/CustomJsTracker/lang/pt.json
index a44a374183..f2bbd63711 100644
--- a/plugins/CustomPiwikJs/lang/pt.json
+++ b/plugins/CustomJsTracker/lang/pt.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Permite que qualquer extensão complemente o ficheiro de acompanhamento de JavaScript do Matomo (matomo.js) e adicione novas funcionalidades e capacidades de medição de sites.",
         "DiagnosticPiwikJsWritable": "Permissões de escrita no JavaScript de acompanhamento (%s)",
         "DiagnosticPiwikJsNotWritable": "O ficheiro JavaScript de acompanhamento do Matomo %snão tem permissões de escrita, o que significa que outras extensões não conseguem complementar o tracker JavaScript. É possível que no futuro certas funcionalidades centrais não funcionem como o esperado.",
diff --git a/plugins/CustomPiwikJs/lang/ru.json b/plugins/CustomJsTracker/lang/ru.json
index 34f8eb5c72..c128245e67 100644
--- a/plugins/CustomPiwikJs/lang/ru.json
+++ b/plugins/CustomJsTracker/lang/ru.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Разрешить любому плагину дополнять JavaScript-код отслеживания Matomo (matomo.js), добавляя новую функциональность и расширяя возможности мониторинга сайтов.",
         "DiagnosticPiwikJsWritable": "Записываемый JavaScript Tracker (%s)",
         "DiagnosticPiwikJsNotWritable": "Файл трекера JavaScript Matomo %s недоступен для записи, это означает, что другие плагины не могут расширять трекер JavaScript. В будущем даже некоторые основные функции могут работать не так, как ожидалось.",
diff --git a/plugins/CustomPiwikJs/lang/sq.json b/plugins/CustomJsTracker/lang/sq.json
index 5bd24a9b79..788f53286b 100644
--- a/plugins/CustomPiwikJs/lang/sq.json
+++ b/plugins/CustomJsTracker/lang/sq.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "I lejon cilësdo shtojcë të zgjerojë kartelën Matomo JavaScript Tracking (matomo.js) dhe të shtojë aftësi të reja funksionimi dhe matjesh në sajt.",
         "DiagnosticPiwikJsWritable": "Ndjekës JavaScript i Shkrueshëm (%s)",
         "DiagnosticPiwikJsNotWritable": "Kartela e ndjekësit JavaScript të Matomo-s %s s’është e shkrueshme, çka do të thotë se shtojcat e tjera s’mund ta zgjerojnë ndjekësin JavaScript. Në të ardhmen mund të mos punojnë siç pritet madje edhe disa veçori bazë.",
diff --git a/plugins/CustomPiwikJs/lang/sr.json b/plugins/CustomJsTracker/lang/sr.json
index 198df11b8d..a95564a8af 100644
--- a/plugins/CustomPiwikJs/lang/sr.json
+++ b/plugins/CustomJsTracker/lang/sr.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Omogućuje bilo kom Matomo dodatku da proširi Matomo JavaScript datoteku za praćenje (piwik.js) i doda nove funkcionalnosti i mogućnosti za praćenje sajtova.",
         "DiagnosticPiwikJsWritable": "JavaScript treker u koji je moguće pisati (\"\/piwik.js\")",
         "DiagnosticPiwikJsMakeWritable": "Predlažemo da omogućite pisanje u piwik.js sledećom komandom: %s"
diff --git a/plugins/CustomPiwikJs/lang/sv.json b/plugins/CustomJsTracker/lang/sv.json
index 42b11d736d..f0e5c00caa 100644
--- a/plugins/CustomPiwikJs/lang/sv.json
+++ b/plugins/CustomJsTracker/lang/sv.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Gör att insticksprogram kan bygga vidare på Matomos JavaScript-spårare (matomo.js) för att lägga till nya funktioner och möjligheter för att mäta webbplatser.",
         "DiagnosticPiwikJsWritable": "Skrivbar JavaScript-spårare (%s)",
         "DiagnosticPiwikJsNotWritable": "JavaScript-filen innehållande Matomos spårare (%s) är skrivskyddad, vilket innebär att insticksprogram inte kan utöka JavaScript-spåraren. I framtiden kan även vissa andra grundfunktioner upphöra fungera som väntat.",
diff --git a/plugins/CustomPiwikJs/lang/tr.json b/plugins/CustomJsTracker/lang/tr.json
index 9a699b436b..6a45f628b6 100644
--- a/plugins/CustomPiwikJs/lang/tr.json
+++ b/plugins/CustomJsTracker/lang/tr.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Matomo JavaScript İzleme dosyasına (matomo.js) tüm uygulama eklerinin katkıda bulunmasını sağlayarak yeni özellik ve web sitesi ölçüm yetenekleri ekler.",
         "DiagnosticPiwikJsWritable": "Yazılabilir JavaScript İzleyici (%s)",
         "DiagnosticPiwikJsNotWritable": "%s Matomo JavaScript izleyici dosyası yazılabilir olmadığından diğer uygulama ekleri JavaScript İzleyiciyi kullanamaz. İleride bazı temel özellikler de beklendiği gibi çalışmayabilir.",
diff --git a/plugins/CustomPiwikJs/lang/uk.json b/plugins/CustomJsTracker/lang/uk.json
index fbbf394e5b..0ffe45b22d 100644
--- a/plugins/CustomPiwikJs/lang/uk.json
+++ b/plugins/CustomJsTracker/lang/uk.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Дозволяє будь-якому плагіну розширювати Matomo JavaScript код відстеження (piwik.js) і додавати нові можливості функціонування та можливості вимірювання веб-сайту.",
         "DiagnosticPiwikJsWritable": "Доступний для запису JavaScript трекер (\"\/piwik.js\")",
         "DiagnosticPiwikJsNotWritable": "Відстеження файлів Matomo через JavaScript \"\/piwik.js\" не підлягає запису, це означає, що інші плагіни не можуть розширити трекер JavaScript. Надалі навіть деякі основні функції можуть не працювати, як очікується.",
diff --git a/plugins/CustomPiwikJs/lang/zh-cn.json b/plugins/CustomJsTracker/lang/zh-cn.json
index cd3f4e91dc..dede8a4824 100644
--- a/plugins/CustomPiwikJs/lang/zh-cn.json
+++ b/plugins/CustomJsTracker/lang/zh-cn.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "允许任何插件扩展Matomo JavaScript追踪文件（matomo.js）并添加新功能和网站评估功能。",
         "DiagnosticPiwikJsWritable": "可写的JavaScript追踪器（%s）",
         "DiagnosticPiwikJsNotWritable": "Matomo JavaScript追踪器文件%s不可写，这意味着其他插件无法扩展JavaScript追踪器。 将来，甚至某些核心功能可能也无法按预期运行。",
diff --git a/plugins/CustomPiwikJs/lang/zh-tw.json b/plugins/CustomJsTracker/lang/zh-tw.json
index 4f5e361d65..d7d3087d30 100644
--- a/plugins/CustomPiwikJs/lang/zh-tw.json
+++ b/plugins/CustomJsTracker/lang/zh-tw.json
@@ -1,5 +1,5 @@
 {
-    "CustomPiwikJs": {
+    "CustomJsTracker": {
         "PluginDescription": "允許任何外掛擴展 Matomo JavaScript 追蹤檔案（piwik.js）來增加新功能和網站追蹤能力。",
         "DiagnosticPiwikJsWritable": "JavaScript 追蹤檔案可寫入（%s）",
         "DiagnosticPiwikJsNotWritable": "Matomo 的 JavaScript 追蹤檔案 %s 無法寫入，這代表其他外掛無法擴展 JavaScript 追蹤功能。未來甚至有些核心功能會無法正常運作。",
diff --git a/plugins/CustomPiwikJs/tests/Framework/Mock/PluginTrackerFilesMock.php b/plugins/CustomJsTracker/tests/Framework/Mock/PluginTrackerFilesMock.php
index 2503353ec0..4849753a51 100644
--- a/plugins/CustomPiwikJs/tests/Framework/Mock/PluginTrackerFilesMock.php
+++ b/plugins/CustomJsTracker/tests/Framework/Mock/PluginTrackerFilesMock.php
@@ -6,10 +6,10 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\tests\Framework\Mock;
+namespace Piwik\Plugins\CustomJsTracker\tests\Framework\Mock;
 
-use Piwik\Plugins\CustomPiwikJs\File;
-use Piwik\Plugins\CustomPiwikJs\TrackingCode\PluginTrackerFiles;
+use Piwik\Plugins\CustomJsTracker\File;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles;
 
 class PluginTrackerFilesMock extends PluginTrackerFiles
 {
diff --git a/plugins/CustomPiwikJs/tests/Integration/ApiTest.php b/plugins/CustomJsTracker/tests/Integration/ApiTest.php
index d1fce33e4c..b8ffa36602 100644
--- a/plugins/CustomPiwikJs/tests/Integration/ApiTest.php
+++ b/plugins/CustomJsTracker/tests/Integration/ApiTest.php
@@ -6,15 +6,15 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
-use Piwik\Plugins\CustomPiwikJs\API;
+use Piwik\Plugins\CustomJsTracker\API;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
- * @group CustomPiwikJs
+ * @group CustomJsTracker
  * @group ApiTest
  * @group Api
  * @group Plugins
diff --git a/plugins/CustomPiwikJs/tests/Integration/FileTest.php b/plugins/CustomJsTracker/tests/Integration/FileTest.php
index da221e0f2e..1457de0336 100644
--- a/plugins/CustomPiwikJs/tests/Integration/FileTest.php
+++ b/plugins/CustomJsTracker/tests/Integration/FileTest.php
@@ -6,9 +6,9 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
-use Piwik\Plugins\CustomPiwikJs\File;
+use Piwik\Plugins\CustomJsTracker\File;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 class CustomTestFile extends File {
@@ -16,7 +16,7 @@ class CustomTestFile extends File {
 }
 
 /**
- * @group CustomPiwikJs
+ * @group CustomJsTracker
  * @group FileTest
  * @group File
  * @group Plugins
@@ -34,7 +34,7 @@ class FileTest extends IntegrationTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomPiwikJs/tests/resources/';
+        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomJsTracker/tests/resources/';
 
         // make directory not writable
         $nonWritableDir = dirname($this->dir . self::NOT_EXISTING_FILE_IN_NON_WRITABLE_DIRECTORY);
@@ -153,7 +153,7 @@ class FileTest extends IntegrationTestCase
     }
 
     /**
-     * @expectedException \Piwik\Plugins\CustomPiwikJs\Exception\AccessDeniedException
+     * @expectedException \Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException
      * @expectedExceptionMessage not readable
      */
     public function test_checkReadable_shouldThrowException_IfNotIsReadable()
@@ -162,7 +162,7 @@ class FileTest extends IntegrationTestCase
     }
 
     /**
-     * @expectedException \Piwik\Plugins\CustomPiwikJs\Exception\AccessDeniedException
+     * @expectedException \Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException
      * @expectedExceptionMessage not writable
      */
     public function test_checkWritable_shouldThrowException_IfNotIsWritable()
diff --git a/plugins/CustomPiwikJs/tests/Integration/PiwikJsManipulatorTest.php b/plugins/CustomJsTracker/tests/Integration/PiwikJsManipulatorTest.php
index 75c66b73f7..3decbd21f7 100644
--- a/plugins/CustomPiwikJs/tests/Integration/PiwikJsManipulatorTest.php
+++ b/plugins/CustomJsTracker/tests/Integration/PiwikJsManipulatorTest.php
@@ -6,14 +6,14 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
-use Piwik\Plugins\CustomPiwikJs\tests\Framework\Mock\PluginTrackerFilesMock;
-use Piwik\Plugins\CustomPiwikJs\TrackingCode\PiwikJsManipulator;
+use Piwik\Plugins\CustomJsTracker\tests\Framework\Mock\PluginTrackerFilesMock;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PiwikJsManipulator;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
- * @group CustomPiwikJs
+ * @group CustomJsTracker
  * @group PiwikJsManipulatorTest
  * @group PiwikJsManipulator
  * @group Plugins
@@ -29,8 +29,8 @@ var myArray = [];
     public function test_manipulateContent_shouldAddCodeOfTrackerPlugins()
     {
         $manipulator = $this->makeManipulator(array(
-            '/plugins/CustomPiwikJs/tests/resources/tracker.js',
-            '/plugins/CustomPiwikJs/tests/resources/tracker.min.js',
+            '/plugins/CustomJsTracker/tests/resources/tracker.js',
+            '/plugins/CustomJsTracker/tests/resources/tracker.min.js',
         ));
 
         $updatedContent = $manipulator->manipulateContent();
diff --git a/plugins/CustomPiwikJs/tests/Integration/PluginTrackerFilesTest.php b/plugins/CustomJsTracker/tests/Integration/PluginTrackerFilesTest.php
index edd913ae9c..b063fbab28 100644
--- a/plugins/CustomPiwikJs/tests/Integration/PluginTrackerFilesTest.php
+++ b/plugins/CustomJsTracker/tests/Integration/PluginTrackerFilesTest.php
@@ -6,21 +6,21 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
 use Piwik\Piwik;
-use Piwik\Plugins\CustomPiwikJs\TrackingCode\PluginTrackerFiles;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 class CustomPluginTrackerFiles extends PluginTrackerFiles {
 
     private $pluginNamesForFile = array();
 
-    public function __construct($pluginNameForRegularTrackerFile = 'CustomPiwikJs', $pluginNameForMinifiedTracker = 'CustomPiwikJs')
+    public function __construct($pluginNameForRegularTrackerFile = 'CustomJsTracker', $pluginNameForMinifiedTracker = 'CustomJsTracker')
     {
         parent::__construct();
 
-        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomPiwikJs/tests/';
+        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomJsTracker/tests/';
 
         $this->pluginNamesForFile = array(
             'tracker.js' => $pluginNameForRegularTrackerFile,
@@ -44,7 +44,7 @@ class CustomPluginTrackerFiles2 extends PluginTrackerFiles {
 }
 
 /**
- * @group CustomPiwikJs
+ * @group CustomJsTracker
  * @group PluginTrackerFilesTest
  * @group PluginTrackerFiles
  * @group Plugins
@@ -57,8 +57,8 @@ class PluginTrackerFilesTest extends IntegrationTestCase
         $foundFiles = $trackerFiles->find();
 
         $this->assertCount(1, $foundFiles);
-        $this->assertTrue(isset($foundFiles['CustomPiwikJs']));
-        $this->assertEquals('tracker.min.js', $foundFiles['CustomPiwikJs']->getName());
+        $this->assertTrue(isset($foundFiles['CustomJsTracker']));
+        $this->assertEquals('tracker.min.js', $foundFiles['CustomJsTracker']->getName());
     }
 
     public function test_find_shouldIgnoreMinifiedVersion_IfRequested()
@@ -68,29 +68,29 @@ class PluginTrackerFilesTest extends IntegrationTestCase
         $foundFiles = $trackerFiles->find();
 
         $this->assertCount(1, $foundFiles);
-        $this->assertTrue(isset($foundFiles['CustomPiwikJs']));
-        $this->assertEquals('tracker.js', $foundFiles['CustomPiwikJs']->getName());
+        $this->assertTrue(isset($foundFiles['CustomJsTracker']));
+        $this->assertEquals('tracker.js', $foundFiles['CustomJsTracker']->getName());
     }
 
     public function test_find_ifMultiplePluginsImplementATracker_ShouldReturnEachOfThem()
     {
-        $trackerFiles = new CustomPluginTrackerFiles('CustomPiwikJs', 'Goals');
+        $trackerFiles = new CustomPluginTrackerFiles('CustomJsTracker', 'Goals');
         $foundFiles = $trackerFiles->find();
 
         $this->assertCount(2, $foundFiles);
-        $this->assertTrue(isset($foundFiles['CustomPiwikJs']));
+        $this->assertTrue(isset($foundFiles['CustomJsTracker']));
         $this->assertTrue(isset($foundFiles['Goals']));
-        $this->assertEquals('tracker.js', $foundFiles['CustomPiwikJs']->getName());
+        $this->assertEquals('tracker.js', $foundFiles['CustomJsTracker']->getName());
         $this->assertEquals('tracker.min.js', $foundFiles['Goals']->getName());
     }
 
     public function test_find_EventsCanIgnoreFiles()
     {
-        $trackerFiles = new CustomPluginTrackerFiles('CustomPiwikJs', 'Goals');
+        $trackerFiles = new CustomPluginTrackerFiles('CustomJsTracker', 'Goals');
         $foundFiles = $trackerFiles->find();
         $this->assertCount(2, $foundFiles);
 
-        Piwik::addAction('CustomPiwikJs.shouldAddTrackerFile', function (&$shouldAdd, $pluginName) {
+        Piwik::addAction('CustomJsTracker.shouldAddTrackerFile', function (&$shouldAdd, $pluginName) {
             if ($pluginName === 'Goals') {
                 $shouldAdd = false;
             }
@@ -98,7 +98,7 @@ class PluginTrackerFilesTest extends IntegrationTestCase
 
         $foundFiles = $trackerFiles->find();
         $this->assertCount(1, $foundFiles);
-        $this->assertTrue(isset($foundFiles['CustomPiwikJs']));
+        $this->assertTrue(isset($foundFiles['CustomJsTracker']));
         $this->assertFalse(isset($foundFiles['Goals']));
     }
 
diff --git a/plugins/CustomPiwikJs/tests/Integration/TrackerUpdaterTest.php b/plugins/CustomJsTracker/tests/Integration/TrackerUpdaterTest.php
index 7a66b035fb..0c0130e5b6 100644
--- a/plugins/CustomPiwikJs/tests/Integration/TrackerUpdaterTest.php
+++ b/plugins/CustomJsTracker/tests/Integration/TrackerUpdaterTest.php
@@ -6,15 +6,15 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
-use Piwik\Plugins\CustomPiwikJs\File;
-use Piwik\Plugins\CustomPiwikJs\tests\Framework\Mock\PluginTrackerFilesMock;
-use Piwik\Plugins\CustomPiwikJs\TrackerUpdater;
+use Piwik\Plugins\CustomJsTracker\File;
+use Piwik\Plugins\CustomJsTracker\tests\Framework\Mock\PluginTrackerFilesMock;
+use Piwik\Plugins\CustomJsTracker\TrackerUpdater;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
- * @group CustomPiwikJs
+ * @group CustomJsTracker
  * @group PiwikJsManipulatorTest
  * @group PiwikJsManipulator
  * @group Plugins
@@ -22,13 +22,13 @@ use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 class TrackerUpdaterTest extends IntegrationTestCase
 {
     private $dir;
-    private $piwikJsChangedEventPath = null;
+    private $trackerJsChangedEventPath = null;
 
     public function setUp()
     {
         parent::setUp();
-        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomPiwikJs/tests/resources/';
-        $this->piwikJsChangedEventPath = null;
+        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomJsTracker/tests/resources/';
+        $this->trackerJsChangedEventPath = null;
 
         $this->cleanUp();
     }
@@ -113,7 +113,7 @@ class TrackerUpdaterTest extends IntegrationTestCase
     }
 
     /**
-     * @expectedException \Piwik\Plugins\CustomPiwikJs\Exception\AccessDeniedException
+     * @expectedException \Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException
      * @expectedExceptionMessage not writable
      */
     public function test_checkWillSucceed_shouldNotThrowExceptionIfTargetIsNotWritable()
@@ -185,7 +185,7 @@ var myArray = [];
         $updater = $this->makeUpdater(null, $this->dir . 'not-writable/MyNotExisIngFilessss.js');
         $updater->update();
         $this->assertTrue(true);
-        $this->assertNull($this->piwikJsChangedEventPath);
+        $this->assertNull($this->trackerJsChangedEventPath);
     }
 
     public function test_update_shouldNotWriteToFileIfThereIsNothingToChange()
@@ -199,7 +199,7 @@ var myArray = [];
         $updater->update();
 
         $this->assertSame(file_get_contents($source), file_get_contents($target));
-        $this->assertNull($this->piwikJsChangedEventPath);
+        $this->assertNull($this->trackerJsChangedEventPath);
     }
 
     public function test_update_targetFileIfPluginsDefineDifferentFiles()
@@ -230,15 +230,15 @@ var PiwikJs = "mytest";
 
 var myArray = [];
 ', file_get_contents($target));
-        $this->assertEquals($target, $this->piwikJsChangedEventPath);
+        $this->assertEquals($target, $this->trackerJsChangedEventPath);
     }
 
     public function provideContainerConfig()
     {
         return [
             'observers.global' => \DI\add([
-                ['CustomPiwikJs.piwikJsChanged', function ($path) {
-                    $this->piwikJsChangedEventPath = $path;
+                ['CustomJsTracker.trackerJsChanged', function ($path) {
+                    $this->trackerJsChangedEventPath = $path;
                 }],
             ]),
         ];
diff --git a/plugins/CustomPiwikJs/tests/System/PiwikJsContentTest.php b/plugins/CustomJsTracker/tests/System/PiwikJsContentTest.php
index a08ecdb61e..300c312984 100644
--- a/plugins/CustomPiwikJs/tests/System/PiwikJsContentTest.php
+++ b/plugins/CustomJsTracker/tests/System/PiwikJsContentTest.php
@@ -6,14 +6,14 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CustomPiwikJs\tests\System;
+namespace Piwik\Plugins\CustomJsTracker\tests\System;
 
-use Piwik\Plugins\CustomPiwikJs\TrackerUpdater;
-use Piwik\Plugins\CustomPiwikJs\TrackingCode\PiwikJsManipulator;
+use Piwik\Plugins\CustomJsTracker\TrackerUpdater;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PiwikJsManipulator;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 
 /**
- * @group CustomPiwikJs
+ * @group CustomJsTracker
  * @group PiwikJsContentTest
  * @group PiwikJsContent
  * @group Plugins
diff --git a/plugins/CustomPiwikJs/tests/resources/MyTestTarget2.js b/plugins/CustomJsTracker/tests/resources/MyTestTarget2.js
index 258c2d3e11..258c2d3e11 100644
--- a/plugins/CustomPiwikJs/tests/resources/MyTestTarget2.js
+++ b/plugins/CustomJsTracker/tests/resources/MyTestTarget2.js
diff --git a/plugins/CustomPiwikJs/tests/resources/test.js b/plugins/CustomJsTracker/tests/resources/test.js
index 0ea6fcc24a..0ea6fcc24a 100644
--- a/plugins/CustomPiwikJs/tests/resources/test.js
+++ b/plugins/CustomJsTracker/tests/resources/test.js
diff --git a/plugins/CustomPiwikJs/tests/resources/testpiwik.js b/plugins/CustomJsTracker/tests/resources/testpiwik.js
index 02b60f8bcd..02b60f8bcd 100644
--- a/plugins/CustomPiwikJs/tests/resources/testpiwik.js
+++ b/plugins/CustomJsTracker/tests/resources/testpiwik.js
diff --git a/plugins/CustomPiwikJs/tests/resources/tracker.js b/plugins/CustomJsTracker/tests/resources/tracker.js
index ae4d228f39..ae4d228f39 100644
--- a/plugins/CustomPiwikJs/tests/resources/tracker.js
+++ b/plugins/CustomJsTracker/tests/resources/tracker.js
diff --git a/plugins/CustomPiwikJs/tests/resources/tracker.min.js b/plugins/CustomJsTracker/tests/resources/tracker.min.js
index 587ee0464d..587ee0464d 100644
--- a/plugins/CustomPiwikJs/tests/resources/tracker.min.js
+++ b/plugins/CustomJsTracker/tests/resources/tracker.min.js
diff --git a/plugins/Marketplace/tests/Integration/PluginsTest.php b/plugins/Marketplace/tests/Integration/PluginsTest.php
index 36d035bfba..aa1fe2a642 100644
--- a/plugins/Marketplace/tests/Integration/PluginsTest.php
+++ b/plugins/Marketplace/tests/Integration/PluginsTest.php
@@ -371,7 +371,7 @@ class PluginsTest extends IntegrationTestCase
         $this->service->returnFixture('v2.0_plugins.json');
         $plugins = $this->plugins->searchPlugins($query = '', $sort = Sort::DEFAULT_SORT, $themesOnly = false);
 
-        $this->assertCount(54, $plugins);
+        $this->assertCount(47, $plugins);
         $names = array_map(function ($plugin) {
             return $plugin['name'];
         }, $plugins);
@@ -485,7 +485,6 @@ class PluginsTest extends IntegrationTestCase
     {
         return array (
             'AdminNotification',
-            'AdvancedCampaignReporting',
             'AnonymousPiwikUsageMeasurement',
             'ApiGetWithSitesInfo',
             'Bandwidth',
@@ -496,14 +495,12 @@ class PluginsTest extends IntegrationTestCase
             'CustomAlerts',
             'CustomDimensions',
             'CustomOptOut',
-            'CustomTrackerJs',
             'ExcludeByDDNS',
             'FeedAnnotation',
             'FlagCounter',
             'FreeMobileMessaging',
             'GoogleAuthenticator',
             'GrabGravatar',
-            'InterSites',
             'IntranetGeoIP',
             'Ip2Hostname',
             'IP2Location',
@@ -519,7 +516,6 @@ class PluginsTest extends IntegrationTestCase
             'PaidPlugin1',
             'PerformanceInfo',
             'PerformanceMonitor',
-            'PlatformsReport',
             'QueuedTracking',
             'ReferrersManager',
             'RerUserDates',
@@ -527,17 +523,14 @@ class PluginsTest extends IntegrationTestCase
             'ServerMonitor',
             'ShibbolethLogin',
             'ShortcodeTracker',
-            'SimplePageBuilder',
             'SimpleSysMon',
-            'SiteMigration',
             'SnoopyBehavioralScoring',
             'TasksTimetable',
             'TopPagesByActions',
             'TrackingCodeCustomizer',
             'TreemapVisualization',
             'UptimeRobotMonitor',
-            'VisitorAvatar',
-            'WebsiteGroups'
+            'VisitorAvatar'
         );
     }
 }
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
index cdf9198e9b..41d9d631af 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b7c8a1eaed0ef1c37e46143cf0248a843f689eadb7d343dab452f0202845c7e
-size 931422
+oid sha256:3000a27ba0656474f91d0469bcc0525972f1076fe6fa6bccd8aae90aa5d29130
+size 825055
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
index eee4d55df3..1d114cfcc8 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_enable_plugins_admin_with_multiserver_enabled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b3cbb8387bee4f2dcccae0816df96f008dffa320c958f975f63ca39764af0e0
-size 961347
+oid sha256:9b80f3e7360c6d56f0b04de3a28cc39dfef57a52c2de05a7050c84d36dc02d03
+size 850800
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
index 66d036abda..9e7dc8d9b8 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_invalid_license_key_entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:995398ff818e2ffd09976a587ea6e6b14d1e0a8bbb8dea474f7773a8b10ad9d4
-size 947600
+oid sha256:f67e86f4d5f0bb39d8d62964ce2b5bc4392b4ea24e6e98166d4aad77a9f587e8
+size 842446
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
index 58b09a33da..8918ac3938 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_remove_license_key_confirmed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b54c8f776f2c49a2cac212fde2a18c2e4c2ada824f987fb816d4cebc555b2448
-size 942151
+oid sha256:df8842c7383689b5caa2cd0fc15ebb713e4909db5b1db79ae87f23fd3ae6ee2d
+size 838448
diff --git a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
index 439f812769..1b19c83f3c 100644
--- a/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
+++ b/plugins/Marketplace/tests/UI/expected-screenshots/Marketplace_superuser_valid_license_key_entered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fbe61587a2af134c797c827030649a01235e620c082d0661fc9a475d56ecb9f3
-size 951302
+oid sha256:01ce5959eafb08ff882c4458ec7e4993ef9da53ec9e064920165c8645ba79658
+size 847430
diff --git a/plugins/Marketplace/tests/resources/v2.0_plugins.json b/plugins/Marketplace/tests/resources/v2.0_plugins.json
index 0caa2e0fca..a006274726 100644
--- a/plugins/Marketplace/tests/resources/v2.0_plugins.json
+++ b/plugins/Marketplace/tests/resources/v2.0_plugins.json
@@ -30,88 +30,7 @@
     "readmeHtml":{"description":"\n\n<p>Adds the ability for Piwik administrators to include an informative message on all users' dashboards. This may be useful for communicating with users in larger shared environments. In our setup we were tracking 1,900 websites with 250 users. This is a solution we wrote to allow us to easily inform our users of maintainance windows.<\/p>\n\n",
       "faq":"",
       "documentation":"",
-      "changelog":"<p>0.1.2 Tested with Piwik v2.15 and included new registerEvents() hook for compatibility with Piwik 3.0\n0.1.1 Cleanup. Removed plugin template verbiage from code files.\n0.1.0 Initial Release<\/p>"},"download":"\/api\/2.0\/plugins\/AdminNotification\/download\/0.1.2"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/AdminNotification\/changelog"},"consumer":{"license":null}},{"name":"AdvancedCampaignReporting",
-  "displayName":"Advanced Campaign Reporting",
-  "owner":"PiwikPRO",
-  "description":"Track up to five Campaigns parameter (campaign, source, medium, keyword, content). Lets you also segment users by any campaign dimension, and provides",
-  "homepage":"http:\/\/piwik.pro",
-  "createdDateTime":"2014-10-01 03:22:04",
-  "donate":{},"support":[],"isTheme":false,"keywords":[],"basePrice":0,"authors":[],"repositoryUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting",
-  "lastUpdated":"2016-03-22 12:36:04",
-  "latestVersion":"1.3.1",
-  "numDownloads":8360,"screenshots":[],"previews":[],"activity":{"numCommits":"149",
-    "numContributors":"9",
-    "lastCommitDate":"2016-04-15 22:57:32"},"featured":false,"isFree":true,"isPaid":false,"isCustomPlugin":false,"shop":null,"versions":[{"name":"1.0.3",
-    "release":"2014-10-01 03:22:04",
-    "requires":{},"numDownloads":496,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.3"},{"name":"1.0.4",
-    "release":"2014-11-03 15:08:04",
-    "requires":{},"numDownloads":213,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.4"},{"name":"1.0.5",
-    "release":"2014-11-14 11:16:04",
-    "requires":{},"numDownloads":109,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.5"},{"name":"1.0.6",
-    "release":"2014-11-17 04:44:03",
-    "requires":{},"numDownloads":1531,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.6"},{"name":"1.0.7",
-    "release":"2015-03-31 20:50:04",
-    "requires":{},"numDownloads":9,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.7"},{"name":"1.0.8",
-    "release":"2015-03-31 21:20:04",
-    "requires":{},"numDownloads":1853,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.0.8"},{"name":"1.1.1",
-    "release":"2015-09-03 02:04:03",
-    "requires":{"piwik":">=2.14.0"},"numDownloads":954,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.1.1"},{"name":"1.2.0",
-    "release":"2015-11-11 13:08:02",
-    "requires":{"piwik":">=2.15.0"},"numDownloads":1743,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/2.0.2",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.2.0"},{"name":"1.3.0",
-    "release":"2016-03-08 14:02:03",
-    "requires":{"piwik":">=2.16.0"},"numDownloads":352,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.3.0"},{"name":"1.3.1",
-    "release":"2016-03-22 12:36:04",
-    "requires":{"piwik":">=2.16.0"},"numDownloads":1100,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/commits\/v0.1.1",
-    "readmeHtml":{"description":"\n\n<p>Track up to five Campaigns parameters (name, source, medium, keyword, content), and access Campaign Analytics reports.<\/p>\n\n<h3>Measuring campaigns<\/h3>\n\n<p>The default Campaign parameters are called: pk_campaign, pk_source, pk_medium, pk_keyword, pk_content and pk_cid.<\/p>\n\n<p>If you already have URLs tagged with Google Analytics parameters these are supported: utm_campaign, utm_source, utm_medium, utm_term, utm_content and utm_id<\/p>\n\n<p>An example landing page URL is:<\/p>\n\n<pre><code>\/offer?pk_campaign=Best-Seller&amp;pk_source=Newsletter_7&amp;pk_medium=email\n<\/code><\/pre>\n\n<h3>Features<\/h3>\n\n<ul><li>Real time Analytics Reports of all your Campaign Marketing<\/li>\n<li>Detects Campaign parameters from the landing page URL, within the query string or in the #hash string<\/li>\n<li>The Referrers&gt;Overview report displays a left column \"Referrers Overview\" with a list of reports that can be loaded on click.\nThis report viewer now also lists the new Campaign reports under \"View Referrers by Campaign\".<\/li>\n<li>The content of Referrers&gt; Campaign will be replaced with the new enhanced Campaigns reports.<\/li>\n<li>The default Referrers Campaign widget and API are working as before.<\/li>\n<li>The campaign reports are available in Piwik Mobile and can be sent as Scheduled reports (by email, as HTML or PDF)<\/li>\n<li>Segment editor: a new \"Campaigns\" category lists the five new segment for each campaign dimension<\/li>\n<li>The new Campaign reports can be added as widgets in your personalized Dashboard<\/li>\n<li>Access the Campaign Report data by the API<\/li>\n<li>Comes with automated tests to ensure the Plugin works as expected<\/li>\n<li>Will track up to 250 characters for each of the five Campaign dimension<\/li>\n<\/ul><h3>Notes<\/h3>\n\n<p>In the Campaign reports by default Piwik will only archive the first 1000 rows. If you track many campaigns you can configure Piwik so it does not truncate your data. To have data truncated after 10,000 rows, edit your <code>config\/config.ini.php<\/code> and add the following:<\/p>\n\n<pre><code>[General]\ndatatable_archiving_maximum_rows_referrers = 10000\ndatatable_archiving_maximum_rows_subtable_referrers = 10000\n<\/code><\/pre>\n\n<h3>Ideas for improvement<\/h3>\n\n<ul><li>To improve data acquisition accuracy, we could extend the piwik.js class to store in first party cookies\nthe five campaign dimensions. This would increase the accuracy of Goal conversions and Ecommerce conversions attributions\nfor these conversions made at least one day after the first visit with a campaign set. <a href=\"https:\/\/github.com\/PiwikPRO\/plugin-AdvancedCampaignReporting\/issues\/10\">#10<\/a><\/li>\n<li>Add friendly Tracking API parameters to collect campaign dimensions.\ncampaignName <code>cn<\/code>, campaignSource <code>cs<\/code>, campaignMedium <code>cm<\/code>, campaignContent <code>cc<\/code>, campaignId <code>ci<\/code>.<\/li>\n<\/ul>",
-      "faq":"",
-      "documentation":"",
-      "changelog":"<ul><li>1.3.1 Better support for campaign parameters behind hash tag (#)<\/li>\n<li>1.3.0 PPCDEV-2609 Compatibility with Piwik 2.16.0<\/li>\n<li>1.2.0 (Nov 10th 2015) - Plugin comaptibility with Piwik 2.15.0<\/li>\n<li>1.1.1 (Sept 3rd 2015) - Campaign reports now display your campaign report data even for campaign data before you activated AdvancedCampaignReporting<\/li>\n<li>1.1.0 (July 28th 2015)<\/li>\n<li>1.0.8 (Apr 1st 2015) - Exclude Google Analytics campaign parameters from the Page URLs<\/li>\n<li>1.0.6 (Nov 17th 2014) - Documentation<\/li>\n<li>1.0.5 (Nov 14th 2014) - Detect new URL parameters: piwik_campaign, pk_cpn and for Keywords: pk_kwd, piwik_keyword<\/li>\n<li>1.0.4 (Nov 4th 2014) - View Goals by Campaign Dimension in the Goals &amp; Ecommerce reports<\/li>\n<li>1.0.3 (Oct 1st 2014) - Released for free on the <a href=\"http:\/\/plugins.piwik.org\/\">Piwik Marketplace<\/a><\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/AdvancedCampaignReporting\/download\/1.3.1"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/AdvancedCampaignReporting\/changelog"},"consumer":{"license":null}},{"name":"AnonymousPiwikUsageMeasurement",
+      "changelog":"<p>0.1.2 Tested with Piwik v2.15 and included new registerEvents() hook for compatibility with Piwik 3.0\n0.1.1 Cleanup. Removed plugin template verbiage from code files.\n0.1.0 Initial Release<\/p>"},"download":"\/api\/2.0\/plugins\/AdminNotification\/download\/0.1.2"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/AdminNotification\/changelog"},"consumer":{"license":null}},{"name":"AnonymousPiwikUsageMeasurement",
   "displayName":"Anonymous Piwik Usage Measurement",
   "owner":"piwik",
   "description":"Help improve your Piwik experience by sending anonymized usage data to the creators of Piwik, to your own Piwik instance or to any other Piwik",
@@ -621,53 +540,7 @@
     "readmeHtml":{"description":"\n\n<p>Add a new admin tab, to change the opt-out CSS Styles for each website.<\/p>\n\n",
       "faq":"",
       "documentation":"",
-      "changelog":"<h4>CustomOptOut 0.1.4:<\/h4>\n\n<ul><li>Issue #3 Code updated to support Piwik 2.1 and newer<\/li>\n<li>Issue #2 Allow relative urls in css file field<\/li>\n<\/ul><h4>CustomOptOut 0.1.3:<\/h4>\n\n<ul><li>Issue #1 Added a p-tag around the opt-out text for better markup and easier styling. (christianseel)<\/li>\n<\/ul><h4>CustomOptOut 0.1.2:<\/h4>\n\n<ul><li>Fix wrong css escaping<\/li>\n<\/ul><h4>CustomOptOut 0.1.1:<\/h4>\n\n<ul><li>Initial Version<\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/CustomOptOut\/download\/0.1.4"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/CustomOptOut\/changelog"},"consumer":{"license":null}},{"name":"CustomTrackerJs",
-  "displayName":"Custom Tracker Js",
-  "owner":"PiwikPRO",
-  "description":"Lets Super Users and other plugins customise the piwik.js tracker file.",
-  "homepage":"https:\/\/github.com\/PiwikPRO\/plugin-CustomTrackerJs",
-  "createdDateTime":"2014-10-14 04:56:03",
-  "donate":{},"support":[],"isTheme":false,"keywords":[],"basePrice":0,"authors":[],"repositoryUrl":"https:\/\/github.com\/PiwikPRO\/plugin-CustomTrackerJs",
-  "lastUpdated":"2016-04-12 16:00:04",
-  "latestVersion":"1.1.2",
-  "numDownloads":4376,"screenshots":[],"previews":[],"activity":{"numCommits":"33",
-    "numContributors":"5",
-    "lastCommitDate":"2016-04-15 22:59:15"},"featured":false,"isFree":true,"isPaid":false,"isCustomPlugin":false,"shop":null,"versions":[{"name":"1.0.2",
-    "release":"2014-10-14 04:56:03",
-    "requires":{"piwik":">=2.8.0-b4"},"numDownloads":64,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-CustomTrackerJs\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/CustomTrackerJs\/download\/1.0.2"},{"name":"1.0.3",
-    "release":"2014-10-15 21:58:03",
-    "requires":{"piwik":">=2.8.0-b4"},"numDownloads":3554,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-CustomTrackerJs\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/CustomTrackerJs\/download\/1.0.3"},{"name":"1.1.0",
-    "release":"2016-03-08 14:28:03",
-    "requires":{"piwik":">=2.8.0-b4"},"numDownloads":315,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-CustomTrackerJs\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/CustomTrackerJs\/download\/1.1.0"},{"name":"1.1.1",
-    "release":"2016-04-12 14:30:04",
-    "requires":{"piwik":">=2.8.0-b4"},"numDownloads":1,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-CustomTrackerJs\/commits\/v0.0.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/CustomTrackerJs\/download\/1.1.1"},{"name":"1.1.2",
-    "release":"2016-04-12 16:00:04",
-    "requires":{"piwik":">=2.8.0-b4"},"numDownloads":442,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-CustomTrackerJs\/commits\/v0.1.1",
-    "readmeHtml":{"description":"\n\n<p>The <code>CustomTrackerJs<\/code> plugin lets the super users or other plugins add custom code to the Piwik Javascript Tracker.<\/p>\n\n",
-      "faq":"",
-      "documentation":"",
-      "changelog":"<ul><li>1.1.2\n\n<ul><li>Marketplace release<\/li>\n<\/ul><\/li>\n<li>1.1.0\n\n<ul><li>PPCDEV-2609 Compatibility with Piwik 2.16.0<\/li>\n<\/ul><\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/CustomTrackerJs\/download\/1.1.2"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/CustomTrackerJs\/changelog"},"consumer":{"license":null}},{"name":"ExcludeByDDNS",
+      "changelog":"<h4>CustomOptOut 0.1.4:<\/h4>\n\n<ul><li>Issue #3 Code updated to support Piwik 2.1 and newer<\/li>\n<li>Issue #2 Allow relative urls in css file field<\/li>\n<\/ul><h4>CustomOptOut 0.1.3:<\/h4>\n\n<ul><li>Issue #1 Added a p-tag around the opt-out text for better markup and easier styling. (christianseel)<\/li>\n<\/ul><h4>CustomOptOut 0.1.2:<\/h4>\n\n<ul><li>Fix wrong css escaping<\/li>\n<\/ul><h4>CustomOptOut 0.1.1:<\/h4>\n\n<ul><li>Initial Version<\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/CustomOptOut\/download\/0.1.4"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/CustomOptOut\/changelog"},"consumer":{"license":null}},{"name":"ExcludeByDDNS",
   "displayName":"Exclude By DDNS",
   "owner":"sgiehl",
   "description":"This plugin allows you to dynamically exclude a IP using DDNS update",
@@ -947,88 +820,7 @@
     "readmeHtml":{"description":"\n\n<p>A Piwik plugin that adds a profile photo from Gravatar based on the email address stored in the User Id field.<\/p>\n\n",
       "faq":"<p><strong>What information do I need to make this plugin work?<\/strong>\nMake sure you are capturing the email address for your visitors in the User Id field.<\/p>\n\n<p><strong>Why do some of my visitors just display the Gravatar logo instead of a photo?<\/strong>\nEither there is no email address associated with the visitor or they do not have a Gravatar set up at gravatar.com<\/p>",
       "documentation":"",
-      "changelog":"<ul><li>0.1.11 Fixed screenshot filename<\/li>\n<li>0.1.1 Add screenshots<\/li>\n<li>0.1.0 First beta<\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/GrabGravatar\/download\/0.2.0"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/GrabGravatar\/changelog"},"consumer":{"license":null}},{"name":"InterSites",
-  "displayName":"Inter Sites",
-  "owner":"PiwikPRO",
-  "description":"Analyze how many visitors navigate between your websites.",
-  "homepage":"http:\/\/piwik.pro",
-  "createdDateTime":"2014-09-14 04:10:03",
-  "donate":{},"support":[],"isTheme":false,"keywords":[],"basePrice":0,"authors":[],"repositoryUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites",
-  "lastUpdated":"2016-03-08 14:16:03",
-  "latestVersion":"0.4.0",
-  "numDownloads":7766,"screenshots":[],"previews":[],"activity":{"numCommits":"69",
-    "numContributors":"6",
-    "lastCommitDate":"2016-04-15 22:58:13"},"featured":false,"isFree":true,"isPaid":false,"isCustomPlugin":false,"shop":null,"versions":[{"name":"0.1.0",
-    "release":"2014-09-14 04:10:03",
-    "requires":{"piwik":">=2.7.0-b3"},"numDownloads":0,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.1.0"},{"name":"0.1.1",
-    "release":"2014-09-14 04:40:03",
-    "requires":{"piwik":">=2.7.0-b3"},"numDownloads":1138,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.1.1"},{"name":"0.1.2",
-    "release":"2014-12-08 02:56:04",
-    "requires":{"piwik":">=2.10.0-b6"},"numDownloads":951,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.1.2"},{"name":"0.2.0",
-    "release":"2015-03-04 13:02:04",
-    "requires":{"piwik":">=2.10.0"},"numDownloads":126,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.2.0"},{"name":"0.2.1",
-    "release":"2015-03-05 08:36:03",
-    "requires":{"piwik":">=2.10.0"},"numDownloads":1472,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v0.1.2",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.2.1"},{"name":"0.2.3",
-    "release":"2015-07-29 11:10:03",
-    "requires":{"piwik":">=2.11.0"},"numDownloads":1043,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.2.3"},{"name":"0.3.0",
-    "release":"2015-10-21 23:18:03",
-    "requires":{"piwik":">=2.11.0"},"numDownloads":0,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.3.0"},{"name":"0.3.1",
-    "release":"2015-10-21 23:24:03",
-    "requires":{"piwik":">=2.15.0-rc4"},"numDownloads":372,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.3.1"},{"name":"0.3.2",
-    "release":"2015-11-11 20:10:03",
-    "requires":{"piwik":">=2.15.0"},"numDownloads":1597,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v1.0",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.3.2"},{"name":"0.4.0",
-    "release":"2016-03-08 14:16:03",
-    "requires":{"piwik":">=2.16.0"},"numDownloads":1067,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-InterSites\/commits\/v0.1.1",
-    "readmeHtml":{"description":"\n\n<p>Measures number of visits and unique visitors that have navigated across two or three specific websites.<\/p>\n\n<p><em>(Unique user is determined across websites using the fingerprint config_id stored in the DB.)<\/em><\/p>\n\n",
-      "faq":"",
-      "documentation":"",
-      "changelog":"<ul><li>0.4.0\n\n<ul><li>PPCDEV-2609 Compatibility with Piwik 2.16.0<\/li>\n<\/ul><\/li>\n<li>0.3.2\n\n<ul><li>Changed minimum required Piwik to 2.15.0<\/li>\n<\/ul><\/li>\n<li>0.3.1\n\n<ul><li>Bumping minimum required Piwik.<\/li>\n<\/ul><\/li>\n<li>0.3.0\n\n<ul><li>Compatibility w\/ Piwik 2.15.<\/li>\n<\/ul><\/li>\n<li>0.2.2:\n\n<ul><li>Fixed bug with day period<\/li>\n<li>Added tests for day and month period<\/li>\n<li>Fixed Site names display, as they were displayed as HTML entities<\/li>\n<\/ul><\/li>\n<li>0.2.1: Market release<\/li>\n<li>0.2.0: Introduced composer.json file<\/li>\n<li>0.1.2: Compatibility with Piwik 2.10.0 (Notification will explain that config setting <code>enable_fingerprinting_across_websites=1<\/code> is required)<\/li>\n<li>0.1.0: Initial release<\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/InterSites\/download\/0.4.0"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/InterSites\/changelog"},"consumer":{"license":null}},{"name":"IntranetGeoIP",
+      "changelog":"<ul><li>0.1.11 Fixed screenshot filename<\/li>\n<li>0.1.1 Add screenshots<\/li>\n<li>0.1.0 First beta<\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/GrabGravatar\/download\/0.2.0"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/GrabGravatar\/changelog"},"consumer":{"license":null}},{"name":"IntranetGeoIP",
   "displayName":"Intranet Geo IP",
   "owner":"ThaDafinser",
   "description":"Piwik plugin to locate all locale data of a user based on the IP address\/subnetwork (country, region, city, latitude, longitude, provider, ...)",
@@ -1791,53 +1583,7 @@
     "readmeHtml":{"description":"\n\n<p>This is a plugin for the Open Source Web Analytics platform Piwik. If enabled, it will add a new widget that you can add to your dashboard and a new link in the top navigation.<\/p>\n\n<p>The widget will show the performance index of a site that auto-refreshes every 30 seconds. It shows the number of visitors or visit time in a 30 minute period compared to the maximum number of visitors in any 30 minute period of the last 30 days.<\/p>\n\n<p>This plugin is inspired by the <a href=\"https:\/\/github.com\/halfdan\/piwik-barometer-plugin\">piwik barometer plugin<\/a> and uses a lightly modified jQuery-Dynameter (original by <a href=\"http:\/\/tze1.com\/dynameter\/\">Tzechiu Lei<\/a>.<\/p>\n\n<p><strong>This plugin should run fine with installations with up to 100.000 page impressions per day. If you run a very large piwik installation and have performance issues with this plugin, please contact me - there is a solution for this. I have it up and running in an installation with more than 5 million visits per day.<\/strong><\/p>\n\n<p>(Tested with piwik 2.7.0, but supposed to run with older versions)<\/p>\n\n",
       "faq":"<h3>Features<\/h3>\n\n<p>Here is a list of features that are included in this project:<\/p>\n\n<ul><li>Live widget (\"Performance Monitor\") with key performance indices<\/li>\n<li>Add an item to the top navigation (\"Performance overview\") which displays the performance monitor widget for all your sites (configurable).<\/li>\n<\/ul><h3>Configuration<\/h3>\n\n<p><em>Refresh interval<\/em>: Defines how often the widgets will be updated. Every 30 seconds is a good value to choose.<\/p>\n\n<p><em>Measurement period<\/em>: Defines the measurement period in minutes. 5 minutes is a good value to choose.<\/p>\n\n<p><em>Comparison period<\/em>: Defines the period (x * 24h) the last 30 minutes are compared to. A good value for small sites with more or less static content is 30. For sites with peak days on weekends for example 1 will be a good value. 1 is also a good value for very big sites with a lot of traffic. You will have to play around with this value a little bit and figure out whalt will fit your needs.<\/p>\n\n<p><em>Sites in overview<\/em>: Defines which sites are displayed in the overview.<\/p>",
       "documentation":"",
-      "changelog":"<h3>0.2.5 Bugfix Release<\/h3>\n\n<ul><li>fixed bug with timezones that match \/^UTC[+-]*\/<\/li>\n<\/ul><h3>0.2.4 Bugfix Release<\/h3>\n\n<ul><li>reengineering of scheduled task<\/li>\n<\/ul><h3>0.2.3 Bugfix Release<\/h3>\n\n<ul><li>fixed bug in scheduled task<\/li>\n<\/ul><h3>0.2.2 Bugfix Release<\/h3>\n\n<ul><li>fixed an installation bug<\/li>\n<\/ul><h3>0.2.0 Second Beta<\/h3>\n\n<ul><li>made the plugin configurable by settings<\/li>\n<li>added more key performance indices<\/li>\n<li>performance overview now links to the dashboards<\/li>\n<li>fixed the timezone bug (configure timezone for each site properly)<\/li>\n<li>fixed several minor bugs<\/li>\n<\/ul><h3>0.1.0 First Beta<\/h3>\n\n<ul><li>initial release<\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/PerformanceMonitor\/download\/0.2.5"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/PerformanceMonitor\/changelog"},"consumer":{"license":null}},{"name":"PlatformsReport",
-  "displayName":"Platforms Report",
-  "owner":"PiwikPRO",
-  "description":"New report in Visitors > Platforms that aggregates visits based on device type, OS version & browser version.",
-  "homepage":"http:\/\/piwik.pro",
-  "createdDateTime":"2015-10-27 02:06:03",
-  "donate":{},"support":[],"isTheme":false,"keywords":[],"basePrice":0,"authors":[],"repositoryUrl":"https:\/\/github.com\/PiwikPRO\/plugin-PlatformsReport",
-  "lastUpdated":"2016-01-04 08:42:03",
-  "latestVersion":"1.0.4",
-  "numDownloads":2347,"screenshots":[],"previews":[],"activity":{"numCommits":"24",
-    "numContributors":"3",
-    "lastCommitDate":"2016-03-15 04:25:00"},"featured":false,"isFree":true,"isPaid":false,"isCustomPlugin":false,"shop":null,"versions":[{"name":"1.0.0",
-    "release":"2015-10-27 02:06:03",
-    "requires":{"piwik":">=2.14.3"},"numDownloads":0,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-PlatformsReport\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/PlatformsReport\/download\/1.0.0"},{"name":"1.0.1",
-    "release":"2015-10-27 02:14:03",
-    "requires":{"piwik":">=2.14.3"},"numDownloads":0,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-PlatformsReport\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/PlatformsReport\/download\/1.0.1"},{"name":"1.0.2",
-    "release":"2015-10-27 02:30:04",
-    "requires":{"piwik":">=2.14.3"},"numDownloads":100,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-PlatformsReport\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/PlatformsReport\/download\/1.0.2"},{"name":"1.0.3",
-    "release":"2015-10-29 23:52:03",
-    "requires":{"piwik":">=2.14.3"},"numDownloads":777,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-PlatformsReport\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/PlatformsReport\/download\/1.0.3"},{"name":"1.0.4",
-    "release":"2016-01-04 08:42:03",
-    "requires":{"piwik":">=2.14.3"},"numDownloads":1470,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-PlatformsReport\/commits\/1.0.1",
-    "readmeHtml":{"description":"\n\n<p>Includes two new reports: Platforms and Platforms With Versions.<\/p>\n\n<p>The <strong>Platforms<\/strong> report displays visitors by their device type, OS and browser.<\/p>\n\n<p>The <strong>Platforms With Versions<\/strong> report displays the same information, but includes OS version &amp; browser version information.<\/p>\n\n<p>The new reports are available via the Visitors &gt; Platforms menu.<\/p>\n\n",
-      "faq":"",
-      "documentation":"",
-      "changelog":"<ul><li>1.0.3\n\n<ul><li>Moved sub-menu entry after 'Software'<\/li>\n<\/ul><\/li>\n<li>1.0.2\n\n<ul><li>Initial release on Marketplace.<\/li>\n<\/ul><\/li>\n<li>1.0.0\n\n<ul><li>Initial release.<\/li>\n<\/ul><\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/PlatformsReport\/download\/1.0.4"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/PlatformsReport\/changelog"},"consumer":{"license":null}},{"name":"QueuedTracking",
+      "changelog":"<h3>0.2.5 Bugfix Release<\/h3>\n\n<ul><li>fixed bug with timezones that match \/^UTC[+-]*\/<\/li>\n<\/ul><h3>0.2.4 Bugfix Release<\/h3>\n\n<ul><li>reengineering of scheduled task<\/li>\n<\/ul><h3>0.2.3 Bugfix Release<\/h3>\n\n<ul><li>fixed bug in scheduled task<\/li>\n<\/ul><h3>0.2.2 Bugfix Release<\/h3>\n\n<ul><li>fixed an installation bug<\/li>\n<\/ul><h3>0.2.0 Second Beta<\/h3>\n\n<ul><li>made the plugin configurable by settings<\/li>\n<li>added more key performance indices<\/li>\n<li>performance overview now links to the dashboards<\/li>\n<li>fixed the timezone bug (configure timezone for each site properly)<\/li>\n<li>fixed several minor bugs<\/li>\n<\/ul><h3>0.1.0 First Beta<\/h3>\n\n<ul><li>initial release<\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/PerformanceMonitor\/download\/0.2.5"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/PerformanceMonitor\/changelog"},"consumer":{"license":null}},{"name":"QueuedTracking",
   "displayName":"Queued Tracking",
   "owner":"piwik",
   "description":"Scale your large traffic Piwik service by queuing tracking requests in Redis for better performance. ",
@@ -2239,67 +1985,7 @@
     "readmeHtml":{"description":"\n\n<p>Plugin allows to turn Piwik instance into URL Shortener.<\/p>\n\n<p>Basic features:<\/p>\n\n<ul><li>easily create shortcode from any page you track in Piwik (integration with Actions report UI),<\/li>\n<li>create shortcode for any custom URL you want,<\/li>\n<li>perform redirects using your Piwik instance,<\/li>\n<li>get usage statistics for shortcodes handled by your instance\n\n<ul><li>get best performing URL's on websites you track,<\/li>\n<li>external URLs redirect statistics,<\/li>\n<\/ul><\/li>\n<li>see which URLs are being shortened and visited most often - also for external URLs not tracked in your Piwik.<\/li>\n<\/ul><p>Goodness coming:<\/p>\n\n<ul><li>for redirect performance improvement, store your shortcodes in storage like Memcache or Redis,<\/li>\n<li>attributing shortcode redirects with actual visits on your page,<\/li>\n<li>more advanced reports,<\/li>\n<\/ul><p>Before using, please read content in <a href=\"https:\/\/github.com\/mgazdzik\/plugin-ShortcodeTracker#setup\"><code>Setup<\/code><\/a> section \nas it contains steps required to make plugin work with your Piwik instance!<\/p>\n\n",
       "faq":"",
       "documentation":"",
-      "changelog":"<ul><li><p>0.6.2<\/p>\n\n<ul><li>Sort out mistakenly pushed tag<\/li>\n<\/ul><\/li>\n<li><p>0.6.0<\/p>\n\n<ul><li>Shortcode usage report added link to shortened page to for easier recognition of what is being shortened and used most,<\/li>\n<li>Display summarized report displaying which URLs were visited most via shortcode redirects,<\/li>\n<\/ul><\/li>\n<li><p>0.5.0<\/p>\n\n<ul><li>Add statistics collection for redirects to pages not tracked with Piwik (external pages)\n\n<ul><li>collect redirect statistics into Site you choose in interface,<\/li>\n<li>aggregate and display report for external shortcodes in separate view<\/li>\n<\/ul><\/li>\n<\/ul><\/li>\n<li><p>0.4.5<\/p>\n\n<ul><li>fix README formating for sake of Plugin market<\/li>\n<\/ul><\/li>\n<li><p>0.4.4<\/p>\n\n<ul><li>add license to plugin.json<\/li>\n<\/ul><\/li>\n<li><p>0.4.3<\/p>\n\n<ul><li>fix plugin.json structure for Plugin market<\/li>\n<\/ul><\/li>\n<li><p>0.4.2<\/p>\n\n<ul><li>Added missing changelog<\/li>\n<\/ul><\/li>\n<li><p>0.4.0<\/p>\n\n<ul><li>Piwik Plugin market release<\/li>\n<\/ul><\/li>\n<li><p>0.3.0<\/p>\n\n<ul><li>Tuned travis build file<\/li>\n<li>Mark Shortcodes as internal during creating<\/li>\n<li>Track custom event with \"redirect\" category upon each redirect for internal Shortcode<\/li>\n<li>Secure API methods from anonymous user usage<\/li>\n<li>Add shortcode report for internally tracked URLs:\n\n<ul><li>Create new visit during redirect (store referrer)<\/li>\n<li>Add Shortcode usage report based on Custom Events plugin API<\/li>\n<\/ul><\/li>\n<\/ul><\/li>\n<li><p>0.2.0<\/p>\n\n<ul><li>added Travis build badges for master and develop branches<\/li>\n<li>fixed existing unit tests<\/li>\n<li>slight refactor in terms of class naming<\/li>\n<li>added integration test for API methods<\/li>\n<\/ul><\/li>\n<li><p>0.1.0<\/p>\n\n<ul><li>API allowing to create and retrieve shortcodes,<\/li>\n<li>basic storage in MySQL, but possible to add other caching layers - for ex. Memcache, Redis,<\/li>\n<li>unit tests covering core logic,<\/li>\n<li>redirect API method that will preform appropriate redirects for incoming shortcode requests,<\/li>\n<li>basic setup guide involving Apache2 and Nginx configs,<\/li>\n<li>settings section allowing user to configure Shortener base URL (which may and should be different than Piwik instance)<\/li>\n<\/ul><\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/ShortcodeTracker\/download\/0.6.2"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/ShortcodeTracker\/changelog"},"consumer":{"license":null}},{"name":"SimplePageBuilder",
-  "displayName":"Simple Page Builder",
-  "owner":"PiwikPRO",
-  "description":"Lets you add a custom page to Piwik. The page will be visible to all users in the top menu.",
-  "homepage":"https:\/\/github.com\/PiwikPRO\/SimplePageBuilder",
-  "createdDateTime":"2014-12-08 04:50:03",
-  "donate":{},"support":[],"isTheme":false,"keywords":[],"basePrice":0,"authors":[],"repositoryUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SimplePageBuilder",
-  "lastUpdated":"2016-03-08 12:08:04",
-  "latestVersion":"1.2.0",
-  "numDownloads":3892,"screenshots":[],"previews":[],"activity":{"numCommits":"38",
-    "numContributors":"5",
-    "lastCommitDate":"2016-04-15 22:58:07"},"featured":false,"isFree":true,"isPaid":false,"isCustomPlugin":false,"shop":null,"versions":[{"name":"1.0.1",
-    "release":"2014-12-08 04:50:03",
-    "requires":{"piwik":">=2.10.0-b2"},"numDownloads":14,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SimplePageBuilder\/commits\/v0.1.2",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SimplePageBuilder\/download\/1.0.1"},{"name":"1.0.2",
-    "release":"2014-12-09 02:18:04",
-    "requires":{"piwik":">=2.10.0-b2"},"numDownloads":52,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SimplePageBuilder\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SimplePageBuilder\/download\/1.0.2"},{"name":"1.0.3",
-    "release":"2014-12-12 14:08:03",
-    "requires":{"piwik":">=2.10.0-b2"},"numDownloads":289,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SimplePageBuilder\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SimplePageBuilder\/download\/1.0.3"},{"name":"1.0.4",
-    "release":"2015-01-19 14:28:03",
-    "requires":{"piwik":">=2.9.0"},"numDownloads":1234,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SimplePageBuilder\/commits\/0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SimplePageBuilder\/download\/1.0.4"},{"name":"1.0.5",
-    "release":"2015-07-28 10:00:03",
-    "requires":{"piwik":">=2.9.0"},"numDownloads":557,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SimplePageBuilder\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SimplePageBuilder\/download\/1.0.5"},{"name":"1.1.0",
-    "release":"2015-10-21 22:20:03",
-    "requires":{"piwik":">=2.15.0-b15"},"numDownloads":1124,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SimplePageBuilder\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SimplePageBuilder\/download\/1.1.0"},{"name":"1.2.0",
-    "release":"2016-03-08 12:08:04",
-    "requires":{"piwik":">=2.16.0"},"numDownloads":622,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SimplePageBuilder\/commits\/v0.1.2",
-    "readmeHtml":{"description":"\n\n<p>This plugin lets you add a page with custom HTML content to Piwik. The page will be linked in the top menu and can be edited by the super user.<\/p>\n\n",
-      "faq":"",
-      "documentation":"",
-      "changelog":"<p><strong>1.2.0<\/strong><\/p>\n\n<ul><li>PPCDEV-2609 Compatibility with Piwik 2.16.0<\/li>\n<\/ul><p><strong>1.1.0<\/strong><\/p>\n\n<ul><li>Compatibility with Piwik 2.15.<\/li>\n<\/ul><p><strong>1.0.3<\/strong><\/p>\n\n<ul><li>added composer.json<\/li>\n<\/ul><p><strong>1.0.2<\/strong><\/p>\n\n<ul><li>Correctly replace {date} when period is range.<\/li>\n<li>In example use H2 in the sample text for the custom page title<\/li>\n<\/ul><p><strong>1.0.0<\/strong><\/p>\n\n<ul><li>First stable version<\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/SimplePageBuilder\/download\/1.2.0"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/SimplePageBuilder\/changelog"},"consumer":{"license":null}},{"name":"SimpleSysMon",
+      "changelog":"<ul><li><p>0.6.2<\/p>\n\n<ul><li>Sort out mistakenly pushed tag<\/li>\n<\/ul><\/li>\n<li><p>0.6.0<\/p>\n\n<ul><li>Shortcode usage report added link to shortened page to for easier recognition of what is being shortened and used most,<\/li>\n<li>Display summarized report displaying which URLs were visited most via shortcode redirects,<\/li>\n<\/ul><\/li>\n<li><p>0.5.0<\/p>\n\n<ul><li>Add statistics collection for redirects to pages not tracked with Piwik (external pages)\n\n<ul><li>collect redirect statistics into Site you choose in interface,<\/li>\n<li>aggregate and display report for external shortcodes in separate view<\/li>\n<\/ul><\/li>\n<\/ul><\/li>\n<li><p>0.4.5<\/p>\n\n<ul><li>fix README formating for sake of Plugin market<\/li>\n<\/ul><\/li>\n<li><p>0.4.4<\/p>\n\n<ul><li>add license to plugin.json<\/li>\n<\/ul><\/li>\n<li><p>0.4.3<\/p>\n\n<ul><li>fix plugin.json structure for Plugin market<\/li>\n<\/ul><\/li>\n<li><p>0.4.2<\/p>\n\n<ul><li>Added missing changelog<\/li>\n<\/ul><\/li>\n<li><p>0.4.0<\/p>\n\n<ul><li>Piwik Plugin market release<\/li>\n<\/ul><\/li>\n<li><p>0.3.0<\/p>\n\n<ul><li>Tuned travis build file<\/li>\n<li>Mark Shortcodes as internal during creating<\/li>\n<li>Track custom event with \"redirect\" category upon each redirect for internal Shortcode<\/li>\n<li>Secure API methods from anonymous user usage<\/li>\n<li>Add shortcode report for internally tracked URLs:\n\n<ul><li>Create new visit during redirect (store referrer)<\/li>\n<li>Add Shortcode usage report based on Custom Events plugin API<\/li>\n<\/ul><\/li>\n<\/ul><\/li>\n<li><p>0.2.0<\/p>\n\n<ul><li>added Travis build badges for master and develop branches<\/li>\n<li>fixed existing unit tests<\/li>\n<li>slight refactor in terms of class naming<\/li>\n<li>added integration test for API methods<\/li>\n<\/ul><\/li>\n<li><p>0.1.0<\/p>\n\n<ul><li>API allowing to create and retrieve shortcodes,<\/li>\n<li>basic storage in MySQL, but possible to add other caching layers - for ex. Memcache, Redis,<\/li>\n<li>unit tests covering core logic,<\/li>\n<li>redirect API method that will preform appropriate redirects for incoming shortcode requests,<\/li>\n<li>basic setup guide involving Apache2 and Nginx configs,<\/li>\n<li>settings section allowing user to configure Shortener base URL (which may and should be different than Piwik instance)<\/li>\n<\/ul><\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/ShortcodeTracker\/download\/0.6.2"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/ShortcodeTracker\/changelog"},"consumer":{"license":null}},{"name":"SimpleSysMon",
   "displayName":"Simple Sys Mon",
   "owner":"job963",
   "description":"Simple System Monitor for visualizing system data like cpu load, memory use or network traffic",
@@ -2359,90 +2045,7 @@
     "readmeHtml":{"description":"\n\n<p>This plugin shows how much load your webserver does have, where Piwik (and maybe your main website) is running. Additionally the free or the used memory will be displayed.<\/p>\n\n<p>The display will be refreshed automatically as often as you like. This can be setup by yourself in the plugin settings.<\/p>\n\n",
       "faq":"<p><strong>How is the CPU load calculated?<\/strong>\nFor the CPU load the PHP function sys_getloadavg() is used and divided by the number of cores.<\/p>\n\n<p><strong>Why is there a difference between free and used memory?<\/strong>\nThere are three \"memory parts\" under Linux:<\/p>\n\n<ul><li>Used memory<\/li>\n<li>Cache<\/li>\n<li>Free memory<\/li>\n<\/ul><p>The sum of these three parts will be equal to the total memory. But only <code>used memory<\/code> and <code>free memory<\/code> are available as options (in settings).<\/p>\n\n<p><strong>What is the value for 100% network traffic<\/strong>\nYou can setup the value for the maximum network traffic in the plugin system settings. The value there must be specified in kB\/s (kilobyte per second). This value is used as 100% network traffic.<\/p>\n\n<p><strong>Does the plugin work on a shared webspace?<\/strong>\nIn the most cases a shared webspace doesn't have access to system information. Therefore in these cases, the plugin cannot be used. The pseudo file system \/proc must be accessible.<\/p>\n\n<p><strong>Does the plugin work on Windows system?<\/strong>\nIf the server where Piwik is running is using Windows as OS, the plugin doesn't work yet.\nIf just your browser is running under Windows (and the server runs under Linux) this plugin works well.<\/p>",
       "documentation":"",
-      "changelog":"<ul><li><p><strong>0.1.0 Initial release<\/strong><\/p>\n\n<ul><li>Display of CPU load<\/li>\n<li>Display of free or used memory    <\/li>\n<\/ul><\/li>\n<li><p><strong>0.1.1 Initial release<\/strong><\/p>\n\n<ul><li>Corrections and error trapping for shared websites where the some values aren't accessible <\/li>\n<\/ul><\/li>\n<li><p><strong>0.2.0 Graphical display<\/strong><\/p>\n\n<ul><li>Display as bar chart for system load and memory use added <\/li>\n<\/ul><\/li>\n<li><p><strong>0.2.1 Hungarian language<\/strong><\/p>\n\n<ul><li>Hungarian language added <\/li>\n<\/ul><\/li>\n<li><p><strong>0.3.0 Bar charts for network and disk<\/strong><\/p>\n\n<ul><li>Two new bars for displaying network traffic (upload and download) and disk usage added<\/li>\n<li>Additional to the percentage values, the real values are display on hover <\/li>\n<\/ul><\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/SimpleSysMon\/download\/0.3.1"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/SimpleSysMon\/changelog"},"consumer":{"license":null}},{"name":"SiteMigration",
-  "displayName":"Site Migration",
-  "owner":"PiwikPRO",
-  "description":"Migrate your website and all website data between two Piwik installations.",
-  "homepage":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration",
-  "createdDateTime":"2014-11-11 21:28:05",
-  "donate":{},"support":[],"isTheme":false,"keywords":[],"basePrice":0,"authors":[],"repositoryUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration",
-  "lastUpdated":"2015-11-27 02:46:04",
-  "latestVersion":"1.0.8",
-  "numDownloads":5191,"screenshots":[],"previews":[],"activity":{"numCommits":"70",
-    "numContributors":"7",
-    "lastCommitDate":"2016-05-11 09:27:40"},"featured":false,"isFree":true,"isPaid":false,"isCustomPlugin":false,"shop":null,"versions":[{"name":"1.0.0",
-    "release":"2014-11-11 21:28:05",
-    "requires":{"php":">=5.3.0",
-      "piwik":">=2.9.0-b9"},"numDownloads":77,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SiteMigration\/download\/1.0.0"},{"name":"1.0.1",
-    "release":"2014-11-12 23:34:05",
-    "requires":{"php":">=5.3.0",
-      "piwik":">=2.9.0-b9"},"numDownloads":127,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SiteMigration\/download\/1.0.1"},{"name":"1.0.2",
-    "release":"2014-11-17 00:04:05",
-    "requires":{"php":">=5.3.0",
-      "piwik":">=2.9.0-b9"},"numDownloads":0,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SiteMigration\/download\/1.0.2"},{"name":"1.0.3",
-    "release":"2014-11-17 00:06:05",
-    "requires":{"php":">=5.3.0",
-      "piwik":">=2.9.0-b9"},"numDownloads":19,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SiteMigration\/download\/1.0.3"},{"name":"1.0.4",
-    "release":"2014-11-17 11:06:05",
-    "requires":{"php":">=5.3.0",
-      "piwik":">=2.9.1"},"numDownloads":202,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SiteMigration\/download\/1.0.4"},{"name":"1.0.5",
-    "release":"2014-11-26 21:26:06",
-    "requires":{"php":">=5.3.0",
-      "piwik":">=2.9.1"},"numDownloads":130,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SiteMigration\/download\/1.0.5"},{"name":"1.0.6",
-    "release":"2014-12-03 03:34:05",
-    "requires":{"php":">=5.3.0",
-      "piwik":">=2.9.1"},"numDownloads":174,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SiteMigration\/download\/1.0.6"},{"name":"1.0.7",
-    "release":"2014-12-21 22:04:05",
-    "requires":{"php":">=5.3.0",
-      "piwik":">=2.10.0-b10"},"numDownloads":2669,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/SiteMigration\/download\/1.0.7"},{"name":"1.0.8",
-    "release":"2015-11-27 02:46:04",
-    "requires":{"php":">=5.3.3",
-      "piwik":">=2.11.0"},"numDownloads":1793,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/commits\/v1.0.0",
-    "readmeHtml":{"description":"\n\n<p>Migrate websites, and all the tracking data between two Piwik installations.<\/p>\n\n<p>This tool is useful in case you want to merge two Piwik installations, or if you want to move one or several websites to another Piwik server.<\/p>\n\n<h3>Requirements<\/h3>\n\n<p>To migrate data from one Piwik server to another server, you must:<\/p>\n\n<ul><li>First make sure that both Piwik servers are using the latest Piwik version.<\/li>\n<li>You must be able to connect to the Mysql server of the Target Piwik Server.<\/li>\n<li>You must run the console command on the Piwik Server that data will be copied from.<\/li>\n<\/ul><h3>Migrating the data<\/h3>\n\n<p>Start the migration by calling from the command line CLI the following command:<\/p>\n\n<pre><code>.\/console migration:site idSite --db-prefix piwik_\n<\/code><\/pre>\n\n<p>The command will ask for the credentials to the target database.<\/p>\n\n<p>It will then migrate the data from the current Piwik to the target Piwik.<\/p>\n\n<h3>Options<\/h3>\n\n<p>Run <code>.\/console migration:site --help<\/code> to get a full list of options.<\/p>\n\n",
-      "faq":"<p><strong>How do I migrate site data between two dates only?<\/strong><\/p>\n\n<p>You can use command options: <code>--date-from<\/code> and <code>--date-to<\/code>.<\/p>\n\n<p><strong>How do I migrate tracking log data only, and skip migrating archived data?<\/strong><\/p>\n\n<p>Just add the <code>--skip-archive-data<\/code> option.<\/p>\n\n<p><strong>How do I migrate the archived data and skip the tracking data?<\/strong><\/p>\n\n<p>Just add the <code>--skip-log-data<\/code> option.<\/p>\n\n<p><strong>Can I run the command on the Target Piwik server (where data will be imported)?<\/strong><\/p>\n\n<p>No, you must run the command from the source Piwik server (the server which contains the data you want to migrate).<\/p>",
-      "documentation":"",
-      "changelog":"<p><strong>v1.0.7<\/strong><\/p>\n\n<ul><li>Updated the plugin for compatibility with Piwik 2.10.<\/li>\n<\/ul><p><strong>v1.0.6<\/strong><\/p>\n\n<ul><li><a href=\"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/issues\/6\">#6<\/a>: fixed a PHP 5.3 incompatibility<\/li>\n<\/ul><p><strong>v1.0.5<\/strong><\/p>\n\n<ul><li><a href=\"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/issues\/5\">#5<\/a>: fixed <code>Integrity constraint violation: 1048 Column 'idaction_url' cannot be null<\/code><\/li>\n<\/ul><p><strong>v1.0.4<\/strong><\/p>\n\n<ul><li><a href=\"https:\/\/github.com\/PiwikPRO\/plugin-SiteMigration\/issues\/3\">#3<\/a>: fixed <code>--db-prefix<\/code> option<\/li>\n<\/ul><p><strong>v1.0.3<\/strong><\/p>\n\n<ul><li>Documentation update<\/li>\n<\/ul><p><strong>v1.0.2<\/strong><\/p>\n\n<ul><li>Documentation update &amp; fixed bug when archive_blob tables are not found <\/li>\n<\/ul><p><strong>v1.0.1<\/strong><\/p>\n\n<ul><li>Documentation update<\/li>\n<\/ul><p><strong>v1.0.0<\/strong><\/p>\n\n<ul><li>First stable release<\/li>\n<li>Bugfixes<\/li>\n<\/ul><p><strong>v0.1.1<\/strong><\/p>\n\n<ul><li>Changed license to free plugin<\/li>\n<li>Changed name to SiteMigration<\/li>\n<\/ul><p><strong>v0.1.0<\/strong><\/p>\n\n<ul><li>Initial release<\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/SiteMigration\/download\/1.0.8"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/SiteMigration\/changelog"},"consumer":{"license":null}},{"name":"SnoopyBehavioralScoring",
+      "changelog":"<ul><li><p><strong>0.1.0 Initial release<\/strong><\/p>\n\n<ul><li>Display of CPU load<\/li>\n<li>Display of free or used memory    <\/li>\n<\/ul><\/li>\n<li><p><strong>0.1.1 Initial release<\/strong><\/p>\n\n<ul><li>Corrections and error trapping for shared websites where the some values aren't accessible <\/li>\n<\/ul><\/li>\n<li><p><strong>0.2.0 Graphical display<\/strong><\/p>\n\n<ul><li>Display as bar chart for system load and memory use added <\/li>\n<\/ul><\/li>\n<li><p><strong>0.2.1 Hungarian language<\/strong><\/p>\n\n<ul><li>Hungarian language added <\/li>\n<\/ul><\/li>\n<li><p><strong>0.3.0 Bar charts for network and disk<\/strong><\/p>\n\n<ul><li>Two new bars for displaying network traffic (upload and download) and disk usage added<\/li>\n<li>Additional to the percentage values, the real values are display on hover <\/li>\n<\/ul><\/li>\n<\/ul>"},"download":"\/api\/2.0\/plugins\/SimpleSysMon\/download\/0.3.1"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/SimpleSysMon\/changelog"},"consumer":{"license":null}},{"name":"SnoopyBehavioralScoring",
   "displayName":"Snoopy Behavioral Scoring",
   "owner":"spletnik",
   "description":"User behaviour scoring plugin for piwik. It allows you to score your visitors depending on goals reached, pages visited, email campaigns opened and ot",
@@ -2692,50 +2295,4 @@
     "readmeHtml":{"description":"\n\n<ul><li><p>Step1 Tracking Code<\/p>\n\n<p>Reference:<\/p>\n\n<p>http:\/\/piwik.org\/docs\/custom-variables\/#track-a-custom-variable-in-javascript<\/p>\n\n<p>http:\/\/developer.piwik.org\/api-reference\/tracking-javascript#custom-variables<\/p>\n\n<p>Example:<\/p>\n\n<pre><code>\/\/ you can set up to 5 custom variables for each visitor\n_paq.push([\n    \"setCustomVariable\", \n    1, \n    \"RTX\", \n    document.cookie.match(new RegExp(\"(^| )_login_name=([^;]*)(;|$)\"))[2], \n    \"visit\"\n]);\n<\/code><\/pre><\/li>\n<li><p>Step2 Plugin Settings<\/p>\n\n<ol><li><p>Name of the custom variable :<\/p>\n\n<p>\"RTX\" (Previous set of custom variable names, no default)<\/p><\/li>\n<li><p>Visitor avatar url rules :<\/p>\n\n<p>\"\/\/rtx.oa.com\/avatars\/%s\/profile.jpg\" (The default is \"plugins\/VisitorAvatar\/images\/default_avatar.gif\")<\/p><\/li>\n<li><p>Visitor description text rules :<\/p>\n\n<p>\"my rtx is %s\" (The default is \"%s\")<\/p><\/li>\n<\/ol><\/li>\n<li><p>Step3 Visitor Profile<\/p>\n\n<p><em>View Visitors custom avatar and description<\/em><\/p><\/li>\n<\/ul>",
       "faq":"",
       "documentation":"",
-      "changelog":""},"download":"\/api\/2.0\/plugins\/VisitorAvatar\/download\/0.2.2"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/VisitorAvatar\/changelog"},"consumer":{"license":null}},{"name":"WebsiteGroups",
-  "displayName":"Website Groups",
-  "owner":"PiwikPRO",
-  "description":"Assign websites to groups in your 'All Websites' dashboard. Useful to get a view by client or category.",
-  "homepage":"http:\/\/piwik.pro",
-  "createdDateTime":"2014-11-07 03:14:03",
-  "donate":{},"support":[],"isTheme":false,"keywords":[],"basePrice":0,"authors":[],"repositoryUrl":"https:\/\/github.com\/PiwikPRO\/plugin-WebsiteGroups",
-  "lastUpdated":"2016-03-09 18:04:03",
-  "latestVersion":"0.3.0",
-  "numDownloads":5489,"screenshots":[],"previews":[],"activity":{"numCommits":"70",
-    "numContributors":"6",
-    "lastCommitDate":"2016-04-15 22:56:33"},"featured":false,"isFree":true,"isPaid":false,"isCustomPlugin":false,"shop":null,"versions":[{"name":"0.1.2",
-    "release":"2014-11-07 03:14:03",
-    "requires":{"piwik":">=2.1.1-b1"},"numDownloads":3,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-WebsiteGroups\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/WebsiteGroups\/download\/0.1.2"},{"name":"0.1.3",
-    "release":"2014-11-07 03:18:03",
-    "requires":{"piwik":">=2.1.1-b1"},"numDownloads":2156,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-WebsiteGroups\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/WebsiteGroups\/download\/0.1.3"},{"name":"0.1.4",
-    "release":"2015-07-28 14:50:03",
-    "requires":{"piwik":">=2.1.1-b1"},"numDownloads":992,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-WebsiteGroups\/commits\/v0.1.1",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/WebsiteGroups\/download\/0.1.4"},{"name":"0.2.0",
-    "release":"2015-11-11 14:48:03",
-    "requires":{"piwik":">=2.15.0"},"numDownloads":1320,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-WebsiteGroups\/commits\/0.1.3",
-    "readmeHtml":{"description":"",
-      "faq":"",
-      "changelog":"",
-      "documentation":""},"download":"\/api\/2.0\/plugins\/WebsiteGroups\/download\/0.2.0"},{"name":"0.3.0",
-    "release":"2016-03-09 18:04:03",
-    "requires":{"piwik":">=2.16.0"},"numDownloads":1018,"license":{"name":"GPLv3+",
-      "url":""},"repositoryChangelogUrl":"https:\/\/github.com\/PiwikPRO\/plugin-WebsiteGroups\/commits\/v0.1.1",
-    "readmeHtml":{"description":"\n\n<p>Features of this plugin:<\/p>\n\n<ul><li>Users can assign websites to groups in the UI<\/li>\n<li>'All Websites' dashboard shows websites grouped by Group, and for each group it shows the sum of visits\/actions\/revenue for websites within this group<\/li>\n<li>In the 'All Websites' dashboard, the Super User can see an aggregated number of visits\/pages for the group. Websites appear below their group row<\/li>\n<li>A user can set the groups within the 'All Websites' dashboard<\/li>\n<li>The website selector shows the website groups prefixed with the group name<\/li>\n<li>The website selector allows you to search for groups<\/li>\n<\/ul>",
-      "faq":"",
-      "documentation":"",
-      "changelog":"<p><strong>v.0.3.0<\/strong>\n- PPCDEV-2609 Compatibility with Piwik 2.16.0<\/p>\n\n<p><strong>v.0.2.0<\/strong>\n- compatibility with Piwik 2.15.0<\/p>"},"download":"\/api\/2.0\/plugins\/WebsiteGroups\/download\/0.3.0"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/WebsiteGroups\/changelog"},"consumer":{"license":null}}]}
\ No newline at end of file
+      "changelog":""},"download":"\/api\/2.0\/plugins\/VisitorAvatar\/download\/0.2.2"}],"isDownloadable":true,"changelog":{"url":"http:\/\/plugins.piwik.org\/VisitorAvatar\/changelog"},"consumer":{"license":null}}]}
\ No newline at end of file
diff --git a/plugins/TagManager b/plugins/TagManager
-Subproject 33d982fa055b3310548ad8fd0678d517b02077e
+Subproject 6ba750183db9ca2e3ea64751dee592c6f7b7afa
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
index 7565361fca..8b7d6b85a7 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:614d1bdf10965af2a883fa23d2a9cf8473775f237f53ce7bbea99da41f871b5e
-size 4195094
+oid sha256:03c394560d046d5691b10f1ae2b857e0e8d94b937b27a9a10a0f5b8c39c770db
+size 4195403
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
index 2598424ba6..e1ca42d76d 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f24e2a938829952f545d996081f8f45a20583d807ca76d6534f09e4631fcfbb4
-size 1044444
+oid sha256:5f67a0da2c8cd0adc25899e0947a3be23e0df1c5fbedbb6bffc89a7303d4b4d4
+size 1044442
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png
index 8529c2bc3e..038288e970 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_plugins_no_internet.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:953001be1657311d5163d3cb091f29469a80f6156c707916c42ee6732482d90c
-size 1056284
+oid sha256:3ac07669bca934f1cd0c2f2cb3f18b5ae53f545dcc93429ced7f26ff3112e967
+size 1056289
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
index 453a2aa9c0..95c558ba9c 100644
--- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
+++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fba29ae0960d5f150636b462d060d3407573d9aa31e4467e98b5d80a38e94ecb
-size 4943071
+oid sha256:7260e83828e9510616e2786fad99724630a22013444115be8f8fa28c392d362c
+size 4944235
diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index e727c13ff0..98d9861422 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -21,8 +21,8 @@ try {
     $mysql = false;
 }
 
-use \Piwik\Plugins\CustomPiwikJs\TrackerUpdater;
-use \Piwik\Plugins\CustomPiwikJs\TrackingCode\JsTestPluginTrackerFiles;
+use \Piwik\Plugins\CustomJsTracker\TrackerUpdater;
+use \Piwik\Plugins\CustomJsTracker\TrackingCode\JsTestPluginTrackerFiles;
 
 $targetFileName = '/tests/resources/matomo.test.js';
 $sourceFile = PIWIK_DOCUMENT_ROOT . TrackerUpdater::DEVELOPMENT_PIWIK_JS;