diff --git a/app/app_controller.php b/app/app_controller.php
index 7c568e252..a202410c6 100644
--- a/app/app_controller.php
+++ b/app/app_controller.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/app/app_model.php b/app/app_model.php
index 48c31eb81..f8c042810 100644
--- a/app/app_model.php
+++ b/app/app_model.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/app/controllers/pages_controller.php b/app/controllers/pages_controller.php
index 9d5631514..5748391d4 100644
--- a/app/controllers/pages_controller.php
+++ b/app/controllers/pages_controller.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/app/controllers/tests_controller.php b/app/controllers/tests_controller.php
index 4b6f52b0d..26f780979 100644
--- a/app/controllers/tests_controller.php
+++ b/app/controllers/tests_controller.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/app/helpers/pages_helper.php b/app/helpers/pages_helper.php
index 305e0850b..39c8c42db 100644
--- a/app/helpers/pages_helper.php
+++ b/app/helpers/pages_helper.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/app/helpers/tests_helper.php b/app/helpers/tests_helper.php
index 1c07e60d2..e45c1e109 100644
--- a/app/helpers/tests_helper.php
+++ b/app/helpers/tests_helper.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : Rapid Development Framework <http://www.cakephp.org/>  + //
 // + Copyright: (c) 2005, Cake Authors/Developers                     + //
 // +------------------------------------------------------------------+ //
 // + Licensed under The MIT License                                   + //
diff --git a/app/views/tests/test_all.thtml b/app/views/tests/test_all.thtml
index 273e3a2ee..ac03dc2d7 100644
--- a/app/views/tests/test_all.thtml
+++ b/app/views/tests/test_all.thtml
@@ -1,30 +1,30 @@
 <?php /* if ($success) { ?>
 <p class="box" id="ok"><b>PASSED</b></p>
-<?PHP } else { ?>
+<?php } else { ?>
 <p class="box" id="error"><b>FAILED</b></p>
-<?PHP } ?>
+<?php } ?>
 
 <table>
-<?PHP foreach ($results as $r) {
+<?php foreach ($results as $r) {
 $performed = $r['result']['tests'];
 if ($performed||1) {
 ?>
 <tr><th><b><?=$r['name']?></b> <?=$performed?> test<?=$performed==1?'':'s'?></th></tr>
-<?PHP if ($r['result']['tests']) {
+<?php if ($r['result']['tests']) {
 foreach ($r['result']['details'] as $detail) {
 if ($detail['failed']) { ?>
 <tr class="fail"><td><?=$r['name']?>::<?=$detail['method']?></td></tr>
-<?PHP foreach ($detail['errors'] as $error) { ?>
+<?php foreach ($detail['errors'] as $error) { ?>
 <tr class="info"><td>
 <span class="ok"><?=$error['expected'][0]?></span> <em><?=$error['expected'][1]?></em><br />
 <span class="not"><?=$error['actual'][0]?></span> <em><?=$error['actual'][1]?></em>
 </td></tr>
-<?PHP
+<?php
 }
 }
 else { ?>
 <tr class="pass"><td><?=$r['name']?>::<?=$detail['method']?></td></tr>
 
-<?PHP } } } } } ?>
+<?php } } } } } ?>
 </table>
 <?php */ ?>
diff --git a/config/core.php b/config/core.php
index 13b629c04..579a40c7a 100644
--- a/config/core.php
+++ b/config/core.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 bd4d1c66b..e6354f707 100644
--- a/config/database.php.default
+++ b/config/database.php.default
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 0863f9d22..cb4c1e922 100644
--- a/config/paths.php
+++ b/config/paths.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 51d85fa8c..ad915e71e 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 010eac59e..f182bee9c 100644
--- a/config/routes.php.default
+++ b/config/routes.php.default
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 02d26463a..ee72cfd6b 100644
--- a/config/tags.php
+++ b/config/tags.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 f8efc1157..60c5ca576 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +21,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @since Cake v 0.2.9
  * @version $Revision$
diff --git a/libs/bake.php b/libs/bake.php
index c8765046d..148326f68 100644
--- a/libs/bake.php
+++ b/libs/bake.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
  * @since Cake v 0.2.9
diff --git a/libs/basics.php b/libs/basics.php
index cbc469156..e9c1c65ef 100644
--- a/libs/basics.php
+++ b/libs/basics.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
  * @since Cake v 0.2.9
