diff --git a/module/VuFind/src/VuFind/Net/IpAddressUtils.php b/module/VuFind/src/VuFind/Net/IpAddressUtils.php
index 2bbb411b6f1f03cb5f623345b9f5be28f38f39d4..fcd54ac25d42aa6cf66cf3461313ab262c4e89d5 100644
--- a/module/VuFind/src/VuFind/Net/IpAddressUtils.php
+++ b/module/VuFind/src/VuFind/Net/IpAddressUtils.php
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category VuFind
- * @package  Authorization
+ * @package  Net
  * @author   Ere Maijala <ere.maijala@helsinki.fi>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
@@ -31,7 +31,7 @@ namespace VuFind\Net;
  * IP address utility functions.
  *
  * @category VuFind
- * @package  Authorization
+ * @package  Net
  * @author   Ere Maijala <ere.maijala@helsinki.fi>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
diff --git a/module/VuFind/src/VuFind/Security/CspHeaderGenerator.php b/module/VuFind/src/VuFind/Security/CspHeaderGenerator.php
index 0adf1323781d15c799bd7e650c82fe5ff0e02c2f..a2ca9e44e9c85e81af0b719c8937877c6144703b 100644
--- a/module/VuFind/src/VuFind/Security/CspHeaderGenerator.php
+++ b/module/VuFind/src/VuFind/Security/CspHeaderGenerator.php
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category VuFind
- * @package  VuFind\Security
+ * @package  Security
  * @author   Josef Moravec <moravec@mzk.cz>
  * @license  https://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
@@ -35,7 +35,7 @@ use Laminas\Http\Header\ContentSecurityPolicyReportOnly;
  * VuFind class for generating Content Security Policy http headers
  *
  * @category VuFind
- * @package  VuFind\Security
+ * @package  Security
  * @author   Josef Moravec <moravec@mzk.cz>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/ Wiki
diff --git a/module/VuFind/src/VuFind/Security/CspHeaderGeneratorFactory.php b/module/VuFind/src/VuFind/Security/CspHeaderGeneratorFactory.php
index ddfeaf88ab2480eeffd4409e0e8bffda8db3e3d4..d0e50f109aa30ae7f56ccfd970d87a7a30e88759 100644
--- a/module/VuFind/src/VuFind/Security/CspHeaderGeneratorFactory.php
+++ b/module/VuFind/src/VuFind/Security/CspHeaderGeneratorFactory.php
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category VuFind
- * @package  VuFind\Security
+ * @package  Security
  * @author   Josef Moravec <moravec@mzk.cz>
  * @license  https://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org Main Page
@@ -38,7 +38,7 @@ use Laminas\ServiceManager\Factory\FactoryInterface;
  * Factory for creating  Content Security Policy http headers generator class
  *
  * @category VuFind
- * @package  VuFind\Security
+ * @package  Security
  * @author   Josef Moravec <moravec@mzk.cz>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/ Wiki
diff --git a/module/VuFind/src/VuFind/Security/NonceGenerator.php b/module/VuFind/src/VuFind/Security/NonceGenerator.php
index 42ae57164ca28a7ad2f676e5713ca95c10f3dec7..8632eadbdf2d1e2b508e514087fd342c8427c360 100644
--- a/module/VuFind/src/VuFind/Security/NonceGenerator.php
+++ b/module/VuFind/src/VuFind/Security/NonceGenerator.php
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category VuFind
- * @package  VuFind\Security
+ * @package  Security
  * @author   Josef Moravec <moravec@mzk.cz>
  * @license  https://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/ Wiki
@@ -33,7 +33,7 @@ namespace VuFind\Security;
  * policy.
  *
  * @category VuFind
- * @package  VuFind\Security
+ * @package  Security
  * @author   Josef Moravec <moravec@mzk.cz>
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/ Wiki