diff --git a/app/Config/Schema/db_acl.php b/app/Config/Schema/db_acl.php
index 65bb5b6ff..7133acb19 100644
--- a/app/Config/Schema/db_acl.php
+++ b/app/Config/Schema/db_acl.php
@@ -1,5 +1,6 @@
 <?php
 /*DbAcl schema generated on: 2007-11-24 15:11:13 : 1195945453*/
+
 /**
  * This is Acl Schema file
  *
@@ -15,10 +16,11 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.config.sql
+ * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 /*
  *
  * Using the Schema command line utility
@@ -27,6 +29,15 @@
  */
 class DbAclSchema extends CakeSchema {
 
+	public $name = 'DbAcl';
+
+	public function before($event = array()) {
+		return true;
+	}
+
+	public function after($event = array()) {
+	}
+
 	public $acos = array(
 			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
 			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
diff --git a/app/Config/Schema/i18n.php b/app/Config/Schema/i18n.php
index d6480a1c0..377645796 100644
--- a/app/Config/Schema/i18n.php
+++ b/app/Config/Schema/i18n.php
@@ -1,5 +1,6 @@
 <?php
 /*i18n schema generated on: 2007-11-25 07:11:25 : 1196004805*/
+
 /**
  * This is i18n Schema file
  *
@@ -15,10 +16,11 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.config.sql
+ * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 /*
  *
  * Using the Schema command line utility
@@ -27,6 +29,15 @@
  */
 class i18nSchema extends CakeSchema {
 
+	public $name = 'i18n';
+
+	public function before($event = array()) {
+		return true;
+	}
+
+	public function after($event = array()) {
+	}
+
 	public $i18n = array(
 			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
 			'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'),
diff --git a/app/Config/Schema/sessions.php b/app/Config/Schema/sessions.php
index 247535a22..4e2ba5f55 100644
--- a/app/Config/Schema/sessions.php
+++ b/app/Config/Schema/sessions.php
@@ -1,5 +1,6 @@
 <?php
 /*Sessions schema generated on: 2007-11-25 07:11:54 : 1196004714*/
+
 /**
  * This is Sessions Schema file
  *
@@ -15,10 +16,11 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.config.sql
+ * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+
 /*
  *
  * Using the Schema command line utility
@@ -27,6 +29,15 @@
  */
 class SessionsSchema extends CakeSchema {
 
+	public $name = 'Sessions';
+
+	public function before($event = array()) {
+		return true;
+	}
+
+	public function after($event = array()) {
+	}
+
 	public $cake_sessions = array(
 			'id' => array('type'=>'string', 'null' => false, 'key' => 'primary'),
 			'data' => array('type'=>'text', 'null' => true, 'default' => NULL),
diff --git a/app/Config/acl.ini.php b/app/Config/acl.ini.php
index c61abb3c8..1241aeff3 100644
--- a/app/Config/acl.ini.php
+++ b/app/Config/acl.ini.php
@@ -5,7 +5,7 @@
 ; *
 ; * PHP 5
 ; *
-; * CakePHP(tm) :  Rapid Development Framework http://cakephp.org
+; * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 ; * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
@@ -13,7 +13,7 @@
 ; *
 ; * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; * @link          http://cakephp.org CakePHP(tm) Project
-; * @package       app.config
+; * @package       app.Config
 ; * @since         CakePHP(tm) v 0.10.0.1076
 ; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
 ; */
diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php
index 37d3c1dba..fce18ccba 100644
--- a/app/Config/bootstrap.php
+++ b/app/Config/bootstrap.php
@@ -18,7 +18,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.config
+ * @package       app.Config
  * @since         CakePHP(tm) v 0.10.8.2117
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/Config/core.php b/app/Config/core.php
index 812f642ad..2b03097dc 100644
--- a/app/Config/core.php
+++ b/app/Config/core.php
@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.config
+ * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/Config/database.php.default b/app/Config/database.php.default
index 627691e1b..3ce441be3 100644
--- a/app/Config/database.php.default
+++ b/app/Config/database.php.default
@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.config
+ * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/Config/email.php.default b/app/Config/email.php.default
index 56dd69dc7..bf2b4b51a 100644
--- a/app/Config/email.php.default
+++ b/app/Config/email.php.default
@@ -14,7 +14,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.config
+ * @package       app.Config
  * @since         CakePHP(tm) v 2.0.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/Config/routes.php b/app/Config/routes.php
index 0a7a011b8..d984d96ef 100644
--- a/app/Config/routes.php
+++ b/app/Config/routes.php
@@ -16,7 +16,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.config
+ * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/app/Console/cake b/app/Console/cake
index 5e1075b93..64f91b5ba 100755
--- a/app/Console/cake
+++ b/app/Console/cake
@@ -11,10 +11,10 @@
 # Redistributions of files must retain the above copyright notice.
 #
 # @copyright		Copyright 2005-2011, Cake Software Foundation, Inc.
-# @link				http://cakephp.org CakePHP(tm) Project
-# @package   		app.console
-# @since			CakePHP(tm) v 2.0
-# @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
+# @link			http://cakephp.org CakePHP(tm) Project
+# @package   		app.Console
+# @since		CakePHP(tm) v 2.0
+# @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
 #
 ################################################################################
 LIB=${0/%cake/}
@@ -22,4 +22,4 @@ APP=`pwd`
 
 exec php -q ${LIB}cake.php -working "${APP}" "$@"
 
-exit;
\ No newline at end of file
+exit;
diff --git a/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php b/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
index 32da8c4db..7133acb19 100644
--- a/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
+++ b/lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
@@ -16,7 +16,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.Config
+ * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php b/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
index e6a3c6528..377645796 100644
--- a/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
+++ b/lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
@@ -16,7 +16,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.Config
+ * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/lib/Cake/Console/Templates/skel/Config/Schema/sessions.php b/lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
index 1abad9486..4e2ba5f55 100644
--- a/lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
+++ b/lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
@@ -16,7 +16,7 @@
  *
  * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.Config
+ * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
diff --git a/lib/Cake/Console/Templates/skel/Config/acl.ini.php b/lib/Cake/Console/Templates/skel/Config/acl.ini.php
index 31c6bf19d..1241aeff3 100644
--- a/lib/Cake/Console/Templates/skel/Config/acl.ini.php
+++ b/lib/Cake/Console/Templates/skel/Config/acl.ini.php
@@ -5,7 +5,7 @@
 ; *
 ; * PHP 5
 ; *
-; * CakePHP(tm) : Rapid Development Framework http://www.cakephp.org/
+; * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
 ; * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
@@ -13,7 +13,7 @@
 ; *
 ; * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
 ; * @link          http://cakephp.org CakePHP(tm) Project
-; * @package       Cake.Console.Templates.skel.Config
+; * @package       app.Config
 ; * @since         CakePHP(tm) v 0.10.0.1076
 ; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
 ; */
diff --git a/lib/Cake/Console/Templates/skel/Config/bootstrap.php b/lib/Cake/Console/Templates/skel/Config/bootstrap.php
index 38ae63baf..fce18ccba 100644
--- a/lib/Cake/Console/Templates/skel/Config/bootstrap.php
+++ b/lib/Cake/Console/Templates/skel/Config/bootstrap.php
@@ -62,4 +62,4 @@ Cache::config('default', array('engine' => 'File'));
  * CakePlugin::loadAll(); // Loads all plugins at once
  * CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit
  *
- */
\ No newline at end of file
+ */
diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php
index 6bf57693d..2b03097dc 100644
--- a/lib/Cake/Console/Templates/skel/Config/core.php
+++ b/lib/Cake/Console/Templates/skel/Config/core.php
@@ -196,8 +196,8 @@
  * Will append a querystring parameter containing the time the file was modified. This is
  * useful for invalidating browser caches.
  *
- * Set to `true` to apply timestamps, when debug > 0, or set to 'force' to always enable
- * timestamping.
+ * Set to `true` to apply timestamps when debug > 0. Set to 'force' to always enable
+ * timestamping regardless of debug value.
  */
 	//Configure::write('Asset.timestamp', true);
 /**
diff --git a/lib/Cake/Console/Templates/skel/Console/cake b/lib/Cake/Console/Templates/skel/Console/cake
index 61b8c171f..64f91b5ba 100644
--- a/lib/Cake/Console/Templates/skel/Console/cake
+++ b/lib/Cake/Console/Templates/skel/Console/cake
@@ -11,10 +11,10 @@
 # Redistributions of files must retain the above copyright notice.
 #
 # @copyright		Copyright 2005-2011, Cake Software Foundation, Inc.
-# @link				http://cakephp.org CakePHP(tm) Project
+# @link			http://cakephp.org CakePHP(tm) Project
 # @package   		app.Console
-# @since			CakePHP(tm) v 2.0
-# @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
+# @since		CakePHP(tm) v 2.0
+# @license		MIT License (http://www.opensource.org/licenses/mit-license.php)
 #
 ################################################################################
 LIB=${0/%cake/}
@@ -22,4 +22,4 @@ APP=`pwd`
 
 exec php -q ${LIB}cake.php -working "${APP}" "$@"
 
-exit;
\ No newline at end of file
+exit;