diff --git a/app/app_controller.php b/app/app_controller.php
index 53214d839..db2ae6bff 100644
--- a/app/app_controller.php
+++ b/app/app_controller.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/app/app_model.php b/app/app_model.php
index 0f9e55fdc..441da4e07 100644
--- a/app/app_model.php
+++ b/app/app_model.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/app/controllers/pages_controller.php b/app/controllers/pages_controller.php
index d8b53171f..414cad9d0 100644
--- a/app/controllers/pages_controller.php
+++ b/app/controllers/pages_controller.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/app/controllers/tests_controller.php b/app/controllers/tests_controller.php
index 98501ad26..eacfe0852 100644
--- a/app/controllers/tests_controller.php
+++ b/app/controllers/tests_controller.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/app/helpers/pages_helper.php b/app/helpers/pages_helper.php
index 4595d7231..6617c9b26 100644
--- a/app/helpers/pages_helper.php
+++ b/app/helpers/pages_helper.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/app/helpers/tests_helper.php b/app/helpers/tests_helper.php
index 69e1b926c..ccc5a079e 100644
--- a/app/helpers/tests_helper.php
+++ b/app/helpers/tests_helper.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/config/core.php b/config/core.php
index a2a827440..539096d08 100644
--- a/config/core.php
+++ b/config/core.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/config/database.php.default b/config/database.php.default
index f2c59bae8..56686398a 100644
--- a/config/database.php.default
+++ b/config/database.php.default
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/config/paths.php b/config/paths.php
index 9c5e1b2bb..5df05ffed 100644
--- a/config/paths.php
+++ b/config/paths.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/config/routes.php b/config/routes.php
index 1d80a281c..bbb741a39 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/config/routes.php.default b/config/routes.php.default
index 2ed5be164..d28391028 100644
--- a/config/routes.php.default
+++ b/config/routes.php.default
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/config/tags.php b/config/tags.php
index 00ea31e7d..3cad2250f 100644
--- a/config/tags.php
+++ b/config/tags.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
 //////////////////////////////////////////////////////////////////////////
diff --git a/docs/COPYING.txt b/docs/COPYING.txt
index 10b40f125..c07aa5c94 100644
--- a/docs/COPYING.txt
+++ b/docs/COPYING.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright: (c) 2005, Cake Authors/Developers
+Copyright: (c) 2005, CakePHP Authors/Developers
                Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
                Larry E. Masters aka PhpNut <nut@phpnut.com>
                Kamil Dzielinski aka Brego <brego.dk@gmail.com>
diff --git a/docs/LICENSE.txt b/docs/LICENSE.txt
index 10b40f125..c07aa5c94 100644
--- a/docs/LICENSE.txt
+++ b/docs/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright: (c) 2005, Cake Authors/Developers
+Copyright: (c) 2005, CakePHP Authors/Developers
                Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com>
                Larry E. Masters aka PhpNut <nut@phpnut.com>
                Kamil Dzielinski aka Brego <brego.dk@gmail.com>
