diff --git a/include/matador/criteria/criteria.hpp b/include/matador/criteria/abstract_criteria.hpp
similarity index 58%
rename from include/matador/criteria/criteria.hpp
rename to include/matador/criteria/abstract_criteria.hpp
index 77bb46f..21cfde0 100644
--- a/include/matador/criteria/criteria.hpp
+++ b/include/matador/criteria/abstract_criteria.hpp
@@ -7,14 +7,14 @@ namespace matador::criteria {
 
 class condition_node_visitor;
 
-class criteria {
+class abstract_criteria {
 public:
-    virtual ~criteria() = default;
+    virtual ~abstract_criteria() = default;
 
     virtual void accept(condition_node_visitor& visitor) const = 0;
 };
 
-using condition_node_ptr = std::unique_ptr<criteria>;
+using condition_node_ptr = std::unique_ptr<abstract_criteria>;
 
 }
 #endif //CRITERIA_CRITERIA_NODE_HPP
\ No newline at end of file
diff --git a/include/matador/criteria/between_criteria.hpp b/include/matador/criteria/between_criteria.hpp
index 4e7e314..7f540b0 100644
--- a/include/matador/criteria/between_criteria.hpp
+++ b/include/matador/criteria/between_criteria.hpp
@@ -2,12 +2,12 @@
 #define CRITERIA_BETWEEN_CRITERIA_NODE_HPP
 
 #include "column.hpp"
-#include "criteria.hpp"
+#include "abstract_criteria.hpp"
 #include "value.hpp"
 
 namespace matador::criteria {
 
-class between_criteria final : public criteria {
+class between_criteria final : public abstract_criteria {
 public:
     between_criteria() = delete;
     between_criteria(column column, value min, value max);
diff --git a/include/matador/criteria/binary_criteria.hpp b/include/matador/criteria/binary_criteria.hpp
index 98799ca..1f0c9b0 100644
--- a/include/matador/criteria/binary_criteria.hpp
+++ b/include/matador/criteria/binary_criteria.hpp
@@ -1,7 +1,7 @@
 #ifndef CRITERIA_BINARY_CRITERIA_NODE_HPP
 #define CRITERIA_BINARY_CRITERIA_NODE_HPP
 
-#include "matador/criteria/criteria.hpp"
+#include "matador/criteria/abstract_criteria.hpp"
 #include "matador/criteria/column.hpp"
 #include "matador/criteria/value.hpp"
 
@@ -15,7 +15,7 @@ enum class binary_operator {
     LESS_THAN_OR_EQUAL,
 };
 
-class binary_criteria final : public criteria {
+class binary_criteria final : public abstract_criteria {
 public:
     binary_criteria() = delete;
     binary_criteria( column column, binary_operator operator_, value value );
diff --git a/include/matador/criteria/collection_criteria.hpp b/include/matador/criteria/collection_criteria.hpp
index bd55c3f..346c158 100644
--- a/include/matador/criteria/collection_criteria.hpp
+++ b/include/matador/criteria/collection_criteria.hpp
@@ -2,7 +2,7 @@
 #define CRITERIA_COLLECTION_CRITERIA_NODE_HPP
 
 #include "column.hpp"
-#include "criteria.hpp"
+#include "abstract_criteria.hpp"
 #include "value.hpp"
 
 namespace matador::criteria {
@@ -11,7 +11,7 @@ enum class collection_operator {
     OUT
 };
 
-class collection_criteria final : public criteria {
+class collection_criteria final : public abstract_criteria {
 public:
     collection_criteria() = delete;
     collection_criteria(column col, collection_operator operator_, std::vector<value> values);
diff --git a/include/matador/criteria/like_criteria.hpp b/include/matador/criteria/like_criteria.hpp
index b953f0a..d6bfa38 100644
--- a/include/matador/criteria/like_criteria.hpp
+++ b/include/matador/criteria/like_criteria.hpp
@@ -2,10 +2,10 @@
 #define CRITERIA_LIKE_CRITERIA_NODE_HPP
 
 #include "column.hpp"
-#include "criteria.hpp"
+#include "abstract_criteria.hpp"
 
 namespace matador::criteria {
-class like_criteria final : public criteria {
+class like_criteria final : public abstract_criteria {
 public:
   like_criteria() = delete;
   like_criteria(column column, std::string pattern);
diff --git a/include/matador/criteria/logical_criteria.hpp b/include/matador/criteria/logical_criteria.hpp
index 1be81b5..5b09c80 100644
--- a/include/matador/criteria/logical_criteria.hpp
+++ b/include/matador/criteria/logical_criteria.hpp
@@ -1,7 +1,7 @@
 #ifndef CRITERIA_LOGICAL_CRITERIA_NODE_HPP
 #define CRITERIA_LOGICAL_CRITERIA_NODE_HPP
 
-#include "criteria.hpp"
+#include "abstract_criteria.hpp"
 
 namespace matador::criteria {
 enum class logical_operator {
@@ -9,7 +9,7 @@ enum class logical_operator {
     OR,
 };
 
-class logical_criteria final : public criteria {
+class logical_criteria final : public abstract_criteria {
 public:
     logical_criteria() = delete;
     logical_criteria(condition_node_ptr left, logical_operator op, condition_node_ptr right);
@@ -17,9 +17,9 @@ public:
     void accept(condition_node_visitor& visitor) const override;
 
 private:
-    std::unique_ptr<criteria> left_;
+    std::unique_ptr<abstract_criteria> left_;
     logical_operator op_;
-    std::unique_ptr<criteria> right_;
+    std::unique_ptr<abstract_criteria> right_;
 };
 }
 #endif //CRITERIA_LOGICAL_CRITERIA_NODE_HPP
\ No newline at end of file
diff --git a/include/matador/criteria/not_criteria.hpp b/include/matador/criteria/not_criteria.hpp
index 4587ab2..98de17b 100644
--- a/include/matador/criteria/not_criteria.hpp
+++ b/include/matador/criteria/not_criteria.hpp
@@ -1,10 +1,10 @@
 #ifndef CRITERIA_NOT_CRITERIA_NODE_HPP
 #define CRITERIA_NOT_CRITERIA_NODE_HPP
 
-#include "matador/criteria/criteria.hpp"
+#include "matador/criteria/abstract_criteria.hpp"
 
 namespace matador::criteria {
-class not_criteria final : public criteria {
+class not_criteria final : public abstract_criteria {
 public:
     not_criteria(condition_node_ptr condition);
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cbf2eed..28d479b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ SET(SOURCE
   ../include/matador/criteria/column.hpp
   ../include/matador/criteria/condition_node_visitor.hpp
   ../include/matador/criteria/condition_operators.hpp
-  ../include/matador/criteria/criteria.hpp
+  ../include/matador/criteria/abstract_criteria.hpp
   ../include/matador/criteria/like_criteria.hpp
   ../include/matador/criteria/logical_criteria.hpp
   ../include/matador/criteria/types.hpp