diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
index fe9795c7d8e9d3eb305179f48debe9881c045e03..febe013b737245f15f43afbb215e49a9b84a3d44 100644
--- a/core/Plugin/Visualization.php
+++ b/core/Plugin/Visualization.php
@@ -420,7 +420,7 @@ class Visualization extends ViewDataTable
      * - etc.
      *
      * The values are loaded:
-     * - from the generic filters that are applied by default @see Piwik_API_DataTableGenericFilter.php::getGenericFiltersInformation()
+     * - from the generic filters that are applied by default @see Piwik\API\DataTableGenericFilter::getGenericFiltersInformation()
      * - from the values already available in the GET array
      * - from the values set using methods from this class (eg. setSearchPattern(), setLimit(), etc.)
      *
diff --git a/core/QuickForm2.php b/core/QuickForm2.php
index 2c8d6fa98e88226b54a0f3c3ab3dd48d3854da06..0da689d5cb524e71718f00ad932edaf38d31b263 100644
--- a/core/QuickForm2.php
+++ b/core/QuickForm2.php
@@ -18,7 +18,7 @@ use HTML_QuickForm2_Renderer;
 /**
  * Manages forms displayed in Twig
  *
- * For an example, @see Piwik_Login_FormLogin
+ * For an example, @see Piwik\Plugins\Login\FormLogin
  *
  * @see                 HTML_QuickForm2, libs/HTML/QuickForm2.php
  * @link http://pear.php.net/package/HTML_QuickForm2/
diff --git a/core/ViewDataTable/RequestConfig.php b/core/ViewDataTable/RequestConfig.php
index 349c84184e69bf562d277e2321f83ef2a2a872a6..a816ee003153b7f159f374a8b96bd91a8d58474e 100644
--- a/core/ViewDataTable/RequestConfig.php
+++ b/core/ViewDataTable/RequestConfig.php
@@ -183,7 +183,7 @@ class RequestConfig
     /**
      * Whether to run generic filters on the DataTable before rendering or not.
      *
-     * @see Piwik_API_DataTableGenericFilter
+     * @see Piwik\API\DataTableGenericFilter
      *
      * Default value: false
      */
diff --git a/plugins/API/API.php b/plugins/API/API.php
index b11a35dcc0518ff4b68fb30626341c8b3170ca2e..96d776160d7ae2ba8c840fa6917fac0d1ffa6a25 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -671,7 +671,7 @@ class Plugin extends \Piwik\Plugin
     }
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 4f98846dddaa5474790e1e6518ea998f9a6532b2..3b2ddf8a0d1ab5a29e1c230ec7e468d5fc7c04e4 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -31,7 +31,7 @@ class Actions extends \Piwik\Plugin
     const ACTIONS_REPORT_ROWS_DISPLAY = 100;
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Annotations/Annotations.php b/plugins/Annotations/Annotations.php
index 483b9f165c05f04545959cdb294f9843a02d4764..56d142ed6df91759927b8006c399642d6e4b61de 100755
--- a/plugins/Annotations/Annotations.php
+++ b/plugins/Annotations/Annotations.php
@@ -16,7 +16,7 @@ namespace Piwik\Plugins\Annotations;
 class Annotations extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php
index a66204ab62a7f5f4f270540ef63517c209aae1c6..0985d7de3c43074be520b7c7b49c636559d07965 100644
--- a/plugins/CoreAdminHome/CoreAdminHome.php
+++ b/plugins/CoreAdminHome/CoreAdminHome.php
@@ -26,7 +26,7 @@ use Piwik\Settings\UserSetting;
 class CoreAdminHome extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/CoreConsole/CoreConsole.php b/plugins/CoreConsole/CoreConsole.php
index 58a0bfc0452aabb9d0c100c5cbb318a378e4bfb7..f7030e7897d11150f0b97dd35d7b6ca7eb9e729f 100644
--- a/plugins/CoreConsole/CoreConsole.php
+++ b/plugins/CoreConsole/CoreConsole.php
@@ -13,7 +13,7 @@ namespace Piwik\Plugins\CoreConsole;
 class CoreConsole extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index a109e85150cf7ff4d7dce98fa78e527b506da890..5d9a523a59681442bb9e3c3da12d7aeba02f0e53 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -16,7 +16,7 @@ use Piwik\WidgetsList;
 class CoreHome extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
