diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 538e27109..cca18b80c 100644
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -15,7 +15,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Controller
+ * @package       app.Controller
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -23,14 +23,13 @@
 App::uses('Controller', 'Controller');
 
 /**
- * This is a placeholder class.
- * Create the same file in app/Controller/AppController.php
+ * Application Controller
  *
  * Add your application-wide methods in the class below, your controllers
  * will inherit them.
  *
- * @package       Cake.Controller
- * @link http://book.cakephp.org/view/957/The-App-Controller
+ * @package       app.Controller
+ * @link http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
  */
 class AppController extends Controller {
 }
diff --git a/app/Controller/PagesController.php b/app/Controller/PagesController.php
index 4423f60f1..194ac4299 100644
--- a/app/Controller/PagesController.php
+++ b/app/Controller/PagesController.php
@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Controller
+ * @package       app.Controller
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -26,7 +26,7 @@ App::uses('AppController', 'Controller');
  *
  * Override this controller by placing a copy in controllers directory of an application
  *
- * @package       Cake.Controller
+ * @package       app.Controller
  * @link http://book.cakephp.org/2.0/en/controllers/pages-controller.html
  */
 class PagesController extends AppController {
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index 5a21cda3b..4c9b8bde7 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -15,7 +15,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Model
+ * @package       app.Model
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
@@ -25,11 +25,10 @@ App::uses('Model', 'Model');
 /**
  * Application model for Cake.
  *
- * This is a placeholder class.
- * Create the same file in app/Model/AppModel.php
- * Add your application-wide methods to the class, your models will inherit them.
+ * Add your application-wide methods in the class below, your models
+ * will inherit them.
  *
- * @package       Cake.Model
+ * @package       app.Model
  */
 class AppModel extends Model {
 }
diff --git a/app/View/Helper/AppHelper.php b/app/View/Helper/AppHelper.php
index 97b169d12..450fd0ea5 100644
--- a/app/View/Helper/AppHelper.php
+++ b/app/View/Helper/AppHelper.php
@@ -15,20 +15,19 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.View.Helper
+ * @package       app.View.Helper
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 App::uses('Helper', 'View');
 
 /**
- * This is a placeholder class.
- * Create the same file in app/View/Helper/AppHelper.php
+ * Application helper
  *
  * Add your application-wide methods in the class below, your helpers
  * will inherit them.
  *
- * @package       Cake.View.Helper
+ * @package       app.View.Helper
  */
 class AppHelper extends Helper {
 }
diff --git a/lib/Cake/Console/Templates/skel/Controller/AppController.php b/lib/Cake/Console/Templates/skel/Controller/AppController.php
index a46563f02..cca18b80c 100644
--- a/lib/Cake/Console/Templates/skel/Controller/AppController.php
+++ b/lib/Cake/Console/Templates/skel/Controller/AppController.php
@@ -29,6 +29,7 @@ App::uses('Controller', 'Controller');
  * will inherit them.
  *
  * @package       app.Controller
+ * @link http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
  */
 class AppController extends Controller {
 }
diff --git a/lib/Cake/Console/Templates/skel/Controller/PagesController.php b/lib/Cake/Console/Templates/skel/Controller/PagesController.php
index 0fd243970..7ee90cd5f 100644
--- a/lib/Cake/Console/Templates/skel/Controller/PagesController.php
+++ b/lib/Cake/Console/Templates/skel/Controller/PagesController.php
@@ -25,6 +25,7 @@
  * Override this controller by placing a copy in controllers directory of an application
  *
  * @package       app.Controller
+ * @link http://book.cakephp.org/2.0/en/controllers/pages-controller.html
  */
 class PagesController extends AppController {
 
diff --git a/lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php b/lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
index c31df1ab6..450fd0ea5 100644
--- a/lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
+++ b/lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
@@ -22,8 +22,7 @@
 App::uses('Helper', 'View');
 
 /**
- * This is a placeholder class.
- * Create the same file in app/View/Helper/AppHelper.php
+ * Application helper
  *
  * Add your application-wide methods in the class below, your helpers
  * will inherit them.