diff --git a/framework/console/commands/AppController.php b/framework/console/controllers/AppController.php
similarity index 100%
rename from framework/console/commands/AppController.php
rename to framework/console/controllers/AppController.php
diff --git a/framework/console/commands/HelpController.php b/framework/console/controllers/HelpController.php
similarity index 99%
rename from framework/console/commands/HelpController.php
rename to framework/console/controllers/HelpController.php
index d986363..8806fe0 100644
--- a/framework/console/commands/HelpController.php
+++ b/framework/console/controllers/HelpController.php
@@ -7,7 +7,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\console\commands;
+namespace yii\console\controllers;
 
 use yii\base\Application;
 use yii\base\InlineAction;
diff --git a/framework/console/commands/MessageController.php b/framework/console/controllers/MessageController.php
similarity index 100%
rename from framework/console/commands/MessageController.php
rename to framework/console/controllers/MessageController.php
diff --git a/framework/console/commands/MigrateController.php b/framework/console/controllers/MigrateController.php
similarity index 100%
rename from framework/console/commands/MigrateController.php
rename to framework/console/controllers/MigrateController.php
diff --git a/framework/console/commands/ShellController.php b/framework/console/controllers/ShellController.php
similarity index 100%
rename from framework/console/commands/ShellController.php
rename to framework/console/controllers/ShellController.php
diff --git a/framework/yiic.php b/framework/yiic.php
index a6b205d..9b38690 100644
--- a/framework/yiic.php
+++ b/framework/yiic.php
@@ -13,7 +13,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 require(__DIR__ . '/yii.php');
 
 $config = array(
-	'controllerPath' => '@yii/console/commands',
+	'controllerPath' => '@yii/console/controllers',
 );
 $id = 'yiic';
 $basePath = __DIR__ . '/console';