diff --git a/src/Database/Query.php b/src/Database/Query.php
index 09c2b408a0c..3de967679f4 100644
--- a/src/Database/Query.php
+++ b/src/Database/Query.php
@@ -36,7 +36,7 @@ class Query implements ExpressionInterface, IteratorAggregate
     /**
      * Connection instance to be used to execute this query.
      *
-     * @var \Cake\Database\Connection
+     * @var \Cake\Datasource\ConnectionInterface
      */
     protected $_connection;
 
@@ -124,7 +124,7 @@ class Query implements ExpressionInterface, IteratorAggregate
     /**
      * Constructor.
      *
-     * @param \Cake\Database\Connection $connection The connection
+     * @param \Cake\Datasource\ConnectionInterface $connection The connection
      * object to be used for transforming and executing this query
      */
     public function __construct($connection)
@@ -136,8 +136,8 @@ public function __construct($connection)
      * Sets the connection instance to be used for executing and transforming this query
      * When called with a null argument, it will return the current connection instance.
      *
-     * @param \Cake\Database\Connection $connection instance
-     * @return $this|\Cake\Database\Connection
+     * @param \Cake\Datasource\ConnectionInterface $connection instance
+     * @return $this|\Cake\Datasource\ConnectionInterface
      */
     public function connection($connection = null)
     {
diff --git a/src/Database/Schema/Collection.php b/src/Database/Schema/Collection.php
index 1fd20019dba..30b0f7bf95a 100644
--- a/src/Database/Schema/Collection.php
+++ b/src/Database/Schema/Collection.php
@@ -30,7 +30,7 @@ class Collection
     /**
      * Connection object
      *
-     * @var \Cake\Database\Connection
+     * @var \Cake\Datasource\ConnectionInterface
      */
     protected $_connection;
 
diff --git a/src/Datasource/ConnectionManager.php b/src/Datasource/ConnectionManager.php
index 41b6b38b792..12f7cc94b7d 100644
--- a/src/Datasource/ConnectionManager.php
+++ b/src/Datasource/ConnectionManager.php
@@ -174,7 +174,7 @@ public static function dropAlias($name)
      *
      * @param string $name The connection name.
      * @param bool $useAliases Set to false to not use aliased connections.
-     * @return \Cake\Database\Connection A connection object.
+     * @return \Cake\Datasource\ConnectionInterface A connection object.
      * @throws \Cake\Datasource\Exception\MissingDatasourceConfigException When config
      * data is missing.
      */
diff --git a/src/ORM/Query.php b/src/ORM/Query.php
index 1992b97a6a2..a56ee226336 100644
--- a/src/ORM/Query.php
+++ b/src/ORM/Query.php
@@ -110,7 +110,7 @@ class Query extends DatabaseQuery implements JsonSerializable
     /**
      * Constructor
      *
-     * @param \Cake\Database\Connection $connection The connection object
+     * @param \Cake\Datasource\ConnectionInterface $connection The connection object
      * @param \Cake\ORM\Table $table The table this query is starting on
      */
     public function __construct($connection, $table)
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
index 584f71012be..b98b8054bad 100644
--- a/src/ORM/Table.php
+++ b/src/ORM/Table.php
@@ -161,7 +161,7 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc
     /**
      * Connection instance
      *
-     * @var \Cake\Database\Connection
+     * @var \Cake\Datasource\ConnectionInterface
      */
     protected $_connection;
 
diff --git a/src/TestSuite/Fixture/FixtureManager.php b/src/TestSuite/Fixture/FixtureManager.php
index 5eccbba8b71..531e7f8cc56 100644
--- a/src/TestSuite/Fixture/FixtureManager.php
+++ b/src/TestSuite/Fixture/FixtureManager.php
@@ -339,7 +339,7 @@ public function unload($test)
      * Creates a single fixture table and loads data into it.
      *
      * @param string $name of the fixture
-     * @param \Cake\Database\Connection $db Connection instance or leave null to get a Connection from the fixture
+     * @param \Cake\Datasource\ConnectionInterface $db Connection instance or leave null to get a Connection from the fixture
      * @param bool $dropTables Whether or not tables should be dropped and re-created.
      * @return void
      * @throws \UnexpectedValueException if $name is not a previously loaded class
diff --git a/tests/TestCase/Database/Schema/MysqlSchemaTest.php b/tests/TestCase/Database/Schema/MysqlSchemaTest.php
index 2248ab50c78..6ee96017be4 100644
--- a/tests/TestCase/Database/Schema/MysqlSchemaTest.php
+++ b/tests/TestCase/Database/Schema/MysqlSchemaTest.php
@@ -184,7 +184,7 @@ public function testConvertColumn($type, $expected)
     /**
      * Helper method for testing methods.
      *
-     * @param \Cake\Database\Connection $connection
+     * @param \Cake\Datasource\ConnectionInterface $connection
      * @return void
      */
     protected function _createTables($connection)
diff --git a/tests/TestCase/Database/Schema/PostgresSchemaTest.php b/tests/TestCase/Database/Schema/PostgresSchemaTest.php
index b30daa5e40e..7d5cbf353f0 100644
--- a/tests/TestCase/Database/Schema/PostgresSchemaTest.php
+++ b/tests/TestCase/Database/Schema/PostgresSchemaTest.php
@@ -41,7 +41,7 @@ protected function _needsConnection()
     /**
      * Helper method for testing methods.
      *
-     * @param \Cake\Database\Connection $connection
+     * @param \Cake\Datasource\ConnectionInterface $connection
      * @return void
      */
     protected function _createTables($connection)