diff --git a/lib/User/Form/LoginForm.php b/lib/User/Form/LoginForm.php
index dac46b9..a10bac9 100644
--- a/lib/User/Form/LoginForm.php
+++ b/lib/User/Form/LoginForm.php
@@ -14,13 +14,13 @@ namespace Da\User\Form;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Model\User;
 use Da\User\Query\UserQuery;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\base\Model;
 
 class LoginForm extends Model
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
 
     /**
      * @var string login User's email or username
diff --git a/lib/User/Form/RegistrationForm.php b/lib/User/Form/RegistrationForm.php
index bd10da2..e67a0e2 100644
--- a/lib/User/Form/RegistrationForm.php
+++ b/lib/User/Form/RegistrationForm.php
@@ -13,13 +13,13 @@ namespace Da\User\Form;
 
 use Da\User\Model\User;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\base\Model;
 
 class RegistrationForm extends Model
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     /**
diff --git a/lib/User/Form/SettingsForm.php b/lib/User/Form/SettingsForm.php
index 8bc8345..5f99d50 100644
--- a/lib/User/Form/SettingsForm.php
+++ b/lib/User/Form/SettingsForm.php
@@ -15,13 +15,13 @@ use Da\User\Factory\EmailChangeStrategyFactory;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Model\User;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\base\Model;
 
 class SettingsForm extends Model
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     /**
diff --git a/lib/User/Helper/AuthHelper.php b/lib/User/Helper/AuthHelper.php
index 7c07149..45a5504 100644
--- a/lib/User/Helper/AuthHelper.php
+++ b/lib/User/Helper/AuthHelper.php
@@ -13,7 +13,7 @@ namespace Da\User\Helper;
 
 use Da\User\Model\AbstractAuthItem;
 use Da\User\Module;
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Yii;
 use yii\helpers\ArrayHelper;
 use yii\rbac\Permission;
@@ -22,7 +22,7 @@ use yii\rbac\Rule;
 
 class AuthHelper
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     /**
      * Checks whether a user has certain role.
diff --git a/lib/User/Model/AbstractAuthItem.php b/lib/User/Model/AbstractAuthItem.php
index 579eb39..1628572 100644
--- a/lib/User/Model/AbstractAuthItem.php
+++ b/lib/User/Model/AbstractAuthItem.php
@@ -11,7 +11,7 @@
 
 namespace Da\User\Model;
 
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Validator\RbacItemsValidator;
 use Da\User\Validator\RbacRuleValidator;
 use yii\base\Model;
@@ -20,7 +20,7 @@ use Yii;
 
 abstract class AbstractAuthItem extends Model
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     /**
      * @var string
diff --git a/lib/User/Model/Assignment.php b/lib/User/Model/Assignment.php
index e319e31..3ae9cde 100644
--- a/lib/User/Model/Assignment.php
+++ b/lib/User/Model/Assignment.php
@@ -11,7 +11,7 @@
 
 namespace Da\User\Model;
 
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Validator\RbacItemsValidator;
 use yii\base\InvalidConfigException;
 use yii\base\Model;
@@ -19,7 +19,7 @@ use Yii;
 
 class Assignment extends Model
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     public $items = [];
     public $user_id;
diff --git a/lib/User/Model/Profile.php b/lib/User/Model/Profile.php
index 8b06718..bdb5dba 100644
--- a/lib/User/Model/Profile.php
+++ b/lib/User/Model/Profile.php
@@ -14,7 +14,7 @@ namespace Da\User\Model;
 use Da\User\Helper\GravatarHelper;
 use Da\User\Query\ProfileQuery;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Da\User\Validator\TimeZoneValidator;
 use Yii;
 use yii\db\ActiveRecord;
@@ -36,7 +36,7 @@ use DateTime;
  */
 class Profile extends ActiveRecord
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     /**
diff --git a/lib/User/Model/SocialNetworkAccount.php b/lib/User/Model/SocialNetworkAccount.php
index 6f970a4..b44c6e0 100644
--- a/lib/User/Model/SocialNetworkAccount.php
+++ b/lib/User/Model/SocialNetworkAccount.php
@@ -13,7 +13,7 @@ namespace Da\User\Model;
 
 use Da\User\Query\SocialNetworkAccountQuery;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\db\ActiveRecord;
 use yii\helpers\Url;
@@ -34,7 +34,7 @@ use yii\helpers\Url;
  */
 class SocialNetworkAccount extends ActiveRecord
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     /**
diff --git a/lib/User/Model/Token.php b/lib/User/Model/Token.php
index 052ba7f..3da1d87 100644
--- a/lib/User/Model/Token.php
+++ b/lib/User/Model/Token.php
@@ -14,10 +14,10 @@ namespace Da\User\Model;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Query\TokenQuery;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
+use RuntimeException;
 use yii\db\ActiveRecord;
 use yii\helpers\Url;
-use RuntimeException;
 
 /**
  * Token Active Record model.
@@ -32,7 +32,7 @@ use RuntimeException;
  */
 class Token extends ActiveRecord
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     const TYPE_CONFIRMATION = 0;
diff --git a/lib/User/Model/User.php b/lib/User/Model/User.php
index da29cba..21bbe5b 100644
--- a/lib/User/Model/User.php
+++ b/lib/User/Model/User.php
@@ -14,7 +14,7 @@ namespace Da\User\Model;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Query\UserQuery;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\base\NotSupportedException;
 use yii\behaviors\TimestampBehavior;