diff --git a/libs/cache.php b/libs/cache.php
index f4f4f0d15..67ab26330 100644
--- a/libs/cache.php
+++ b/libs/cache.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/controller.php b/libs/controller.php
index a7dfa94e5..da5bc11a6 100644
--- a/libs/controller.php
+++ b/libs/controller.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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>          + //
@@ -23,7 +23,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
  * @since Cake v 0.2.9
diff --git a/libs/dbo.php b/libs/dbo.php
index fc76fe9e8..18827f3bd 100644
--- a/libs/dbo.php
+++ b/libs/dbo.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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>          + //
@@ -52,7 +52,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
  * @since Cake v 0.2.9
diff --git a/libs/dbo/dbo_adodb.php b/libs/dbo/dbo_adodb.php
index 910fce5b4..4302ddee2 100644
--- a/libs/dbo/dbo_adodb.php
+++ b/libs/dbo/dbo_adodb.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/dbo/dbo_generic.php b/libs/dbo/dbo_generic.php
index 1a6148da4..4c71e43d3 100644
--- a/libs/dbo/dbo_generic.php
+++ b/libs/dbo/dbo_generic.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/dbo/dbo_mysql.php b/libs/dbo/dbo_mysql.php
index 1cb7d3f0e..e7939b32a 100644
--- a/libs/dbo/dbo_mysql.php
+++ b/libs/dbo/dbo_mysql.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/dbo/dbo_pear.php b/libs/dbo/dbo_pear.php
index 17fcbe6eb..668201660 100644
--- a/libs/dbo/dbo_pear.php
+++ b/libs/dbo/dbo_pear.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/dbo/dbo_postgres.php b/libs/dbo/dbo_postgres.php
index 4e3c09c6b..72385788f 100644
--- a/libs/dbo/dbo_postgres.php
+++ b/libs/dbo/dbo_postgres.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 1.0.0.114
diff --git a/libs/dbo/dbo_sqlite.php b/libs/dbo/dbo_sqlite.php
index 604cdaef7..1629f1aa0 100644
--- a/libs/dbo/dbo_sqlite.php
+++ b/libs/dbo/dbo_sqlite.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
  * @since Cake v 0.9.0
diff --git a/libs/dbo_factory.php b/libs/dbo_factory.php
index 5523cfb61..14c28da6b 100644
--- a/libs/dbo_factory.php
+++ b/libs/dbo_factory.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +21,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @version $Revision$
  * @modifiedby $LastChangedBy$
  * @lastmodified $Date$
diff --git a/libs/dispatcher.php b/libs/dispatcher.php
index 4419d763b..0ddb76148 100644
--- a/libs/dispatcher.php
+++ b/libs/dispatcher.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
  * @since Cake v 0.2.9
diff --git a/libs/error_messages.php b/libs/error_messages.php
index b9f857422..857eb27fd 100644
--- a/libs/error_messages.php
+++ b/libs/error_messages.php
@@ -1,8 +1,8 @@
-<?PHP 
+<?php 
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/flay.php b/libs/flay.php
index d0caa2bf0..7fabef725 100644
--- a/libs/flay.php
+++ b/libs/flay.php
@@ -1,8 +1,8 @@
-<?PHP 
+<?php 
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/folder.php b/libs/folder.php
index d020f6e1d..5f495db4b 100644
--- a/libs/folder.php
+++ b/libs/folder.php
@@ -1,8 +1,8 @@
-<?PHP 
+<?php 
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/helpers/html.php b/libs/helpers/html.php
index 0386a633d..98cc76b84 100644
--- a/libs/helpers/html.php
+++ b/libs/helpers/html.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs.helpers
  * @since Cake v 0.2.9
diff --git a/libs/inflector.php b/libs/inflector.php
index f43b80b30..341c78f76 100644
--- a/libs/inflector.php
+++ b/libs/inflector.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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>          + //
@@ -22,7 +22,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/legacy.php b/libs/legacy.php
index 28d68bd6e..5d1a8da2d 100644
--- a/libs/legacy.php
+++ b/libs/legacy.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +21,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/log.php b/libs/log.php
index 15760fffd..abfdfe0c4 100644
--- a/libs/log.php
+++ b/libs/log.php
@@ -1,8 +1,8 @@
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id $
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 1.0.0.0
diff --git a/libs/model.php b/libs/model.php
index 080fecb5d..c43cb93ae 100644
--- a/libs/model.php
+++ b/libs/model.php
@@ -1,8 +1,8 @@
-<?PHP 
+<?php 
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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>          + //
@@ -27,7 +27,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
  * @since Cake v 0.2.9