index cfbb195b87fc84d6475c4b77b360e1b4058bf5c8..f707365d425f567aeebad90e2853150da605e974 100644
--- a/plugins/CorePluginsAdmin/CorePluginsAdmin.php
+++ b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
@@ -21,7 +21,7 @@ use Piwik\ScheduledTime;
 class CorePluginsAdmin extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index bc09ffb7fa0c216b2838fc8594dc862afd0137e5..11009acd266eabc8f1b45c4559c5c2de385c82f8 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -23,7 +23,7 @@ use Piwik\Version;
 class CoreUpdater extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/CoreVisualizations/CoreVisualizations.php b/plugins/CoreVisualizations/CoreVisualizations.php
index 60fa663ecdea3286f4aa57e2e9970183572f96f3..db3b3f15b6441b07b92c21b488c33e61fb3ce3c7 100644
--- a/plugins/CoreVisualizations/CoreVisualizations.php
+++ b/plugins/CoreVisualizations/CoreVisualizations.php
@@ -21,7 +21,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/CoreVisualizations/Visualizations/Jq
 class CoreVisualizations extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php
index 15272df5280c7bf7f49b978a0bcc17484d791118..debc71672654eabf166b5a26006157258c7963ab 100644
--- a/plugins/CoreVisualizations/JqplotDataGenerator.php
+++ b/plugins/CoreVisualizations/JqplotDataGenerator.php
@@ -27,7 +27,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/CoreVisualizations/JqplotDataGenerat
 class JqplotDataGenerator
 {
     /**
-     * View properties. @see Piwik_ViewDataTable for more info.
+     * View properties. @see Piwik\ViewDataTable for more info.
      *
      * @var array
      */
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index f177b2feac895bba4d801682e0cc74c068bfb200..12bc5b007bdba40124054eb79ba13991c58229bf 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -27,7 +27,7 @@ class CustomVariables extends \Piwik\Plugin
     }
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php
index ba7ad93729d535b56a8345bb79984bf05e47b5bf..402f88eb32bfbd0c68f1e2f58ace972caaffb827 100644
--- a/plugins/DBStats/DBStats.php
+++ b/plugins/DBStats/DBStats.php
@@ -28,7 +28,7 @@ class DBStats extends \Piwik\Plugin
     const TIME_OF_LAST_TASK_RUN_OPTION = 'dbstats_time_of_last_cache_task_run';
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
index b9f28341f6d09fbcec53577cc533e5c61803be63..6b88da7e6e1032b9702b08e6cb1d49be06532c0c 100644
--- a/plugins/Dashboard/Dashboard.php
+++ b/plugins/Dashboard/Dashboard.php
@@ -22,7 +22,7 @@ use Piwik\WidgetsList;
 class Dashboard extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 2f93679847cffff20fb0f60611338ef025da7ca0..9869e459b469d56f7a086c6b4612f82c5c36c8f4 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -28,7 +28,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
 class DevicesDetection extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getInformation
+     * @see Piwik\Plugin::getInformation
      */
     public function getInformation()
     {
@@ -86,7 +86,7 @@ class DevicesDetection extends \Piwik\Plugin
     }
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/ExampleRssWidget/ExampleRssWidget.php b/plugins/ExampleRssWidget/ExampleRssWidget.php
index 0bc7e79805a7fe17a90d97cbdc5b2b015a9e9515..0e501cf218219d4a1afdd5f5d97197372c03af11 100644
--- a/plugins/ExampleRssWidget/ExampleRssWidget.php
+++ b/plugins/ExampleRssWidget/ExampleRssWidget.php
@@ -16,7 +16,7 @@ use Piwik\WidgetsList;
 class ExampleRssWidget extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/ExampleUI/ExampleUI.php b/plugins/ExampleUI/ExampleUI.php