@@ -50,7 +50,7 @@ use yii\web\IdentityInterface;
  */
 class User extends ActiveRecord implements IdentityInterface
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     // following constants are used on secured email changing process
diff --git a/lib/User/Search/AbstractAuthItemSearch.php b/lib/User/Search/AbstractAuthItemSearch.php
index 0eb80a2..7501077 100644
--- a/lib/User/Search/AbstractAuthItemSearch.php
+++ b/lib/User/Search/AbstractAuthItemSearch.php
@@ -11,7 +11,7 @@
 
 namespace Da\User\Search;
 
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Traits\ContainerAwareTrait;
 use yii\base\Model;
 use yii\data\ArrayDataProvider;
@@ -19,7 +19,7 @@ use yii\db\Query;
 
 abstract class AbstractAuthItemSearch extends Model
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
     use ContainerAwareTrait;
 
     /**
diff --git a/lib/User/Service/AuthItemEditionService.php b/lib/User/Service/AuthItemEditionService.php
index a452de3..600e4bd 100644
--- a/lib/User/Service/AuthItemEditionService.php
+++ b/lib/User/Service/AuthItemEditionService.php
@@ -14,13 +14,13 @@ namespace Da\User\Service;
 use Da\User\Contracts\ServiceInterface;
 use Da\User\Factory\AuthItemFactory;
 use Da\User\Model\AbstractAuthItem;
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Traits\ContainerAwareTrait;
 use Exception;
 
 class AuthItemEditionService implements ServiceInterface
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
     use ContainerAwareTrait;
 
     protected $model;
diff --git a/lib/User/Service/EmailChangeService.php b/lib/User/Service/EmailChangeService.php
index 8cccc96..dde6f55 100644
--- a/lib/User/Service/EmailChangeService.php
+++ b/lib/User/Service/EmailChangeService.php
@@ -8,12 +8,12 @@ use Da\User\Model\Token;
 use Da\User\Model\User;
 use Da\User\Query\TokenQuery;
 use Da\User\Query\UserQuery;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 
 class EmailChangeService implements ServiceInterface
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
 
     protected $code;
     protected $model;
diff --git a/lib/User/Service/UpdateAuthAssignmentsService.php b/lib/User/Service/UpdateAuthAssignmentsService.php
index 9d2cae0..d8165fe 100644
--- a/lib/User/Service/UpdateAuthAssignmentsService.php
+++ b/lib/User/Service/UpdateAuthAssignmentsService.php
@@ -13,11 +13,11 @@ namespace Da\User\Service;
 
 use Da\User\Contracts\ServiceInterface;
 use Da\User\Model\Assignment;
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 
 class UpdateAuthAssignmentsService implements ServiceInterface
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     protected $model;
 
diff --git a/lib/User/Service/UserRegisterService.php b/lib/User/Service/UserRegisterService.php
index 704c5c7..97a8d30 100644
--- a/lib/User/Service/UserRegisterService.php
+++ b/lib/User/Service/UserRegisterService.php
@@ -15,16 +15,15 @@ use Da\User\Contracts\ServiceInterface;
 use Da\User\Event\UserEvent;
 use Da\User\Factory\TokenFactory;
 use Da\User\Helper\SecurityHelper;
-use Da\User\Model\Token;
 use Da\User\Model\User;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
+use Exception;
 use yii\base\InvalidCallException;
 use yii\log\Logger;
-use Exception;
 
 class UserRegisterService implements ServiceInterface
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
 
     protected $model;
     protected $securityHelper;
diff --git a/lib/User/Traits/AuthManagerTrait.php b/lib/User/Traits/AuthManagerAwareTrait.php
similarity index 94%
rename from lib/User/Traits/AuthManagerTrait.php
rename to lib/User/Traits/AuthManagerAwareTrait.php
index a593006..27fee56 100644
--- a/lib/User/Traits/AuthManagerTrait.php
+++ b/lib/User/Traits/AuthManagerAwareTrait.php
@@ -14,7 +14,7 @@ namespace Da\User\Traits;
 use Da\User\Component\AuthDbManagerComponent;
 use Yii;
 
-trait AuthManagerTrait
+trait AuthManagerAwareTrait
 {
     /**
      * @return AuthDbManagerComponent|\yii\rbac\ManagerInterface
diff --git a/lib/User/Traits/ModuleTrait.php b/lib/User/Traits/ModuleAwareTrait.php
similarity index 90%
rename from lib/User/Traits/ModuleTrait.php
rename to lib/User/Traits/ModuleAwareTrait.php
index 73dbeaa..8a0d1a9 100644
--- a/lib/User/Traits/ModuleTrait.php
+++ b/lib/User/Traits/ModuleAwareTrait.php
@@ -17,10 +17,10 @@ use Yii;
 /**
  * @property-read Module $module
  */
