diff --git a/tests/Aggregation/CardinalityAggregationTest.php b/tests/Aggregation/CardinalityAggregationTest.php
index 75b9d19b53f5a8c5887eb2ecfbb25d3dd607cf61..607948f2fb9ddfab25484333be0fd8979a4cc370 100644
--- a/tests/Aggregation/CardinalityAggregationTest.php
+++ b/tests/Aggregation/CardinalityAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\CardinalityAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\CardinalityAggregation;
 
 /**
  * Unit test for cardinality aggregation.
diff --git a/tests/Aggregation/ChildrenAggregationTest.php b/tests/Aggregation/ChildrenAggregationTest.php
index 11e4446099eb0c48fb110edcc80205535cb1d9bc..ceb7e3d065d256e551f44b52fa4d90677a3d2ae6 100644
--- a/tests/Aggregation/ChildrenAggregationTest.php
+++ b/tests/Aggregation/ChildrenAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\ChildrenAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\ChildrenAggregation;
 
 /**
  * Unit test for children aggregation.
@@ -44,7 +44,7 @@ class ChildrenAggregationTest extends \PHPUnit_Framework_TestCase
      */
     public function testChildrenAggregationGetArray()
     {
-        $mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Aggregation\AbstractAggregation')
+        $mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation')
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $aggregation = new ChildrenAggregation('foo');
diff --git a/tests/Aggregation/DateRangeAggregationTest.php b/tests/Aggregation/DateRangeAggregationTest.php
index f2643adaaf0d311824f8245c51fea4bc0aac5c98..45ec22675d39a8eba2f574f4a82002a849b16b8b 100644
--- a/tests/Aggregation/DateRangeAggregationTest.php
+++ b/tests/Aggregation/DateRangeAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\DateRangeAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\DateRangeAggregation;
 
 class DateRangeAggregationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Aggregation/FilterAggregationTest.php b/tests/Aggregation/FilterAggregationTest.php
index 520c18bb767def7cbbc7794d8678e3b65244f04d..385a94b8a9d2ba16bc9e92359d00b7e1ecf67ef2 100644
--- a/tests/Aggregation/FilterAggregationTest.php
+++ b/tests/Aggregation/FilterAggregationTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\FilterAggregation;
-use ONGR\ElasticsearchBundle\DSL\Filter\AndFilter;
-use ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter;
+use ONGR\ElasticsearchDSL\Aggregation\FilterAggregation;
+use ONGR\ElasticsearchDSL\Filter\AndFilter;
+use ONGR\ElasticsearchDSL\Filter\MissingFilter;
 
 class FilterAggregationTest extends \PHPUnit_Framework_TestCase
 {
@@ -29,7 +29,7 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
         // Case #0 filter aggregation.
         $aggregation = new FilterAggregation('test_agg');
 
-        $filter = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $filter = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->setMethods(['toArray', 'getType'])
             ->getMockForAbstractClass();
         $filter->expects($this->any())
@@ -60,7 +60,7 @@ class FilterAggregationTest extends \PHPUnit_Framework_TestCase
         $aggregation = new FilterAggregation('test_agg');
         $aggregation->setFilter($filter);
 
-        $aggregation2 = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Aggregation\AbstractAggregation')
+        $aggregation2 = $this->getMockBuilder('ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation')
             ->disableOriginalConstructor()
             ->setMethods(['toArray', 'getName'])
             ->getMockForAbstractClass();
diff --git a/tests/Aggregation/FiltersAggregationTest.php b/tests/Aggregation/FiltersAggregationTest.php
index 38c9cae2ab577436b14891ea8b8bdbaa27862297..4f541beecd39618d1e80df6344334882e6cbc134 100644
--- a/tests/Aggregation/FiltersAggregationTest.php
+++ b/tests/Aggregation/FiltersAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\FiltersAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\FiltersAggregation;
 
 /**
  * Unit test for filters aggregation.
@@ -26,7 +26,7 @@ class FiltersAggregationTest extends \PHPUnit_Framework_TestCase
      */
     public function testIfExceptionIsThrown()
     {
-        $mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')->getMock();
+        $mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')->getMock();
         $aggregation = new FiltersAggregation('test_agg');
         $aggregation->addFilter($mock);
     }
@@ -36,7 +36,7 @@ class FiltersAggregationTest extends \PHPUnit_Framework_TestCase
      */
     public function testFiltersAggregationGetArray()
     {
-        $mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')->getMock();
+        $mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')->getMock();
         $aggregation = new FiltersAggregation('test_agg');
         $aggregation->setAnonymous(true);
         $aggregation->addFilter($mock, 'name');
@@ -60,7 +60,7 @@ class FiltersAggregationTest extends \PHPUnit_Framework_TestCase
     public function testToArray()
     {
         $aggregation = new FiltersAggregation('test_agg');
-        $filter = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $filter = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->setMethods(['toArray', 'getType'])
             ->getMockForAbstractClass();
         $filter->expects($this->any())
diff --git a/tests/Aggregation/GeoBoundsAggregationTest.php b/tests/Aggregation/GeoBoundsAggregationTest.php
index 829f371ef59cff8252d6d1f15b44de6d737ff42a..d38aa25fd3151a5a50fee6dbed83a36526ca2e26 100644
--- a/tests/Aggregation/GeoBoundsAggregationTest.php
+++ b/tests/Aggregation/GeoBoundsAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\GeoBoundsAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\GeoBoundsAggregation;
 
 /**
  * Unit test for geo bounds aggregation.
diff --git a/tests/Aggregation/GeoDistanceAggregationTest.php b/tests/Aggregation/GeoDistanceAggregationTest.php
index 4dd3e0ece475d757f7a795f3df2257bd988adf95..0379ab08ef0c18bbf7d22c0e03b12a1cc4343d97 100644
--- a/tests/Aggregation/GeoDistanceAggregationTest.php
+++ b/tests/Aggregation/GeoDistanceAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\GeoDistanceAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\GeoDistanceAggregation;
 
 class GeoDistanceAggregationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Aggregation/GeoHashGridAggregationTest.php b/tests/Aggregation/GeoHashGridAggregationTest.php
index aac572646b759121e1621439afaa6e8b4d749e4c..489d1715d4166303ca4f447cb89327b5b7ca6975 100644
--- a/tests/Aggregation/GeoHashGridAggregationTest.php
+++ b/tests/Aggregation/GeoHashGridAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\GeoHashGridAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\GeoHashGridAggregation;
 
 /**
  * Unit test for geohash grid aggregation.
diff --git a/tests/Aggregation/GlobalAggregationTest.php b/tests/Aggregation/GlobalAggregationTest.php
index 351c27e2b932718dbad4965e40ebc8e509ba7c7d..49ae84b47b5a6f621bb33d216cf2cc5662da2719 100644
--- a/tests/Aggregation/GlobalAggregationTest.php
+++ b/tests/Aggregation/GlobalAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\GlobalAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\GlobalAggregation;
 
 class GlobalAggregationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Aggregation/Ipv4RangeAggregationTest.php b/tests/Aggregation/Ipv4RangeAggregationTest.php
index 00111227d908d76e257d57466499c7fadf3566e4..eb3a27eccdfae5c950c57f48d816c374c1be69e7 100644
--- a/tests/Aggregation/Ipv4RangeAggregationTest.php
+++ b/tests/Aggregation/Ipv4RangeAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Ipv4RangeAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\Ipv4RangeAggregation;
 
 class Ipv4RangeAggregationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Aggregation/MissingAggregationTest.php b/tests/Aggregation/MissingAggregationTest.php
index 300971ef16150a4cde2de255ed66b4900d06f951..1caae742cb3e3f1e3cfdec0cc4a085f8006b1728 100644
--- a/tests/Aggregation/MissingAggregationTest.php
+++ b/tests/Aggregation/MissingAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\MissingAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\MissingAggregation;
 
 class MissingAggregationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Aggregation/NestedAggregationTest.php b/tests/Aggregation/NestedAggregationTest.php
index 500ccb54259ac659e7c9386465ba124db08ec2ec..941060d162ea524eb178cb77b386d1fbe0d35a2b 100644
--- a/tests/Aggregation/NestedAggregationTest.php
+++ b/tests/Aggregation/NestedAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\NestedAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\NestedAggregation;
 
 class NestedAggregationTest extends \PHPUnit_Framework_TestCase
 {
@@ -40,7 +40,7 @@ class NestedAggregationTest extends \PHPUnit_Framework_TestCase
     public function testToArray()
     {
         $termMock = $this
-            ->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Aggregation\TermsAggregation')
+            ->getMockBuilder('ONGR\ElasticsearchDSL\Aggregation\TermsAggregation')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/tests/Aggregation/PercentileRanksAggregationTest.php b/tests/Aggregation/PercentileRanksAggregationTest.php
index a063b361372eb09a011d0654f1f0f8fdc183be59..5ac348596cd0e43bbfb10bdf771c720af2cc9441 100644
--- a/tests/Aggregation/PercentileRanksAggregationTest.php
+++ b/tests/Aggregation/PercentileRanksAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\PercentileRanksAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\PercentileRanksAggregation;
 
 /**
  * Percentile ranks aggregation unit tests.
diff --git a/tests/Aggregation/PercentilesAggregationTest.php b/tests/Aggregation/PercentilesAggregationTest.php
index f7d1fd7ea26eaa24818eaa5cad98a406908a8681..9ab92e4e6e4260aef7651a1b4e954abcddace258 100644
--- a/tests/Aggregation/PercentilesAggregationTest.php
+++ b/tests/Aggregation/PercentilesAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\PercentilesAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\PercentilesAggregation;
 
 class PercentilesAggregationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Aggregation/RangeAggregationTest.php b/tests/Aggregation/RangeAggregationTest.php
index fe8c317c7ecf48201d3329f3be51c25aeb4e5f61..9414ea5d368bf703172415a1f78878a102e024c8 100644
--- a/tests/Aggregation/RangeAggregationTest.php
+++ b/tests/Aggregation/RangeAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\RangeAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\RangeAggregation;
 
 class RangeAggregationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Aggregation/ReverseNestedAggregationTest.php b/tests/Aggregation/ReverseNestedAggregationTest.php
index e4e8eeef0bee080d9466b7739f15ceeeabcc18b5..2b401ec06d6b3cd31c8920440c8b42e966f2e6e1 100644
--- a/tests/Aggregation/ReverseNestedAggregationTest.php
+++ b/tests/Aggregation/ReverseNestedAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\ReverseNestedAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\ReverseNestedAggregation;
 
 class ReverseNestedAggregationTest extends \PHPUnit_Framework_TestCase
 {
@@ -40,7 +40,7 @@ class ReverseNestedAggregationTest extends \PHPUnit_Framework_TestCase
     public function testToArray()
     {
         $termMock = $this
-            ->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Aggregation\TermsAggregation')
+            ->getMockBuilder('ONGR\ElasticsearchDSL\Aggregation\TermsAggregation')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -71,7 +71,7 @@ class ReverseNestedAggregationTest extends \PHPUnit_Framework_TestCase
     public function testToArrayNoPath()
     {
         $termMock = $this
-            ->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Aggregation\TermsAggregation')
+            ->getMockBuilder('ONGR\ElasticsearchDSL\Aggregation\TermsAggregation')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/tests/Aggregation/StatsAggregationTest.php b/tests/Aggregation/StatsAggregationTest.php
index bbf0e562059ed7047bdc030cfb218c8a855e1960..621e0cfc4dbf5c243600a57846a3545e3c77c7d3 100644
--- a/tests/Aggregation/StatsAggregationTest.php
+++ b/tests/Aggregation/StatsAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\StatsAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\StatsAggregation;
 
 class StatsAggregationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Aggregation/TermsAggregationTest.php b/tests/Aggregation/TermsAggregationTest.php
index 14565d5a814bfcc3b14f37b5f7baaae869b17866..c96ebfe0d4d249873de28cb4adb62e591e70fb76 100644
--- a/tests/Aggregation/TermsAggregationTest.php
+++ b/tests/Aggregation/TermsAggregationTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\TermsAggregation;
+use ONGR\ElasticsearchDSL\Aggregation\TermsAggregation;
 
 class TermsAggregationTest extends \PHPUnit_Framework_TestCase
 {
@@ -57,7 +57,7 @@ class TermsAggregationTest extends \PHPUnit_Framework_TestCase
         // Case #2 terms aggregation with zero size.
         $aggregation = new TermsAggregation('test_agg');
         $aggregation->setField('test_field');
-        $aggregation->setSize(0);
+        $aggregation->addParameter('size', 0);
 
         $result = [
             'agg_test_agg' => [
diff --git a/tests/Aggregation/TopHitsAggregationTest.php b/tests/Aggregation/TopHitsAggregationTest.php
index 743818dcd082dee5ac088e95522591092038c958..a1975eb647aa3b80436fa30128eadda20b816ad9 100644
--- a/tests/Aggregation/TopHitsAggregationTest.php
+++ b/tests/Aggregation/TopHitsAggregationTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\TopHitsAggregation;
-use ONGR\ElasticsearchBundle\DSL\Sort\Sorts;
+use ONGR\ElasticsearchDSL\Aggregation\TopHitsAggregation;
+use ONGR\ElasticsearchDSL\Sort\Sorts;
 
 /**
  * Unit tests for top hits aggregation.
diff --git a/tests/Bool/BoolTest.php b/tests/Bool/BoolTest.php
index 492dc38fbe4acf6b07c14620fb00696eaa4d44a7..521cd7fe190b2c3049814151530f315822c5dbd9 100644
--- a/tests/Bool/BoolTest.php
+++ b/tests/Bool/BoolTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Bool\Bool;
-use ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter;
-use ONGR\ElasticsearchBundle\DSL\Filter\TermFilter;
+use ONGR\ElasticsearchDSL\Bool\Bool;
+use ONGR\ElasticsearchDSL\Filter\MissingFilter;
+use ONGR\ElasticsearchDSL\Filter\TermFilter;
 
 /**
  * Unit test for Bool.
diff --git a/tests/DslTypeAwareTraitTest.php b/tests/DslTypeAwareTraitTest.php
index 921620ea1716ab2ba98c4906c070277ed9713781..2b87d14f45f759ed4382fbb29ec36dd69e7220eb 100644
--- a/tests/DslTypeAwareTraitTest.php
+++ b/tests/DslTypeAwareTraitTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL;
 
-use ONGR\ElasticsearchBundle\DSL\DslTypeAwareTrait;
+use ONGR\ElasticsearchDSL\DslTypeAwareTrait;
 
 /**
  * Test for DslTypeAwareTrait.
@@ -28,7 +28,7 @@ class DslTypeAwareTraitTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $this->mock = $this->getMockForTrait('ONGR\ElasticsearchBundle\DSL\DslTypeAwareTrait');
+        $this->mock = $this->getMockForTrait('ONGR\ElasticsearchDSL\DslTypeAwareTrait');
     }
 
     /**
diff --git a/tests/Filter/AndFilterTest.php b/tests/Filter/AndFilterTest.php
index a7fe5153ef5bf8a659380bde47a57edd744e0938..b7c60aba1ede6fe3006124270fcf151e1ee082d5 100644
--- a/tests/Filter/AndFilterTest.php
+++ b/tests/Filter/AndFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\AndFilter;
+use ONGR\ElasticsearchDSL\Filter\AndFilter;
 
 class AndFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -32,7 +32,7 @@ class AndFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function getArrayDataProvider()
     {
-        $mockBuildeFfirstFilter = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $mockBuildeFfirstFilter = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->getMock();
         $mockBuildeFfirstFilter->expects($this->any())
             ->method('getType')
@@ -41,7 +41,7 @@ class AndFilterTest extends \PHPUnit_Framework_TestCase
             ->method('toArray')
             ->willReturn(['test_field' => ['test_value' => 'test']]);
 
-        $mockBuilderSecondFilter = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $mockBuilderSecondFilter = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->getMock();
         $mockBuilderSecondFilter->expects($this->any())
             ->method('getType')
diff --git a/tests/Filter/ExistsFilterTest.php b/tests/Filter/ExistsFilterTest.php
index 69f85ba43808794381ad09ce0d1e22f1d2837ec6..76524c6d3bad61ee5fa095663df7d7a7842b3e23 100644
--- a/tests/Filter/ExistsFilterTest.php
+++ b/tests/Filter/ExistsFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\ExistsFilter;
+use ONGR\ElasticsearchDSL\Filter\ExistsFilter;
 
 /**
  * Unit test for ExistsFilter.
diff --git a/tests/Filter/GeoBoundingBoxFilterTest.php b/tests/Filter/GeoBoundingBoxFilterTest.php
index e5164c2b791a3177bf32316fdf9b9bda276cd08c..6ab76b7d56aa4086980d186ed6794b2ef665da8a 100644
--- a/tests/Filter/GeoBoundingBoxFilterTest.php
+++ b/tests/Filter/GeoBoundingBoxFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\GeoBoundingBoxFilter;
+use ONGR\ElasticsearchDSL\Filter\GeoBoundingBoxFilter;
 
 class GeoBoundingBoxFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/GeoDistanceFilterTest.php b/tests/Filter/GeoDistanceFilterTest.php
index f506159c1294fb0dd0a6b1d46dbe838d87e972e4..888ccbc94983294266c96744bad7c14073e068e2 100644
--- a/tests/Filter/GeoDistanceFilterTest.php
+++ b/tests/Filter/GeoDistanceFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\GeoDistanceFilter;
+use ONGR\ElasticsearchDSL\Filter\GeoDistanceFilter;
 
 class GeoDistanceFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/GeoDistanceRangeFilterTest.php b/tests/Filter/GeoDistanceRangeFilterTest.php
index a90c7c703a5cf75ee6e3bcf964cb899458e50109..206d9d1434b2986fb4ab6e8d76065252fa9e7b78 100644
--- a/tests/Filter/GeoDistanceRangeFilterTest.php
+++ b/tests/Filter/GeoDistanceRangeFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\GeoDistanceRangeFilter;
+use ONGR\ElasticsearchDSL\Filter\GeoDistanceRangeFilter;
 
 class GeoDistanceRangeFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/GeoPolygonFilterTest.php b/tests/Filter/GeoPolygonFilterTest.php
index f24e1c1c058aea632e384dca8ee4342416c07833..bc0e8d5644d7921d1ea53bfa1d636403e83055fc 100644
--- a/tests/Filter/GeoPolygonFilterTest.php
+++ b/tests/Filter/GeoPolygonFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\GeoPolygonFilter;
+use ONGR\ElasticsearchDSL\Filter\GeoPolygonFilter;
 
 class GeoPolygonFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/HasChildFilterTest.php b/tests/Filter/HasChildFilterTest.php
index a4001c37da117141b35d578317189f8fe602eb55..bfce34420a7ca65bc3f4bb8783c89bc45d05e9a5 100644
--- a/tests/Filter/HasChildFilterTest.php
+++ b/tests/Filter/HasChildFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\HasChildFilter;
+use ONGR\ElasticsearchDSL\Filter\HasChildFilter;
 
 class HasChildFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +20,7 @@ class HasChildFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetType()
     {
-        $mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')->getMock();
+        $mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')->getMock();
         $filter = new HasChildFilter('test_field', $mock);
         $result = $filter->getType();
         $this->assertEquals('has_child', $result);
@@ -69,7 +69,7 @@ class HasChildFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testToArray($type, $queryType, $queryToArray, $parameters, $dslType, $expected)
     {
-        $mockQuery = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')->getMock();
+        $mockQuery = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')->getMock();
         $mockQuery->expects($this->once())
             ->method('getType')
             ->will($this->returnValue($queryType));
diff --git a/tests/Filter/HasParentFilterTest.php b/tests/Filter/HasParentFilterTest.php
index 6f6c9031594bfd1f4d0df423620ffff00ac4350c..b08ed84b2f261c413fa63094563cd66cd0e3a548 100644
--- a/tests/Filter/HasParentFilterTest.php
+++ b/tests/Filter/HasParentFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\HasParentFilter;
+use ONGR\ElasticsearchDSL\Filter\HasParentFilter;
 
 class HasParentFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +20,7 @@ class HasParentFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testGetType()
     {
-        $mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')->getMock();
+        $mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')->getMock();
         $filter = new HasParentFilter('test_field', $mock);
         $result = $filter->getType();
         $this->assertEquals('has_parent', $result);
@@ -69,7 +69,7 @@ class HasParentFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testToArray($parentType, $queryType, $queryToArray, $parameters, $dslType, $expected)
     {
-        $mockQuery = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')->getMock();
+        $mockQuery = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')->getMock();
         $mockQuery->expects($this->once())
             ->method('getType')
             ->will($this->returnValue($queryType));
diff --git a/tests/Filter/IdsFilterTest.php b/tests/Filter/IdsFilterTest.php
index e30a272f2eff9051480f4a5bd867e7e8c14a9ae6..ca68d4320b6951981bd719bc156c1088b2d60590 100644
--- a/tests/Filter/IdsFilterTest.php
+++ b/tests/Filter/IdsFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\IdsFilter;
+use ONGR\ElasticsearchDSL\Filter\IdsFilter;
 
 class IdsFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/IndicesFilterTest.php b/tests/Filter/IndicesFilterTest.php
index 503496345864244681f2d66966fefb4bd82afb35..3afbffa3c5f20cd0356b2c1e2b2da3a0d6673b04 100644
--- a/tests/Filter/IndicesFilterTest.php
+++ b/tests/Filter/IndicesFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\IndicesFilter;
+use ONGR\ElasticsearchDSL\Filter\IndicesFilter;
 
 class IndicesFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -94,7 +94,7 @@ class IndicesFilterTest extends \PHPUnit_Framework_TestCase
      */
     private function indicesQtyMockBuilder(array $param = [])
     {
-        $mockBuilder = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $mockBuilder = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->getMock();
         $mockBuilder->expects($this->any())
             ->method('getType')
diff --git a/tests/Filter/LimitFilterTest.php b/tests/Filter/LimitFilterTest.php
index 9d33e70eb8dad205ef20a4ba0cb8baaf4cdbd50f..d60caf751ed26b2612825333d57713007394c14c 100644
--- a/tests/Filter/LimitFilterTest.php
+++ b/tests/Filter/LimitFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\LimitFilter;
+use ONGR\ElasticsearchDSL\Filter\LimitFilter;
 
 class LimitFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/MatchAllFilterTest.php b/tests/Filter/MatchAllFilterTest.php
index 5e75aae76853b2a8414215479089d33e96fe559f..b1ff37f5023d000cb60d717577f3d89a5f62a914 100644
--- a/tests/Filter/MatchAllFilterTest.php
+++ b/tests/Filter/MatchAllFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\MatchAllFilter;
+use ONGR\ElasticsearchDSL\Filter\MatchAllFilter;
 
 class MatchAllFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/MissingFilterTest.php b/tests/Filter/MissingFilterTest.php
index c11fced3b4c464f1e2362fb223f6fe4d63b3e8c6..65534a2a38ad3ea65f9dc2340991be82dff4f546 100644
--- a/tests/Filter/MissingFilterTest.php
+++ b/tests/Filter/MissingFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter;
+use ONGR\ElasticsearchDSL\Filter\MissingFilter;
 
 class MissingFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/NestedFilterTest.php b/tests/Filter/NestedFilterTest.php
index 1e27ad8d36aab01acc13e1a3f84b2b4580f0bcd8..b201973e24ae0cf3d107eb73ed4a44b56a610c4b 100644
--- a/tests/Filter/NestedFilterTest.php
+++ b/tests/Filter/NestedFilterTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\NestedFilter;
-use ONGR\ElasticsearchBundle\DSL\Filter\TermFilter;
-use ONGR\ElasticsearchBundle\DSL\Filter\TermsFilter;
+use ONGR\ElasticsearchDSL\Filter\NestedFilter;
+use ONGR\ElasticsearchDSL\Filter\TermFilter;
+use ONGR\ElasticsearchDSL\Filter\TermsFilter;
 
 class NestedFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/NotFilterTest.php b/tests/Filter/NotFilterTest.php
index 211bba186681125151e5d67095a963f46ad34fed..409408c366e6acb994da31df596e1228ee05379f 100644
--- a/tests/Filter/NotFilterTest.php
+++ b/tests/Filter/NotFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\NotFilter;
+use ONGR\ElasticsearchDSL\Filter\NotFilter;
 
 class NotFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -31,7 +31,7 @@ class NotFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function getArrayDataProvider()
     {
-        $mockBuilder = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $mockBuilder = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->getMock();
         $mockBuilder->expects($this->any())
             ->method('getType')
diff --git a/tests/Filter/OrFilterTest.php b/tests/Filter/OrFilterTest.php
index 4e6e5fc9b64015c4af5c3b8152105676923c7e55..77c43a1194c8aa61d9b33190128ea72e6dcb79a0 100644
--- a/tests/Filter/OrFilterTest.php
+++ b/tests/Filter/OrFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\OrFilter;
+use ONGR\ElasticsearchDSL\Filter\OrFilter;
 
 class OrFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -32,7 +32,7 @@ class OrFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function getArrayDataProvider()
     {
-        $mockBuilderFirstFilter = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $mockBuilderFirstFilter = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->getMock();
         $mockBuilderFirstFilter->expects($this->any())
             ->method('getType')
@@ -41,7 +41,7 @@ class OrFilterTest extends \PHPUnit_Framework_TestCase
             ->method('toArray')
             ->willReturn(['test_field' => ['test_value' => 'test']]);
 
-        $mockBuilderSecondFilter = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $mockBuilderSecondFilter = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->getMock();
         $mockBuilderSecondFilter->expects($this->any())
             ->method('getType')
diff --git a/tests/Filter/PostFilterTest.php b/tests/Filter/PostFilterTest.php
index 9b60ff1e15c3fa6622589057b00f81f3a473bf3d..ecc354d26b649e9e85d1b347338b4e22c056c62b 100644
--- a/tests/Filter/PostFilterTest.php
+++ b/tests/Filter/PostFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\PostFilter;
+use ONGR\ElasticsearchDSL\Filter\PostFilter;
 
 class PostFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -38,7 +38,7 @@ class PostFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testAddFilter()
     {
-        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
+        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Filter\MissingFilter')
             ->disableOriginalConstructor()
             ->getMock();
         $missingFilterMock
diff --git a/tests/Filter/PrefixFilterTest.php b/tests/Filter/PrefixFilterTest.php
index afd46515cce974eba0c4add07bf309d42b8fde51..2cf76131a46936d4529c5c5823c6f187f79eb0f4 100644
--- a/tests/Filter/PrefixFilterTest.php
+++ b/tests/Filter/PrefixFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\PrefixFilter;
+use ONGR\ElasticsearchDSL\Filter\PrefixFilter;
 
 class PrefixFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/QueryFilterTest.php b/tests/Filter/QueryFilterTest.php
index 0a5909af6ab51f60ef137be0b281118e3130f2dc..71608e96565088b22b4ce5d02dfd7352ea328002 100644
--- a/tests/Filter/QueryFilterTest.php
+++ b/tests/Filter/QueryFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\QueryFilter;
+use ONGR\ElasticsearchDSL\Filter\QueryFilter;
 
 class QueryFilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +20,7 @@ class QueryFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testToArrayWithGetTypeFqueryWithCache()
     {
-        $mockBuilder = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $mockBuilder = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->getMock();
         $mockBuilder->expects($this->any())
             ->method('getType')
@@ -36,7 +36,7 @@ class QueryFilterTest extends \PHPUnit_Framework_TestCase
      */
     public function testToArrayWithGetTypeQueryWithoutCache()
     {
-        $mockBuilder = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\BuilderInterface')
+        $mockBuilder = $this->getMockBuilder('ONGR\ElasticsearchDSL\BuilderInterface')
             ->getMock();
         $mockBuilder->expects($this->any())
             ->method('getType')
diff --git a/tests/Filter/RangeFilterTest.php b/tests/Filter/RangeFilterTest.php
index 4214082170b9ce6a093d4063aa85f93dd5aa7373..3c6589b79331757e1f1ba550f0c7e2df80b0f1d4 100644
--- a/tests/Filter/RangeFilterTest.php
+++ b/tests/Filter/RangeFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\RangeFilter;
+use ONGR\ElasticsearchDSL\Filter\RangeFilter;
 
 class RangeFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/RegexpFilterTest.php b/tests/Filter/RegexpFilterTest.php
index b54eede9cce7ba61fa733ce2a130603f3ae0479d..d0f3e91e29b9f38956f1367c62b01c6adc666143 100644
--- a/tests/Filter/RegexpFilterTest.php
+++ b/tests/Filter/RegexpFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\RegexpFilter;
+use ONGR\ElasticsearchDSL\Filter\RegexpFilter;
 
 class RegexpFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/ScriptFilterTest.php b/tests/Filter/ScriptFilterTest.php
index bcbdf68a711b11a2dc00b8f7dd4b467d947d6635..2125fb7466b22dafeae4ab22e6210f1b0a026e01 100644
--- a/tests/Filter/ScriptFilterTest.php
+++ b/tests/Filter/ScriptFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\ScriptFilter;
+use ONGR\ElasticsearchDSL\Filter\ScriptFilter;
 
 class ScriptFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/TermFilterTest.php b/tests/Filter/TermFilterTest.php
index 11af22b3cebd9da5c2cdba3140d3edb79863f831..ec7f5f00428b2cd40edb4e3d1d4845c78a58a376 100644
--- a/tests/Filter/TermFilterTest.php
+++ b/tests/Filter/TermFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\TermFilter;
+use ONGR\ElasticsearchDSL\Filter\TermFilter;
 
 class TermFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/TermsFilterTest.php b/tests/Filter/TermsFilterTest.php
index e9f7cdf0ff6d4fe7b345e141746ebe79414abd0f..7f5a797ad060f01243c629f631ead8feb9037f57 100644
--- a/tests/Filter/TermsFilterTest.php
+++ b/tests/Filter/TermsFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\TermsFilter;
+use ONGR\ElasticsearchDSL\Filter\TermsFilter;
 
 class TermsFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Filter/TypeFilterTest.php b/tests/Filter/TypeFilterTest.php
index 99bbf0aefad40d3bd53a67b852294a28c697cb29..7ffb00caff562319ec4ddcb02e393d1a53b99fb2 100644
--- a/tests/Filter/TypeFilterTest.php
+++ b/tests/Filter/TypeFilterTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\TypeFilter;
+use ONGR\ElasticsearchDSL\Filter\TypeFilter;
 
 class TypeFilterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Highlight/FieldTest.php b/tests/Highlight/FieldTest.php
index 93c3cf961141d86b1cd7bb4cd35b86f74c3359c9..26d58983c7dab75eea5db8cb9253e467c0527815 100644
--- a/tests/Highlight/FieldTest.php
+++ b/tests/Highlight/FieldTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Highlight;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Highlight;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\TermFilter;
-use ONGR\ElasticsearchBundle\DSL\Highlight\Field;
+use ONGR\ElasticsearchDSL\Filter\TermFilter;
+use ONGR\ElasticsearchDSL\Highlight\Field;
 
 /**
  * Unit test for Field.
diff --git a/tests/Highlight/HighlightTest.php b/tests/Highlight/HighlightTest.php
index 959f970fdc2be518c63c5b69c7511c5b9a5978f4..ae3bb159545e31fd7f5549005022c7265e47de20 100644
--- a/tests/Highlight/HighlightTest.php
+++ b/tests/Highlight/HighlightTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Highlight;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Highlight;
 
-use ONGR\ElasticsearchBundle\DSL\Highlight\Field;
-use ONGR\ElasticsearchBundle\DSL\Highlight\Highlight;
+use ONGR\ElasticsearchDSL\Highlight\Field;
+use ONGR\ElasticsearchDSL\Highlight\Highlight;
 
 /**
  * Unit test for Highlight.
diff --git a/tests/NamedBuilderBagTest.php b/tests/NamedBuilderBagTest.php
index 9a0e98a737b2df611601b9dca423f31543d9c836..8dd7d9874394dd5d72df0101565319fc217c751a 100644
--- a/tests/NamedBuilderBagTest.php
+++ b/tests/NamedBuilderBagTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL;
 
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderBag;
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
+use ONGR\ElasticsearchDSL\NamedBuilderBag;
+use ONGR\ElasticsearchDSL\NamedBuilderInterface;
 
 class NamedBuilderBagTest extends \PHPUnit_Framework_TestCase
 {
@@ -87,7 +87,7 @@ class NamedBuilderBagTest extends \PHPUnit_Framework_TestCase
      */
     private function getBuilder($name)
     {
-        $friendlyBuilderMock = $this->getMock('ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface');
+        $friendlyBuilderMock = $this->getMock('ONGR\ElasticsearchDSL\NamedBuilderInterface');
 
         $friendlyBuilderMock
             ->expects($this->once())
diff --git a/tests/ParametersTraitTest.php b/tests/ParametersTraitTest.php
index 3b9507b92a2f623aac6dbadf3f6a138b66e2a9fb..e5d3c9fcdd748a3614e031454eeb92d7923da528 100644
--- a/tests/ParametersTraitTest.php
+++ b/tests/ParametersTraitTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL;
 
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Test for ParametersTrait.
@@ -28,7 +28,7 @@ class ParametersTraitTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $this->parametersTraitMock = $this->getMockForTrait('ONGR\ElasticsearchBundle\DSL\ParametersTrait');
+        $this->parametersTraitMock = $this->getMockForTrait('ONGR\ElasticsearchDSL\ParametersTrait');
     }
 
     /**
diff --git a/tests/Query/HasChildQueryTest.php b/tests/Query/HasChildQueryTest.php
index 4fe6d8293e056581e46f6550a17bc9ccee8bccc3..a2f420563a398059ea2a07712eff7c96c53b8533 100644
--- a/tests/Query/HasChildQueryTest.php
+++ b/tests/Query/HasChildQueryTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\Query\HasChildQuery;
+use ONGR\ElasticsearchDSL\Query\HasChildQuery;
 
 class HasChildQueryTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +20,7 @@ class HasChildQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testConstructor()
     {
-        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
+        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Filter\MissingFilter')
             ->setConstructorArgs(['test_field'])
             ->getMock();
         $query = new HasChildQuery('test_type', $missingFilterMock, ['test_parameter1']);
diff --git a/tests/Query/HasParentQueryTest.php b/tests/Query/HasParentQueryTest.php
index 57a8b77837150dca23efe0bdbec668d136f3c0ad..6efcef5875182a77d704f604bb229af8c86c42fb 100644
--- a/tests/Query/HasParentQueryTest.php
+++ b/tests/Query/HasParentQueryTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\Query\HasParentQuery;
+use ONGR\ElasticsearchDSL\Query\HasParentQuery;
 
 class HasParentQueryTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +20,7 @@ class HasParentQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testConstructor()
     {
-        $missingFilter = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
+        $missingFilter = $this->getMockBuilder('ONGR\ElasticsearchDSL\Filter\MissingFilter')
             ->setConstructorArgs(['test_field'])
             ->getMock();
         $query = new HasParentQuery('test_type', $missingFilter, ['test_parameter1']);
diff --git a/tests/Query/IndicesQueryTest.php b/tests/Query/IndicesQueryTest.php
index 13366530dc815857ff75b2bfa177e54a8f14a2c6..3d12065bec11f16b10aad88b7aa64a9cf2e962dd 100644
--- a/tests/Query/IndicesQueryTest.php
+++ b/tests/Query/IndicesQueryTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\Query\FilteredQuery;
-use ONGR\ElasticsearchBundle\DSL\Query\IndicesQuery;
-use ONGR\ElasticsearchBundle\Test\EncapsulationTestAwareTrait;
+use ONGR\ElasticsearchDSL\Query\FilteredQuery;
+use ONGR\ElasticsearchDSL\Query\IndicesQuery;
+use ONGR\ElasticsearchDSL\Test\EncapsulationTestAwareTrait;
 
 class IndicesQueryTest extends \PHPUnit_Framework_TestCase
 {
@@ -24,7 +24,7 @@ class IndicesQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function getArrayWithManyIndicesDataProvider()
     {
-        $queryMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Query\Query')
+        $queryMock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Query\Query')
             ->getMock();
         $queryMock->expects($this->any())
             ->method('toArray')
diff --git a/tests/Query/NestedQueryTest.php b/tests/Query/NestedQueryTest.php
index 545df36f1628deaff62455dbbc096092f40d57dd..4b51d9d4e81431e37a01cf621ab08ce98ae3653b 100644
--- a/tests/Query/NestedQueryTest.php
+++ b/tests/Query/NestedQueryTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\Query\NestedQuery;
+use ONGR\ElasticsearchDSL\Query\NestedQuery;
 
 class NestedQueryTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +20,7 @@ class NestedQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testToArray()
     {
-        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
+        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Filter\MissingFilter')
             ->setConstructorArgs(['test_field'])
             ->getMock();
         $missingFilterMock->expects($this->any())
diff --git a/tests/Query/QueryTest.php b/tests/Query/QueryTest.php
index e2ffd57fd2108cc3428ec895b59419941c58d09f..c27a031532a6c076f09efc3bc8f0a314b002bd98 100644
--- a/tests/Query/QueryTest.php
+++ b/tests/Query/QueryTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\Query\Query;
+use ONGR\ElasticsearchDSL\Query\Query;
 
 class QueryTest extends \PHPUnit_Framework_TestCase
 {
@@ -20,7 +20,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testSetBoolParameters()
     {
-        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
+        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Filter\MissingFilter')
             ->setConstructorArgs(['test_field'])
             ->getMock();
         $missingFilterMock->expects($this->once())
@@ -37,7 +37,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase
     public function testAddQuery()
     {
         $missingFilterMock = $this
-            ->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
+            ->getMockBuilder('ONGR\ElasticsearchDSL\Filter\MissingFilter')
             ->disableOriginalConstructor()
             ->setMethods(['add'])
             ->getMock();
@@ -46,7 +46,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase
             ->method('add')
             ->withAnyParameters();
         $postFilterMock = $this
-            ->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\PostFilter')
+            ->getMockBuilder('ONGR\ElasticsearchDSL\Filter\PostFilter')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -69,7 +69,7 @@ class QueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testToArray()
     {
-        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Filter\MissingFilter')
+        $missingFilterMock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Filter\MissingFilter')
             ->disableOriginalConstructor()
             ->getMock();
         $missingFilterMock->expects($this->once())
diff --git a/tests/Query/Span/SpanFirstQueryTest.php b/tests/Query/Span/SpanFirstQueryTest.php
index 9b1e4d1ef867e68d0ea3ab62835d837f5ed3d472..7dbb30aa347aca2adf3ed130333f0f5d9718f0e8 100644
--- a/tests/Query/Span/SpanFirstQueryTest.php
+++ b/tests/Query/Span/SpanFirstQueryTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanFirstQuery;
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanQueryInterface;
+use ONGR\ElasticsearchDSL\Query\Span\SpanFirstQuery;
+use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
 
 /**
  * Unit test for SpanFirstQuery.
@@ -29,7 +29,7 @@ class SpanFirstQueryTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Query\Span\SpanQueryInterface')->getMock();
+        $this->mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface')->getMock();
         $this->mock->expects($this->atMost(1))
             ->method('getType')
             ->will($this->returnValue('span_or'));
diff --git a/tests/Query/Span/SpanMultiTermQueryTest.php b/tests/Query/Span/SpanMultiTermQueryTest.php
index dbbfe4edad1b212e6a434d090e0d49f24ea5f693..38528612e6e7319ea2bb84ba4b2dc894318ac18c 100644
--- a/tests/Query/Span/SpanMultiTermQueryTest.php
+++ b/tests/Query/Span/SpanMultiTermQueryTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanMultiTermQuery;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\Query\Span\SpanMultiTermQuery;
 
 /**
  * Unit test for SpanMultiTermQuery.
@@ -32,7 +32,7 @@ class SpanMultiTermQueryTest extends \PHPUnit_Framework_TestCase
         $allowedQueries = ['\FuzzyQuery', '\PrefixQuery', '\TermQuery', '\WildcardQuery', '\RegexpQuery'];
         // Same constructors for all of these queries.
         foreach ($allowedQueries as $query) {
-            $this->mock[$query] = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Query' . "{$query}")
+            $this->mock[$query] = $this->getMockBuilder('ONGR\ElasticsearchDSL\Query' . "{$query}")
                 ->setConstructorArgs(['field', 'value'])
                 ->getMock();
             $this->mock[$query]->expects($this->atMost(1))
@@ -79,7 +79,7 @@ class SpanMultiTermQueryTest extends \PHPUnit_Framework_TestCase
     public function testSpanMultiTermQueryToArrayNext()
     {
         /** @var BuilderInterface $mock */
-        $mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Query\RangeQuery')
+        $mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Query\RangeQuery')
             ->setConstructorArgs(['field', ['gte']])
             ->getMock();
         $mock->expects($this->once())
diff --git a/tests/Query/Span/SpanNearQueryTest.php b/tests/Query/Span/SpanNearQueryTest.php
index ebdcfbc6d1ce43248aa03e59e050e9a09357cd0b..23b254cdfbb053fd46022620b2c4958e95486433 100644
--- a/tests/Query/Span/SpanNearQueryTest.php
+++ b/tests/Query/Span/SpanNearQueryTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanNearQuery;
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanQueryInterface;
+use ONGR\ElasticsearchDSL\Query\Span\SpanNearQuery;
+use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
 
 /**
  * Unit test for SpanNearQuery.
@@ -29,7 +29,7 @@ class SpanNearQueryTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Query\Span\SpanQueryInterface')->getMock();
+        $this->mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface')->getMock();
         $this->mock->expects($this->atMost(1))
             ->method('getType')
             ->will($this->returnValue('span_or'));
diff --git a/tests/Query/Span/SpanNotQueryTest.php b/tests/Query/Span/SpanNotQueryTest.php
index df6856a8bb455c8e8674559917b9c0f8f4caca19..4f0afdf31e6eb96c247d2a243461c5135ca63fae 100644
--- a/tests/Query/Span/SpanNotQueryTest.php
+++ b/tests/Query/Span/SpanNotQueryTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanNotQuery;
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanQueryInterface;
+use ONGR\ElasticsearchDSL\Query\Span\SpanNotQuery;
+use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
 
 /**
  * Unit test for SpanNotQuery.
@@ -29,7 +29,7 @@ class SpanNotQueryTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Query\Span\SpanQueryInterface')->getMock();
+        $this->mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface')->getMock();
         $this->mock->expects($this->atMost(2))
             ->method('getType')
             ->will($this->returnValue('span_or'));
diff --git a/tests/Query/Span/SpanOrQueryTest.php b/tests/Query/Span/SpanOrQueryTest.php
index 5e4b1fe92593385447a1f4e5b1799b15bbcc5994..b9eead593678b93ceae76e166113aecaf894a099 100644
--- a/tests/Query/Span/SpanOrQueryTest.php
+++ b/tests/Query/Span/SpanOrQueryTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanOrQuery;
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanQueryInterface;
+use ONGR\ElasticsearchDSL\Query\Span\SpanOrQuery;
+use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
 
 /**
  * Unit test for SpanOrQuery.
@@ -29,7 +29,7 @@ class SpanOrQueryTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->mock = $this->getMockBuilder('ONGR\ElasticsearchBundle\DSL\Query\Span\SpanQueryInterface')->getMock();
+        $this->mock = $this->getMockBuilder('ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface')->getMock();
         $this->mock->expects($this->atMost(1))
             ->method('getType')
             ->will($this->returnValue('span_or'));
diff --git a/tests/Query/Span/SpanTermQueryTest.php b/tests/Query/Span/SpanTermQueryTest.php
index 1af7971f32461096cc088393ff849edf6ecca69f..537f8621b8bdf40b8b21b3ccfab87b8e886bb5da 100644
--- a/tests/Query/Span/SpanTermQueryTest.php
+++ b/tests/Query/Span/SpanTermQueryTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\Query\Span\SpanTermQuery;
+use ONGR\ElasticsearchDSL\Query\Span\SpanTermQuery;
 
 /**
  * Unit test for SpanTermQuery.
diff --git a/tests/SearchEndpoint/SearchEndpointFactoryTest.php b/tests/SearchEndpoint/SearchEndpointFactoryTest.php
index eeaee162242e13cb9884b856f85be768c53f7baf..5f62d2376a0c9088154e1e279f465894e28ac72b 100644
--- a/tests/SearchEndpoint/SearchEndpointFactoryTest.php
+++ b/tests/SearchEndpoint/SearchEndpointFactoryTest.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\Tests\Unit\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\Tests\Unit\SearchEndpoint;
 
-use ONGR\ElasticsearchBundle\DSL\SearchEndpoint\SearchEndpointFactory;
+use ONGR\ElasticsearchDSL\SearchEndpoint\SearchEndpointFactory;
 
 /**
  * Unit test class for search endpoint factory.
diff --git a/tests/Suggester/CompletionTest.php b/tests/Suggester/CompletionTest.php
deleted file mode 100644
index 973d8e0b468b91e94873b450d480580fcc607b9c..0000000000000000000000000000000000000000
--- a/tests/Suggester/CompletionTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-/*
- * This file is part of the ONGR package.
- *
- * (c) NFQ Technologies UAB <info@nfq.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Suggester;
-
-use ONGR\ElasticsearchBundle\DSL\Suggester\Completion;
-use ONGR\ElasticsearchBundle\Test\EncapsulationTestAwareTrait;
-
-class CompletionTest extends \PHPUnit_Framework_TestCase
-{
-    use EncapsulationTestAwareTrait;
-
-    /**
-     * @return array
-     */
-    public function getTestToArrayData()
-    {
-        $out = [];
-
-        // Case #0: simple.
-        $completion0 = new Completion('my-field', 'lorem ipsum');
-        $expected0 = [
-            'my-field-completion' => [
-                'text' => 'lorem ipsum',
-                'completion' => ['field' => 'my-field'],
-            ],
-        ];
-
-        $out[] = [
-            $expected0,
-            $completion0,
-        ];
-
-        // Case #1: using fuzzy.
-        $completion1 = new Completion('my-other-field', 'super awesome cat', 'my-completion1');
-        $completion1->useFuzzy(true);
-        $expected1 = [
-            'my-completion1' => [
-                'text' => 'super awesome cat',
-                'completion' => [
-                    'field' => 'my-other-field',
-                    'fuzzy' => true,
-                ],
-            ],
-        ];
-
-        $out[] = [
-            $expected1,
-            $completion1,
-        ];
-
-        // Case #2: providing all data.
-        $completion2 = new Completion('body', 'even more super awesome cat', 'my-completion2');
-        $completion2
-            ->setFuzziness(2)
-            ->setMinLength(3)
-            ->setPrefixLength(1)
-            ->setTranspositions(true)
-            ->setUnicodeAware('');
-
-        $expected2 = [
-            'my-completion2' => [
-                'text' => 'even more super awesome cat',
-                'completion' => [
-                    'field' => 'body',
-                    'fuzzy' => [
-                        'fuzziness' => 2,
-                        'transpositions' => true,
-                        'min_length' => 3,
-                        'prefix_length' => 1,
-                    ],
-                ],
-            ],
-        ];
-
-        $out[] = [
-            $expected2,
-            $completion2,
-        ];
-
-        return $out;
-    }
-
-    /**
-     * Tests toArray method.
-     *
-     * @param array      $expected
-     * @param Completion $completion
-     *
-     * @dataProvider getTestToArrayData
-     */
-    public function testToArray($expected, $completion)
-    {
-        $this->assertEquals($expected, $completion->toArray());
-    }
-
-    /**
-     * Tests if toArray method throws Logic Exception.
-     *
-     * @expectedException \LogicException
-     */
-    public function testToArrayException()
-    {
-        $completion = new Completion('foo', 'bar');
-        $completion->setField(null);
-        $completion->setText(null);
-        $completion->toArray();
-    }
-
-    /**
-     * Tests useFuzzy property.
-     */
-    public function testUseFuzzy()
-    {
-        $completion = new Completion('foo', 'bar');
-        $completion->useFuzzy(true);
-        $this->assertEquals(true, $completion->isFuzzy());
-    }
-
-    /**
-     * @return string
-     */
-    public function getClassName()
-    {
-        $this->setStub(new Completion('foo', 'bar'));
-        $this->addIgnoredField('useFuzzy');
-
-        return 'ONGR\ElasticsearchBundle\DSL\Suggester\Completion';
-    }
-
-    /**
-     * @return array
-     */
-    public function getFieldsData()
-    {
-        return [
-            ['name'],
-            ['fuzziness'],
-            ['transpositions', 'boolean'],
-            ['minLength'],
-            ['prefixLength'],
-            ['unicodeAware'],
-        ];
-    }
-}
diff --git a/tests/Suggester/Context/CategoryContextTest.php b/tests/Suggester/Context/CategoryContextTest.php
deleted file mode 100644
index e5567cd2ed04c45fa63efc80cce8090fa88cfd9b..0000000000000000000000000000000000000000
--- a/tests/Suggester/Context/CategoryContextTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the ONGR package.
- *
- * (c) NFQ Technologies UAB <info@nfq.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Suggester\Context;
-
-use ONGR\ElasticsearchBundle\DSL\Suggester\Context\CategoryContext;
-use ONGR\ElasticsearchBundle\Test\EncapsulationTestAwareTrait;
-
-class CategoryContextTest extends \PHPUnit_Framework_TestCase
-{
-    use EncapsulationTestAwareTrait;
-
-    /**
-     * @return string
-     */
-    public function getClassName()
-    {
-        $this->setStub(new CategoryContext('foo', 'bar'));
-
-        return 'ONGR\ElasticsearchBundle\DSL\Suggester\Context\CategoryContext';
-    }
-
-    /**
-     * @return array
-     */
-    public function getFieldsData()
-    {
-        return [
-            ['name'],
-            ['value'],
-        ];
-    }
-}
diff --git a/tests/Suggester/Context/GeoContextTest.php b/tests/Suggester/Context/GeoContextTest.php
deleted file mode 100644
index 8a8a918319237cdf5de24ee9b7021999da9699af..0000000000000000000000000000000000000000
--- a/tests/Suggester/Context/GeoContextTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of the ONGR package.
- *
- * (c) NFQ Technologies UAB <info@nfq.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Suggester\Context;
-
-use ONGR\ElasticsearchBundle\DSL\Suggester\Context\CategoryContext;
-use ONGR\ElasticsearchBundle\DSL\Suggester\Context\GeoContext;
-use ONGR\ElasticsearchBundle\Test\EncapsulationTestAwareTrait;
-
-class GeoContextTest extends \PHPUnit_Framework_TestCase
-{
-    use EncapsulationTestAwareTrait;
-
-    /**
-     * @return string
-     */
-    public function getClassName()
-    {
-        $this->setStub(new GeoContext('foo', 'bar'));
-
-        return 'ONGR\ElasticsearchBundle\DSL\Suggester\Context\GeoContext';
-    }
-
-    /**
-     * @return array
-     */
-    public function getFieldsData()
-    {
-        return [
-            ['precision'],
-            ['name'],
-            ['value'],
-        ];
-    }
-}
diff --git a/tests/Suggester/ContextTest.php b/tests/Suggester/ContextTest.php
deleted file mode 100644
index 363a368317069dbdc96c3783b09e0ba9e71af79e..0000000000000000000000000000000000000000
--- a/tests/Suggester/ContextTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/*
- * This file is part of the ONGR package.
- *
- * (c) NFQ Technologies UAB <info@nfq.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Suggester;
-
-use ONGR\ElasticsearchBundle\DSL\Suggester\Completion;
-use ONGR\ElasticsearchBundle\DSL\Suggester\Context;
-use ONGR\ElasticsearchBundle\DSL\Suggester\Phrase;
-use ONGR\ElasticsearchBundle\Test\EncapsulationTestAwareTrait;
-
-class ContextTest extends \PHPUnit_Framework_TestCase
-{
-    use EncapsulationTestAwareTrait;
-
-    /**
-     * Tests toArray method when $this->getSize() !== null.
-     */
-    public function testToArrayNotNull()
-    {
-        $name = 'testName';
-
-        $context = new Context('', '', $name);
-        $context->setSize(123);
-        $context->setContext(new Phrase('', ''));
-
-        $result = $context->toArray();
-        $this->assertArrayHasKey($name, $result);
-
-        $data = $result[$name];
-        $this->assertArrayHasKey('completion', $data);
-
-        $completion = $data['completion'];
-        $this->assertArrayHasKey('size', $completion);
-        $this->assertEquals($completion['size'], 123);
-    }
-
-    /**
-     * Returns list of fields to test. Works as data provider.
-     *
-     * @return array
-     */
-    public function getFieldsData()
-    {
-        return [
-            ['context'],
-            ['size'],
-        ];
-    }
-
-    /**
-     * Returns entity class name.
-     *
-     * @return string
-     */
-    public function getClassName()
-    {
-        $this->setStub(new Context('foo', 'bar'));
-
-        return 'ONGR\ElasticsearchBundle\DSL\Suggester\Context';
-    }
-}
diff --git a/tests/Suggester/PhraseTest.php b/tests/Suggester/PhraseTest.php
deleted file mode 100644
index 946bcee0b880448a6e330b26ed3b396220685668..0000000000000000000000000000000000000000
--- a/tests/Suggester/PhraseTest.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/*
- * This file is part of the ONGR package.
- *
- * (c) NFQ Technologies UAB <info@nfq.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Suggester;
-
-use ONGR\ElasticsearchBundle\DSL\Suggester\Phrase;
-use ONGR\ElasticsearchBundle\Test\EncapsulationTestAwareTrait;
-
-class PhraseTest extends \PHPUnit_Framework_TestCase
-{
-    use EncapsulationTestAwareTrait;
-
-    /**
-     * @return array
-     */
-    public function getTestToArrayData()
-    {
-        $out = [];
-
-        // Case #0: simple.
-        $phrase0 = new Phrase('body', 'lorem ipsum');
-        $expected0 = [
-            'body-phrase' => [
-                'text' => 'lorem ipsum',
-                'phrase' => ['field' => 'body'],
-            ],
-        ];
-
-        $out[] = [
-            $expected0,
-            $phrase0,
-        ];
-
-        // Case #1: using all fields.
-        $phrase1 = new Phrase('description', 'awesome cat');
-        $phrase1->setMaxErrors(2);
-        $phrase1->setGramSize(1);
-        $phrase1->setRealWordErrorLikelihood(0.95);
-        $phrase1->setHighlight(['pre_tag' => '<span class="info">', 'post_tag' => '</span>']);
-        $phrase1->setAnalyzer('simple');
-        $phrase1->setConfidence(1);
-        $phrase1->setSize(6);
-
-        $highlightObject = new \stdClass();
-        $highlightObject->post_tag = '</span>';
-        $highlightObject->pre_tag = '<span class="info">';
-
-        $expected1 = [
-            'description-phrase' => [
-                'text' => 'awesome cat',
-                'phrase' => [
-                    'analyzer' => 'simple',
-                    'field' => 'description',
-                    'size' => 6,
-                    'real_word_error_likelihood' => 0.95,
-                    'max_errors' => 2.0,
-                    'gram_size' => 1,
-                    'highlight' => $highlightObject,
-                ],
-            ],
-        ];
-
-        $out[] = [
-            $expected1,
-            $phrase1,
-        ];
-
-        return $out;
-    }
-
-    /**
-     * Tests toArray method.
-     *
-     * @param array  $expected
-     * @param Phrase $phrase
-     *
-     * @dataProvider getTestToArrayData
-     */
-    public function testToArray($expected, $phrase)
-    {
-        $this->assertEquals($expected, $phrase->toArray());
-    }
-
-    /**
-     * Tests toArray method exception.
-     *
-     * @expectedException \LogicException
-     */
-    public function testToArrayException()
-    {
-        $phrase = new Phrase('', '');
-        $phrase->toArray();
-    }
-
-    /**
-     * @return string
-     */
-    public function getClassName()
-    {
-        $this->setStub(new Phrase('foo', 'bar'));
-
-        return 'ONGR\ElasticsearchBundle\DSL\Suggester\Phrase';
-    }
-
-    /**
-     * Returns list of fields to test. Works as data provider.
-     *
-     * @return array
-     */
-    public function getFieldsData()
-    {
-        return [
-            ['analyzer'],
-            ['gramSize'],
-            ['realWordErrorLikelihood'],
-            ['confidence'],
-            ['maxErrors'],
-            ['highlight'],
-            ['size'],
-        ];
-    }
-}
diff --git a/tests/Suggester/TermTest.php b/tests/Suggester/TermTest.php
deleted file mode 100644
index c0ec281975d0ddaf6d1b73ad6b55ac4c1086c3de..0000000000000000000000000000000000000000
--- a/tests/Suggester/TermTest.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/*
- * This file is part of the ONGR package.
- *
- * (c) NFQ Technologies UAB <info@nfq.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace ONGR\ElasticsearchBundle\Tests\Unit\DSL\Suggester;
-
-use ONGR\ElasticsearchBundle\DSL\Suggester\Term;
-use ONGR\ElasticsearchBundle\Test\EncapsulationTestAwareTrait;
-
-class TermTest extends \PHPUnit_Framework_TestCase
-{
-    use EncapsulationTestAwareTrait;
-
-    /**
-     * @return array
-     */
-    public function getTestToArrayData()
-    {
-        $out = [];
-
-        // Case #0: simple.
-        $term0 = new Term('body', 'lorem ipsum');
-        $expected0 = [
-            'body-term' => [
-                'text' => 'lorem ipsum',
-                'term' => ['field' => 'body'],
-            ],
-        ];
-        $out[] = [
-            $expected0,
-            $term0,
-        ];
-
-        // Case #1: full suggester.
-        $term1 = new Term('body', 'lorem ipsum');
-        $term1
-            ->setSize(2)
-            ->setAnalyzer('simple')
-            ->setSuggestMode(Term::SUGGEST_MODE_ALWAYS)
-            ->setSort(Term::SORT_BY_SCORE);
-
-        $expected1 = [
-            'body-term' => [
-                'text' => 'lorem ipsum',
-                'term' => [
-                    'field' => 'body',
-                    'analyzer' => 'simple',
-                    'sort' => 'score',
-                    'suggest_mode' => 'always',
-                ],
-                'size' => 2,
-            ],
-        ];
-
-        $out[] = [
-            $expected1,
-            $term1,
-        ];
-
-        return $out;
-    }
-
-    /**
-     * Tests toArray method.
-     *
-     * @param array $expected
-     * @param Term  $suggester
-     *
-     * @dataProvider getTestToArrayData
-     */
-    public function testToArray($expected, $suggester)
-    {
-        $this->assertEquals($expected, $suggester->toArray());
-    }
-
-    /**
-     * Tests toArray method exception.
-     *
-     * @expectedException \LogicException
-     */
-    public function testToArrayException()
-    {
-        $term = new Term('', '');
-        $term->toArray();
-    }
-
-    /**
-     * Tests setSort method.
-     */
-    public function testSetSort()
-    {
-        $term = new Term('foo', 'bar');
-
-        $term->setSort(Term::SORT_BY_FREQ);
-        $this->assertEquals(Term::SORT_BY_FREQ, $term->getSort());
-
-        $term->setSort(Term::SORT_BY_SCORE);
-        $this->assertEquals(Term::SORT_BY_SCORE, $term->getSort());
-
-        $initValue = $term->getSort();
-        $term->setSort('wrongSort');
-        $this->assertEquals($initValue, $term->getSort());
-    }
-
-    /**
-     * Tests setSuggestMode method.
-     */
-    public function testSetSuggestMode()
-    {
-        $term = new Term('foo', 'bar');
-
-        $term->setSuggestMode(Term::SUGGEST_MODE_ALWAYS);
-        $this->assertEquals(Term::SUGGEST_MODE_ALWAYS, $term->getSuggestMode());
-
-        $term->setSuggestMode(Term::SUGGEST_MODE_MISSING);
-        $this->assertEquals(Term::SUGGEST_MODE_MISSING, $term->getSuggestMode());
-
-        $initValue = $term->getSuggestMode();
-        $term->setSuggestMode('wrongMode');
-        $this->assertEquals($initValue, $term->getSuggestMode());
-    }
-
-    /**
-     * Returns list of fields to test. Works as data provider.
-     *
-     * @return array
-     */
-    public function getFieldsData()
-    {
-        return [
-            ['analyzer'],
-            ['size'],
-        ];
-    }
-
-    /**
-     * Returns entity class name.
-     *
-     * @return string
-     */
-    public function getClassName()
-    {
-        $this->setStub(new Term('foo', 'bar'));
-        $this->addIgnoredField('sort');
-        $this->addIgnoredField('suggestMode');
-
-        return 'ONGR\ElasticsearchBundle\DSL\Suggester\Term';
-    }
-}