diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Database/ConnectionManager.php
similarity index 99%
rename from lib/Cake/Model/ConnectionManager.php
rename to lib/Cake/Database/ConnectionManager.php
index 923f69f6abc..1ccd223061a 100644
--- a/lib/Cake/Model/ConnectionManager.php
+++ b/lib/Cake/Database/ConnectionManager.php
@@ -14,7 +14,7 @@
  * @since         CakePHP(tm) v 0.10.x.1402
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Model;
+namespace Cake\Database;
 
 use Cake\Core\App;
 use Cake\Core\Configure;
diff --git a/lib/Cake/Test/TestCase/Model/ConnectionManagerTest.php b/lib/Cake/Test/TestCase/Database/ConnectionManagerTest.php
similarity index 98%
rename from lib/Cake/Test/TestCase/Model/ConnectionManagerTest.php
rename to lib/Cake/Test/TestCase/Database/ConnectionManagerTest.php
index e3b8d189ebb..f5a4c4430fb 100644
--- a/lib/Cake/Test/TestCase/Model/ConnectionManagerTest.php
+++ b/lib/Cake/Test/TestCase/Database/ConnectionManagerTest.php
@@ -1,17 +1,13 @@
 <?php
 /**
- * Connection Manager tests
- *
  * PHP 5
  *
- *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.Case.Model
  * @since         CakePHP(tm) v 1.2.0.5550
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
@@ -19,13 +15,12 @@
 
 use Cake\Core\App;
 use Cake\Core\Plugin;
-use Cake\Model\ConnectionManager;
+use Cake\Database\ConnectionManager;
 use Cake\TestSuite\TestCase;
 
 /**
  * ConnectionManagerTest
  *
- * @package       Cake.Test.Case.Model
  */
 class ConnectionManagerTest extends TestCase {