index 98a8e469ab41317e11f9ed53b2c38efa0b216b9a..a9b3a83104f25cd38de2bf33cf56b9148ed28f31 100644
--- a/plugins/ExampleUI/ExampleUI.php
+++ b/plugins/ExampleUI/ExampleUI.php
@@ -16,7 +16,7 @@ use Piwik\Menu\MenuTop;
 class ExampleUI extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/ExampleVisualization/ExampleVisualization.php b/plugins/ExampleVisualization/ExampleVisualization.php
index 650f7f7a63abe7126d751f47494ef6cc103cc4eb..dea4707012e20eabb1f9a1ab8a095444792976b9 100644
--- a/plugins/ExampleVisualization/ExampleVisualization.php
+++ b/plugins/ExampleVisualization/ExampleVisualization.php
@@ -13,7 +13,7 @@ namespace Piwik\Plugins\ExampleVisualization;
 class ExampleVisualization extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Feedback/Feedback.php b/plugins/Feedback/Feedback.php
index dfd5b5881da1b788b127409b38fbef9c32d13d8a..82fa716d260b6644025960cc9f019153ddf4ab43 100644
--- a/plugins/Feedback/Feedback.php
+++ b/plugins/Feedback/Feedback.php
@@ -18,7 +18,7 @@ class Feedback extends \Piwik\Plugin
 {
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 3230e2c31594c8a1e5da782f1e9b5160278a247d..f0ee13983d294ac80c63917fa83f7c1143373b2f 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -81,7 +81,7 @@ class Goals extends \Piwik\Plugin
     }
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php
index b11d26965cbcf372755f49f786a7fd1523c38513..f0a5b7a7a0106a4b86291e79d4f9317b4772d815 100644
--- a/plugins/ImageGraph/ImageGraph.php
+++ b/plugins/ImageGraph/ImageGraph.php
@@ -36,7 +36,7 @@ class ImageGraph extends \Piwik\Plugin
     );
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index 6eaa8bb5f0059768da1db21f9fc64c2d8c3c77a3..1487e5c67b92a2ae156951c176b00774c4410ce8 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -22,7 +22,7 @@ class Installation extends \Piwik\Plugin
     protected $installationControllerName = '\\Piwik\\Plugins\\Installation\\Controller';
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 9ce7e22f3dd267bea21b327c9af2c22f44000ce1..3be1c000aa38d3c5f98533f006c1ea2e07071632 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -26,7 +26,7 @@ use Piwik\View;
 class LanguagesManager extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index 368aa09ed859cb0e8a38f5e7161b91233bfa719f..28a14a6c6cc36c00e788a57ecf4b93fec2c51582 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -21,7 +21,7 @@ class Live extends \Piwik\Plugin
 {
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php
index 33b2a71300c742f702b3f65f1df37c2bb62ec79f..66ae036595c3546b484e872e9cc1242094056eab 100644
--- a/plugins/Login/Login.php
+++ b/plugins/Login/Login.php
@@ -22,7 +22,7 @@ use Piwik\Session;
 class Login extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php
index 57f3d76d3b59241df94429d870381495200fd71d..f36a6c6c705e05d17386fe048c55af0e64e96aa5 100644
--- a/plugins/MobileMessaging/MobileMessaging.php
+++ b/plugins/MobileMessaging/MobileMessaging.php
@@ -61,7 +61,7 @@ class MobileMessaging extends \Piwik\Plugin
     );
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index 827afe84eae02ca1c74f2307cdada8343de6fd3a..8cc48c1c55a021fd732acdac5e0f595e91e1e2db 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -133,7 +133,7 @@ class API extends \Piwik\Plugin\API
 
     /**
      * Same as getAll but for a unique Piwik site
-     * @see Piwik_MultiSites_API::getAll()
+     * @see Piwik\Plugins\MultiSites\API::getAll()
      *
      * @param int $idSite Id of the Piwik site
      * @param string $period The period type to get data for.
diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php
index 3131890ea5eefd75afc7ada6925919e55b9288a2..a1e4e027a0dbca056b185e6bdf9ec864478a2a63 100644
--- a/plugins/MultiSites/MultiSites.php
+++ b/plugins/MultiSites/MultiSites.php
@@ -24,7 +24,7 @@ class MultiSites extends \Piwik\Plugin
     }
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Overlay/Overlay.php b/plugins/Overlay/Overlay.php
index b1c4637e9eb4c76b3656e4bd2a21bb5e65c18368..c4a4c0558f1fb366b7d6f39937838643997acd05 100644
--- a/plugins/Overlay/Overlay.php
+++ b/plugins/Overlay/Overlay.php
@@ -21,7 +21,7 @@ class Overlay extends \Piwik\Plugin
     }
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     function getListHooksRegistered()
     {
diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php
index 40af71fd3f72d78e9ebd6ecc137e6f2c867a5797..4dc3013df5936971bd00c75a9b4da098a47a1e3a 100644
--- a/plugins/PrivacyManager/PrivacyManager.php
+++ b/plugins/PrivacyManager/PrivacyManager.php
@@ -136,7 +136,7 @@ class PrivacyManager extends \Piwik\Plugin
     }
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index 7c956e95b9de9aa24960ec01ed0346134be312cf..fc737e51583597ea905c0afbae7f4be58fda0f03 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -27,7 +27,7 @@ use Piwik\WidgetsList;
 class Provider extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Proxy/Proxy.php b/plugins/Proxy/Proxy.php
index 305d197b8b836783653563124a7a5c83f2a4c705..ce31b70f2b4434ad085ae03b7fd8f299d94fd4a8 100644
--- a/plugins/Proxy/Proxy.php
+++ b/plugins/Proxy/Proxy.php
@@ -19,7 +19,7 @@ class Proxy extends \Piwik\Plugin
     /**
      * Return information about this plugin.
      *
-     * @see Piwik_Plugin
+     * @see Piwik\Plugin
      *
      * @return array
      */
