diff --git a/libraries/src/Captcha/Captcha.php b/libraries/src/Captcha/Captcha.php
index 6aa2d5d9b3602..6a1d77c70e281 100644
--- a/libraries/src/Captcha/Captcha.php
+++ b/libraries/src/Captcha/Captcha.php
@@ -19,9 +19,7 @@
  * Joomla! Captcha base object
  *
  * @abstract
- * @package     Joomla.Libraries
- * @subpackage  Captcha
- * @since       2.5
+ * @since  2.5
  */
 class Captcha extends \JObject
 {
diff --git a/libraries/src/Client/ClientWrapper.php b/libraries/src/Client/ClientWrapper.php
index 90428f8ecbe7d..adf0e824ed088 100644
--- a/libraries/src/Client/ClientWrapper.php
+++ b/libraries/src/Client/ClientWrapper.php
@@ -13,8 +13,6 @@
 /**
  * Wrapper class for ClientHelper
  *
- * @package     Joomla.Platform
- * @subpackage  Client
  * @since       3.4
  * @deprecated  4.0 Will be removed without replacement
  */
diff --git a/libraries/src/Filesystem/Wrapper/FileWrapper.php b/libraries/src/Filesystem/Wrapper/FileWrapper.php
index e2e93eec32bf4..acbe578aec8e2 100644
--- a/libraries/src/Filesystem/Wrapper/FileWrapper.php
+++ b/libraries/src/Filesystem/Wrapper/FileWrapper.php
@@ -15,8 +15,6 @@
 /**
  * Wrapper class for File
  *
- * @package     Joomla.Platform
- * @subpackage  Filesystem
  * @since       3.4
  * @deprecated  4.0 Use \Joomla\CMS\Filesystem\File instead
  */
diff --git a/libraries/src/Filesystem/Wrapper/FolderWrapper.php b/libraries/src/Filesystem/Wrapper/FolderWrapper.php
index a528a5e2269be..2ec2d009cf732 100644
--- a/libraries/src/Filesystem/Wrapper/FolderWrapper.php
+++ b/libraries/src/Filesystem/Wrapper/FolderWrapper.php
@@ -15,8 +15,6 @@
 /**
  * Wrapper class for Folder
  *
- * @package     Joomla.Platform
- * @subpackage  Filesystem
  * @since       3.4
  * @deprecated  4.0 Use \Joomla\CMS\Filesystem\Folder instead
  */
diff --git a/libraries/src/Filesystem/Wrapper/PathWrapper.php b/libraries/src/Filesystem/Wrapper/PathWrapper.php
index 6e1886e4cdd11..37d72a05fa6e1 100644
--- a/libraries/src/Filesystem/Wrapper/PathWrapper.php
+++ b/libraries/src/Filesystem/Wrapper/PathWrapper.php
@@ -15,8 +15,6 @@
 /**
  * Wrapper class for Path
  *
- * @package     Joomla.Platform
- * @subpackage  Filesystem
  * @since       3.4
  * @deprecated  4.0 Use \Joomla\CMS\Filesystem\Path instead
  */
diff --git a/libraries/src/Http/Wrapper/FactoryWrapper.php b/libraries/src/Http/Wrapper/FactoryWrapper.php
index d6015443aa1b7..de4cf4eb820e4 100644
--- a/libraries/src/Http/Wrapper/FactoryWrapper.php
+++ b/libraries/src/Http/Wrapper/FactoryWrapper.php
@@ -18,9 +18,7 @@
 /**
  * Wrapper class for HttpFactory
  *
- * @package     Joomla.Platform
- * @subpackage  Http
- * @since       3.4
+ * @since  3.4
  */
 class FactoryWrapper
 {
diff --git a/libraries/src/Mail/MailWrapper.php b/libraries/src/Mail/MailWrapper.php
index 4240fd527f751..3142179b83e68 100644
--- a/libraries/src/Mail/MailWrapper.php
+++ b/libraries/src/Mail/MailWrapper.php
@@ -13,8 +13,6 @@
 /**
  * Wrapper class for MailHelper
  *
- * @package     Joomla.Platform
- * @subpackage  Mail
  * @since       3.4
  * @deprecated  4.0 Will be removed without replacement
  */
diff --git a/libraries/src/Mail/language/phpmailer.lang-en_gb.php b/libraries/src/Mail/language/phpmailer.lang-en_gb.php
index 4b32657cdc142..e053543d5b116 100644
--- a/libraries/src/Mail/language/phpmailer.lang-en_gb.php
+++ b/libraries/src/Mail/language/phpmailer.lang-en_gb.php
@@ -1,10 +1,9 @@
 <?php
 /**
- * @package     Joomla.Platform
- * @subpackage  Mail
+ * Joomla! Content Management System
  *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('JPATH_PLATFORM') or die;
diff --git a/libraries/src/Table/UpdateSite.php b/libraries/src/Table/UpdateSite.php
index ee94793412ca9..003f6d9d0fdb7 100644
--- a/libraries/src/Table/UpdateSite.php
+++ b/libraries/src/Table/UpdateSite.php
@@ -14,9 +14,7 @@
  * Update site table
  * Stores the update sites for extensions
  *
- * @package     Joomla.Platform
- * @subpackage  Table
- * @since       3.4
+ * @since  3.4
  */
 class UpdateSite extends Table
 {
diff --git a/libraries/src/Toolbar/ToolbarHelper.php b/libraries/src/Toolbar/ToolbarHelper.php
index 91822091c7675..6a0f8137315a9 100644
--- a/libraries/src/Toolbar/ToolbarHelper.php
+++ b/libraries/src/Toolbar/ToolbarHelper.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @package    Joomla.Administrator
+ * Joomla! Content Management System
  *
  * @copyright  Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt