From 68a3265fdcdbfc672c5ae4712508cfa741d145e9 Mon Sep 17 00:00:00 2001
From: Roland Bock <rbock@eudoxos.de>
Date: Tue, 30 Jul 2024 07:27:25 +0200
Subject: [PATCH] More moves

---
 include/sqlpp11/core/basic/parameter.h               | 2 +-
 include/sqlpp11/core/clause/cte.h                    | 1 -
 include/sqlpp11/core/clause/insert.h                 | 1 -
 include/sqlpp11/core/clause/remove.h                 | 1 -
 include/sqlpp11/core/clause/select_column_list.h     | 4 ++--
 include/sqlpp11/core/clause/union.h                  | 1 -
 include/sqlpp11/core/clause/update.h                 | 1 -
 include/sqlpp11/core/clause/where.h                  | 1 -
 include/sqlpp11/core/clause/with.h                   | 1 -
 include/sqlpp11/core/{ => database}/parameter_list.h | 0
 include/sqlpp11/core/database/prepared_execute.h     | 2 +-
 include/sqlpp11/core/database/prepared_insert.h      | 2 +-
 include/sqlpp11/core/database/prepared_remove.h      | 2 +-
 include/sqlpp11/core/database/prepared_select.h      | 2 +-
 include/sqlpp11/core/database/prepared_update.h      | 2 +-
 include/sqlpp11/core/detail/type_set.h               | 2 +-
 include/sqlpp11/core/eval.h                          | 2 +-
 include/sqlpp11/core/function.h                      | 2 +-
 include/sqlpp11/core/{ => name}/alias_provider.h     | 2 +-
 include/sqlpp11/core/{ => name}/char_sequence.h      | 0
 include/sqlpp11/core/{ => name}/name_tag.h           | 0
 include/sqlpp11/core/operator/case.h                 | 2 +-
 include/sqlpp11/core/query/statement.h               | 2 +-
 include/sqlpp11/core/type_traits.h                   | 2 +-
 include/sqlpp11/sqlite3/insert_or.h                  | 2 +-
 include/sqlpp11/sqlpp11.h                            | 2 +-
 tests/core/static_asserts/AssertTables.h             | 2 +-
 tests/core/static_asserts/aggregates.cpp             | 2 +-
 tests/core/usage/Function.cpp                        | 2 +-
 tests/core/usage/Sample.h                            | 2 +-
 tests/core/usage/Select.cpp                          | 2 +-
 tests/core/usage/SelectType.cpp                      | 2 +-
 tests/core/usage/Union.cpp                           | 2 +-
 tests/core/usage/With.cpp                            | 2 +-
 tests/include/TabDepartment.h                        | 2 +-
 tests/mysql/usage/DynamicSelect.cpp                  | 2 +-
 tests/mysql/usage/MoveConstructor.cpp                | 2 +-
 tests/mysql/usage/Prepared.cpp                       | 2 +-
 tests/mysql/usage/Select.cpp                         | 2 +-
 tests/mysql/usage/Tables.h                           | 2 +-
 tests/mysql/usage/Truncated.cpp                      | 2 +-
 tests/postgresql/usage/Exceptions.cpp                | 2 +-
 tests/postgresql/usage/Tables.h                      | 2 +-
 tests/postgresql/usage/Transaction.cpp               | 2 +-
 tests/sqlite3/usage/DynamicLoadingTest.cpp           | 2 +-
 tests/sqlite3/usage/DynamicSelect.cpp                | 2 +-
 tests/sqlite3/usage/Select.cpp                       | 2 +-
 tests/sqlite3/usage/Tables.h                         | 2 +-
 tests/sqlite3/usage/Transaction.cpp                  | 2 +-
 49 files changed, 40 insertions(+), 47 deletions(-)
 rename include/sqlpp11/core/{ => database}/parameter_list.h (100%)
 rename include/sqlpp11/core/{ => name}/alias_provider.h (99%)
 rename include/sqlpp11/core/{ => name}/char_sequence.h (100%)
 rename include/sqlpp11/core/{ => name}/name_tag.h (100%)

diff --git a/include/sqlpp11/core/basic/parameter.h b/include/sqlpp11/core/basic/parameter.h
index d3263d92..203c941b 100644
--- a/include/sqlpp11/core/basic/parameter.h
+++ b/include/sqlpp11/core/basic/parameter.h
@@ -28,7 +28,7 @@
 
 #include <sqlpp11/core/operator/enable_comparison.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/detail/type_set.h>
 
 namespace sqlpp