diff --git a/plugins/Referrers/Referrers.php b/plugins/Referrers/Referrers.php
index 7244848786c3c5c14f4e7ca0f019072f83a14b64..694af2e8ed29f6dd76785bf05e6063bd7e3d6c5d 100644
--- a/plugins/Referrers/Referrers.php
+++ b/plugins/Referrers/Referrers.php
@@ -29,7 +29,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/functions.php';
 class Referrers extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/SEO/SEO.php b/plugins/SEO/SEO.php
index 8592afb645f0c2a47d8dc87c3531dc887280eb97..334a5ed2a6f28c2ca48b107cce8096a9cf704839 100644
--- a/plugins/SEO/SEO.php
+++ b/plugins/SEO/SEO.php
@@ -16,7 +16,7 @@ use Piwik\WidgetsList;
 class SEO extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getInformation
+     * @see Piwik\Plugin::getInformation
      */
     public function getInformation()
     {
@@ -30,7 +30,7 @@ class SEO extends \Piwik\Plugin
     }
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php
index 2ee391ed57737f55fee17534356c8988c7bf505e..a5e7949f3b8d482baac373a87200cdd092cee7c9 100644
--- a/plugins/ScheduledReports/ScheduledReports.php
+++ b/plugins/ScheduledReports/ScheduledReports.php
@@ -71,7 +71,7 @@ class ScheduledReports extends \Piwik\Plugin
     );
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
index 2de4b80335a597ad3826e7ec542239d001944612..7e72517a5e3c210613247ec40b56075e9f3c1784 100644
--- a/plugins/SegmentEditor/SegmentEditor.php
+++ b/plugins/SegmentEditor/SegmentEditor.php
@@ -18,7 +18,7 @@ use Piwik\Version;
 class SegmentEditor extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getInformation
+     * @see Piwik\Plugin::getInformation
      */
     public function getInformation()
     {
@@ -32,7 +32,7 @@ class SegmentEditor extends \Piwik\Plugin
     }
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index 3171439c90669501c8b5989d9622e705185ab214..6c649c15b0aa9dace886ad2dc2f64f6c79947fec 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -21,7 +21,7 @@ class SitesManager extends \Piwik\Plugin
     const KEEP_URL_FRAGMENT_NO = 2;
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Transitions/Transitions.php b/plugins/Transitions/Transitions.php
index 142eac034f80726be3114acee961b0f62d0442bc..0ab191bdc12ea07fbf7805581072ce2853009e97 100644
--- a/plugins/Transitions/Transitions.php
+++ b/plugins/Transitions/Transitions.php
@@ -14,7 +14,7 @@ namespace Piwik\Plugins\Transitions;
 class Transitions extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 0ce85aea5c434353bb6bc4a7b50b73c2fbfbb600..dcfadff81bb338d43477dd7464b17e6f4786c3d6 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -34,7 +34,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/GeoIPAutoUpdater.php';
 class UserCountry extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php
