diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index 7c9b22086..a06650218 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -20,7 +20,7 @@
  * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package			cake
- * @subpackage		cake.cake.libs.model.dbo
+ * @subpackage		cake.cake.libs.model.datasources.dbo
  * @since			CakePHP v 0.2.9
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
@@ -39,7 +39,7 @@ vendor ('adodb' . DS . 'adodb.inc');
  * Database abstraction implementation for the AdoDB library.
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
 class DboAdodb extends DboSource {
 /**
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 33a1db10a..e82282cdb 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -20,7 +20,7 @@
  * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package			cake
- * @subpackage		cake.cake.libs.model.dbo
+ * @subpackage		cake.cake.libs.model.datasources.dbo
  * @since			CakePHP v 0.10.5.1790
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
@@ -34,7 +34,7 @@
  * Long description for class
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
 class DboMssql extends DboSource {
 /**
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/cake/libs/model/datasources/dbo/dbo_mysql.php
index 9de7167b3..df5a9d64a 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -19,7 +19,7 @@
  * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package			cake
- * @subpackage		cake.cake.libs.model.dbo
+ * @subpackage		cake.cake.libs.model.datasources.dbo
  * @since			CakePHP v 0.10.5.1790
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
@@ -33,7 +33,7 @@
  * Long description for class
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
 class DboMysql extends DboSource {
 /**
diff --git a/cake/libs/model/datasources/dbo/dbo_mysqli.php b/cake/libs/model/datasources/dbo/dbo_mysqli.php
index dc49f70f7..5ef42177c 100644
--- a/cake/libs/model/datasources/dbo/dbo_mysqli.php
+++ b/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -19,7 +19,7 @@
  * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package			cake
- * @subpackage		cake.cake.libs.model.dbo
+ * @subpackage		cake.cake.libs.model.datasources.dbo
  * @since			CakePHP v 1.1.4.2974
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
@@ -33,7 +33,7 @@
  * Long description for class
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
 class DboMysqli extends DboSource {
 /**
diff --git a/cake/libs/model/datasources/dbo/dbo_odbc.php b/cake/libs/model/datasources/dbo/dbo_odbc.php
index 524c34092..9216094e5 100644
--- a/cake/libs/model/datasources/dbo/dbo_odbc.php
+++ b/cake/libs/model/datasources/dbo/dbo_odbc.php
@@ -34,7 +34,7 @@
  * Long description for class
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
 class DboOdbc extends DboSource{
 
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index 051858b14..ff43e8223 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -19,7 +19,7 @@
  * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package			cake
- * @subpackage		cake.cake.libs.model.dbo
+ * @subpackage		cake.cake.libs.model.datasources.dbo
  * @since			CakePHP v 1.2.0.4041
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
@@ -36,7 +36,7 @@ uses('model'.DS.'datasources'.DS.'dbo_source');
  * Long description for class
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
 class DboOracle extends DboSource {
  /**
diff --git a/cake/libs/model/datasources/dbo/dbo_pear.php b/cake/libs/model/datasources/dbo/dbo_pear.php
index 55f42f004..218cdd05f 100644
--- a/cake/libs/model/datasources/dbo/dbo_pear.php
+++ b/cake/libs/model/datasources/dbo/dbo_pear.php
@@ -20,7 +20,7 @@
  * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package			cake
- * @subpackage		cake.cake.libs.model.dbo
+ * @subpackage		cake.cake.libs.model.datasources.dbo
  * @since			CakePHP v 0.2.9
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
@@ -40,9 +40,9 @@ vendor ('Pear/DB');
  * Long description for class
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
-class DBO_Pear extends DboSource{
+class DboPear extends DboSource{
 
 /**
  * PEAR::DB object with which we connect.
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index d590b315b..e3e8ef723 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -20,7 +20,7 @@
  * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package			cake
- * @subpackage		cake.cake.libs.model.dbo
+ * @subpackage		cake.cake.libs.model.datasources.dbo
  * @since			CakePHP v 0.9.1.114
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
@@ -34,7 +34,7 @@
  * Long description for class
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
 class DboPostgres extends DboSource {
 
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 9ecde77d0..a7c568f52 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -20,7 +20,7 @@
  * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package			cake
- * @subpackage		cake.cake.libs.model.dbo
+ * @subpackage		cake.cake.libs.model.datasources.dbo
  * @since			CakePHP v 0.9.0
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
@@ -33,7 +33,7 @@
  * Long description for class
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
 class DboSqlite extends DboSource {
 
diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
index 9582072ee..5a2b6c07f 100644
--- a/cake/libs/model/datasources/dbo/dbo_sybase.php
+++ b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -19,8 +19,8 @@
  * @copyright		Copyright (c) 2006, Cake Software Foundation, Inc.
  * @link				http://www.cakefoundation.org/projects/info/cakephp CakePHP Project
  * @package			cake
- * @subpackage		cake.cake.libs.model.dbo
- * @since			CakePHP v 0.10.5.1790
+ * @subpackage		cake.cake.libs.model.datasources.dbo
+ * @since			CakePHP v 1.2.0.3097
  * @version			$Revision$
  * @modifiedby		$LastChangedBy$
  * @lastmodified	$Date$
@@ -32,7 +32,7 @@
  * Long description for class
  *
  * @package		cake
- * @subpackage	cake.cake.libs.model.dbo
+ * @subpackage	cake.cake.libs.model.datasources.dbo
  */
 class DboSybase extends DboSource {
 /**