diff --git a/include/sqlpp11/core/clause/cte.h b/include/sqlpp11/core/clause/cte.h
index a5c819a4..caa72e4d 100644
--- a/include/sqlpp11/core/clause/cte.h
+++ b/include/sqlpp11/core/clause/cte.h
@@ -28,7 +28,6 @@
 
 #include <sqlpp11/core/interpret_tuple.h>
 #include <sqlpp11/core/logic.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/query/result_row.h>
 #include <sqlpp11/core/clause/select_flags.h>
 #include <sqlpp11/core/query/statement_fwd.h>
diff --git a/include/sqlpp11/core/clause/insert.h b/include/sqlpp11/core/clause/insert.h
index 088234f5..5518fca3 100644
--- a/include/sqlpp11/core/clause/insert.h
+++ b/include/sqlpp11/core/clause/insert.h
@@ -29,7 +29,6 @@
 #include <sqlpp11/core/query/statement.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/database/prepared_insert.h>
 #include <sqlpp11/core/default_value.h>
 #include <sqlpp11/core/noop.h>
diff --git a/include/sqlpp11/core/clause/remove.h b/include/sqlpp11/core/clause/remove.h
index 5c187f55..17c87672 100644
--- a/include/sqlpp11/core/clause/remove.h
+++ b/include/sqlpp11/core/clause/remove.h
@@ -29,7 +29,6 @@
 #include <sqlpp11/core/query/statement.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/database/prepared_remove.h>
 #include <sqlpp11/core/noop.h>
 #include <sqlpp11/core/clause/from.h>
diff --git a/include/sqlpp11/core/clause/select_column_list.h b/include/sqlpp11/core/clause/select_column_list.h
index 53c1967c..93713613 100644
--- a/include/sqlpp11/core/clause/select_column_list.h
+++ b/include/sqlpp11/core/clause/select_column_list.h
@@ -205,13 +205,13 @@ namespace sqlpp
       template <typename Db, typename Composite>
       auto _prepare(Db& db, const Composite& composite) const -> prepared_select_t<Db, _statement_t, Composite>
       {
-        return {make_parameter_list_t<Composite>{}, db.prepare_select(composite)};
+        return {{}, db.prepare_select(composite)};
       }
 
       template <typename Db>
       auto _prepare(Db& db) const -> prepared_select_t<Db, _statement_t>
       {
-        return {make_parameter_list_t<_statement_t>{}, db.prepare_select(_get_statement())};
+        return {{}, db.prepare_select(_get_statement())};
       }
     };
   };
diff --git a/include/sqlpp11/core/clause/union.h b/include/sqlpp11/core/clause/union.h
index cceb832d..807ba31d 100644
--- a/include/sqlpp11/core/clause/union.h
+++ b/include/sqlpp11/core/clause/union.h
@@ -28,7 +28,6 @@
 
 #include <sqlpp11/core/interpret_tuple.h>
 #include <sqlpp11/core/logic.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/query/result_row.h>
 #include <sqlpp11/core/query/statement_fwd.h>
 #include <sqlpp11/core/type_traits.h>
diff --git a/include/sqlpp11/core/clause/update.h b/include/sqlpp11/core/clause/update.h
index 7a9bc9e1..080ed874 100644
--- a/include/sqlpp11/core/clause/update.h
+++ b/include/sqlpp11/core/clause/update.h
@@ -29,7 +29,6 @@
 #include <sqlpp11/core/query/statement.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/database/prepared_update.h>
 #include <sqlpp11/core/clause/single_table.h>
 #include <sqlpp11/core/clause/update_list.h>
diff --git a/include/sqlpp11/core/clause/where.h b/include/sqlpp11/core/clause/where.h
index 73174440..582626b8 100644
--- a/include/sqlpp11/core/clause/where.h
+++ b/include/sqlpp11/core/clause/where.h
@@ -28,7 +28,6 @@
 
 #include <sqlpp11/core/interpret_tuple.h>
 #include <sqlpp11/core/logic.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/query/statement_fwd.h>
 #include <sqlpp11/core/type_traits.h>
 #include <sqlpp11/core/unconditional.h>
