diff --git a/repertory/librepertory/include/database/db_common.hpp b/repertory/librepertory/include/database/db_common.hpp
index 50b2270e..8f5fb86c 100644
--- a/repertory/librepertory/include/database/db_common.hpp
+++ b/repertory/librepertory/include/database/db_common.hpp
@@ -317,7 +317,7 @@ struct db_where_next_limit_t final {
   w_t &owner;
   w_t &parent;
 
-  using n_t = db_next_t<cn_t, op_t, w_t, db_where_next_limit_t>;
+  using n_t = db_next_limit_t<cn_t, op_t, w_t, db_where_next_limit_t>;
 
   [[nodiscard]] auto and_() -> n_t & {
     owner.actions.emplace_back(n_t{
diff --git a/repertory/repertory_test/src/database_test.cpp b/repertory/repertory_test/src/database_test.cpp
index 4a1f426b..9dcf796a 100644
--- a/repertory/repertory_test/src/database_test.cpp
+++ b/repertory/repertory_test/src/database_test.cpp
@@ -139,7 +139,7 @@ TEST_F(database_test, db_delete_where_query) {
                    .where("column1")
                    .equals("test1")
                    .and_()
-                   .column("column2")
+                   .where("column2")
                    .equals("test2");
   std::int64_t idx{};
   auto query_str = query.dump(idx);
@@ -182,7 +182,7 @@ TEST_F(database_test, db_select_where_query) {
                    .where("column1")
                    .equals("test1")
                    .and_()
-                   .column("column2")
+                   .where("column2")
                    .equals("test2");
   std::int64_t idx{};
   auto query_str = query.dump(idx);
@@ -199,7 +199,7 @@ TEST_F(database_test, db_select_columns_query) {
                    .where("column1")
                    .equals("test1")
                    .and_()
-                   .column("column2")
+                   .where("column2")
                    .equals("test2");
   std::int64_t idx{};
   auto query_str = query.dump(idx);
@@ -215,7 +215,7 @@ TEST_F(database_test, db_update_query) {
                    .where("column1")
                    .equals("test1")
                    .and_()
-                   .column("column2")
+                   .where("column2")
                    .equals("test2");
   std::int64_t idx{};
   auto query_str = query.dump(idx);