diff --git a/lib/Cake/Console/Command/Task/DbConfigTask.php b/lib/Cake/Console/Command/Task/DbConfigTask.php
index 8d992e9dd1b..0ae27fe21a6 100644
--- a/lib/Cake/Console/Command/Task/DbConfigTask.php
+++ b/lib/Cake/Console/Command/Task/DbConfigTask.php
@@ -20,7 +20,7 @@
 
 use Cake\Console\Shell;
 use Cake\Core\Configure;
-use Cake\Model\ConnectionManager;
+use Cake\Database\ConnectionManager;
 
 /**
  * Task class for creating and updating the database configuration file.
@@ -346,16 +346,15 @@ public function bake($configs) {
  * @return void
  */
 	public function getConfig() {
-		$configs = ConnectionManager::enumConnectionObjects();
+		$configs = ConnectionManager::configured();
 
-		$useDbConfig = key($configs);
+		$useDbConfig = current($configs);
 		if (!is_array($configs) || empty($configs)) {
 			return $this->execute();
 		}
-		$connections = array_keys($configs);
 
-		if (count($connections) > 1) {
-			$useDbConfig = $this->in(__d('cake_console', 'Use Database Config') . ':', $connections, $useDbConfig);
+		if (count($configs) > 1) {
+			$useDbConfig = $this->in(__d('cake_console', 'Use Database Config') . ':', $configs, $useDbConfig);
 		}
 		return $useDbConfig;
 	}
diff --git a/lib/Cake/Test/TestCase/Cache/CacheTest.php b/lib/Cake/Test/TestCase/Cache/CacheTest.php
index ac296d5db5c..202e433d3bd 100644
--- a/lib/Cake/Test/TestCase/Cache/CacheTest.php
+++ b/lib/Cake/Test/TestCase/Cache/CacheTest.php
@@ -152,6 +152,7 @@ public static function configProvider() {
 			}],
 		];
 	}
