diff --git a/include/matador/query/basic_schema.hpp b/include/matador/query/basic_schema.hpp
index d7c3224..75afa9a 100644
--- a/include/matador/query/basic_schema.hpp
+++ b/include/matador/query/basic_schema.hpp
@@ -87,7 +87,7 @@ public:
 
   [[nodiscard]] bool contains(const std::type_index &index) const;
 
-  void initialize_executor(sql::executor &exec) const;
+  void initialize(sql::executor &exec) const;
 
 protected:
   template<typename Type>
diff --git a/source/orm/query/basic_schema.cpp b/source/orm/query/basic_schema.cpp
index 8166a0b..0469eb9 100644
--- a/source/orm/query/basic_schema.cpp
+++ b/source/orm/query/basic_schema.cpp
@@ -86,7 +86,7 @@ bool basic_schema::contains(const std::type_index &index) const {
   return schema_nodes_.count(index) == 1;
 }
 
-void basic_schema::initialize_executor(sql::executor &exec) const {
+void basic_schema::initialize(sql::executor &exec) const {
   auto factory = std::make_shared<sql::producer_resolver_factory>();
   for (const auto &[key, producer] : resolver_producers_) {
     auto resolver = producer->produce(exec);
diff --git a/test/backends/QueryTest.cpp b/test/backends/QueryTest.cpp
index 65f2558..57fa73a 100644
--- a/test/backends/QueryTest.cpp
+++ b/test/backends/QueryTest.cpp
@@ -311,7 +311,7 @@ TEST_CASE_METHOD(QueryFixture, "Select statement with foreign key and for single
     .and_then([this] {return repo.create(db); });
   REQUIRE(result.is_ok());
 
-  repo.initialize_executor(db);
+  repo.initialize(db);
 
   REQUIRE(db.exists(AIRPLANE.table_name()));
   REQUIRE(db.exists(FLIGHT.table_name()));
@@ -538,7 +538,7 @@ TEST_CASE_METHOD(QueryFixture, "Test load entity with eager has many relation",
     .and_then([this] {return repo.create(db); });
   REQUIRE(result.is_ok());
 
-  repo.initialize_executor(db);
+  repo.initialize(db);
 
   const std::vector shipments {
     make_object<shipment>(1, "4711"),
@@ -636,7 +636,7 @@ TEST_CASE_METHOD(QueryFixture, "Test load entity with lazy has many relation", "
   } );
   REQUIRE(result.is_ok());
 
-  repo.initialize_executor(db);
+  repo.initialize(db);
 
   const std::vector authors {
     make_object<author>(1, "Michael", "Crichton", "23.10.1942", 1975, true),
@@ -718,7 +718,7 @@ TEST_CASE_METHOD(QueryFixture, "Test load entity with lazy belongs to relation",
     .and_then([this] {return repo.create(db); });
   REQUIRE(result.is_ok());
 
-  repo.initialize_executor(db);
+  repo.initialize(db);
 
   const std::vector deps {
     make_object<department>(1, "Human Resources"),
@@ -864,7 +864,7 @@ TEST_CASE_METHOD(QueryFixture, "Test load entity with eager has many to many rel
 
   REQUIRE(result.is_ok());
 
-  repo.initialize_executor(db);
+  repo.initialize(db);
 
   REQUIRE(db.exists(RECIPE.table_name()));
   REQUIRE(db.exists(INGREDIENT.table_name()));
diff --git a/test/backends/SessionInsertHasMany.cpp b/test/backends/SessionInsertHasMany.cpp
index 13c450c..ea2c424 100644
--- a/test/backends/SessionInsertHasMany.cpp
+++ b/test/backends/SessionInsertHasMany.cpp
@@ -15,7 +15,7 @@ TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation", "[
     .and_then([this] { return schema.create(db); } );
   REQUIRE(result.is_ok());
 
-  schema.initialize_executor(ses);
+  schema.initialize(ses);
 
   auto s_king = make_object<author>(1, "Steven", "King", "21.9.1947", 1956, false);
 
diff --git a/test/backends/SessionTest.cpp b/test/backends/SessionTest.cpp
index c769dab..f6e6fd5 100644
--- a/test/backends/SessionTest.cpp
+++ b/test/backends/SessionTest.cpp
@@ -66,7 +66,7 @@ TEST_CASE_METHOD(SessionFixture, "Session delete test", "[session][delete]") {
     .and_then([this] { return schema.create(db); } );
   REQUIRE(res.is_ok());
 
-  schema.initialize_executor(ses);
+  schema.initialize(ses);
 
   auto result = ses.insert(make_object<airplane>(1, "Boeing", "A380"));
   REQUIRE(result.is_ok());
@@ -165,7 +165,7 @@ TEST_CASE_METHOD(SessionFixture, "Use session to find all objects with one-to-ma
     .and_then([this] { return schema.create(db); } );
   REQUIRE(result.is_ok());
 
-  schema.initialize_executor(ses);
+  schema.initialize(ses);
   std::vector authors {
     make_object<author>(1, "Michael", "Crichton", "23.10.1942", 1975, true),
     make_object<author>( 2, "Steven", "King", "21.9.1947", 1956, false)
diff --git a/test/backends/StatementTest.cpp b/test/backends/StatementTest.cpp
index d6c16af..2ded065 100644
--- a/test/backends/StatementTest.cpp
+++ b/test/backends/StatementTest.cpp
@@ -26,7 +26,7 @@ public:
   StatementTestFixture() {
     REQUIRE(repo.attach<airplane>("airplanes")
       .and_then([this] {return repo.create(db); }));
-    repo.initialize_executor(db);
+    repo.initialize(db);
   }
 
 protected: