diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0daa5a718f9..7f8abc98811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,11 +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` was renamed `CustomTrackerJs`
+* The core plugin `CustomPiwikJs` was renamed `CustomJsTracker`
 
 ### Deprecations
-* The event `CustomPiwikJs.piwikJsChanged` has been deprecated. Use `CustomTrackerJs.trackerJsChanged` instead
-* The event `CustomPiwikJs.shouldAddTrackerFile` has been deprecated. Use `CustomTrackerJs.shouldAddTrackerFile` instead
+* The event `CustomPiwikJs.piwikJsChanged` has been deprecated. Use `CustomJsTracker.trackerJsChanged` instead
+* The event `CustomPiwikJs.shouldAddTrackerFile` has been deprecated. Use `CustomJsTracker.shouldAddTrackerFile` instead
 
 ## Matomo 3.13.1
 
diff --git a/config/global.ini.php b/config/global.ini.php
index fcb2990085b..3c2159beac2 100755
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -1016,7 +1016,7 @@
 Plugins[] = Marketplace
 Plugins[] = ProfessionalServices
 Plugins[] = UserId
-Plugins[] = CustomTrackerJs
+Plugins[] = CustomJsTracker
 Plugins[] = Tour
 
 [PluginsInstalled]
diff --git a/config/global.php b/config/global.php
index 34f72a60b95..16278ec6099 100644
--- a/config/global.php
+++ b/config/global.php
@@ -223,5 +223,5 @@
     /**
      * @todo remove in Matomo 5. For BC only
      */
-    'Piwik\Plugins\CustomPiwikJs\TrackerUpdater' => DI\get(Piwik\Plugins\CustomTrackerJs\TrackerUpdater::class),
+    'Piwik\Plugins\CustomPiwikJs\TrackerUpdater' => DI\get(Piwik\Plugins\CustomJsTracker\TrackerUpdater::class),
 );
diff --git a/core/FileIntegrity.php b/core/FileIntegrity.php
index cb1c4681c61..5505e7fbfb9 100644
--- a/core/FileIntegrity.php
+++ b/core/FileIntegrity.php
@@ -10,8 +10,8 @@
 namespace Piwik;
 
 use Piwik\Container\StaticContainer;
-use Piwik\Plugins\CustomTrackerJs\Exception\AccessDeniedException;
-use Piwik\Plugins\CustomTrackerJs\TrackerUpdater;
+use Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException;
+use Piwik\Plugins\CustomJsTracker\TrackerUpdater;
 
 class FileIntegrity
 {
@@ -372,7 +372,7 @@ protected static function isModifiedPathValid($path)
             // 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('CustomTrackerJs')) {
+            if (Plugin\Manager::getInstance()->isPluginActivated('CustomJsTracker')) {
                 $trackerUpdater = new TrackerUpdater();
 
                 if ($trackerUpdater->getCurrentTrackerFileContent() === $trackerUpdater->getUpdatedTrackerFileContent()) {
@@ -383,7 +383,7 @@ protected static function isModifiedPathValid($path)
 
                 try {
                     // the piwik.js tracker file was not updated yet, but may be updated just after the update by
-                    // one of the events CustomTrackerJs 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/Updates/4.0.0-b1.php b/core/Updates/4.0.0-b1.php
index f4a65a9a107..2ddcee9d836 100644
--- a/core/Updates/4.0.0-b1.php
+++ b/core/Updates/4.0.0-b1.php
@@ -62,13 +62,13 @@ protected function renameTrackerJsPluginInConfig()
 
         foreach ($config->Plugins['Plugins'] as $index => $plugin) {
             if ($plugin === 'CustomPiwikJs') {
-                $config->Plugins['Plugins'][$index] = 'CustomTrackerJs';
+                $config->Plugins['Plugins'][$index] = 'CustomJsTracker';
             }
         }
 
         foreach ($config->PluginsInstalled['PluginsInstalled'] as $index => $plugin) {
             if ($plugin === 'CustomPiwikJs') {
-                $config->PluginsInstalled['PluginsInstalled'][$index] = 'CustomTrackerJs';
+                $config->PluginsInstalled['PluginsInstalled'][$index] = 'CustomJsTracker';
             }
         }
 
diff --git a/plugins/CustomTrackerJs/.gitignore b/plugins/CustomJsTracker/.gitignore
similarity index 100%
rename from plugins/CustomTrackerJs/.gitignore
rename to plugins/CustomJsTracker/.gitignore
diff --git a/plugins/CustomTrackerJs/API.php b/plugins/CustomJsTracker/API.php
similarity index 78%
rename from plugins/CustomTrackerJs/API.php
rename to plugins/CustomJsTracker/API.php
index 2de03fcf81d..c8349efe2ec 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Piwik;
-use Piwik\Plugins\CustomTrackerJs\Exception\AccessDeniedException;
+use Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException;
 
 /**
- * API for plugin CustomTrackerJs
+ * API for plugin CustomJsTracker
  *
- * @method static \Piwik\Plugins\CustomTrackerJs\API getInstance()
+ * @method static \Piwik\Plugins\CustomJsTracker\API getInstance()
  */
 class API extends \Piwik\Plugin\API
 {
@@ -29,7 +29,7 @@ public function doesIncludePluginTrackersAutomatically()
         Piwik::checkUserHasSomeAdminAccess();
 
         try {
-            $updater = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackerUpdater');
+            $updater = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater');
             $updater->checkWillSucceed();
             return true;
         } catch (AccessDeniedException $e) {
diff --git a/plugins/CustomTrackerJs/Commands/UpdateTracker.php b/plugins/CustomJsTracker/Commands/UpdateTracker.php
similarity index 90%
rename from plugins/CustomTrackerJs/Commands/UpdateTracker.php
rename to plugins/CustomJsTracker/Commands/UpdateTracker.php
index 4730aa2d849..bddd99136a4 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\Commands;
+namespace Piwik\Plugins\CustomJsTracker\Commands;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Plugin\ConsoleCommand;
-use Piwik\Plugins\CustomTrackerJs\TrackerUpdater;
-use Piwik\Plugins\CustomTrackerJs\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 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
     public function updateTracker($sourceFile, $targetFile, $ignoreMinified)
     {
-        $pluginTrackerFiles = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackingCode\PluginTrackerFiles');
+        $pluginTrackerFiles = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles');
 
         if ($ignoreMinified) {
             if (empty($sourceFile) || $sourceFile === $this->getPathOriginalPiwikJs()) {
@@ -56,7 +56,7 @@ public function updateTracker($sourceFile, $targetFile, $ignoreMinified)
             $pluginTrackerFiles->ignoreMinified();
         }
 
-        $updater = StaticContainer::getContainer()->make('Piwik\Plugins\CustomTrackerJs\TrackerUpdater', array(
+        $updater = StaticContainer::getContainer()->make('Piwik\Plugins\CustomJsTracker\TrackerUpdater', array(
             'fromFile' => $sourceFile, 'toFile' => $targetFile
         ));
         $updater->setTrackerFiles($pluginTrackerFiles);
diff --git a/plugins/CustomTrackerJs/CustomTrackerJs.php b/plugins/CustomJsTracker/CustomJsTracker.php
similarity index 89%
rename from plugins/CustomTrackerJs/CustomTrackerJs.php
rename to plugins/CustomJsTracker/CustomJsTracker.php
index 4a11c3ecd75..ebf63933fac 100644
--- a/plugins/CustomTrackerJs/CustomTrackerJs.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\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Container\StaticContainer;
 use Piwik\Log;
 use Piwik\Plugin;
 
-class CustomTrackerJs extends Plugin
+class CustomJsTracker extends Plugin
 {
     public function registerEvents()
     {
@@ -30,8 +30,8 @@ public function registerEvents()
     public function updateTracker()
     {
         try {
-            if (Plugin\Manager::getInstance()->isPluginActivated('CustomTrackerJs')) {
-                $trackerUpdater = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackerUpdater');
+            if (Plugin\Manager::getInstance()->isPluginActivated('CustomJsTracker')) {
+                $trackerUpdater = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater');
                 $trackerUpdater->update();
             }
         } catch (\Exception $e) {
diff --git a/plugins/CustomTrackerJs/Diagnostic/TrackerJsCheck.php b/plugins/CustomJsTracker/Diagnostic/TrackerJsCheck.php
similarity index 88%
rename from plugins/CustomTrackerJs/Diagnostic/TrackerJsCheck.php
rename to plugins/CustomJsTracker/Diagnostic/TrackerJsCheck.php
index edd7a2ef546..5def5fa7172 100644
--- a/plugins/CustomTrackerJs/Diagnostic/TrackerJsCheck.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\CustomTrackerJs\Diagnostic;
+namespace Piwik\Plugins\CustomJsTracker\Diagnostic;
 
 use Piwik\Filechecks;
 use Piwik\Filesystem;
-use Piwik\Plugins\CustomTrackerJs\File;
+use Piwik\Plugins\CustomJsTracker\File;
 use Piwik\Plugins\Diagnostics\Diagnostic\Diagnostic;
 use Piwik\Plugins\Diagnostics\Diagnostic\DiagnosticResult;
 use Piwik\SettingsPiwik;
@@ -54,13 +54,13 @@ public function execute()
             }
         }
 
-        $label = $this->translator->translate('CustomTrackerJs_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('CustomTrackerJs_DiagnosticPiwikJsNotWritable', $this->makeFilesTitles($notWritableFiles));
+        $comment = $this->translator->translate('CustomJsTracker_DiagnosticPiwikJsNotWritable', $this->makeFilesTitles($notWritableFiles));
 
         if (!SettingsServer::isWindows()) {
             $command = '';
@@ -68,7 +68,7 @@ public function execute()
                 $realpath = Filesystem::realpath(PIWIK_INCLUDE_PATH . '/' . $notWritableFile);
                 $command .= "<br/><code> chmod +w $realpath<br/> chown ". Filechecks::getUserAndGroup() ." " . $realpath . "</code><br />";
             }
-            $comment .= $this->translator->translate('CustomTrackerJs_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/CustomTrackerJs/Exception/AccessDeniedException.php b/plugins/CustomJsTracker/Exception/AccessDeniedException.php
similarity index 81%
rename from plugins/CustomTrackerJs/Exception/AccessDeniedException.php
rename to plugins/CustomJsTracker/Exception/AccessDeniedException.php
index 8d4c6a44e1f..7cfd6a550e8 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\Exception;
+namespace Piwik\Plugins\CustomJsTracker\Exception;
 
 use Exception;
 
diff --git a/plugins/CustomTrackerJs/File.php b/plugins/CustomJsTracker/File.php
similarity index 95%
rename from plugins/CustomTrackerJs/File.php
rename to plugins/CustomJsTracker/File.php
index f153335b66b..0b8325e9028 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
-use Piwik\Plugins\CustomTrackerJs\Exception\AccessDeniedException;
+use Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException;
 
 class File
 {
diff --git a/plugins/CustomTrackerJs/Tasks.php b/plugins/CustomJsTracker/Tasks.php
similarity index 75%
rename from plugins/CustomTrackerJs/Tasks.php
rename to plugins/CustomJsTracker/Tasks.php
index 421bf4b146f..24427a6d43d 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Container\StaticContainer;
 
@@ -19,7 +19,7 @@ public function schedule()
 
     public function updateTracker()
     {
-        $updater = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackerUpdater');
+        $updater = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater');
         $updater->update();
     }
 }
diff --git a/plugins/CustomTrackerJs/TrackerUpdater.php b/plugins/CustomJsTracker/TrackerUpdater.php
similarity index 92%
rename from plugins/CustomTrackerJs/TrackerUpdater.php
rename to plugins/CustomJsTracker/TrackerUpdater.php
index c6c72d3cae8..19b63f50e67 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs;
+namespace Piwik\Plugins\CustomJsTracker;
 
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
-use Piwik\Plugins\CustomTrackerJs\TrackingCode\PiwikJsManipulator;
-use Piwik\Plugins\CustomTrackerJs\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\CustomTrackerJs\TrackerUpdater')->update();
+ * StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackerUpdater')->update();
  */
 class TrackerUpdater
 {
@@ -54,7 +54,7 @@ public function __construct($fromFile = null, $toFile = null)
 
         $this->setFromFile($fromFile);
         $this->setToFile($toFile);
-        $this->trackerFiles = StaticContainer::get('Piwik\Plugins\CustomTrackerJs\TrackingCode\PluginTrackerFiles');
+        $this->trackerFiles = StaticContainer::get('Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles');
     }
 
     public function setFromFile($fromFile)
@@ -139,7 +139,7 @@ public function update()
                  *
                  * @param string $absolutePath The path to the new piwik.js file.
                  */
-                Piwik::postEvent('CustomTrackerJs.trackerJsChanged', [$savedFile]);
+                Piwik::postEvent('CustomJsTracker.trackerJsChanged', [$savedFile]);
 
                 /**
                  * @todo remove in Matomo 5. For BC only
@@ -162,7 +162,7 @@ private function updateAlternative($fromFile, $toFile, $newContent)
             if ($file->hasWriteAccess() && !$file->isFileContentSame($newContent)) {
                 $savedFiles = $file->save($newContent);
                 foreach ($savedFiles as $savedFile) {
-                    Piwik::postEvent('CustomTrackerJs.trackerJsChanged', [$savedFile]);
+                    Piwik::postEvent('CustomJsTracker.trackerJsChanged', [$savedFile]);
 
                     /**
                      * @todo remove in Matomo 5. For BC only
diff --git a/plugins/CustomTrackerJs/TrackingCode/JsTestPluginTrackerFiles.php b/plugins/CustomJsTracker/TrackingCode/JsTestPluginTrackerFiles.php
similarity index 90%
rename from plugins/CustomTrackerJs/TrackingCode/JsTestPluginTrackerFiles.php
rename to plugins/CustomJsTracker/TrackingCode/JsTestPluginTrackerFiles.php
index 0226ad15e9e..7bf8062a8bd 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\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/CustomTrackerJs/TrackingCode/PiwikJsManipulator.php b/plugins/CustomJsTracker/TrackingCode/PiwikJsManipulator.php
similarity index 97%
rename from plugins/CustomTrackerJs/TrackingCode/PiwikJsManipulator.php
rename to plugins/CustomJsTracker/TrackingCode/PiwikJsManipulator.php
index 958dee55635..0fe821c4e62 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\TrackingCode;
+namespace Piwik\Plugins\CustomJsTracker\TrackingCode;
 
 use Piwik\Piwik;
 
diff --git a/plugins/CustomTrackerJs/TrackingCode/PluginTrackerFiles.php b/plugins/CustomJsTracker/TrackingCode/PluginTrackerFiles.php
similarity index 95%
rename from plugins/CustomTrackerJs/TrackingCode/PluginTrackerFiles.php
rename to plugins/CustomJsTracker/TrackingCode/PluginTrackerFiles.php
index 0c1d29f3930..7e403b39a23 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\TrackingCode;
+namespace Piwik\Plugins\CustomJsTracker\TrackingCode;
 
 use Piwik\Piwik;
 use Piwik\Plugin;
-use Piwik\Plugins\CustomTrackerJs\File;
+use Piwik\Plugins\CustomJsTracker\File;
 
 class PluginTrackerFiles
 {
@@ -92,7 +92,7 @@ protected function shouldIncludeFile($pluginName)
          * @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('CustomTrackerJs.shouldAddTrackerFile', array(&$shouldAddFile, $pluginName));
+        Piwik::postEvent('CustomJsTracker.shouldAddTrackerFile', array(&$shouldAddFile, $pluginName));
 
         /**
          * @todo remove in Matomo 5. For BC only
diff --git a/plugins/CustomTrackerJs/config/config.php b/plugins/CustomJsTracker/config/config.php
similarity index 57%
rename from plugins/CustomTrackerJs/config/config.php
rename to plugins/CustomJsTracker/config/config.php
index 47731f5e8a3..88d0d6417a5 100644
--- a/plugins/CustomTrackerJs/config/config.php
+++ b/plugins/CustomJsTracker/config/config.php
@@ -2,6 +2,6 @@
 
 return array(
     'diagnostics.optional' => DI\add(array(
-        DI\get('Piwik\Plugins\CustomTrackerJs\Diagnostic\TrackerJsCheck'),
+        DI\get('Piwik\Plugins\CustomJsTracker\Diagnostic\TrackerJsCheck'),
     )),
 );
diff --git a/plugins/CustomTrackerJs/config/tracker.php b/plugins/CustomJsTracker/config/tracker.php
similarity index 100%
rename from plugins/CustomTrackerJs/config/tracker.php
rename to plugins/CustomJsTracker/config/tracker.php
diff --git a/plugins/CustomTrackerJs/lang/cs.json b/plugins/CustomJsTracker/lang/cs.json
similarity index 77%
rename from plugins/CustomTrackerJs/lang/cs.json
rename to plugins/CustomJsTracker/lang/cs.json
index e1680d17e31..6812140b567 100644
--- a/plugins/CustomTrackerJs/lang/cs.json
+++ b/plugins/CustomJsTracker/lang/cs.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Zapisovatelný JavaScript záznam (%s)"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomTrackerJs/lang/da.json b/plugins/CustomJsTracker/lang/da.json
similarity index 89%
rename from plugins/CustomTrackerJs/lang/da.json
rename to plugins/CustomJsTracker/lang/da.json
index d5bd4334fed..e73375b4819 100644
--- a/plugins/CustomTrackerJs/lang/da.json
+++ b/plugins/CustomJsTracker/lang/da.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/de.json b/plugins/CustomJsTracker/lang/de.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/de.json
rename to plugins/CustomJsTracker/lang/de.json
index e68f2d29825..a01246a60a1 100644
--- a/plugins/CustomTrackerJs/lang/de.json
+++ b/plugins/CustomJsTracker/lang/de.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/el.json b/plugins/CustomJsTracker/lang/el.json
similarity index 97%
rename from plugins/CustomTrackerJs/lang/el.json
rename to plugins/CustomJsTracker/lang/el.json
index 7a4b6708e1e..86b0c82b3b9 100644
--- a/plugins/CustomTrackerJs/lang/el.json
+++ b/plugins/CustomJsTracker/lang/el.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Επιτρέπει σε οποιοδήποτε πρόσθετο να επεκτείνει το αρχείο ιχνηλάτησης σε JavaScript του Matomo (matomo.js) και να προσθέτει νέα λειτουργικότητα και δυνατότητες μετρήσεων των ιστοτόπων.",
         "DiagnosticPiwikJsWritable": "Εγγράψιμο Αρχείο Ιχνηλάτησης JavaScript (%s)",
         "DiagnosticPiwikJsNotWritable": "Το αρχείο ιχνηλάτησης της JavaScript του Matomo %s δεν είναι εγγράψιμο, που σημαίνει ότι άλλα πρόσθετα δεν μπορούν να επεκτείνουν την ιχνηλάτηση. Μελλοντικά ενδέχεται ορισμένα χαρακτηριστικά του πυρήνα να μην λειτουργούν όπως πρέπει.",
diff --git a/plugins/CustomTrackerJs/lang/en.json b/plugins/CustomJsTracker/lang/en.json
similarity index 95%
rename from plugins/CustomTrackerJs/lang/en.json
rename to plugins/CustomJsTracker/lang/en.json
index eb59accf22a..9d64e174df4 100644
--- a/plugins/CustomTrackerJs/lang/en.json
+++ b/plugins/CustomJsTracker/lang/en.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/eo.json b/plugins/CustomJsTracker/lang/eo.json
similarity index 94%
rename from plugins/CustomTrackerJs/lang/eo.json
rename to plugins/CustomJsTracker/lang/eo.json
index f57e0e686d2..8e069b7a311 100644
--- a/plugins/CustomTrackerJs/lang/eo.json
+++ b/plugins/CustomJsTracker/lang/eo.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/es-ar.json b/plugins/CustomJsTracker/lang/es-ar.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/es-ar.json
rename to plugins/CustomJsTracker/lang/es-ar.json
index 1f3f8927a09..6db0d6c3eb9 100644
--- a/plugins/CustomTrackerJs/lang/es-ar.json
+++ b/plugins/CustomJsTracker/lang/es-ar.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/es.json b/plugins/CustomJsTracker/lang/es.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/es.json
rename to plugins/CustomJsTracker/lang/es.json
index 1dc8910d7a2..cc338858e85 100644
--- a/plugins/CustomTrackerJs/lang/es.json
+++ b/plugins/CustomJsTracker/lang/es.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/fi.json b/plugins/CustomJsTracker/lang/fi.json
similarity index 94%
rename from plugins/CustomTrackerJs/lang/fi.json
rename to plugins/CustomJsTracker/lang/fi.json
index 1655dec4b36..ce556e4dd3f 100644
--- a/plugins/CustomTrackerJs/lang/fi.json
+++ b/plugins/CustomJsTracker/lang/fi.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/fr.json b/plugins/CustomJsTracker/lang/fr.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/fr.json
rename to plugins/CustomJsTracker/lang/fr.json
index 094cad6db34..d4e89792491 100644
--- a/plugins/CustomTrackerJs/lang/fr.json
+++ b/plugins/CustomJsTracker/lang/fr.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/id.json b/plugins/CustomJsTracker/lang/id.json
similarity index 80%
rename from plugins/CustomTrackerJs/lang/id.json
rename to plugins/CustomJsTracker/lang/id.json
index bbe6fc716d3..9f590870cf5 100644
--- a/plugins/CustomTrackerJs/lang/id.json
+++ b/plugins/CustomJsTracker/lang/id.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsWritable": "Pelacak JavaScript yang Dapat Ditulis (\"\/piwik.js\")"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomTrackerJs/lang/it.json b/plugins/CustomJsTracker/lang/it.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/it.json
rename to plugins/CustomJsTracker/lang/it.json
index 2edae1fb9eb..e2d47aa1619 100644
--- a/plugins/CustomTrackerJs/lang/it.json
+++ b/plugins/CustomJsTracker/lang/it.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/ja.json b/plugins/CustomJsTracker/lang/ja.json
similarity index 97%
rename from plugins/CustomTrackerJs/lang/ja.json
rename to plugins/CustomJsTracker/lang/ja.json
index 6c98bdf8b7d..dfa58e56c7e 100644
--- a/plugins/CustomTrackerJs/lang/ja.json
+++ b/plugins/CustomJsTracker/lang/ja.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "任意のプラグインが Matomo JavaScript Tracking ファイル（ matomo.js ）を拡張し、新しい機能と Web サイトの測定機能を追加することができます。",
         "DiagnosticPiwikJsWritable": "書き込み可能な JavaScript トラッカー（%s）",
         "DiagnosticPiwikJsNotWritable": "Matomo JavaScriptトラッカーファイル %s は書き込み可能ではありません。これは、他のプラグインが JavaScriptトラッカー を拡張できないことを意味します。 将来的には、一部のコア機能も期待どおりに機能しない可能性があります。",
diff --git a/plugins/CustomTrackerJs/lang/nb.json b/plugins/CustomJsTracker/lang/nb.json
similarity index 89%
rename from plugins/CustomTrackerJs/lang/nb.json
rename to plugins/CustomJsTracker/lang/nb.json
index 88364102044..ce4b6f7f2ba 100644
--- a/plugins/CustomTrackerJs/lang/nb.json
+++ b/plugins/CustomJsTracker/lang/nb.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/nl.json b/plugins/CustomJsTracker/lang/nl.json
similarity index 84%
rename from plugins/CustomTrackerJs/lang/nl.json
rename to plugins/CustomJsTracker/lang/nl.json
index 6b469442d8e..0509203e9c9 100644
--- a/plugins/CustomTrackerJs/lang/nl.json
+++ b/plugins/CustomJsTracker/lang/nl.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "DiagnosticPiwikJsMakeWritable": "We adviseren %1$s schrijfbaar te maken door het volgende commando uit te voeren: %2$s"
     }
 }
\ No newline at end of file
diff --git a/plugins/CustomTrackerJs/lang/pl.json b/plugins/CustomJsTracker/lang/pl.json
similarity index 89%
rename from plugins/CustomTrackerJs/lang/pl.json
rename to plugins/CustomJsTracker/lang/pl.json
index c34652f68b5..fd21f3a1ae8 100644
--- a/plugins/CustomTrackerJs/lang/pl.json
+++ b/plugins/CustomJsTracker/lang/pl.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/pt-br.json b/plugins/CustomJsTracker/lang/pt-br.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/pt-br.json
rename to plugins/CustomJsTracker/lang/pt-br.json
index 6f4858dc538..328ef530263 100644
--- a/plugins/CustomTrackerJs/lang/pt-br.json
+++ b/plugins/CustomJsTracker/lang/pt-br.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/pt.json b/plugins/CustomJsTracker/lang/pt.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/pt.json
rename to plugins/CustomJsTracker/lang/pt.json
index 9c1e4e28f51..f2bbd63711c 100644
--- a/plugins/CustomTrackerJs/lang/pt.json
+++ b/plugins/CustomJsTracker/lang/pt.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/ru.json b/plugins/CustomJsTracker/lang/ru.json
similarity index 97%
rename from plugins/CustomTrackerJs/lang/ru.json
rename to plugins/CustomJsTracker/lang/ru.json
index 86cd79ec060..c128245e67c 100644
--- a/plugins/CustomTrackerJs/lang/ru.json
+++ b/plugins/CustomJsTracker/lang/ru.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Разрешить любому плагину дополнять JavaScript-код отслеживания Matomo (matomo.js), добавляя новую функциональность и расширяя возможности мониторинга сайтов.",
         "DiagnosticPiwikJsWritable": "Записываемый JavaScript Tracker (%s)",
         "DiagnosticPiwikJsNotWritable": "Файл трекера JavaScript Matomo %s недоступен для записи, это означает, что другие плагины не могут расширять трекер JavaScript. В будущем даже некоторые основные функции могут работать не так, как ожидалось.",
diff --git a/plugins/CustomTrackerJs/lang/sq.json b/plugins/CustomJsTracker/lang/sq.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/sq.json
rename to plugins/CustomJsTracker/lang/sq.json
index 779feaeb484..788f53286bc 100644
--- a/plugins/CustomTrackerJs/lang/sq.json
+++ b/plugins/CustomJsTracker/lang/sq.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/sr.json b/plugins/CustomJsTracker/lang/sr.json
similarity index 94%
rename from plugins/CustomTrackerJs/lang/sr.json
rename to plugins/CustomJsTracker/lang/sr.json
index 656b8c92fdb..a95564a8af4 100644
--- a/plugins/CustomTrackerJs/lang/sr.json
+++ b/plugins/CustomJsTracker/lang/sr.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/sv.json b/plugins/CustomJsTracker/lang/sv.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/sv.json
rename to plugins/CustomJsTracker/lang/sv.json
index 1727dca1cbc..f0e5c00caa2 100644
--- a/plugins/CustomTrackerJs/lang/sv.json
+++ b/plugins/CustomJsTracker/lang/sv.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/tr.json b/plugins/CustomJsTracker/lang/tr.json
similarity index 96%
rename from plugins/CustomTrackerJs/lang/tr.json
rename to plugins/CustomJsTracker/lang/tr.json
index 4a66884efa1..6a45f628b6a 100644
--- a/plugins/CustomTrackerJs/lang/tr.json
+++ b/plugins/CustomJsTracker/lang/tr.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "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/CustomTrackerJs/lang/uk.json b/plugins/CustomJsTracker/lang/uk.json
similarity index 97%
rename from plugins/CustomTrackerJs/lang/uk.json
rename to plugins/CustomJsTracker/lang/uk.json
index 4509f5f2b79..0ffe45b22d9 100644
--- a/plugins/CustomTrackerJs/lang/uk.json
+++ b/plugins/CustomJsTracker/lang/uk.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "Дозволяє будь-якому плагіну розширювати Matomo JavaScript код відстеження (piwik.js) і додавати нові можливості функціонування та можливості вимірювання веб-сайту.",
         "DiagnosticPiwikJsWritable": "Доступний для запису JavaScript трекер (\"\/piwik.js\")",
         "DiagnosticPiwikJsNotWritable": "Відстеження файлів Matomo через JavaScript \"\/piwik.js\" не підлягає запису, це означає, що інші плагіни не можуть розширити трекер JavaScript. Надалі навіть деякі основні функції можуть не працювати, як очікується.",
diff --git a/plugins/CustomTrackerJs/lang/zh-cn.json b/plugins/CustomJsTracker/lang/zh-cn.json
similarity index 95%
rename from plugins/CustomTrackerJs/lang/zh-cn.json
rename to plugins/CustomJsTracker/lang/zh-cn.json
index 2e6cbaf2fd3..dede8a48245 100644
--- a/plugins/CustomTrackerJs/lang/zh-cn.json
+++ b/plugins/CustomJsTracker/lang/zh-cn.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "允许任何插件扩展Matomo JavaScript追踪文件（matomo.js）并添加新功能和网站评估功能。",
         "DiagnosticPiwikJsWritable": "可写的JavaScript追踪器（%s）",
         "DiagnosticPiwikJsNotWritable": "Matomo JavaScript追踪器文件%s不可写，这意味着其他插件无法扩展JavaScript追踪器。 将来，甚至某些核心功能可能也无法按预期运行。",
diff --git a/plugins/CustomTrackerJs/lang/zh-tw.json b/plugins/CustomJsTracker/lang/zh-tw.json
similarity index 95%
rename from plugins/CustomTrackerJs/lang/zh-tw.json
rename to plugins/CustomJsTracker/lang/zh-tw.json
index 102a4be7ded..d7d3087d306 100644
--- a/plugins/CustomTrackerJs/lang/zh-tw.json
+++ b/plugins/CustomJsTracker/lang/zh-tw.json
@@ -1,5 +1,5 @@
 {
-    "CustomTrackerJs": {
+    "CustomJsTracker": {
         "PluginDescription": "允許任何外掛擴展 Matomo JavaScript 追蹤檔案（piwik.js）來增加新功能和網站追蹤能力。",
         "DiagnosticPiwikJsWritable": "JavaScript 追蹤檔案可寫入（%s）",
         "DiagnosticPiwikJsNotWritable": "Matomo 的 JavaScript 追蹤檔案 %s 無法寫入，這代表其他外掛無法擴展 JavaScript 追蹤功能。未來甚至有些核心功能會無法正常運作。",
diff --git a/plugins/CustomTrackerJs/tests/Framework/Mock/PluginTrackerFilesMock.php b/plugins/CustomJsTracker/tests/Framework/Mock/PluginTrackerFilesMock.php
similarity index 77%
rename from plugins/CustomTrackerJs/tests/Framework/Mock/PluginTrackerFilesMock.php
rename to plugins/CustomJsTracker/tests/Framework/Mock/PluginTrackerFilesMock.php
index d4715cf4841..4849753a519 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\tests\Framework\Mock;
+namespace Piwik\Plugins\CustomJsTracker\tests\Framework\Mock;
 
-use Piwik\Plugins\CustomTrackerJs\File;
-use Piwik\Plugins\CustomTrackerJs\TrackingCode\PluginTrackerFiles;
+use Piwik\Plugins\CustomJsTracker\File;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PluginTrackerFiles;
 
 class PluginTrackerFilesMock extends PluginTrackerFiles
 {
diff --git a/plugins/CustomTrackerJs/tests/Integration/ApiTest.php b/plugins/CustomJsTracker/tests/Integration/ApiTest.php
similarity index 94%
rename from plugins/CustomTrackerJs/tests/Integration/ApiTest.php
rename to plugins/CustomJsTracker/tests/Integration/ApiTest.php
index 97742ea071e..b8ffa366023 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
-use Piwik\Plugins\CustomTrackerJs\API;
+use Piwik\Plugins\CustomJsTracker\API;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
- * @group CustomTrackerJs
+ * @group CustomJsTracker
  * @group ApiTest
  * @group Api
  * @group Plugins
diff --git a/plugins/CustomTrackerJs/tests/Integration/FileTest.php b/plugins/CustomJsTracker/tests/Integration/FileTest.php
similarity index 95%
rename from plugins/CustomTrackerJs/tests/Integration/FileTest.php
rename to plugins/CustomJsTracker/tests/Integration/FileTest.php
index 94d597432c5..1457de03366 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
-use Piwik\Plugins\CustomTrackerJs\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 CustomTrackerJs
+ * @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/CustomTrackerJs/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 @@ public function test_checkWritable_shouldNotThrowException_IfIsWritable()
     }
 
     /**
-     * @expectedException \Piwik\Plugins\CustomTrackerJs\Exception\AccessDeniedException
+     * @expectedException \Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException
      * @expectedExceptionMessage not readable
      */
     public function test_checkReadable_shouldThrowException_IfNotIsReadable()
@@ -162,7 +162,7 @@ public function test_checkReadable_shouldThrowException_IfNotIsReadable()
     }
 
     /**
-     * @expectedException \Piwik\Plugins\CustomTrackerJs\Exception\AccessDeniedException
+     * @expectedException \Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException
      * @expectedExceptionMessage not writable
      */
     public function test_checkWritable_shouldThrowException_IfNotIsWritable()
diff --git a/plugins/CustomTrackerJs/tests/Integration/PiwikJsManipulatorTest.php b/plugins/CustomJsTracker/tests/Integration/PiwikJsManipulatorTest.php
similarity index 81%
rename from plugins/CustomTrackerJs/tests/Integration/PiwikJsManipulatorTest.php
rename to plugins/CustomJsTracker/tests/Integration/PiwikJsManipulatorTest.php
index bb18a4f4974..3decbd21f7f 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
-use Piwik\Plugins\CustomTrackerJs\tests\Framework\Mock\PluginTrackerFilesMock;
-use Piwik\Plugins\CustomTrackerJs\TrackingCode\PiwikJsManipulator;
+use Piwik\Plugins\CustomJsTracker\tests\Framework\Mock\PluginTrackerFilesMock;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PiwikJsManipulator;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
- * @group CustomTrackerJs
+ * @group CustomJsTracker
  * @group PiwikJsManipulatorTest
  * @group PiwikJsManipulator
  * @group Plugins
@@ -29,8 +29,8 @@ class PiwikJsManipulatorTest extends IntegrationTestCase
     public function test_manipulateContent_shouldAddCodeOfTrackerPlugins()
     {
         $manipulator = $this->makeManipulator(array(
-            '/plugins/CustomTrackerJs/tests/resources/tracker.js',
-            '/plugins/CustomTrackerJs/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/CustomTrackerJs/tests/Integration/PluginTrackerFilesTest.php b/plugins/CustomJsTracker/tests/Integration/PluginTrackerFilesTest.php
similarity index 81%
rename from plugins/CustomTrackerJs/tests/Integration/PluginTrackerFilesTest.php
rename to plugins/CustomJsTracker/tests/Integration/PluginTrackerFilesTest.php
index 15b3edb851f..b063fbab287 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
 use Piwik\Piwik;
-use Piwik\Plugins\CustomTrackerJs\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 = 'CustomTrackerJs', $pluginNameForMinifiedTracker = 'CustomTrackerJs')
+    public function __construct($pluginNameForRegularTrackerFile = 'CustomJsTracker', $pluginNameForMinifiedTracker = 'CustomJsTracker')
     {
         parent::__construct();
 
-        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomTrackerJs/tests/';
+        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomJsTracker/tests/';
 
         $this->pluginNamesForFile = array(
             'tracker.js' => $pluginNameForRegularTrackerFile,
@@ -44,7 +44,7 @@ public function getPluginNameFromFile($file)
 }
 
 /**
- * @group CustomTrackerJs
+ * @group CustomJsTracker
  * @group PluginTrackerFilesTest
  * @group PluginTrackerFiles
  * @group Plugins
@@ -57,8 +57,8 @@ public function test_find_ifAPluginDefinesAMinifiedAndARegularTrackerItShouldPre
         $foundFiles = $trackerFiles->find();
 
         $this->assertCount(1, $foundFiles);
-        $this->assertTrue(isset($foundFiles['CustomTrackerJs']));
-        $this->assertEquals('tracker.min.js', $foundFiles['CustomTrackerJs']->getName());
+        $this->assertTrue(isset($foundFiles['CustomJsTracker']));
+        $this->assertEquals('tracker.min.js', $foundFiles['CustomJsTracker']->getName());
     }
 
     public function test_find_shouldIgnoreMinifiedVersion_IfRequested()
@@ -68,29 +68,29 @@ public function test_find_shouldIgnoreMinifiedVersion_IfRequested()
         $foundFiles = $trackerFiles->find();
 
         $this->assertCount(1, $foundFiles);
-        $this->assertTrue(isset($foundFiles['CustomTrackerJs']));
-        $this->assertEquals('tracker.js', $foundFiles['CustomTrackerJs']->getName());
+        $this->assertTrue(isset($foundFiles['CustomJsTracker']));
+        $this->assertEquals('tracker.js', $foundFiles['CustomJsTracker']->getName());
     }
 
     public function test_find_ifMultiplePluginsImplementATracker_ShouldReturnEachOfThem()
     {
-        $trackerFiles = new CustomPluginTrackerFiles('CustomTrackerJs', 'Goals');
+        $trackerFiles = new CustomPluginTrackerFiles('CustomJsTracker', 'Goals');
         $foundFiles = $trackerFiles->find();
 
         $this->assertCount(2, $foundFiles);
-        $this->assertTrue(isset($foundFiles['CustomTrackerJs']));
+        $this->assertTrue(isset($foundFiles['CustomJsTracker']));
         $this->assertTrue(isset($foundFiles['Goals']));
-        $this->assertEquals('tracker.js', $foundFiles['CustomTrackerJs']->getName());
+        $this->assertEquals('tracker.js', $foundFiles['CustomJsTracker']->getName());
         $this->assertEquals('tracker.min.js', $foundFiles['Goals']->getName());
     }
 
     public function test_find_EventsCanIgnoreFiles()
     {
-        $trackerFiles = new CustomPluginTrackerFiles('CustomTrackerJs', 'Goals');
+        $trackerFiles = new CustomPluginTrackerFiles('CustomJsTracker', 'Goals');
         $foundFiles = $trackerFiles->find();
         $this->assertCount(2, $foundFiles);
 
-        Piwik::addAction('CustomTrackerJs.shouldAddTrackerFile', function (&$shouldAdd, $pluginName) {
+        Piwik::addAction('CustomJsTracker.shouldAddTrackerFile', function (&$shouldAdd, $pluginName) {
             if ($pluginName === 'Goals') {
                 $shouldAdd = false;
             }
@@ -98,7 +98,7 @@ public function test_find_EventsCanIgnoreFiles()
 
         $foundFiles = $trackerFiles->find();
         $this->assertCount(1, $foundFiles);
-        $this->assertTrue(isset($foundFiles['CustomTrackerJs']));
+        $this->assertTrue(isset($foundFiles['CustomJsTracker']));
         $this->assertFalse(isset($foundFiles['Goals']));
     }
 
diff --git a/plugins/CustomTrackerJs/tests/Integration/TrackerUpdaterTest.php b/plugins/CustomJsTracker/tests/Integration/TrackerUpdaterTest.php
similarity index 93%
rename from plugins/CustomTrackerJs/tests/Integration/TrackerUpdaterTest.php
rename to plugins/CustomJsTracker/tests/Integration/TrackerUpdaterTest.php
index 02c9cc9ff84..0c0130e5b6a 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\tests\Integration;
+namespace Piwik\Plugins\CustomJsTracker\tests\Integration;
 
-use Piwik\Plugins\CustomTrackerJs\File;
-use Piwik\Plugins\CustomTrackerJs\tests\Framework\Mock\PluginTrackerFilesMock;
-use Piwik\Plugins\CustomTrackerJs\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 CustomTrackerJs
+ * @group CustomJsTracker
  * @group PiwikJsManipulatorTest
  * @group PiwikJsManipulator
  * @group Plugins
@@ -27,7 +27,7 @@ class TrackerUpdaterTest extends IntegrationTestCase
     public function setUp()
     {
         parent::setUp();
-        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomTrackerJs/tests/resources/';
+        $this->dir = PIWIK_DOCUMENT_ROOT . '/plugins/CustomJsTracker/tests/resources/';
         $this->trackerJsChangedEventPath = null;
 
         $this->cleanUp();
@@ -113,7 +113,7 @@ public function test_checkWillSucceed_shouldNotThrowExceptionIfPiwikJsTargetIsWr
     }
 
     /**
-     * @expectedException \Piwik\Plugins\CustomTrackerJs\Exception\AccessDeniedException
+     * @expectedException \Piwik\Plugins\CustomJsTracker\Exception\AccessDeniedException
      * @expectedExceptionMessage not writable
      */
     public function test_checkWillSucceed_shouldNotThrowExceptionIfTargetIsNotWritable()
@@ -237,7 +237,7 @@ public function provideContainerConfig()
     {
         return [
             'observers.global' => \DI\add([
-                ['CustomTrackerJs.trackerJsChanged', function ($path) {
+                ['CustomJsTracker.trackerJsChanged', function ($path) {
                     $this->trackerJsChangedEventPath = $path;
                 }],
             ]),
diff --git a/plugins/CustomTrackerJs/tests/System/PiwikJsContentTest.php b/plugins/CustomJsTracker/tests/System/PiwikJsContentTest.php
similarity index 82%
rename from plugins/CustomTrackerJs/tests/System/PiwikJsContentTest.php
rename to plugins/CustomJsTracker/tests/System/PiwikJsContentTest.php
index dd30ef828b9..300c3129841 100644
--- a/plugins/CustomTrackerJs/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\CustomTrackerJs\tests\System;
+namespace Piwik\Plugins\CustomJsTracker\tests\System;
 
-use Piwik\Plugins\CustomTrackerJs\TrackerUpdater;
-use Piwik\Plugins\CustomTrackerJs\TrackingCode\PiwikJsManipulator;
+use Piwik\Plugins\CustomJsTracker\TrackerUpdater;
+use Piwik\Plugins\CustomJsTracker\TrackingCode\PiwikJsManipulator;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 
 /**
- * @group CustomTrackerJs
+ * @group CustomJsTracker
  * @group PiwikJsContentTest
  * @group PiwikJsContent
  * @group Plugins
diff --git a/plugins/CustomTrackerJs/tests/resources/MyTestTarget2.js b/plugins/CustomJsTracker/tests/resources/MyTestTarget2.js
similarity index 100%
rename from plugins/CustomTrackerJs/tests/resources/MyTestTarget2.js
rename to plugins/CustomJsTracker/tests/resources/MyTestTarget2.js
diff --git a/plugins/CustomTrackerJs/tests/resources/test.js b/plugins/CustomJsTracker/tests/resources/test.js
similarity index 100%
rename from plugins/CustomTrackerJs/tests/resources/test.js
rename to plugins/CustomJsTracker/tests/resources/test.js
diff --git a/plugins/CustomTrackerJs/tests/resources/testpiwik.js b/plugins/CustomJsTracker/tests/resources/testpiwik.js
similarity index 100%
rename from plugins/CustomTrackerJs/tests/resources/testpiwik.js
rename to plugins/CustomJsTracker/tests/resources/testpiwik.js
diff --git a/plugins/CustomTrackerJs/tests/resources/tracker.js b/plugins/CustomJsTracker/tests/resources/tracker.js
similarity index 100%
rename from plugins/CustomTrackerJs/tests/resources/tracker.js
rename to plugins/CustomJsTracker/tests/resources/tracker.js
diff --git a/plugins/CustomTrackerJs/tests/resources/tracker.min.js b/plugins/CustomJsTracker/tests/resources/tracker.min.js
similarity index 100%
rename from plugins/CustomTrackerJs/tests/resources/tracker.min.js
rename to plugins/CustomJsTracker/tests/resources/tracker.min.js
diff --git a/tests/javascript/index.php b/tests/javascript/index.php
index 80b40c5ecf5..b29b4f95f52 100644
--- a/tests/javascript/index.php
+++ b/tests/javascript/index.php
@@ -21,8 +21,8 @@
     $mysql = false;
 }
 
-use \Piwik\Plugins\CustomTrackerJs\TrackerUpdater;
-use \Piwik\Plugins\CustomTrackerJs\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;