diff --git a/include/orm/databasemanager.hpp b/include/orm/databasemanager.hpp
index cdfa680df..1eb3d28cb 100644
--- a/include/orm/databasemanager.hpp
+++ b/include/orm/databasemanager.hpp
@@ -134,7 +134,7 @@ namespace Query
         DatabaseConnection &connection(const QString &name = "") final;
         /*! Begin a fluent query against the database on a given connection (alias for
             the connection() method). */
-        inline DatabaseConnection &on(const QString &name);
+        inline DatabaseConnection &on(const QString &connection);
         /*! Register a connection with the manager. */
         DatabaseManager &
         addConnection(const QVariantHash &config,
@@ -172,7 +172,7 @@ namespace Query
         /*! Is the given driver name available? */
         bool isDriverAvailable(const QString &driverName) const;
         /*! Is a driver for the given connection available? */
-        bool isConnectionDriverAvailable(const QString &connectionName);
+        bool isConnectionDriverAvailable(const QString &connection);
 
         /*! Get the default connection name. */
         const QString &getDefaultConnection() const noexcept final;
@@ -336,7 +336,7 @@ namespace Query
             connection as default connection at once. */
         explicit DatabaseManager(
                 const QVariantHash &config,
-                const QString &name = Configuration::defaultConnectionName,
+                const QString &connection = Configuration::defaultConnectionName,
                 const QString &defaultConnection = Configuration::defaultConnectionName);
         /*! Private constructor to create DatabaseManager instance and set connections
             at once. */
@@ -352,7 +352,7 @@ namespace Query
 
         /*! Make the database connection instance. */
         std::unique_ptr<DatabaseConnection>
-        makeConnection(const QString &name);
+        makeConnection(const QString &connection);
 
         /*! Get the configuration for a connection. */
         QVariantHash &configuration(const QString &connection);
@@ -365,7 +365,7 @@ namespace Query
 
         /*! Refresh an underlying QSqlDatabase connection resolver on a given
             TinyORM connection. */
-        DatabaseConnection &refreshQtConnection(const QString &name);
+        DatabaseConnection &refreshQtConnection(const QString &connection);
 
         /*! Throw exception if DatabaseManager instance already exists. */
         static void checkInstance();
@@ -395,9 +395,9 @@ namespace Query
 
     /* DatabaseManager */
 
-    DatabaseConnection &DatabaseManager::on(const QString &name)
+    DatabaseConnection &DatabaseManager::on(const QString &connection)
     {
-        return connection(name);
+        return this->connection(connection);
     }
 
 } // namespace Orm
diff --git a/include/orm/db.hpp b/include/orm/db.hpp
index e205b9c98..52503e8eb 100644
--- a/include/orm/db.hpp
+++ b/include/orm/db.hpp
@@ -48,7 +48,7 @@ namespace Orm
         static DatabaseConnection &connection(const QString &name = "");
         /*! Begin a fluent query against the database on a given connection (alias for
             the connection() method). */
-        static DatabaseConnection &on(const QString &name);
+        static DatabaseConnection &on(const QString &connection);
         /*! Register a connection with the manager. */
         static DatabaseManager &
         addConnection(const QVariantHash &config,
@@ -86,7 +86,7 @@ namespace Orm
         /*! Is the given driver name available? */
         static bool isDriverAvailable(const QString &driverName);
         /*! Is a driver for the given connection available? */
-        static bool isConnectionDriverAvailable(const QString &connectionName);
+        static bool isConnectionDriverAvailable(const QString &connection);
 
         /*! Get the default connection name. */
         static const QString &getDefaultConnection();
diff --git a/src/orm/databasemanager.cpp b/src/orm/databasemanager.cpp
index 7db01f511..b7e1ada29 100644
--- a/src/orm/databasemanager.cpp
+++ b/src/orm/databasemanager.cpp
@@ -32,11 +32,11 @@ DatabaseManager::DatabaseManager(const QString &defaultConnection)
     setupDefaultReconnector();
 }
 