diff --git a/index.php b/index.php
index 8468b52d3..374931b48 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -20,7 +20,7 @@
  * 
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @since CakePHP v 0.2.9
diff --git a/libs/bake.php b/libs/bake.php
index 22ae26455..b6d1fa74f 100644
--- a/libs/bake.php
+++ b/libs/bake.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
  *
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
diff --git a/libs/basics.php b/libs/basics.php
index 32ada3750..000c2f93f 100644
--- a/libs/basics.php
+++ b/libs/basics.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
  * 
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
diff --git a/libs/cache.php b/libs/cache.php
index 2caba0a48..e24f933f5 100644
--- a/libs/cache.php
+++ b/libs/cache.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/controller.php b/libs/controller.php
index cc7b7557e..b32e6cb9a 100644
--- a/libs/controller.php
+++ b/libs/controller.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -22,7 +22,7 @@
  * 
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
diff --git a/libs/dbo.php b/libs/dbo.php
index d25a4549d..d88bb4e16 100644
--- a/libs/dbo.php
+++ b/libs/dbo.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -51,7 +51,7 @@
  *
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
diff --git a/libs/dbo/dbo_adodb.php b/libs/dbo/dbo_adodb.php
index d771194fd..4bec4857b 100644
--- a/libs/dbo/dbo_adodb.php
+++ b/libs/dbo/dbo_adodb.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/dbo/dbo_generic.php b/libs/dbo/dbo_generic.php
index 0bc867463..5aedbf863 100644
--- a/libs/dbo/dbo_generic.php
+++ b/libs/dbo/dbo_generic.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/dbo/dbo_mysql.php b/libs/dbo/dbo_mysql.php
index 50a9f1eba..d585512db 100644
--- a/libs/dbo/dbo_mysql.php
+++ b/libs/dbo/dbo_mysql.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/dbo/dbo_pear.php b/libs/dbo/dbo_pear.php
index 57450d893..9f7458193 100644
--- a/libs/dbo/dbo_pear.php
+++ b/libs/dbo/dbo_pear.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/dbo/dbo_postgres.php b/libs/dbo/dbo_postgres.php
index 41ad005bd..cc1fa4f3c 100644
--- a/libs/dbo/dbo_postgres.php
+++ b/libs/dbo/dbo_postgres.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/dbo/dbo_sqlite.php b/libs/dbo/dbo_sqlite.php
index 53fa36363..82e2ddfc4 100644
--- a/libs/dbo/dbo_sqlite.php
+++ b/libs/dbo/dbo_sqlite.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
  * 
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
diff --git a/libs/dbo_factory.php b/libs/dbo_factory.php
index c0e5949c8..9293f15b2 100644
--- a/libs/dbo_factory.php
+++ b/libs/dbo_factory.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -20,7 +20,7 @@
  *
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @version $Revision$
  * @modifiedby $LastChangedBy$
diff --git a/libs/dispatcher.php b/libs/dispatcher.php
index 2237785c0..c473ebe2a 100644
--- a/libs/dispatcher.php
+++ b/libs/dispatcher.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
  * 
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
diff --git a/libs/error_messages.php b/libs/error_messages.php
index 0e895fa9c..d4362ee31 100644
--- a/libs/error_messages.php
+++ b/libs/error_messages.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/flay.php b/libs/flay.php
index d9b826fe1..379a0cb3c 100644
--- a/libs/flay.php
+++ b/libs/flay.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
   *
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/folder.php b/libs/folder.php
index 7c6d1461b..619c921ca 100644
--- a/libs/folder.php
+++ b/libs/folder.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
   *
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/helpers/html.php b/libs/helpers/html.php
index 1803eeba4..54514fab1 100644
--- a/libs/helpers/html.php
+++ b/libs/helpers/html.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
  * 
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs.helpers
diff --git a/libs/inflector.php b/libs/inflector.php
index aceca6f63..bd9fd4c93 100644
--- a/libs/inflector.php
+++ b/libs/inflector.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -21,7 +21,7 @@
   *
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/legacy.php b/libs/legacy.php
index b697dfdd6..edf78dd21 100644
--- a/libs/legacy.php
+++ b/libs/legacy.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -20,7 +20,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/log.php b/libs/log.php
index 8d7783a85..36ab1aa7f 100644
--- a/libs/log.php
+++ b/libs/log.php
@@ -3,7 +3,7 @@
 // + $Id $
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
   *
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/model.php b/libs/model.php
index bfb977d78..ab00280bf 100644
--- a/libs/model.php
+++ b/libs/model.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -26,7 +26,7 @@
  *
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
diff --git a/libs/neat_string.php b/libs/neat_string.php
index e98ac8334..e32d1877a 100644
--- a/libs/neat_string.php
+++ b/libs/neat_string.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
   *
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/object.php b/libs/object.php
index b982094e2..68c3206f1 100644
--- a/libs/object.php
+++ b/libs/object.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
  *
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
diff --git a/libs/router.php b/libs/router.php
index 838e3b72a..37cea7cd4 100644
--- a/libs/router.php
+++ b/libs/router.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
   *
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/template.php b/libs/template.php
index 71fec88d5..9949db5ee 100644
--- a/libs/template.php
+++ b/libs/template.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
  *
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
diff --git a/libs/time.php b/libs/time.php
index 3301b04b6..f4f7d1b3d 100644
--- a/libs/time.php
+++ b/libs/time.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
   *
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/validators.php b/libs/validators.php
index 611d24f53..50d6e3d4b 100644
--- a/libs/validators.php
+++ b/libs/validators.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
   *
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/libs/view.php b/libs/view.php
index 75ab296f2..0b21c6db9 100644
--- a/libs/view.php
+++ b/libs/view.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
diff --git a/public/css.php b/public/css.php
index 346b2a055..7a1a1fac8 100644
--- a/public/css.php
+++ b/public/css.php
@@ -13,7 +13,7 @@
  * 
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.public
diff --git a/public/index.php b/public/index.php
index 40a3bb4ab..e95867880 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
  * 
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.public
diff --git a/public/js/vendors.php b/public/js/vendors.php
index 2f64141cc..5a221ad02 100644
--- a/public/js/vendors.php
+++ b/public/js/vendors.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
  * 
  * @filesource 
  * @author CakePHP Authors/Developers
