diff --git a/api/models/ChangePasswordForm.php b/api/models/ChangePasswordForm.php
index 33b6c70..b112f64 100644
--- a/api/models/ChangePasswordForm.php
+++ b/api/models/ChangePasswordForm.php
@@ -1,10 +1,11 @@
 <?php
 namespace api\models;
 
+use api\models\base\ApiForm;
 use common\models\Account;
 use Yii;
 
-class ChangePasswordForm extends BaseApiForm {
+class ChangePasswordForm extends ApiForm {
 
     public $password;
 
diff --git a/api/models/ChangeUsernameForm.php b/api/models/ChangeUsernameForm.php
index 413320c..4333a07 100644
--- a/api/models/ChangeUsernameForm.php
+++ b/api/models/ChangeUsernameForm.php
@@ -1,11 +1,12 @@
 <?php
 namespace api\models;
 
+use api\models\base\PasswordProtectedForm;
 use common\models\Account;
 use Yii;
 use yii\helpers\ArrayHelper;
 
-class ChangeUsernameForm extends BasePasswordProtectedForm {
+class ChangeUsernameForm extends PasswordProtectedForm {
 
     public $username;
 
diff --git a/api/models/ConfirmEmailForm.php b/api/models/ConfirmEmailForm.php
index c9d454f..7728278 100644
--- a/api/models/ConfirmEmailForm.php
+++ b/api/models/ConfirmEmailForm.php
@@ -1,12 +1,13 @@
 <?php
 namespace api\models;
 
+use api\models\base\KeyConfirmationForm;
 use common\models\Account;
 use common\models\EmailActivation;
 use Yii;
 use yii\base\ErrorException;
 
-class ConfirmEmailForm extends BaseKeyConfirmationForm {
+class ConfirmEmailForm extends KeyConfirmationForm {
 
     public function confirm() {
         if (!$this->validate()) {
diff --git a/api/models/LoginForm.php b/api/models/LoginForm.php
index a123560..0d43056 100644
--- a/api/models/LoginForm.php
+++ b/api/models/LoginForm.php
@@ -1,10 +1,11 @@
 <?php
 namespace api\models;
 
+use api\models\base\ApiForm;
 use common\models\Account;
 use Yii;
 
-class LoginForm extends BaseApiForm {
+class LoginForm extends ApiForm {
 
     public $login;
     public $password;
diff --git a/api/models/RegistrationForm.php b/api/models/RegistrationForm.php
index 1f63da6..c5f4645 100644
--- a/api/models/RegistrationForm.php
+++ b/api/models/RegistrationForm.php
@@ -2,6 +2,7 @@
 namespace api\models;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
+use api\models\base\ApiForm;
 use common\components\UserFriendlyRandomKey;
 use common\models\Account;
 use common\models\EmailActivation;
@@ -9,7 +10,7 @@ use Ramsey\Uuid\Uuid;
 use Yii;
 use yii\base\ErrorException;
 
-class RegistrationForm extends BaseApiForm {
+class RegistrationForm extends ApiForm {
 
     public $username;
     public $email;
diff --git a/api/models/RepeatAccountActivationForm.php b/api/models/RepeatAccountActivationForm.php
index 7f7bf3f..9efd297 100644
--- a/api/models/RepeatAccountActivationForm.php
+++ b/api/models/RepeatAccountActivationForm.php
@@ -1,13 +1,14 @@
 <?php
 namespace api\models;
 
+use api\models\base\ApiForm;
 use common\components\UserFriendlyRandomKey;
 use common\models\Account;
 use common\models\EmailActivation;
 use Yii;
 use yii\base\ErrorException;
 
-class RepeatAccountActivationForm extends BaseApiForm {
+class RepeatAccountActivationForm extends ApiForm {
 
     // Частота повтора отправки нового письма
     const REPEAT_FREQUENCY = 5 * 60;
diff --git a/api/models/BaseApiForm.php b/api/models/base/ApiForm.php
similarity index 61%
rename from api/models/BaseApiForm.php
rename to api/models/base/ApiForm.php
index 342eb26..1987bf2 100644
--- a/api/models/BaseApiForm.php
+++ b/api/models/base/ApiForm.php
@@ -1,9 +1,9 @@
 <?php
-namespace api\models;
+namespace api\models\base;
 
 use yii\base\Model;
 
-class BaseApiForm extends Model {
+class ApiForm extends Model {
 
     public function formName() {
         return '';
diff --git a/api/models/BaseKeyConfirmationForm.php b/api/models/base/KeyConfirmationForm.php
similarity index 92%
rename from api/models/BaseKeyConfirmationForm.php
rename to api/models/base/KeyConfirmationForm.php
index fd0b898..efdcd53 100644
--- a/api/models/BaseKeyConfirmationForm.php
+++ b/api/models/base/KeyConfirmationForm.php
@@ -1,9 +1,9 @@
 <?php
-namespace api\models;
+namespace api\models\base;
 
 use common\models\EmailActivation;
 
-class BaseKeyConfirmationForm extends BaseApiForm {
+class KeyConfirmationForm extends ApiForm {
 
     public $key;
 
diff --git a/api/models/BasePasswordProtectedForm.php b/api/models/base/PasswordProtectedForm.php
similarity index 88%
rename from api/models/BasePasswordProtectedForm.php
rename to api/models/base/PasswordProtectedForm.php
index 4b5d209..822141b 100644
--- a/api/models/BasePasswordProtectedForm.php
+++ b/api/models/base/PasswordProtectedForm.php
@@ -1,9 +1,9 @@
 <?php
-namespace api\models;
+namespace api\models\base;
 
 use Yii;
 
-class BasePasswordProtectedForm extends BaseApiForm {
+class PasswordProtectedForm extends ApiForm {
 
     public $password;
 
diff --git a/tests/codeception/api/unit/models/BaseApiFormTest.php b/tests/codeception/api/unit/models/base/ApiFormTest.php
similarity index 69%
rename from tests/codeception/api/unit/models/BaseApiFormTest.php
rename to tests/codeception/api/unit/models/base/ApiFormTest.php
index a7ddcad..c2ea2e4 100644
--- a/tests/codeception/api/unit/models/BaseApiFormTest.php
+++ b/tests/codeception/api/unit/models/base/ApiFormTest.php
@@ -1,16 +1,17 @@
 <?php
-namespace tests\codeception\api\models;
+namespace tests\codeception\api\models\base;
 
-use api\models\BaseApiForm;
+use api\models\base\ApiForm;
 use Codeception\Specify;
 use tests\codeception\api\unit\TestCase;
 
-class BaseApiFormTest extends TestCase {
+class ApiFormTest extends TestCase {
+
     use Specify;
 
     public function testLoad() {
-        $model = new DummyBaseApiForm();
-        $this->specify('model should load data without ModelName array scope', function() use ($model) {
+        $model = new DummyApiForm();
+        $this->specify('model should load data without ModelName array scope', function () use ($model) {
             expect('model successful load data without prefix', $model->load(['field' => 'test-data']))->true();
             expect('field is set as passed data', $model->field)->equals('test-data');
         });
@@ -18,7 +19,7 @@ class BaseApiFormTest extends TestCase {
 
 }
 
-class DummyBaseApiForm extends BaseApiForm {
+class DummyApiForm extends ApiForm {
 
     public $field;
 
diff --git a/tests/codeception/api/unit/models/BasePasswordProtectedFormTest.php b/tests/codeception/api/unit/models/base/BasePasswordProtectedFormTest.php
similarity index 82%
rename from tests/codeception/api/unit/models/BasePasswordProtectedFormTest.php
rename to tests/codeception/api/unit/models/base/BasePasswordProtectedFormTest.php
index d51e1aa..2256163 100644
--- a/tests/codeception/api/unit/models/BasePasswordProtectedFormTest.php
+++ b/tests/codeception/api/unit/models/base/BasePasswordProtectedFormTest.php
@@ -1,12 +1,12 @@
 <?php
-namespace tests\codeception\api\models;
+namespace tests\codeception\api\models\base;
 
-use api\models\BasePasswordProtectedForm;
+use api\models\base\PasswordProtectedForm;
 use Codeception\Specify;
 use common\models\Account;
 use tests\codeception\api\unit\TestCase;
 
-class BasePasswordProtectedFormTest extends TestCase {
+class PasswordProtectedFormTest extends TestCase {
     use Specify;
 
     public function testValidatePassword() {
@@ -27,7 +27,7 @@ class BasePasswordProtectedFormTest extends TestCase {
 
 }
 
-class DummyBasePasswordProtectedForm extends BasePasswordProtectedForm {
+class DummyBasePasswordProtectedForm extends PasswordProtectedForm {
 
     protected function getAccount() {
         return new Account([
diff --git a/tests/codeception/api/unit/models/BaseKeyConfirmationFormTest.php b/tests/codeception/api/unit/models/base/KeyConfirmationFormTest.php
similarity index 91%
rename from tests/codeception/api/unit/models/BaseKeyConfirmationFormTest.php
rename to tests/codeception/api/unit/models/base/KeyConfirmationFormTest.php
index 22807ec..0cac58c 100644
--- a/tests/codeception/api/unit/models/BaseKeyConfirmationFormTest.php
+++ b/tests/codeception/api/unit/models/base/KeyConfirmationFormTest.php
@@ -1,7 +1,7 @@
 <?php
-namespace tests\codeception\api\models;
+namespace tests\codeception\api\models\base;
 
-use api\models\BaseKeyConfirmationForm;
+use api\models\base\KeyConfirmationForm;
 use Codeception\Specify;
 use tests\codeception\api\unit\DbTestCase;
 use tests\codeception\common\fixtures\EmailActivationFixture;
@@ -10,7 +10,7 @@ use Yii;
 /**
  * @property array $emailActivations
  */
-class BaseKeyConfirmationFormTest extends DbTestCase {
+class KeyConfirmationFormTest extends DbTestCase {
     use Specify;
 
     public function fixtures() {
@@ -23,7 +23,7 @@ class BaseKeyConfirmationFormTest extends DbTestCase {
     }
 
     protected function createModel($key = null) {
-        return new BaseKeyConfirmationForm([
+        return new KeyConfirmationForm([
             'key' => $key,
         ]);
     }