diff --git a/include/sqlpp11/core/clause/with.h b/include/sqlpp11/core/clause/with.h
index 2a368954..808f29ad 100644
--- a/include/sqlpp11/core/clause/with.h
+++ b/include/sqlpp11/core/clause/with.h
@@ -31,7 +31,6 @@
 #include <sqlpp11/core/interpret_tuple.h>
 #include <sqlpp11/core/logic.h>
 #include <sqlpp11/core/no_data.h>
-#include <sqlpp11/core/parameter_list.h>
 #include <sqlpp11/core/query/policy_update.h>
 #include <sqlpp11/core/query/statement_fwd.h>
 #include <sqlpp11/core/type_traits.h>
diff --git a/include/sqlpp11/core/parameter_list.h b/include/sqlpp11/core/database/parameter_list.h
similarity index 100%
rename from include/sqlpp11/core/parameter_list.h
rename to include/sqlpp11/core/database/parameter_list.h
diff --git a/include/sqlpp11/core/database/prepared_execute.h b/include/sqlpp11/core/database/prepared_execute.h
index f8d97ed3..dea40d60 100644
--- a/include/sqlpp11/core/database/prepared_execute.h
+++ b/include/sqlpp11/core/database/prepared_execute.h
@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 
diff --git a/include/sqlpp11/core/database/prepared_insert.h b/include/sqlpp11/core/database/prepared_insert.h
index 77feec9a..7eb2c4bf 100644
--- a/include/sqlpp11/core/database/prepared_insert.h
+++ b/include/sqlpp11/core/database/prepared_insert.h
@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 
diff --git a/include/sqlpp11/core/database/prepared_remove.h b/include/sqlpp11/core/database/prepared_remove.h
index bf2e3f1f..418724ec 100644
--- a/include/sqlpp11/core/database/prepared_remove.h
+++ b/include/sqlpp11/core/database/prepared_remove.h
@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 
diff --git a/include/sqlpp11/core/database/prepared_select.h b/include/sqlpp11/core/database/prepared_select.h
index 43653ace..9ce66790 100644
--- a/include/sqlpp11/core/database/prepared_select.h
+++ b/include/sqlpp11/core/database/prepared_select.h
@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 
diff --git a/include/sqlpp11/core/database/prepared_update.h b/include/sqlpp11/core/database/prepared_update.h
index 2366f665..47cb875f 100644
--- a/include/sqlpp11/core/database/prepared_update.h
+++ b/include/sqlpp11/core/database/prepared_update.h
@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/result.h>
 #include <sqlpp11/core/type_traits.h>
 
diff --git a/include/sqlpp11/core/detail/type_set.h b/include/sqlpp11/core/detail/type_set.h
index dd6346d8..33339711 100644
--- a/include/sqlpp11/core/detail/type_set.h
+++ b/include/sqlpp11/core/detail/type_set.h
@@ -30,7 +30,7 @@
 #include <stddef.h>
 #include <sqlpp11/core/wrong.h>
 #include <sqlpp11/core/logic.h>
