diff --git a/src/Datasource/ConnectionManager.php b/src/Datasource/ConnectionManager.php
index 9d5e2c0089e..7ce1aee5a81 100644
--- a/src/Datasource/ConnectionManager.php
+++ b/src/Datasource/ConnectionManager.php
@@ -134,20 +134,20 @@ public static function parseDsn($config = null)
      *
      * You can remove aliases with ConnectionManager::dropAlias().
      *
-     * @param string $from The connection to add an alias to.
-     * @param string $to The alias to create. $from should return when loaded with get().
+     * @param string $original The connection to add an alias to.
+     * @param string $target The alias to create. Fetching $original will return $target when loaded with get().
      * @return void
      * @throws \Cake\Datasource\Exception\MissingDatasourceConfigException When aliasing a
      * connection that does not exist.
      */
-    public static function alias($from, $to)
+    public static function alias($original, $target)
     {
-        if (empty(static::$_config[$to]) && empty(static::$_config[$from])) {
+        if (empty(static::$_config[$target]) && empty(static::$_config[$original])) {
             throw new MissingDatasourceConfigException(
-                sprintf('Cannot create alias of "%s" as it does not exist.', $from)
+                sprintf('Cannot create alias of "%s" as it does not exist.', $original)
             );
         }
-        static::$_aliasMap[$to] = $from;
+        static::$_aliasMap[$target] = $original;
     }
 
     /**
diff --git a/src/TestSuite/Fixture/FixtureManager.php b/src/TestSuite/Fixture/FixtureManager.php
index d5a2c4c5b4a..644231c9416 100644
--- a/src/TestSuite/Fixture/FixtureManager.php
+++ b/src/TestSuite/Fixture/FixtureManager.php
@@ -133,7 +133,7 @@ protected function _aliasConnections()
                 continue;
             }
             if (strpos($connection, 'test_') === 0) {
-                $map[substr($connection, 5)] = $connection;
+                $map[$connection] = substr($connection, 5);
             } else {
                 $map['test_' . $connection] = $connection;
             }