diff --git a/app/app_controller.php b/app/app_controller.php
index 7d0c8e1b2..53214d839 100644
--- a/app/app_controller.php
+++ b/app/app_controller.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
@@ -13,9 +13,9 @@
  * @filesource 
  * @package cake
  * @subpackage cake.app
- * @version $Revision:$
- * @modifiedby $LastChangedBy:$
- * @lastmodified $Date:$
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
  */
 
 /**
diff --git a/app/app_model.php b/app/app_model.php
index 44f88ce7c..0f9e55fdc 100644
--- a/app/app_model.php
+++ b/app/app_model.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
@@ -13,9 +13,9 @@
  * @filesource 
  * @package cake
  * @subpackage cake.app
- * @version $Revision:$
- * @modifiedby $LastChangedBy:$
- * @lastmodified $Date:$
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
  */
 
 /**
diff --git a/app/controllers/pages_controller.php b/app/controllers/pages_controller.php
index 6d12f2f71..d8b53171f 100644
--- a/app/controllers/pages_controller.php
+++ b/app/controllers/pages_controller.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
@@ -14,9 +14,9 @@
  * @filesource 
  * @package cake
  * @subpackage cake.app.controllers
- * @version $Revision:$
- * @modifiedby $LastChangedBy:$
- * @lastmodified $Date:$
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
  */
 
 /**
diff --git a/app/controllers/tests_controller.php b/app/controllers/tests_controller.php
index 76c002ecd..98501ad26 100644
--- a/app/controllers/tests_controller.php
+++ b/app/controllers/tests_controller.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
@@ -13,9 +13,9 @@
  * @filesource 
  * @package cake
  * @subpackage cake.app.controllers
- * @version $Revision:$
- * @modifiedby $LastChangedBy:$
- * @lastmodified $Date:$
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
  */
 
 /**
diff --git a/app/helpers/pages_helper.php b/app/helpers/pages_helper.php
index 98ff9b754..4595d7231 100644
--- a/app/helpers/pages_helper.php
+++ b/app/helpers/pages_helper.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
@@ -13,9 +13,9 @@
  * @filesource 
  * @package cake
  * @subpackage cake.app.helpers
- * @version $Revision:$
- * @modifiedby $LastChangedBy:$
- * @lastmodified $Date:$
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
  */
 
 /**
diff --git a/app/helpers/tests_helper.php b/app/helpers/tests_helper.php
index 102f889db..69e1b926c 100644
--- a/app/helpers/tests_helper.php
+++ b/app/helpers/tests_helper.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
@@ -13,9 +13,9 @@
  * @filesource 
  * @package cake
  * @subpackage cake.app.helpers
- * @version $Revision:$
- * @modifiedby $LastChangedBy:$
- * @lastmodified $Date:$
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
  */
 
 /**
diff --git a/config/core.php b/config/core.php
index 579a40c7a..a2a827440 100644
--- a/config/core.php
+++ b/config/core.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/config/database.php.default b/config/database.php.default
index e6354f707..f2c59bae8 100644
--- a/config/database.php.default
+++ b/config/database.php.default
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/config/paths.php b/config/paths.php
index cb4c1e922..9c5e1b2bb 100644
--- a/config/paths.php
+++ b/config/paths.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/config/routes.php b/config/routes.php
index ad915e71e..1d80a281c 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/config/routes.php.default b/config/routes.php.default
index f182bee9c..2ed5be164 100644
--- a/config/routes.php.default
+++ b/config/routes.php.default
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/config/tags.php b/config/tags.php
index ee72cfd6b..00ea31e7d 100644
--- a/config/tags.php
+++ b/config/tags.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/index.php b/index.php
index 60c5ca576..8468b52d3 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -19,11 +19,11 @@
  *    - /public is not set as a web root.
  * 
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
diff --git a/libs/bake.php b/libs/bake.php
index 148326f68..22ae26455 100644
--- a/libs/bake.php
+++ b/libs/bake.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
  * Used by /scripts/bake.php.
  *
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
@@ -41,7 +41,7 @@ uses('object', 'inflector');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
   */
 class Bake extends Object {
 
diff --git a/libs/basics.php b/libs/basics.php
index e9c1c65ef..32ada3750 100644
--- a/libs/basics.php
+++ b/libs/basics.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
  * Basic Cake functionalities.
  * 
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
diff --git a/libs/cache.php b/libs/cache.php
index 67ab26330..2caba0a48 100644
--- a/libs/cache.php
+++ b/libs/cache.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
   * Description:
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -41,7 +41,7 @@ uses('model');
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   */
 class Cache extends Model {
 
diff --git a/libs/controller.php b/libs/controller.php
index 16c5cacf8..cc7b7557e 100644
--- a/libs/controller.php
+++ b/libs/controller.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -21,12 +21,12 @@
  * and creates the model object if proper class exists.
  * 
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
@@ -44,7 +44,7 @@ uses('model', 'inflector', 'folder', 'view');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  *
  */
 class Controller extends Object
diff --git a/libs/dbo.php b/libs/dbo.php
index 18827f3bd..d25a4549d 100644
--- a/libs/dbo.php
+++ b/libs/dbo.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -50,12 +50,12 @@
  * </code>
  *
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
@@ -74,7 +74,7 @@ uses('object');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  */
 class DBO extends Object
 {
diff --git a/libs/dbo/dbo_adodb.php b/libs/dbo/dbo_adodb.php
index 4302ddee2..d771194fd 100644
--- a/libs/dbo/dbo_adodb.php
+++ b/libs/dbo/dbo_adodb.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
   * AdoDB layer for DBO.
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -39,7 +39,7 @@ require_once(VENDORS.'adodb/adodb.inc.php');
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   */
 class DBO_AdoDB extends DBO 
 {
diff --git a/libs/dbo/dbo_generic.php b/libs/dbo/dbo_generic.php
index 4c71e43d3..0bc867463 100644
--- a/libs/dbo/dbo_generic.php
+++ b/libs/dbo/dbo_generic.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
   * Generic layer for DBO.
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
diff --git a/libs/dbo/dbo_mysql.php b/libs/dbo/dbo_mysql.php
index e7939b32a..50a9f1eba 100644
--- a/libs/dbo/dbo_mysql.php
+++ b/libs/dbo/dbo_mysql.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
   * MySQL layer for DBO
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -39,7 +39,7 @@ uses('dbo');
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   */
 class DBO_MySQL extends DBO
 {
diff --git a/libs/dbo/dbo_pear.php b/libs/dbo/dbo_pear.php
index 668201660..57450d893 100644
--- a/libs/dbo/dbo_pear.php
+++ b/libs/dbo/dbo_pear.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
   * Pear::DB layer for DBO.
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -41,7 +41,7 @@ vendor('Pear/DB');
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   */
 class DBO_Pear extends DBO
 {
diff --git a/libs/dbo/dbo_postgres.php b/libs/dbo/dbo_postgres.php
index 72385788f..41ad005bd 100644
--- a/libs/dbo/dbo_postgres.php
+++ b/libs/dbo/dbo_postgres.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
   * PostgreSQL layer for DBO.
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 1.0.0.114
+  * @since CakePHP v 1.0.0.114
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -39,7 +39,7 @@ uses('dbo');
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 1.0.0.114
+  * @since CakePHP v 1.0.0.114
   */
 class DBO_Postgres extends DBO 
 {
diff --git a/libs/dbo/dbo_sqlite.php b/libs/dbo/dbo_sqlite.php
index 1629f1aa0..53fa36363 100644
--- a/libs/dbo/dbo_sqlite.php
+++ b/libs/dbo/dbo_sqlite.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
  * SQLite layer for DBO
  * 
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.9.0
+ * @since CakePHP v 0.9.0
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
@@ -39,7 +39,7 @@ uses('dbo');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.9.0
+ * @since CakePHP v 0.9.0
  */
 class DBO_SQLite extends DBO 
 {
diff --git a/libs/dbo_factory.php b/libs/dbo_factory.php
index 14c28da6b..c0e5949c8 100644
--- a/libs/dbo_factory.php
+++ b/libs/dbo_factory.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -19,7 +19,7 @@
  * Creates DBO-descendant objects from a given db connection configuration
  *
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @version $Revision$
@@ -40,7 +40,7 @@ config('database');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 1.0.0.0
+ * @since CakePHP v 1.0.0.0
  *
  */
 class DboFactory extends Object
diff --git a/libs/dispatcher.php b/libs/dispatcher.php
index 0ddb76148..2237785c0 100644
--- a/libs/dispatcher.php
+++ b/libs/dispatcher.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
  * Dispatches the request, creating aproppriate models and controllers.
  * 
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
@@ -43,7 +43,7 @@ uses('error_messages', 'object', 'router', 'controller');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  */
 class Dispatcher extends Object
 {
diff --git a/libs/error_messages.php b/libs/error_messages.php
index 857eb27fd..0e895fa9c 100644
--- a/libs/error_messages.php
+++ b/libs/error_messages.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
   * Purpose: Error Messages Defines
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
diff --git a/libs/flay.php b/libs/flay.php
index 7fabef725..d9b826fe1 100644
--- a/libs/flay.php
+++ b/libs/flay.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
   * Text-to-html parser, similar to Textile or RedCloth, only with somehow different syntax. 
   *
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -40,7 +40,7 @@ uses('object');
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   */
 
 class Flay extends Object
diff --git a/libs/folder.php b/libs/folder.php
index 5f495db4b..7c6d1461b 100644
--- a/libs/folder.php
+++ b/libs/folder.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
   * Folder structure browser, lists folders and files.
   *
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -37,7 +37,7 @@ uses('object');
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   */
 class Folder extends Object {
     
diff --git a/libs/helpers/html.php b/libs/helpers/html.php
index 98cc76b84..1803eeba4 100644
--- a/libs/helpers/html.php
+++ b/libs/helpers/html.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
  * Dispatches the request, creating aproppriate models and controllers.
  * 
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs.helpers
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
@@ -35,7 +35,7 @@
  *
  * @package cake
  * @subpackage cake.libs.helpers
- * @since Cake v 0.9.1
+ * @since CakePHP v 0.9.1
  *
  */
 class HtmlHelper
diff --git a/libs/inflector.php b/libs/inflector.php
index 341c78f76..aceca6f63 100644
--- a/libs/inflector.php
+++ b/libs/inflector.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -20,12 +20,12 @@
   * Test with $i = new Inflector(); $i->test();
   *
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -39,7 +39,7 @@
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   */
 class Inflector extends Object 
 {
diff --git a/libs/legacy.php b/libs/legacy.php
index 5d1a8da2d..b697dfdd6 100644
--- a/libs/legacy.php
+++ b/libs/legacy.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -19,12 +19,12 @@
   *
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
diff --git a/libs/log.php b/libs/log.php
index abfdfe0c4..8d7783a85 100644
--- a/libs/log.php
+++ b/libs/log.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id $
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
   * Logs messages to text files.
   *
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 1.0.0.0
+  * @since CakePHP v 1.0.0.0
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
diff --git a/libs/model.php b/libs/model.php
index d744977c2..bfb977d78 100644
--- a/libs/model.php
+++ b/libs/model.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -25,12 +25,12 @@
  *   - schema-related cross-table ($has_one, $has_many, $belongs_to)
  *
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
@@ -51,7 +51,7 @@ uses('object', 'validators', 'inflector');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  *
  */
 class Model extends Object 
diff --git a/libs/neat_array.php b/libs/neat_array.php
index 87cedf402..03a5b5cf7 100644
--- a/libs/neat_array.php
+++ b/libs/neat_array.php
@@ -5,7 +5,7 @@
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  */
 class NeatArray {
 	/**
diff --git a/libs/neat_string.php b/libs/neat_string.php
index 6214aacd2..e98ac8334 100644
--- a/libs/neat_string.php
+++ b/libs/neat_string.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
   * Purpose:
   *
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
diff --git a/libs/object.php b/libs/object.php
index 19ef53057..b982094e2 100644
--- a/libs/object.php
+++ b/libs/object.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
  * Allows for __construct to be used in PHP4.
  *
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
@@ -37,7 +37,7 @@ uses('log');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  */
 class Object
 {
diff --git a/libs/router.php b/libs/router.php
index 593b829d4..838e3b72a 100644
--- a/libs/router.php
+++ b/libs/router.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
   * Parses the request URL into controller, action, and parameters.
   *
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -37,7 +37,7 @@ uses('object', 'neat_array');
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   *
   */
 class Router extends Object {
diff --git a/libs/template.php b/libs/template.php
index 588b2348a..71fec88d5 100644
--- a/libs/template.php
+++ b/libs/template.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
  * Templating for Controller class.
  *
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
@@ -37,7 +37,7 @@ uses('object');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  */
 class Template extends Object
 {
diff --git a/libs/time.php b/libs/time.php
index c823584d3..3301b04b6 100644
--- a/libs/time.php
+++ b/libs/time.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
   * Time related functions, formatting for dates etc.
   *
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -37,7 +37,7 @@ uses ('object');
   *
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   *
   */
 class Time extends Object {
diff --git a/libs/validators.php b/libs/validators.php
index 3bf4f604b..611d24f53 100644
--- a/libs/validators.php
+++ b/libs/validators.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
   * Used to validate data in Models.
   *
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
diff --git a/libs/view.php b/libs/view.php
index 64b349817..75ab296f2 100644
--- a/libs/view.php
+++ b/libs/view.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
   * 
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
-  * @since Cake v 0.9.1
+  * @since CakePHP v 0.9.1
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
@@ -37,7 +37,7 @@ uses('object');
  *
  * @package cake
  * @subpackage cake.libs
- * @since Cake v 0.9.1
+ * @since CakePHP v 0.9.1
  */
 class View extends Object
 {
diff --git a/public/css.php b/public/css.php
index b10f6c9f3..346b2a055 100644
--- a/public/css.php
+++ b/public/css.php
@@ -12,12 +12,12 @@
  * Purpose:
  * 
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.public
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
diff --git a/public/index.php b/public/index.php
index 3863c9f12..40a3bb4ab 100644
--- a/public/index.php
+++ b/public/index.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
  * The main "loop"
  * 
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.public
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
diff --git a/public/js/vendors.php b/public/js/vendors.php
index 7f149d366..2f64141cc 100644
--- a/public/js/vendors.php
+++ b/public/js/vendors.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,11 +18,11 @@
  * be accessible to the public.
  * 
  * @filesource 
- * @author Cake Authors/Developers
+ * @author CakePHP Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
- * @since Cake v 0.2.9
+ * @since CakePHP v 0.2.9
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
diff --git a/scripts/bake.php b/scripts/bake.php
index db9dc4f63..d4271af7d 100644
--- a/scripts/bake.php
+++ b/scripts/bake.php
@@ -3,7 +3,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -18,12 +18,12 @@
   * Enter description here...
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.scripts
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$
diff --git a/scripts/test.php b/scripts/test.php
index 9c80834ea..dbd8c9201 100644
--- a/scripts/test.php
+++ b/scripts/test.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
@@ -17,12 +17,12 @@
   * Enter description here...
   * 
   * @filesource 
-  * @author Cake Authors/Developers
+  * @author CakePHP Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.scripts
-  * @since Cake v 0.2.9
+  * @since CakePHP v 0.2.9
   * @version $Revision$
   * @modifiedby $LastChangedBy$
   * @lastmodified $Date$