-trait ModuleTrait
+trait ModuleAwareTrait
 {
     /**
-     * @return \Da\User\Module
+     * @return Module
      */
     public function getModule()
     {
diff --git a/lib/User/Validator/RbacItemsValidator.php b/lib/User/Validator/RbacItemsValidator.php
index d0188e0..766dabe 100644
--- a/lib/User/Validator/RbacItemsValidator.php
+++ b/lib/User/Validator/RbacItemsValidator.php
@@ -11,13 +11,13 @@
 
 namespace Da\User\Validator;
 
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Yii;
 use yii\validators\Validator;
 
 class RbacItemsValidator extends Validator
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     protected function validateValue($value)
     {
diff --git a/lib/User/Widget/AssignmentsWidget.php b/lib/User/Widget/AssignmentsWidget.php
index 8a97ee3..89dda49 100644
--- a/lib/User/Widget/AssignmentsWidget.php
+++ b/lib/User/Widget/AssignmentsWidget.php
@@ -13,7 +13,7 @@ namespace Da\User\Widget;
 
 use Da\User\Model\Assignment;
 use Da\User\Service\UpdateAuthAssignmentsService;
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Traits\ContainerAwareTrait;
 use yii\base\InvalidConfigException;
 use yii\base\Widget;
@@ -21,7 +21,7 @@ use yii\helpers\ArrayHelper;
 
 class AssignmentsWidget extends Widget
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
     use ContainerAwareTrait;
 
     /**