diff --git a/libs/narray.php b/libs/narray.php
index 088063327..cdb4b732b 100644
--- a/libs/narray.php
+++ b/libs/narray.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 /**
  * Class used for internal manipulation of multiarrays (arrays of arrays).
diff --git a/libs/object.php b/libs/object.php
index 1d03a514f..19ef53057 100644
--- a/libs/object.php
+++ b/libs/object.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
  * @since Cake v 0.2.9
diff --git a/libs/router.php b/libs/router.php
index a487e88d7..ba9e81947 100644
--- a/libs/router.php
+++ b/libs/router.php
@@ -1,8 +1,8 @@
-<?PHP 
+<?php 
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/template.php b/libs/template.php
index e81dd9547..588b2348a 100644
--- a/libs/template.php
+++ b/libs/template.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.libs
  * @since Cake v 0.2.9
diff --git a/libs/time.php b/libs/time.php
index 648f3c4da..c823584d3 100644
--- a/libs/time.php
+++ b/libs/time.php
@@ -1,8 +1,8 @@
-<?PHP 
+<?php 
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/validators.php b/libs/validators.php
index d428a4b69..3bf4f604b 100644
--- a/libs/validators.php
+++ b/libs/validators.php
@@ -1,8 +1,8 @@
-<?PHP 
+<?php 
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.2.9
diff --git a/libs/view.php b/libs/view.php
index 9dea33e7a..ade3bc2a9 100644
--- a/libs/view.php
+++ b/libs/view.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.libs
   * @since Cake v 0.9.1
diff --git a/public/index.php b/public/index.php
index 70c2788d9..05ad482fa 100644
--- a/public/index.php
+++ b/public/index.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @subpackage cake.public
  * @since Cake v 0.2.9
diff --git a/public/js/vendors.php b/public/js/vendors.php
index 94348e854..7f149d366 100644
--- a/public/js/vendors.php
+++ b/public/js/vendors.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
  * @filesource 
  * @author Cake Authors/Developers
  * @copyright Copyright (c) 2005, Cake Authors/Developers
- * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+ * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
  * @package cake
  * @since Cake v 0.2.9
  * @version $Revision$
diff --git a/scripts/bake.php b/scripts/bake.php
index a131538f8..db9dc4f63 100644
--- a/scripts/bake.php
+++ b/scripts/bake.php
@@ -1,9 +1,9 @@
 #!/usr/local/bin/php
-<?PHP
+<?php
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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,7 +20,7 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.scripts
   * @since Cake v 0.2.9
diff --git a/scripts/test.php b/scripts/test.php
index 8e1e98fc6..9c80834ea 100644
--- a/scripts/test.php
+++ b/scripts/test.php
@@ -2,7 +2,7 @@
 //////////////////////////////////////////////////////////////////////////
 // + $Id$
 // +------------------------------------------------------------------+ //
-// + Cake <https://developers.nextco.com/cake/>                       + //
+// + CakePHP : 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 @@
   * @filesource 
   * @author Cake Authors/Developers
   * @copyright Copyright (c) 2005, Cake Authors/Developers
-  * @link https://developers.nextco.com/cake/wiki/Authors Authors/Developers
+  * @link https://trac.cakephp.org/wiki/Authors Authors/Developers
   * @package cake
   * @subpackage cake.scripts
   * @since Cake v 0.2.9
diff --git a/tests/libs/controller.php b/tests/libs/controller.php
index 621414865..17e500191 100644
--- a/tests/libs/controller.php
+++ b/tests/libs/controller.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 uses('controller');
 
diff --git a/tests/libs/narray.php b/tests/libs/narray.php
index 997ecb354..512ed6bfb 100644
--- a/tests/libs/narray.php
+++ b/tests/libs/narray.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 uses('narray');
 
diff --git a/tests/libs/router.php b/tests/libs/router.php
index 6fb210386..74a20efed 100644
--- a/tests/libs/router.php
+++ b/tests/libs/router.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 
 uses ('router');