diff --git a/lib/Cake/Console/Command/Task/ControllerTask.php b/lib/Cake/Console/Command/Task/ControllerTask.php
index adbaa9f40..86b21e503 100644
--- a/lib/Cake/Console/Command/Task/ControllerTask.php
+++ b/lib/Cake/Console/Command/Task/ControllerTask.php
@@ -36,18 +36,19 @@ class ControllerTask extends BakeTask {
 	public $tasks = array('Model', 'Test', 'Template', 'DbConfig', 'Project');
 
 /**
- * path to CONTROLLERS directory
+ * path to Controller directory
  *
  * @var array
  * @access public
  */
-	public $path = CONTROLLERS;
+	public $path = null;
 
 /**
  * Override initialize
  *
  */
 	public function initialize() {
+		$this->path = App::path('Controller');
 	}
 
 /**
diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
index 9d409a872..7e2c7fa0b 100644
--- a/lib/Cake/Console/Command/Task/PluginTask.php
+++ b/lib/Cake/Console/Command/Task/PluginTask.php
@@ -28,7 +28,7 @@ App::uses('Folder', 'Utility');
 class PluginTask extends Shell {
 
 /**
- * path to CONTROLLERS directory
+ * path to plugins directory
  *
  * @var array
  * @access public
@@ -184,7 +184,7 @@ class PluginTask extends Shell {
  */
 	public function getOptionParser() {
 		$parser = parent::getOptionParser();
-		return $parser->description(__d('cake_console', 
+		return $parser->description(__d('cake_console',
 			'Create the directory structure, AppModel and AppController classes for a new plugin. ' .
 			'Can create plugins in any of your bootstrapped plugin paths.'
 		))->addArgument('name', array(
diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php
index 00284c1cd..4fd7ba71f 100644
--- a/lib/Cake/bootstrap.php
+++ b/lib/Cake/bootstrap.php
@@ -58,11 +58,6 @@ if (!defined('APP')) {
  */
 	define('BEHAVIORS', MODELS.'Behavior'.DS);
 
-/**
- * Path to the application's controllers directory.
- */
-	define('CONTROLLERS', APP.'Controller'.DS);
-
 /**
  * Path to the application's components directory.
  */