diff --git a/CHANGELOG.md b/CHANGELOG.md
index 761045997cf3b679010545209cbfe9339142d07c..c52936900ca24b4e62eacf406a460893ff36d1f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
 CHANGELOG
 =========
 
-v1.x (201x)
+v2.0.0 (2016-x)
 ---
 
+- [BC break] Aggregation name is not prefixed anymore
 
 v1.1.0 (2015-12-28)
 ---
diff --git a/src/Aggregation/AbstractAggregation.php b/src/Aggregation/AbstractAggregation.php
index 1f4a7c1a53a44bdb795d08eb915ea72699de50e9..438335eb4370e1cce167c16b27886a1eba44ae15 100644
--- a/src/Aggregation/AbstractAggregation.php
+++ b/src/Aggregation/AbstractAggregation.php
@@ -24,8 +24,6 @@ abstract class AbstractAggregation implements BuilderInterface
     use ParametersTrait;
     use NameAwareTrait;
 
-    const PREFIX = 'agg_';
-
     /**
      * @var string
      */
@@ -55,7 +53,7 @@ abstract class AbstractAggregation implements BuilderInterface
      */
     public function __construct($name)
     {
-        $this->setName(self::PREFIX.$name);
+        $this->setName($name);
     }
 
     /**
@@ -110,8 +108,8 @@ abstract class AbstractAggregation implements BuilderInterface
      */
     public function getAggregation($name)
     {
-        if ($this->aggregations && $this->aggregations->has(self::PREFIX.$name)) {
-            return $this->aggregations->get(self::PREFIX.$name);
+        if ($this->aggregations && $this->aggregations->has($name)) {
+            return $this->aggregations->get($name);
         } else {
             return null;
         }
diff --git a/src/SearchEndpoint/FilterEndpoint.php b/src/SearchEndpoint/FilterEndpoint.php
index 6b9ba4c793804376792902df1a3657c9b81b706e..17117c1f2a2e8e43a68485f17dbd3b592d29bbd6 100644
--- a/src/SearchEndpoint/FilterEndpoint.php
+++ b/src/SearchEndpoint/FilterEndpoint.php
@@ -11,7 +11,7 @@
 
 namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
+use ONGR\ElasticsearchDSL\Query\BoolQuery;
 use ONGR\ElasticsearchDSL\Query\FilteredQuery;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -51,10 +51,10 @@ class FilterEndpoint extends QueryEndpoint
     /**
      * Returns bool instance for this endpoint case.
      *
-     * @return BoolFilter
+     * @return BoolQuery
      */
     protected function getBoolInstance()
     {
-        return new BoolFilter();
+        return new BoolQuery();
     }
 }
diff --git a/tests/Aggregation/FilterAggregationTest.php b/tests/Aggregation/FilterAggregationTest.php
index 43de57d04210065994d0e6d758cd264914812e3c..94167801e076779843a4ef32f405026a8b892612 100644
--- a/tests/Aggregation/FilterAggregationTest.php
+++ b/tests/Aggregation/FilterAggregationTest.php
@@ -11,14 +11,12 @@
 
 namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
-use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\FilterAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\HistogramAggregation;
-use ONGR\ElasticsearchDSL\BuilderInterface;
-use ONGR\ElasticsearchDSL\Filter\BoolFilter;
-use ONGR\ElasticsearchDSL\Filter\MatchAllFilter;
-use ONGR\ElasticsearchDSL\Filter\MissingFilter;
 use ONGR\ElasticsearchDSL\Filter\TermFilter;
+use ONGR\ElasticsearchDSL\Query\BoolQuery;
+use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
+use ONGR\ElasticsearchDSL\Query\MissingQuery;
 
 class FilterAggregationTest extends \PHPUnit_Framework_TestCase
 {
@@ -33,7 +31,7 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
 
         // Case #0 filter aggregation.
         $aggregation = new FilterAggregation('test_agg');
-        $filter = new MatchAllFilter();
+        $filter = new MatchAllQuery();
 
         $aggregation->setFilter($filter);
 
@@ -71,9 +69,9 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
 
         // Case #2 testing bool filter.
         $aggregation = new FilterAggregation('test_agg');
-        $matchAllFilter = new MatchAllFilter();
+        $matchAllFilter = new MatchAllQuery();
         $termFilter = new TermFilter('acme', 'foo');
-        $boolFilter = new BoolFilter();
+        $boolFilter = new BoolQuery();
         $boolFilter->add($matchAllFilter);
         $boolFilter->add($termFilter);
 
@@ -138,7 +136,7 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
     {
         $aggregation = new FilterAggregation('test_agg');
 
-        $aggregation->setFilter(new MissingFilter('test'));
+        $aggregation->setFilter(new MissingQuery('test'));
         $aggregation->toArray();
     }
 
@@ -147,7 +145,7 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
      */
     public function testConstructorFilter()
     {
-        $matchAllFilter = new MatchAllFilter();
+        $matchAllFilter = new MatchAllQuery();
         $aggregation = new FilterAggregation('test', $matchAllFilter);
         $this->assertSame(
             [
diff --git a/tests/Aggregation/NestedAggregationTest.php b/tests/Aggregation/NestedAggregationTest.php
index 736ac533a945bdc87cfb593a3efdfad60f95aea4..437823fcc2ea127441de1b649a575875a14c6cbf 100644
--- a/tests/Aggregation/NestedAggregationTest.php
+++ b/tests/Aggregation/NestedAggregationTest.php
@@ -11,7 +11,6 @@
 
 namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
-use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\NestedAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\TermsAggregation;
 
@@ -26,14 +25,7 @@ class NestedAggregationTest extends \PHPUnit_Framework_TestCase
     {
         $aggregation = new NestedAggregation('test_agg');
         $aggregation->setPath('test_path');
-
-        $expectedResult = [
-            AbstractAggregation::PREFIX.'test_agg' => [
-                'nested' => ['path' => 'test_path'],
-            ],
-        ];
-
-        $this->assertEquals($expectedResult, $aggregation->toArray());
+        $aggregation->toArray();
     }
 
     /**
diff --git a/tests/Aggregation/RangeAggregationTest.php b/tests/Aggregation/RangeAggregationTest.php
index dec054e8cd5deec081918ac8ce08357fde91a72e..9ee23c16c4a18e428d61d8636fbdaede86788754 100644
--- a/tests/Aggregation/RangeAggregationTest.php
+++ b/tests/Aggregation/RangeAggregationTest.php
@@ -98,7 +98,7 @@ class RangeAggregationTest extends \PHPUnit_Framework_TestCase
                 'keyed' => false,
             ],
             'aggregations' => [
-                AbstractAggregation::PREFIX.'test_agg_2' => [
+                'test_agg_2' => [
                     'range' => [
                         'ranges' => [
                             [