diff --git a/docs/Filter/Bool.md b/docs/Filter/Bool.md
index 51bb746b025d6a60d54667de1a5a4e3d4658afe9..a9efc2b63837ccae450311693f11047f2340be83 100644
--- a/docs/Filter/Bool.md
+++ b/docs/Filter/Bool.md
@@ -93,4 +93,4 @@ You will get this query:
 
 
 [1]: https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-bool-filter.html
-[2]: ../Query/Bool.md
\ No newline at end of file
+[2]: ../Query/Bool.md
diff --git a/docs/Filter/index.md b/docs/Filter/index.md
index 5cb432fc11dcf9b92e0dca6fa4d87960044b3755..d07b941b9774e3d0754b98f7e22fb72305eecd1b 100644
--- a/docs/Filter/index.md
+++ b/docs/Filter/index.md
@@ -1,6 +1,6 @@
 # Filter
 
-> WARNING: Filters are deprecated since 1.1 and will be removed in 2.0. Elasticsearch from 2.0 casts queries the same way as filters, so there is no reason to have both. More information in [the elasticsearch docs](https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html)
+> __WARNING:__ Filters are deprecated since 1.1 and will be removed in 2.0. Elasticsearch from 2.0 casts queries the same way as filters, so there is no reason to have both. More information in [the elasticsearch docs](https://www.elastic.co/guide/en/elasticsearch/reference/2.0/query-dsl-filters.html)
 
 Objective filter builder represents all available [Elasticsearch filters][1].
 
diff --git a/docs/HowTo/HowToSearch.md b/docs/HowTo/HowToSearch.md
index d1e95c8e18920e9cffdb37fa0d175b9b13ac72a5..e8914418c4dc853d9a6a83b328ed65a1cd1dcdc5 100644
--- a/docs/HowTo/HowToSearch.md
+++ b/docs/HowTo/HowToSearch.md
@@ -119,7 +119,7 @@ $missingFilter = new MissingFilter('disabled');
 $existsFilter = new ExistsFilter('tag');
 $search->addFilter($termFilter);
 $search->addFilter($missingFilter);
-$search->addFilter($existsFilter, BoolFilter::MUST_NOT);
+$search->addFilter($existsFilter, BoolQuery::MUST_NOT);
 ```
 
 Elasticsearch DSL will form this query:
diff --git a/src/Aggregation/FilterAggregation.php b/src/Aggregation/FilterAggregation.php
index 3e49b7d14dad8f37ee7776fe3efc0c956e74b8af..2e512baa6e30bc603fd492bc56c164763b643c1e 100644
--- a/src/Aggregation/FilterAggregation.php
+++ b/src/Aggregation/FilterAggregation.php
@@ -13,7 +13,6 @@ namespace ONGR\ElasticsearchDSL\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 use ONGR\ElasticsearchDSL\BuilderInterface;
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
 
 /**
  * Class representing FilterAggregation.
diff --git a/src/Search.php b/src/Search.php
index 828d5f3e73a5aacb9974d40e0b6c3805259d06aa..b9d9d9d49f01f142d487bd71ffec921925db1112 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -12,7 +12,6 @@
 namespace ONGR\ElasticsearchDSL;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
 use ONGR\ElasticsearchDSL\Highlight\Highlight;
 use ONGR\ElasticsearchDSL\Query\BoolQuery;
 use ONGR\ElasticsearchDSL\SearchEndpoint\AbstractSearchEndpoint;
@@ -220,7 +219,7 @@ class Search
      *
      * @return $this
      */
-    public function addFilter(BuilderInterface $filter, $boolType = BoolFilter::MUST, $key = null)
+    public function addFilter(BuilderInterface $filter, $boolType = BoolQuery::MUST, $key = null)
     {
         $this->getEndpoint(QueryEndpoint::NAME);
         $endpoint = $this->getEndpoint(FilterEndpoint::NAME);
@@ -267,7 +266,7 @@ class Search
      *
      * @return int Key of post filter.
      */
-    public function addPostFilter(BuilderInterface $filter, $boolType = BoolFilter::MUST, $key = null)
+    public function addPostFilter(BuilderInterface $filter, $boolType = BoolQuery::MUST, $key = null)
     {
         $this
             ->getEndpoint(PostFilterEndpoint::NAME)
diff --git a/src/SearchEndpoint/AggregationsEndpoint.php b/src/SearchEndpoint/AggregationsEndpoint.php
index 2f39291e9b8aeb0d6e3fc066f7c437577bb4b830..079a6a5debcd9db843af2e6d8a7fe354c60f82e8 100644
--- a/src/SearchEndpoint/AggregationsEndpoint.php
+++ b/src/SearchEndpoint/AggregationsEndpoint.php
@@ -12,7 +12,6 @@
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
-use ONGR\ElasticsearchDSL\BuilderBag;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/PostFilterEndpoint.php b/src/SearchEndpoint/PostFilterEndpoint.php
index 3fadc68ba23db967a76d0b0505527ba5aff417d1..4eff244d1bfa9a9b74c9930fe467c1d47d72c0ca 100644
--- a/src/SearchEndpoint/PostFilterEndpoint.php
+++ b/src/SearchEndpoint/PostFilterEndpoint.php
@@ -11,7 +11,6 @@
 
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/QueryEndpoint.php b/src/SearchEndpoint/QueryEndpoint.php
index 9b610b5190e13c440759438d76c0fbc743db3680..f723e92e37845cf24041e85cb84cb392223dfbdd 100644
--- a/src/SearchEndpoint/QueryEndpoint.php
+++ b/src/SearchEndpoint/QueryEndpoint.php
@@ -12,12 +12,9 @@
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 use ONGR\ElasticsearchDSL\BuilderInterface;
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
-use ONGR\ElasticsearchDSL\ParametersTrait;
 use ONGR\ElasticsearchDSL\Query\BoolQuery;
 use ONGR\ElasticsearchDSL\Query\FilteredQuery;
 use ONGR\ElasticsearchDSL\Serializer\Normalizer\OrderedNormalizerInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/SearchEndpointInterface.php b/src/SearchEndpoint/SearchEndpointInterface.php
index e899f31423657a25d46d26deba4e2ca358e18b79..9bda4082bef0154866d49c56cc97d5172ae87e5a 100644
--- a/src/SearchEndpoint/SearchEndpointInterface.php
+++ b/src/SearchEndpoint/SearchEndpointInterface.php
@@ -12,7 +12,6 @@
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 use ONGR\ElasticsearchDSL\BuilderInterface;
-use ONGR\ElasticsearchDSL\Query\BoolQuery;
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 
 /**