diff --git a/app/code/Magento/Security/Model/Plugin/AdminUserForm.php b/app/code/Magento/Security/Model/Plugin/AdminUserForm.php
index d6276519578f9..106295d5774ff 100644
--- a/app/code/Magento/Security/Model/Plugin/AdminUserForm.php
+++ b/app/code/Magento/Security/Model/Plugin/AdminUserForm.php
@@ -9,8 +9,6 @@
 
 /**
  * Add the `expires_at` form field to the User main form.
- *
- * @package Magento\Security\Model\Plugin
  */
 class AdminUserForm
 {
diff --git a/app/code/Magento/Security/Model/Plugin/UserValidationRules.php b/app/code/Magento/Security/Model/Plugin/UserValidationRules.php
index f400d962644d6..00d5bc13b65e8 100644
--- a/app/code/Magento/Security/Model/Plugin/UserValidationRules.php
+++ b/app/code/Magento/Security/Model/Plugin/UserValidationRules.php
@@ -9,8 +9,6 @@
 
 /**
  * \Magento\User\Model\UserValidationRules decorator
- *
- * @package Magento\Security\Model\Plugin
  */
 class UserValidationRules
 {
diff --git a/app/code/Magento/Security/Model/UserExpiration/Validator.php b/app/code/Magento/Security/Model/UserExpiration/Validator.php
index c71b2ecb849a2..46633db260692 100644
--- a/app/code/Magento/Security/Model/UserExpiration/Validator.php
+++ b/app/code/Magento/Security/Model/UserExpiration/Validator.php
@@ -10,9 +10,7 @@
 use Magento\Framework\Validator\AbstractValidator;
 
 /**
- * Class Validator
- *
- * @package Magento\Security\Model\Validator
+ * Validates that the expires_at field is later than the current date/time.
  */
 class Validator extends AbstractValidator
 {
diff --git a/app/code/Magento/Security/Observer/AdminUserAuthenticateBefore.php b/app/code/Magento/Security/Observer/AdminUserAuthenticateBefore.php
index 61ce889e9722a..3c07285afcb32 100644
--- a/app/code/Magento/Security/Observer/AdminUserAuthenticateBefore.php
+++ b/app/code/Magento/Security/Observer/AdminUserAuthenticateBefore.php
@@ -14,8 +14,6 @@
 
 /**
  * Check for expired users.
- *
- * @package Magento\Security\Observer
  */
 class AdminUserAuthenticateBefore implements ObserverInterface
 {
diff --git a/app/code/Magento/Security/Test/Unit/Model/Plugin/UserValidationRulesTest.php b/app/code/Magento/Security/Test/Unit/Model/Plugin/UserValidationRulesTest.php
index 4498e514e45d3..00b3356c2e11d 100644
--- a/app/code/Magento/Security/Test/Unit/Model/Plugin/UserValidationRulesTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/Plugin/UserValidationRulesTest.php
@@ -8,9 +8,7 @@
 namespace Magento\Security\Test\Unit\Model\Plugin;
 
 /**
- * Class UserValidationRulesTest
- *
- * @package Magento\Security\Test\Unit\Model\Plugin
+ * Test class for expiration date user validation rule.
  */
 class UserValidationRulesTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Security/Test/Unit/Model/UserExpiration/ValidatorTest.php b/app/code/Magento/Security/Test/Unit/Model/UserExpiration/ValidatorTest.php
index 1cc53e76ee969..28541231cb123 100644
--- a/app/code/Magento/Security/Test/Unit/Model/UserExpiration/ValidatorTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/UserExpiration/ValidatorTest.php
@@ -10,9 +10,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
- * Class ExpiresAtValidatorTest
- *
- * @package Magento\User\Test\Unit\Model
+ * Test class for \Magento\Security\Model\UserExpiration\Validator.
  */
 class ValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Security/Test/Unit/Observer/AdminUserAuthenticateBeforeTest.php b/app/code/Magento/Security/Test/Unit/Observer/AdminUserAuthenticateBeforeTest.php
index ecfd3e3759dd3..403255cbb60f8 100644
--- a/app/code/Magento/Security/Test/Unit/Observer/AdminUserAuthenticateBeforeTest.php
+++ b/app/code/Magento/Security/Test/Unit/Observer/AdminUserAuthenticateBeforeTest.php
@@ -9,8 +9,6 @@
 
 /**
  * Test for \Magento\Security\Observer\AdminUserAuthenticateBefore
- *
- * @package Magento\Security\Test\Unit\Observer
  */
 class AdminUserAuthenticateBeforeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Security/Test/Unit/Observer/AfterAdminUserSaveTest.php b/app/code/Magento/Security/Test/Unit/Observer/AfterAdminUserSaveTest.php
index 439ec3f88548b..85505632e1eb6 100644
--- a/app/code/Magento/Security/Test/Unit/Observer/AfterAdminUserSaveTest.php
+++ b/app/code/Magento/Security/Test/Unit/Observer/AfterAdminUserSaveTest.php
@@ -9,8 +9,6 @@
 
 /**
  * Test class for \Magento\Security\Observer\AfterAdminUserSave
- *
- * @package Magento\Security\Test\Unit\Observer
  */
 class AfterAdminUserSaveTest extends \PHPUnit\Framework\TestCase
 {