-#include <sqlpp11/core/name_tag.h>
+#include <sqlpp11/core/name/name_tag.h>
 
 namespace sqlpp
 {
diff --git a/include/sqlpp11/core/eval.h b/include/sqlpp11/core/eval.h
index b4f1866f..265a629e 100644
--- a/include/sqlpp11/core/eval.h
+++ b/include/sqlpp11/core/eval.h
@@ -28,7 +28,7 @@
 
 #include <sqlpp11/core/type_traits.h>
 #include <sqlpp11/core/field_spec.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/basic/verbatim.h>
 
 namespace sqlpp
diff --git a/include/sqlpp11/core/function.h b/include/sqlpp11/core/function.h
index 945357d3..39f73b3e 100644
--- a/include/sqlpp11/core/function.h
+++ b/include/sqlpp11/core/function.h
@@ -29,7 +29,7 @@
 #include <sqlpp11/core/query/dynamic.h>
 #include <sqlpp11/core/noop.h>
 #include <sqlpp11/core/basic/parameter.h>
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/aggregate_function.h>
 #include <sqlpp11/core/function/trim.h>
 #include <sqlpp11/core/operator/case.h>
diff --git a/include/sqlpp11/core/alias_provider.h b/include/sqlpp11/core/name/alias_provider.h
similarity index 99%
rename from include/sqlpp11/core/alias_provider.h
rename to include/sqlpp11/core/name/alias_provider.h
index bff6d75d..5386a787 100644
--- a/include/sqlpp11/core/alias_provider.h
+++ b/include/sqlpp11/core/name/alias_provider.h
@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 #include <sqlpp11/core/type_traits.h>
 
 #define SQLPP_ALIAS_PROVIDER(name)                                           \
diff --git a/include/sqlpp11/core/char_sequence.h b/include/sqlpp11/core/name/char_sequence.h
similarity index 100%
rename from include/sqlpp11/core/char_sequence.h
rename to include/sqlpp11/core/name/char_sequence.h
diff --git a/include/sqlpp11/core/name_tag.h b/include/sqlpp11/core/name/name_tag.h
similarity index 100%
rename from include/sqlpp11/core/name_tag.h
rename to include/sqlpp11/core/name/name_tag.h
diff --git a/include/sqlpp11/core/operator/case.h b/include/sqlpp11/core/operator/case.h
index 37b8b744..d4eaccaa 100644
--- a/include/sqlpp11/core/operator/case.h
+++ b/include/sqlpp11/core/operator/case.h
@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 #include <sqlpp11/core/detail/type_set.h>
 #include <sqlpp11/core/type_traits.h>
 
diff --git a/include/sqlpp11/core/query/statement.h b/include/sqlpp11/core/query/statement.h
index e5ec7682..217f179d 100644
--- a/include/sqlpp11/core/query/statement.h
+++ b/include/sqlpp11/core/query/statement.h
@@ -27,7 +27,7 @@
  */
 
 #include <sqlpp11/core/noop.h>
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/query/policy_update.h>
 #include <sqlpp11/core/database/prepared_select.h>
 #include <sqlpp11/core/result.h>
diff --git a/include/sqlpp11/core/type_traits.h b/include/sqlpp11/core/type_traits.h
index dcd2920a..726bc815 100644
--- a/include/sqlpp11/core/type_traits.h
+++ b/include/sqlpp11/core/type_traits.h
@@ -33,7 +33,7 @@
 #include <vector>
 
 #include <sqlpp11/core/chrono.h>
-#include <sqlpp11/core/name_tag.h>
+#include <sqlpp11/core/name/name_tag.h>
 #include <sqlpp11/core/compat/optional.h>
 #include <sqlpp11/core/compat/string_view.h>
 #include <sqlpp11/core/compat/type_traits.h>
diff --git a/include/sqlpp11/sqlite3/insert_or.h b/include/sqlpp11/sqlite3/insert_or.h
index 35f3ccb9..2e8a1cca 100644
--- a/include/sqlpp11/sqlite3/insert_or.h
+++ b/include/sqlpp11/sqlite3/insert_or.h
@@ -30,7 +30,7 @@
 #include <sqlpp11/core/clause/insert_value_list.h>
 #include <sqlpp11/core/clause/into.h>
 #include <sqlpp11/core/noop.h>
-#include <sqlpp11/core/parameter_list.h>
+#include <sqlpp11/core/database/parameter_list.h>
 #include <sqlpp11/core/database/prepared_insert.h>
 #include <sqlpp11/core/query/statement.h>
 #include <sqlpp11/core/type_traits.h>
diff --git a/include/sqlpp11/sqlpp11.h b/include/sqlpp11/sqlpp11.h
index 24d3b99d..1964fb40 100644
--- a/include/sqlpp11/sqlpp11.h
+++ b/include/sqlpp11/sqlpp11.h
@@ -26,7 +26,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/core/clause/remove.h>
 #include <sqlpp11/core/clause/update.h>
diff --git a/tests/core/static_asserts/AssertTables.h b/tests/core/static_asserts/AssertTables.h
index 79f82d45..2f7b8ac4 100644
--- a/tests/core/static_asserts/AssertTables.h
+++ b/tests/core/static_asserts/AssertTables.h
@@ -4,7 +4,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {
diff --git a/tests/core/static_asserts/aggregates.cpp b/tests/core/static_asserts/aggregates.cpp
index d2732cf3..bbbfcd3e 100644
--- a/tests/core/static_asserts/aggregates.cpp
+++ b/tests/core/static_asserts/aggregates.cpp
@@ -26,7 +26,7 @@
 #include "MockDb.h"
 #include "Sample.h"
 #include <iostream>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/select.h>
diff --git a/tests/core/usage/Function.cpp b/tests/core/usage/Function.cpp
index aea5d5bd..ff0a9c1e 100644
--- a/tests/core/usage/Function.cpp
+++ b/tests/core/usage/Function.cpp
@@ -26,7 +26,7 @@
 #include "Sample.h"
 #include "MockDb.h"
 #include <sqlpp11/auto_alias.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/clause/select.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/database/connection.h>
diff --git a/tests/core/usage/Sample.h b/tests/core/usage/Sample.h
index a037129a..80054ed0 100644
--- a/tests/core/usage/Sample.h
+++ b/tests/core/usage/Sample.h
@@ -5,7 +5,7 @@
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/core/basic/table_columns.h>
 #include <sqlpp11/core/type_traits.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {
diff --git a/tests/core/usage/Select.cpp b/tests/core/usage/Select.cpp
index 9a35fdb1..8a52d269 100644
--- a/tests/core/usage/Select.cpp
+++ b/tests/core/usage/Select.cpp
@@ -28,7 +28,7 @@
 #include "is_regular.h"
 #include <algorithm>
 #include <iostream>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/select.h>
diff --git a/tests/core/usage/SelectType.cpp b/tests/core/usage/SelectType.cpp
index 3f3c1b27..56eaaacc 100644
--- a/tests/core/usage/SelectType.cpp
+++ b/tests/core/usage/SelectType.cpp
@@ -26,7 +26,7 @@
 #include "MockDb.h"
 #include "Sample.h"
 #include <iostream>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/database/connection.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/select.h>
diff --git a/tests/core/usage/Union.cpp b/tests/core/usage/Union.cpp
index ec018932..82a64f25 100644
--- a/tests/core/usage/Union.cpp
+++ b/tests/core/usage/Union.cpp
@@ -26,7 +26,7 @@
 #include "Sample.h"
 #include "MockDb.h"
 #include <sqlpp11/core/clause/select.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <iostream>
 
 namespace greek
diff --git a/tests/core/usage/With.cpp b/tests/core/usage/With.cpp
index 0be4bc7c..03530e7e 100644
--- a/tests/core/usage/With.cpp
+++ b/tests/core/usage/With.cpp
@@ -26,7 +26,7 @@
 #include "Sample.h"
 #include "MockDb.h"
 #include <sqlpp11/core/clause/select.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <iostream>
 #include "../../include/test_helpers.h"
 
diff --git a/tests/include/TabDepartment.h b/tests/include/TabDepartment.h
index f155d560..778546bb 100644
--- a/tests/include/TabDepartment.h
+++ b/tests/include/TabDepartment.h
@@ -2,7 +2,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace model
 {
diff --git a/tests/mysql/usage/DynamicSelect.cpp b/tests/mysql/usage/DynamicSelect.cpp
index 518c86b3..59ff3289 100644
--- a/tests/mysql/usage/DynamicSelect.cpp
+++ b/tests/mysql/usage/DynamicSelect.cpp
@@ -25,7 +25,7 @@
 
 #include "make_test_connection.h"
 #include "Tables.h"
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>
diff --git a/tests/mysql/usage/MoveConstructor.cpp b/tests/mysql/usage/MoveConstructor.cpp
index b6c7c873..0e8da7a2 100644
--- a/tests/mysql/usage/MoveConstructor.cpp
+++ b/tests/mysql/usage/MoveConstructor.cpp
@@ -25,7 +25,7 @@
 
 #include "make_test_connection.h"
 #include "Tables.h"
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>
diff --git a/tests/mysql/usage/Prepared.cpp b/tests/mysql/usage/Prepared.cpp
index 1d8c1de2..a185b29d 100644
--- a/tests/mysql/usage/Prepared.cpp
+++ b/tests/mysql/usage/Prepared.cpp
@@ -26,7 +26,7 @@
 #include "make_test_connection.h"
 #include "Tables.h"
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>
diff --git a/tests/mysql/usage/Select.cpp b/tests/mysql/usage/Select.cpp
index 23be5591..1f3e9eea 100644
--- a/tests/mysql/usage/Select.cpp
+++ b/tests/mysql/usage/Select.cpp
@@ -26,7 +26,7 @@
 #include "make_test_connection.h"
 #include "Tables.h"
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>
diff --git a/tests/mysql/usage/Tables.h b/tests/mysql/usage/Tables.h
index 5f804d1c..1fb5b99d 100644
--- a/tests/mysql/usage/Tables.h
+++ b/tests/mysql/usage/Tables.h
@@ -4,7 +4,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {
diff --git a/tests/mysql/usage/Truncated.cpp b/tests/mysql/usage/Truncated.cpp
index f733f827..967108e7 100644
--- a/tests/mysql/usage/Truncated.cpp
+++ b/tests/mysql/usage/Truncated.cpp
@@ -26,7 +26,7 @@
 #include "make_test_connection.h"
 #include "Tables.h"
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/mysql/database/connection.h>
diff --git a/tests/postgresql/usage/Exceptions.cpp b/tests/postgresql/usage/Exceptions.cpp
index d90ff73f..fa2cf6d5 100644
--- a/tests/postgresql/usage/Exceptions.cpp
+++ b/tests/postgresql/usage/Exceptions.cpp
@@ -27,7 +27,7 @@
 #include <sqlpp11/core/query/query/custom_query.h>
 #include <sqlpp11/postgresql/postgresql.h>
 #include <sqlpp11/core/basic/verbatim.h>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 
 #include "assertThrow.h"
 
diff --git a/tests/postgresql/usage/Tables.h b/tests/postgresql/usage/Tables.h
index 37aaf79e..4c1c4511 100644
--- a/tests/postgresql/usage/Tables.h
+++ b/tests/postgresql/usage/Tables.h
@@ -4,7 +4,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {
diff --git a/tests/postgresql/usage/Transaction.cpp b/tests/postgresql/usage/Transaction.cpp
index 31a189ff..ecd81ca4 100644
--- a/tests/postgresql/usage/Transaction.cpp
+++ b/tests/postgresql/usage/Transaction.cpp
@@ -27,7 +27,7 @@
 #include <memory>
 #include <stdexcept>
 
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/query/query/custom_query.h>
 #include <sqlpp11/postgresql/database/connection.h>
 #include <sqlpp11/sqlpp11.h>
diff --git a/tests/sqlite3/usage/DynamicLoadingTest.cpp b/tests/sqlite3/usage/DynamicLoadingTest.cpp
index 818241a7..2a5170cf 100644
--- a/tests/sqlite3/usage/DynamicLoadingTest.cpp
+++ b/tests/sqlite3/usage/DynamicLoadingTest.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "TabSample.h"
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/core/clause/remove.h>
diff --git a/tests/sqlite3/usage/DynamicSelect.cpp b/tests/sqlite3/usage/DynamicSelect.cpp
index a1a858f8..cfac53e3 100644
--- a/tests/sqlite3/usage/DynamicSelect.cpp
+++ b/tests/sqlite3/usage/DynamicSelect.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "Tables.h"
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/core/clause/remove.h>
diff --git a/tests/sqlite3/usage/Select.cpp b/tests/sqlite3/usage/Select.cpp
index f4479738..f4236900 100644
--- a/tests/sqlite3/usage/Select.cpp
+++ b/tests/sqlite3/usage/Select.cpp
@@ -26,7 +26,7 @@
 
 #include "Tables.h"
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>
 #include <sqlpp11/core/clause/remove.h>
diff --git a/tests/sqlite3/usage/Tables.h b/tests/sqlite3/usage/Tables.h
index 687ccfe9..e265e77f 100644
--- a/tests/sqlite3/usage/Tables.h
+++ b/tests/sqlite3/usage/Tables.h
@@ -4,7 +4,7 @@
 
 #include <sqlpp11/core/basic/table.h>
 #include <sqlpp11/data_types.h>
-#include <sqlpp11/core/char_sequence.h>
+#include <sqlpp11/core/name/char_sequence.h>
 
 namespace test
 {
diff --git a/tests/sqlite3/usage/Transaction.cpp b/tests/sqlite3/usage/Transaction.cpp
index 393ce48e..14ef8ed1 100644
--- a/tests/sqlite3/usage/Transaction.cpp
+++ b/tests/sqlite3/usage/Transaction.cpp
@@ -24,7 +24,7 @@
  */
 
 #include <cassert>
-#include <sqlpp11/core/alias_provider.h>
+#include <sqlpp11/core/name/alias_provider.h>
 #include <sqlpp11/core/query/query/custom_query.h>
 #include <sqlpp11/functions.h>
 #include <sqlpp11/core/clause/insert.h>