+
 /**
  * testConfig method
  *
diff --git a/lib/Cake/Test/TestCase/ORM/BufferedResultSetTest.php b/lib/Cake/Test/TestCase/ORM/BufferedResultSetTest.php
index cbda9e4cae0..566b887660d 100644
--- a/lib/Cake/Test/TestCase/ORM/BufferedResultSetTest.php
+++ b/lib/Cake/Test/TestCase/ORM/BufferedResultSetTest.php
@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\ORM;
 
 use Cake\Core\Configure;
-use Cake\Model\ConnectionManager;
+use Cake\Database\ConnectionManager;
 use Cake\ORM\BufferedResultSet;
 use Cake\ORM\Query;
 use Cake\ORM\Table;
@@ -32,7 +32,7 @@ class BufferedResultSetTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->connection = ConnectionManager::getDataSource('test');
+		$this->connection = ConnectionManager::get('test');
 		$this->table = new Table(['table' => 'articles', 'connection' => $this->connection]);
 	}
 
diff --git a/lib/Cake/Test/TestCase/ORM/QueryTest.php b/lib/Cake/Test/TestCase/ORM/QueryTest.php
index c77cfb775e7..5c4434d6de5 100644
--- a/lib/Cake/Test/TestCase/ORM/QueryTest.php
+++ b/lib/Cake/Test/TestCase/ORM/QueryTest.php
@@ -19,7 +19,7 @@
 use Cake\Core\Configure;
 use Cake\Database\Expression\OrderByExpression;
 use Cake\Database\Expression\QueryExpression;
-use Cake\Model\ConnectionManager;
+use Cake\Database\ConnectionManager;
 use Cake\ORM\Query;
 use Cake\ORM\ResultSet;
 use Cake\ORM\Table;
@@ -36,7 +36,7 @@ class QueryTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->connection = ConnectionManager::getDataSource('test');
+		$this->connection = ConnectionManager::get('test');
 		$schema = ['id' => ['type' => 'integer']];
 		$schema1 = [
 			'id' => ['type' => 'integer'],
diff --git a/lib/Cake/Test/TestCase/ORM/ResultSetTest.php b/lib/Cake/Test/TestCase/ORM/ResultSetTest.php
index 95a5c03ae2e..1a55d84b099 100644
--- a/lib/Cake/Test/TestCase/ORM/ResultSetTest.php
+++ b/lib/Cake/Test/TestCase/ORM/ResultSetTest.php
@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\ORM;
 
 use Cake\Core\Configure;
-use Cake\Model\ConnectionManager;
+use Cake\Database\ConnectionManager;
 use Cake\ORM\Query;
 use Cake\ORM\ResultSet;
 use Cake\ORM\Table;
@@ -32,7 +32,7 @@ class ResultSetTest extends TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->connection = ConnectionManager::getDataSource('test');
+		$this->connection = ConnectionManager::get('test');
 		$this->table = new Table(['table' => 'articles', 'connection' => $this->connection]);
 
 		$this->fixtureData = [
diff --git a/lib/Cake/Test/TestCase/ORM/TableTest.php b/lib/Cake/Test/TestCase/ORM/TableTest.php
index 95d18be94d7..aab8d350186 100644
--- a/lib/Cake/Test/TestCase/ORM/TableTest.php
+++ b/lib/Cake/Test/TestCase/ORM/TableTest.php
@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\ORM;
 
 use Cake\Core\Configure;
-use Cake\Model\ConnectionManager;
+use Cake\Database\ConnectionManager;
 use Cake\ORM\Table;
 
 /**
@@ -58,7 +58,7 @@ class TableTest extends \Cake\TestSuite\TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->connection = ConnectionManager::getDataSource('test');
+		$this->connection = ConnectionManager::get('test');
 	}
 
 	public function tearDown() {
diff --git a/lib/Cake/TestSuite/Fixture/FixtureManager.php b/lib/Cake/TestSuite/Fixture/FixtureManager.php
index 405adf5e921..026c3b4282a 100644
--- a/lib/Cake/TestSuite/Fixture/FixtureManager.php
+++ b/lib/Cake/TestSuite/Fixture/FixtureManager.php
@@ -232,7 +232,7 @@ public function unload(TestCase $test) {
 				$fixture = $this->_loaded[$f];
 				if (!empty($fixture->created)) {
 					foreach ($fixture->created as $ds) {
-						$db = ConnectionManager::getDataSource($ds);
+						$db = ConnectionManager::get($ds);
 						$fixture->truncate($db);
 					}
 				}
@@ -253,7 +253,7 @@ public function loadSingle($name, $db = null, $dropTables = true) {
 		if (isset($this->_fixtureMap[$name])) {
 			$fixture = $this->_fixtureMap[$name];
 			if (!$db) {
-				$db = ConnectionManager::getDataSource($fixture->connection);
+				$db = ConnectionManager::get($fixture->connection);
 			}
 			$this->_setupTable($fixture, $db, $dropTables);
 			$fixture->truncate($db);
@@ -278,7 +278,7 @@ public function shutDown() {
 		foreach ($this->_loaded as $fixture) {
 			if (!empty($fixture->created)) {
 				foreach ($fixture->created as $ds) {
-					$db = ConnectionManager::getDataSource($ds);
+					$db = ConnectionManager::get($ds);
 					$fixture->drop($db);
 				}
 			}
diff --git a/lib/Cake/TestSuite/Fixture/TestFixture.php b/lib/Cake/TestSuite/Fixture/TestFixture.php
index 48b069aa4b2..70cbd2cca5c 100644
--- a/lib/Cake/TestSuite/Fixture/TestFixture.php
+++ b/lib/Cake/TestSuite/Fixture/TestFixture.php
@@ -17,11 +17,11 @@
 
 use Cake\Core\App;
 use Cake\Database\Connection;
+use Cake\Database\ConnectionManager;
 use Cake\Database\Schema\Collection as SchemaCollection;
 use Cake\Database\Schema\Table;
 use Cake\Error;
 use Cake\Log\Log;
-use Cake\Model\ConnectionManager;
 use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
 
@@ -193,7 +193,7 @@ protected function _schemaFromImport() {
 			throw new Error\Exception(__d('cake_dev', 'Cannot import from undefined table.'));
 		}
 
-		$db = ConnectionManager::getDataSource($import['connection']);
+		$db = ConnectionManager::get($import['connection']);
 		$schemaCollection = $db->schemaCollection();
 		$table = $schemaCollection->describe($import['table']);
 		$this->_schema = $table;
diff --git a/lib/Cake/Utility/ClassRegistry.php b/lib/Cake/Utility/ClassRegistry.php
index ba1b06f61f5..e816b040c5c 100644
--- a/lib/Cake/Utility/ClassRegistry.php
+++ b/lib/Cake/Utility/ClassRegistry.php
@@ -17,7 +17,7 @@
 
 use Cake\Core\App;
 use Cake\Error;
-use Cake\Model\ConnectionManager;
+use Cake\Database\ConnectionManager;
 use Cake\Model\Model;
 
 /**
@@ -151,7 +151,7 @@ public static function init($class, $strict = false) {
 						if (isset($defaultProperties['useDbConfig'])) {
 							$useDbConfig = $defaultProperties['useDbConfig'];
 							if ($availableDs === null) {
-								$availableDs = array_keys(ConnectionManager::enumConnectionObjects());
+								$availableDs = ConnectionManager::configured();
 							}
 							if (in_array('test_' . $useDbConfig, $availableDs)) {
 								$useDbConfig = 'test_' . $useDbConfig;