diff --git a/lib/Cake/Console/AppShell.php b/lib/Cake/Console/AppShell.php
index a624a31ad..ca3abc8ed 100644
--- a/lib/Cake/Console/AppShell.php
+++ b/lib/Cake/Console/AppShell.php
@@ -19,7 +19,7 @@
 
 /**
  * This is a placeholder class.
- * Create the same file in app/console/shells/app_shell.php
+ * Create the same file in app/console/shells/AppShell.php
  *
  * Add your application-wide methods in the class below, your shells
  * will inherit them.
diff --git a/lib/Cake/Console/templates/skel/app_controller.php b/lib/Cake/Console/templates/skel/controllers/AppController.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/app_controller.php
rename to lib/Cake/Console/templates/skel/controllers/AppController.php
diff --git a/lib/Cake/Console/templates/skel/controllers/pages_controller.php b/lib/Cake/Console/templates/skel/controllers/PagesController.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/controllers/pages_controller.php
rename to lib/Cake/Console/templates/skel/controllers/PagesController.php
diff --git a/lib/Cake/Console/templates/skel/app_model.php b/lib/Cake/Console/templates/skel/models/AppModel.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/app_model.php
rename to lib/Cake/Console/templates/skel/models/AppModel.php
diff --git a/lib/Cake/Console/templates/skel/app_helper.php b/lib/Cake/Console/templates/skel/views/helpers/AppHelper.php
similarity index 100%
rename from lib/Cake/Console/templates/skel/app_helper.php
rename to lib/Cake/Console/templates/skel/views/helpers/AppHelper.php
diff --git a/lib/Cake/Core/App.php b/lib/Cake/Core/App.php
index 07aea99ef..b8cd6b50c 100644
--- a/lib/Cake/Core/App.php
+++ b/lib/Cake/Core/App.php
@@ -243,7 +243,7 @@ class App {
 				'View' => array('%s' . 'views' . DS),
 				'View/Helper' => array('%s' . 'views' . DS . 'helpers' . DS),
 				'Console' => array(
-					'%s' . 'console' . DS . 'shells' . DS,
+					'%s' . 'console' . DS,
 					'%s' . 'vendors' . DS . 'shells' . DS,
 					VENDORS . 'shells' . DS
 				),