- * @copyright Copyright (c) 2005, Cake Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @since CakePHP v 0.2.9
diff --git a/scripts/bake.php b/scripts/bake.php
index d4271af7d..b3d3a9980 100644
--- a/scripts/bake.php
+++ b/scripts/bake.php
@@ -4,7 +4,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -19,7 +19,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.scripts
diff --git a/scripts/test.php b/scripts/test.php
index dbd8c9201..ac8f00a56 100644
--- a/scripts/test.php
+++ b/scripts/test.php
@@ -3,7 +3,7 @@
 // + $Id$
 // +------------------------------------------------------------------+ //
 // + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
-// + Copyright: (c) 2005, Cake Authors/Developers                     + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
 // + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
 // +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
 // +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
@@ -18,7 +18,7 @@
   * 
   * @filesource 
   * @author CakePHP Authors/Developers
-  * @copyright Copyright (c) 2005, Cake Authors/Developers
+  * @copyright Copyright (c) 2005, CakePHP Authors/Developers
   * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.scripts
diff --git a/tests/libs/controller.php b/tests/libs/controller.php
index 17e500191..172303364 100644
--- a/tests/libs/controller.php
+++ b/tests/libs/controller.php
@@ -1,20 +1,75 @@
 <?php
+//////////////////////////////////////////////////////////////////////////
+// + $Id:$
+// +------------------------------------------------------------------+ //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
+// + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
+// +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
+// +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
+// +------------------------------------------------------------------+ //
+// + Licensed under The MIT License                                   + //
+// + Redistributions of files must retain the above copyright notice. + //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
+//////////////////////////////////////////////////////////////////////////
 
+/**
+ * 
+ * 
+ * @filesource 
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.tests.libs
+ * @since CakePHP v 0.2.9
+ * @version $Revision:$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date:$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ *
+ */
+
+/**
+ * Basic defines
+ */
 uses('controller');
 