-DatabaseManager::DatabaseManager(const QVariantHash &config, const QString &name,
+DatabaseManager::DatabaseManager(const QVariantHash &config, const QString &connection,
                                  const QString &defaultConnection)
     : DatabaseManager(defaultConnection)
 {
-    addConnection(config, name);
+    addConnection(config, connection);
 }
 
 DatabaseManager::DatabaseManager(const ConfigurationsType &configs,
@@ -410,15 +410,15 @@ bool DatabaseManager::isDriverAvailable(const QString &driverName) const
     return QSqlDatabase::isDriverAvailable(driverName);
 }
 
-bool DatabaseManager::isConnectionDriverAvailable(const QString &connectionName)
+bool DatabaseManager::isConnectionDriverAvailable(const QString &connection)
 {
-    const auto driverName = configuration(connectionName)[driver_].value<QString>();
+    const auto driverName = configuration(connection)[driver_].value<QString>();
 
     if (!supportedDrivers().contains(driverName))
         throw Exceptions::LogicError(
                 QStringLiteral("An unsupported driver name '%1' has been defined for "
                                "the '%2' connection.")
-                .arg(driverName, connectionName));
+                .arg(driverName, connection));
 
     return QSqlDatabase::isDriverAvailable(driverName);
 }
@@ -838,13 +838,13 @@ DatabaseManager::parseConnectionName(const QString &name) const
 }
 
 std::unique_ptr<DatabaseConnection>
-DatabaseManager::makeConnection(const QString &name)
+DatabaseManager::makeConnection(const QString &connection)
 {
-    auto &config = configuration(name);
+    auto &config = configuration(connection);
 
     // FUTURE add support for extensions silverqx
 
-    return m_factory.make(config, name);
+    return m_factory.make(config, connection);
 }
 
 /* Can not be const because I'm modifying the Configuration (QVariantHash)
@@ -887,16 +887,16 @@ DatabaseManager::configure(std::unique_ptr<DatabaseConnection> &&connection) con
 }
 
 DatabaseConnection &
-DatabaseManager::refreshQtConnection(const QString &name)
+DatabaseManager::refreshQtConnection(const QString &connection)
 {
-    const auto &name_ = parseConnectionName(name);
+    const auto &connectionName = parseConnectionName(connection);
 
     /* Make OUR new connection and copy the connection resolver from this new
        connection to the current connection, this ensures that the connection
        will be again resolved/connected lazily. */
-    auto fresh = configure(makeConnection(name_));
+    auto fresh = configure(makeConnection(connectionName));
 
-    return (*m_connections)[name_]->setQtConnectionResolver(
+    return (*m_connections)[connectionName]->setQtConnectionResolver(
                 fresh->getQtConnectionResolver());
 }
 
diff --git a/src/orm/db.cpp b/src/orm/db.cpp
index e356b617c..c996fcd01 100644
--- a/src/orm/db.cpp
+++ b/src/orm/db.cpp
@@ -38,9 +38,9 @@ DatabaseConnection &DB::connection(const QString &name)
     return manager().connection(name);
 }
 
-DatabaseConnection &DB::on(const QString &name)
+DatabaseConnection &DB::on(const QString &connection)
 {
-    return manager().connection(name);
+    return manager().connection(connection);
 }
 
 DatabaseManager &
@@ -116,9 +116,9 @@ bool DB::isDriverAvailable(const QString &driverName)
     return manager().isDriverAvailable(driverName);
 }
 
-bool DB::isConnectionDriverAvailable(const QString &connectionName)
+bool DB::isConnectionDriverAvailable(const QString &connection)
 {
-    return manager().isConnectionDriverAvailable(connectionName);
+    return manager().isConnectionDriverAvailable(connection);
 }
 
 const QString &DB::getDefaultConnection()