index 8a200a94ba3c24e8c5500ce64787dd42a5fe524d..d8013ff1cccd67dfc3eb140b091028c79a445bcb 100644
--- a/plugins/UserCountryMap/UserCountryMap.php
+++ b/plugins/UserCountryMap/UserCountryMap.php
@@ -19,7 +19,7 @@ use Piwik\WidgetsList;
 class UserCountryMap extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getInformation
+     * @see Piwik\Plugin::getInformation
      */
     public function getInformation()
     {
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index dc5d2e80377a8dbbd486321d2e057579bcd053d9..b246a84f18624d8f135400bb81d4d9f406709425 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -160,7 +160,7 @@ class UserSettings extends \Piwik\Plugin
     );
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index e2c183991dbf6543b8ccff6957cb7c6b6ce1d73e..c7aff72cb5a33f432be46f7a48a1ed2854295c05 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -25,7 +25,7 @@ class UsersManager extends \Piwik\Plugin
     const PASSWORD_MAX_LENGTH = 26;
 
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
@@ -71,7 +71,7 @@ class UsersManager extends \Piwik\Plugin
     /**
      * Return list of plug-in specific JavaScript files to be imported by the asset manager
      *
-     * @see Piwik_AssetManager
+     * @see Piwik\AssetManager
      */
     public function getJsFiles(&$jsFiles)
     {
diff --git a/plugins/VisitFrequency/VisitFrequency.php b/plugins/VisitFrequency/VisitFrequency.php
index 50f62ac8a47ab9c39280764da2bf87a6a0d8bf64..8dbada0238f18bd1a13a5e4676df6fa8a9169ae2 100644
--- a/plugins/VisitFrequency/VisitFrequency.php
+++ b/plugins/VisitFrequency/VisitFrequency.php
@@ -18,7 +18,7 @@ use Piwik\WidgetsList;
 class VisitFrequency extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 1376e1d278f49c7a8416dc2d821df88ffd35d0cb..f56299f45f893ccf837942ceda3dac1d8ee5aef7 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -27,7 +27,7 @@ use Piwik\WidgetsList;
 class VisitTime extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php
index 0df05acfd80476b27ff4e4e73cf1ed0712da93ae..c94fa7227fe2b0199c1f441fdc9bf14bc8a029b5 100644
--- a/plugins/VisitorInterest/VisitorInterest.php
+++ b/plugins/VisitorInterest/VisitorInterest.php
@@ -24,7 +24,7 @@ use Piwik\WidgetsList;
 class VisitorInterest extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php
index d2e746ee97978d09dec45712546da29ec014a641..c8c076f9829d7a9c094b6f4f934a6fcba1fcd4f0 100644
--- a/plugins/VisitsSummary/VisitsSummary.php
+++ b/plugins/VisitsSummary/VisitsSummary.php
@@ -22,7 +22,7 @@ use Piwik\WidgetsList;
 class VisitsSummary extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {
diff --git a/plugins/Widgetize/Widgetize.php b/plugins/Widgetize/Widgetize.php
index 523f1a04d0ae6336a66a4c149957916033a960b3..f0abcfb87ad244d96390bfb2b4912a26a8589581 100644
--- a/plugins/Widgetize/Widgetize.php
+++ b/plugins/Widgetize/Widgetize.php
@@ -18,7 +18,7 @@ use Piwik\Piwik;
 class Widgetize extends \Piwik\Plugin
 {
     /**
-     * @see Piwik_Plugin::getListHooksRegistered
+     * @see Piwik\Plugin::getListHooksRegistered
      */
     public function getListHooksRegistered()
     {