+/**
+ * Enter description here...
+ *
+ * @package cake
+ * @subpackage cake.tests.libs
+ * @since CakePHP v .9
+ *
+ */
 class ControllerTest extends UnitTestCase
 {
+/**
+ * Enter description here...
+ *
+ * @var unknown_type
+ */
 	var $controller;
 
-	// constructor of the test suite
+
+/**
+ * constructor of the test suite.
+ *
+ * @return ControllerTest
+ */
 	function ControllerTest()
 	{
 		$this->UnitTestCase('Controller test');
 	}
 
-	// called before the test functions will be executed
-	// this function is defined in PHPUnit_TestCase and overwritten
-	// here
+
+/**
+ * called before the test functions will be executed
+ * this function is defined in PHPUnit_TestCase and overwritten
+ * here
+ *
+ */
 	function setUp()
 	{
 		$this->controller = new Controller();
@@ -31,9 +86,11 @@ class ControllerTest extends UnitTestCase
 		$this->controller->passed_args = null;
 	}
 
-	// called after the test functions are executed
-	// this function is defined in PHPUnit_TestCase and overwritten
-	// here
+/**
+ * called after the test functions are executed
+ * this function is defined in PHPUnit_TestCase and overwritten
+ * here
+ */
 	function tearDown()
 	{
 		unset($this->controller);
diff --git a/tests/libs/dbo.php b/tests/libs/dbo.php
index 535254cd0..dbaf30292 100644
--- a/tests/libs/dbo.php
+++ b/tests/libs/dbo.php
@@ -1,20 +1,63 @@
 <?php
+//////////////////////////////////////////////////////////////////////////
+// + $Id:$
+// +------------------------------------------------------------------+ //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
+// + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
+// +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
+// +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
+// +------------------------------------------------------------------+ //
+// + Licensed under The MIT License                                   + //
+// + Redistributions of files must retain the above copyright notice. + //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
+//////////////////////////////////////////////////////////////////////////
 
+/**
+ * 
+ * 
+ * @filesource 
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.tests.libs
+ * @since CakePHP v 0.2.9
+ * @version $Revision:$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date:$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ *
+ */
+
+/**
+ * Basic defines
+ */
 uses('dbo_factory');
 
 class DboTest extends UnitTestCase
 {
+/**
+ * Enter description here...
+ *
+ * @var unknown_type
+ */
 	var $dbo;
 
-	// constructor of the test suite
+/**
+ * Enter description here...
+ *
+ * @return DboTest
+ */
 	function DboTest()
 	{
 		$this->UnitTestCase('DBO test');
 	}
 
-	// called before the test functions will be executed
-	// this function is defined in PHPUnit_TestCase and overwritten
-	// here
+/**
+ * Enter description here...
+ *
+ */
 	function setUp()
 	{
 		$this->dbo = DBO::getInstance('test');
@@ -22,9 +65,11 @@ class DboTest extends UnitTestCase
 		$this->createTemporaryTable();
 	}
 
-	// called after the test functions are executed
-	// this function is defined in PHPUnit_TestCase and overwritten
-	// here
+/**
+ * Enter description here...
+ *
+ * @return unknown
+ */
 	function tearDown()
 	{
 		if(!$this->dbo) return false;
@@ -32,6 +77,11 @@ class DboTest extends UnitTestCase
 		$this->dropTemporaryTable();
 	}
 
+/**
+ * Enter description here...
+ *
+ * @return unknown
+ */
 	function createTemporaryTable()
 	{
 		if(!$this->dbo) return false;
@@ -44,6 +94,11 @@ class DboTest extends UnitTestCase
 		return $this->dbo->query($sql);
 	}
 
+/**
+ * Enter description here...
+ *
+ * @return unknown
+ */
 	function dropTemporaryTable()
 	{
 		if(!$this->dbo) return false;
@@ -51,6 +106,11 @@ class DboTest extends UnitTestCase
 		return $this->dbo->query("DROP TABLE __test");
 	}
 
+/**
+ * Enter description here...
+ *
+ * @return unknown
+ */
 	function testHasImplementation()
 	{
 		if(!$this->dbo) return false;
@@ -75,6 +135,11 @@ class DboTest extends UnitTestCase
 		}
 	}
 
+/**
+ * Enter description here...
+ *
+ * @return unknown
+ */
 	function testConnectivity()
 	{
 		if(!$this->dbo) return false;
@@ -82,6 +147,11 @@ class DboTest extends UnitTestCase
 		$this->assertTrue($this->dbo->connected);
 	}
 
+/**
+ * Enter description here...
+ *
+ * @return unknown
+ */
 	function testFields()
 	{
 		if(!$this->dbo) return false;
@@ -90,6 +160,11 @@ class DboTest extends UnitTestCase
 		$this->assertEqual(count($fields), 2, 'equals');
 	}
 
+/**
+ * Enter description here...
+ *
+ * @return unknown
+ */
 	function testTables()
 	{
 		if(!$this->dbo) return false;
diff --git a/tests/libs/helpers/html.php b/tests/libs/helpers/html.php
index b0bfc2ca6..91130e35c 100644
--- a/tests/libs/helpers/html.php
+++ b/tests/libs/helpers/html.php
@@ -1,17 +1,70 @@
 <?php
+//////////////////////////////////////////////////////////////////////////
+// + $Id:$
+// +------------------------------------------------------------------+ //
+// + Cake PHP : Rapid Development Framework <http://www.cakephp.org/> + //
+// + Copyright: (c) 2005, CakePHP Authors/Developers                  + //
+// + Author(s): Michal Tatarynowicz aka Pies <tatarynowicz@gmail.com> + //
+// +            Larry E. Masters aka PhpNut <nut@phpnut.com>          + //
+// +            Kamil Dzielinski aka Brego <brego.dk@gmail.com>       + //
+// +------------------------------------------------------------------+ //
+// + Licensed under The MIT License                                   + //
+// + Redistributions of files must retain the above copyright notice. + //
+// + See: http://www.opensource.org/licenses/mit-license.php          + //
+//////////////////////////////////////////////////////////////////////////
 
+/**
+ * 
+ * 
+ * @filesource 
+ * @author CakePHP Authors/Developers
+ * @copyright Copyright (c) 2005, CakePHP Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
+ * @package cake
+ * @subpackage cake.tests.libs
+ * @since CakePHP v 0.2.9
+ * @version $Revision:$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date:$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ *
+ */
+
+/**
+ * Basic defines
+ */
 uses('helpers/html');
-
+/**
+ * Enter description here...
+ *
+ * @package cake
+ * @subpackage cake.tests.libs
+ * @since CakePHP v .9
+ *
+ */
 class HtmlHelperTest extends UnitTestCase
 {
+/**
+ * Enter description here...
+ *
+ * @var unknown_type
+ */
 	var $html;
 
-	// constructor of the test suite
+
+/**
+ * constructor of the test suite
+ *
+ */
 	function ControllerTest()
 	{
 		$this->UnitTestCase('Html helper test');
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function setUp()
 	{
 		$this->html = new HtmlHelper();
@@ -29,11 +82,19 @@ class HtmlHelperTest extends UnitTestCase
 		$this->html->passed_args = null;
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function tearDown()
 	{
 		unset($this->html);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testTrim()
 	{
 		$expected = 'Long ...';
@@ -41,6 +102,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($expected, $result);
 	}
 	
+/**
+ * Enter description here...
+ *
+ */
 	function testUrlFor()
 	{
 		$result   = $this->html->urlFor('/foo/bar');
@@ -56,6 +121,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testParseHtmlOptions()
 	{
 		$result   = $this->html->parseHtmlOptions(null);
@@ -79,6 +148,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testLinkTo()
 	{
 		$result   = $this->html->linkTo('Testing �', '/test/ok', array('style'=>'color:Red'), 'Sure?');
@@ -90,6 +163,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testLinkOut()
 	{
 		$result   = $this->html->linkOut('Sputnik.pl', 'http://www.sputnik.pl/', array('style'=>'color:Red'));
@@ -101,6 +178,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testFormTag()
 	{
 		$result   = $this->html->formTag();
@@ -116,6 +197,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testSubmitTag()
 	{
 		$result   = $this->html->submitTag();
@@ -127,6 +212,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testInputTag()
 	{
 		$result   = $this->html->inputTag('foo');
@@ -138,6 +227,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testPasswordTag()
 	{
 		$result   = $this->html->passwordTag('foo');
@@ -149,6 +242,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testHiddenTag()
 	{
 		$result   = $this->html->hiddenTag('foo');
@@ -164,6 +261,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testFileTag()
 	{
 		$result   = $this->html->fileTag('bar', array('class'=>'Foo', 'disabled'=>'1'));
@@ -171,6 +272,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testAreaTag()
 	{
 		$result   = $this->html->areaTag('foo');
@@ -182,6 +287,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testCheckboxTag()
 	{
 		$result   = $this->html->checkboxTag('bar');
@@ -193,6 +302,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testRadioTags()
 	{
 		$result   = $this->html->radioTags('foo', array('foo'=>'Foo', 'bar'=>'Bar'), '---', array('class'=>'Foo'));
@@ -204,6 +317,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testSelectTag()
 	{
 		$result   = $this->html->selectTag('tofu', array('m'=>'male', 'f'=>'female'), 'm', array('class'=>'Outer'), array('class'=>'Inner', 'id'=>'FooID'));
@@ -215,6 +332,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testTableHeaders()
 	{
 		$result   = $this->html->tableHeaders(array('One', 'Two', 'Three'));
@@ -226,6 +347,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testTableCells()
 	{
 		$result   = $this->html->tableCells(array('Foo', 'Bar'));
@@ -237,6 +362,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testImageTag()
 	{
 		$result   = $this->html->imageTag('foo.gif');
@@ -248,6 +377,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+/**
+ * Enter description here...
+ *
+ */
 	function testTagValue()
 	{
 		$result   = $this->html->tagValue('foo');
@@ -259,6 +392,10 @@ class HtmlHelperTest extends UnitTestCase
 		$this->assertEqual($result, $expected);
 	}
 
+	/**
+	 * Enter description here...
+	 *
+	 */
 	function testGetCrumbs()
 	{
 		$this->html->addCrumb('Foo', '/bar/foo');
diff --git a/tests/libs/narray.php b/tests/libs/neat_array.php
similarity index 100%
rename from tests/libs/narray.php
rename to tests/libs/neat_array.php