diff --git a/src/Aggregation/AbstractAggregation.php b/src/Aggregation/AbstractAggregation.php
index 3dff51ff7679722c54495396b8dba809abca4196..19c5a0f4d1ce3360029ce0d661525b96bb89db71 100644
--- a/src/Aggregation/AbstractAggregation.php
+++ b/src/Aggregation/AbstractAggregation.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderBag;
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\NamedBuilderBag;
+use ONGR\ElasticsearchDSL\NamedBuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * AbstractAggregation class.
diff --git a/src/Aggregation/AvgAggregation.php b/src/Aggregation/AvgAggregation.php
index 2d79579efdf864ba1a2c27aaa749c6f4295eaeb9..11b888659c7f73aa6f28781393cb144ae5da55b3 100644
--- a/src/Aggregation/AvgAggregation.php
+++ b/src/Aggregation/AvgAggregation.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
 /**
  * Class representing Avg Aggregation.
diff --git a/src/Aggregation/CardinalityAggregation.php b/src/Aggregation/CardinalityAggregation.php
index fdcb0ee79ce5c41c6102734f9ca4f5e1d400ceec..310ee73a7b846c1a61ac2d7dc0ca6c3bcb5ccdbb 100644
--- a/src/Aggregation/CardinalityAggregation.php
+++ b/src/Aggregation/CardinalityAggregation.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\MetricTrait;
-use ONGR\ElasticsearchBundle\DSL\ScriptAwareTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\MetricTrait;
+use ONGR\ElasticsearchDSL\ScriptAwareTrait;
 
 /**
  * Difference values counter.
diff --git a/src/Aggregation/ChildrenAggregation.php b/src/Aggregation/ChildrenAggregation.php
index 28a23aa11c20216ec7ae4e9fe5b3d5c93833c810..f87b1d92afb3ecc50983ea6df28a12e0bd851d4e 100644
--- a/src/Aggregation/ChildrenAggregation.php
+++ b/src/Aggregation/ChildrenAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing ChildrenAggregation.
diff --git a/src/Aggregation/DateRangeAggregation.php b/src/Aggregation/DateRangeAggregation.php
index a82050f953dbdd18d19983b15a926c86a70b4863..ff445055b318dce8a2c7cb6ef29135387dcd4a69 100644
--- a/src/Aggregation/DateRangeAggregation.php
+++ b/src/Aggregation/DateRangeAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing date range aggregation.
diff --git a/src/Aggregation/ExtendedStatsAggregation.php b/src/Aggregation/ExtendedStatsAggregation.php
index 110e56346f06ea7d0fdec175c322cadb4a06d297..2cf6a408f07adeec1026f8f0534e05093c5c11ab 100644
--- a/src/Aggregation/ExtendedStatsAggregation.php
+++ b/src/Aggregation/ExtendedStatsAggregation.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\MetricTrait;
-use ONGR\ElasticsearchBundle\DSL\ScriptAwareTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\MetricTrait;
+use ONGR\ElasticsearchDSL\ScriptAwareTrait;
 
 /**
  * Class representing Extended stats aggregation.
diff --git a/src/Aggregation/FilterAggregation.php b/src/Aggregation/FilterAggregation.php
index b99f6b4ab1198eb0ae7218acd3b3250c850bd26d..3655c31c6f9833519f01af19ba7c1a7a37d8167d 100644
--- a/src/Aggregation/FilterAggregation.php
+++ b/src/Aggregation/FilterAggregation.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Class representing FilterAggregation.
diff --git a/src/Aggregation/FiltersAggregation.php b/src/Aggregation/FiltersAggregation.php
index 67978ed5364d959b10141ee4d5588bda7d25397d..4206b5eb9eaeb0eb60500390f30957bb499f6fcc 100644
--- a/src/Aggregation/FiltersAggregation.php
+++ b/src/Aggregation/FiltersAggregation.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Class representing filters aggregation.
diff --git a/src/Aggregation/GeoBoundsAggregation.php b/src/Aggregation/GeoBoundsAggregation.php
index 0fd8dea147b1d570a76ed5cda20d9314b816f91f..1079d7cd8a9a22c09feecd5897a93148b3cc156d 100644
--- a/src/Aggregation/GeoBoundsAggregation.php
+++ b/src/Aggregation/GeoBoundsAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing geo bounds aggregation.
diff --git a/src/Aggregation/GeoDistanceAggregation.php b/src/Aggregation/GeoDistanceAggregation.php
index c1e4906a51fa9000beb279c08a5a1d44401d1a74..d360bdf4b2a14bf9d39fce728ec84841e5a646d8 100644
--- a/src/Aggregation/GeoDistanceAggregation.php
+++ b/src/Aggregation/GeoDistanceAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing geo distance aggregation.
diff --git a/src/Aggregation/GeoHashGridAggregation.php b/src/Aggregation/GeoHashGridAggregation.php
index e2642a552a248ce0f40fdfde0cc1f67ee34f41aa..f85144ee11ae546ea9b59f67e5295326d9ca0f30 100644
--- a/src/Aggregation/GeoHashGridAggregation.php
+++ b/src/Aggregation/GeoHashGridAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing geohash grid aggregation.
diff --git a/src/Aggregation/GlobalAggregation.php b/src/Aggregation/GlobalAggregation.php
index 7ff4297498e3d237669a04cff411e6b387b58a7d..ac48255155654e00321bb3e470e0b40ae4455b07 100644
--- a/src/Aggregation/GlobalAggregation.php
+++ b/src/Aggregation/GlobalAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing GlobalAggregation.
diff --git a/src/Aggregation/HistogramAggregation.php b/src/Aggregation/HistogramAggregation.php
index 232df125e1259ad6804c224c3d6a2c3da61c235d..07d70d025cd1dd29480be25e842e01cc6a3bf2c3 100644
--- a/src/Aggregation/HistogramAggregation.php
+++ b/src/Aggregation/HistogramAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing Histogram aggregation.
diff --git a/src/Aggregation/Ipv4RangeAggregation.php b/src/Aggregation/Ipv4RangeAggregation.php
index b8ac5bdddc82137b7133e30a284b41ea5f216771..917c7a8e23c2e95c9f6cf0da6492bce29c26caf5 100644
--- a/src/Aggregation/Ipv4RangeAggregation.php
+++ b/src/Aggregation/Ipv4RangeAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing ip range aggregation.
diff --git a/src/Aggregation/MaxAggregation.php b/src/Aggregation/MaxAggregation.php
index c198923f9c8d444d048c9b617607683efd2da962..406ece795224b6a53b19a426e6bea1b6f790e9d5 100644
--- a/src/Aggregation/MaxAggregation.php
+++ b/src/Aggregation/MaxAggregation.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
 /**
  * Class representing Max Aggregation.
diff --git a/src/Aggregation/MinAggregation.php b/src/Aggregation/MinAggregation.php
index 83ed3ba030bedd4a4ad7f8491ac95a6bd33da223..3fe8f4b5ae307d1d48d4431c152914bfc566500a 100644
--- a/src/Aggregation/MinAggregation.php
+++ b/src/Aggregation/MinAggregation.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
 /**
  * Class representing Min Aggregation.
diff --git a/src/Aggregation/MissingAggregation.php b/src/Aggregation/MissingAggregation.php
index 8431c5e2cdceef21ad345ef2ee075d953319a1ed..feec6a68d25af65ad5516c8533b770edce2ee9b9 100644
--- a/src/Aggregation/MissingAggregation.php
+++ b/src/Aggregation/MissingAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing missing aggregation.
diff --git a/src/Aggregation/NestedAggregation.php b/src/Aggregation/NestedAggregation.php
index d9d9038b966dba32a5a96acfad6b000220dbf683..ee0bdc125031927590cd91e2b9f07bdb106e4232 100644
--- a/src/Aggregation/NestedAggregation.php
+++ b/src/Aggregation/NestedAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing NestedAggregation.
diff --git a/src/Aggregation/PercentileRanksAggregation.php b/src/Aggregation/PercentileRanksAggregation.php
index 5bc5c12a3631afe0bdb36a2c1eac989c52dda8ac..bc8a7fb3c6c381210ceb99f087dcaedf741249c1 100644
--- a/src/Aggregation/PercentileRanksAggregation.php
+++ b/src/Aggregation/PercentileRanksAggregation.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\MetricTrait;
-use ONGR\ElasticsearchBundle\DSL\ScriptAwareTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\MetricTrait;
+use ONGR\ElasticsearchDSL\ScriptAwareTrait;
 
 /**
  * Class representing Percentile Ranks Aggregation.
diff --git a/src/Aggregation/PercentilesAggregation.php b/src/Aggregation/PercentilesAggregation.php
index 8aa9e1e847bc910bc476267c91e2b7f73fb5a6fb..d8890854b7da1ca2f6b461c9d0df7ee00bdb563c 100644
--- a/src/Aggregation/PercentilesAggregation.php
+++ b/src/Aggregation/PercentilesAggregation.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\MetricTrait;
-use ONGR\ElasticsearchBundle\DSL\ScriptAwareTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\MetricTrait;
+use ONGR\ElasticsearchDSL\ScriptAwareTrait;
 
 /**
  * Class representing PercentilesAggregation.
diff --git a/src/Aggregation/RangeAggregation.php b/src/Aggregation/RangeAggregation.php
index 3e24dd670695d015caada7ddb0889cabf00d4f34..41e107569998baaf9fd7396005e294e6077ebc48 100644
--- a/src/Aggregation/RangeAggregation.php
+++ b/src/Aggregation/RangeAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing RangeAggregation.
diff --git a/src/Aggregation/ReverseNestedAggregation.php b/src/Aggregation/ReverseNestedAggregation.php
index cb064035007761d25b1d21148b67f9706360d47f..3225d74b2e5983c0ccda7e53aeaab2cff208e3c4 100644
--- a/src/Aggregation/ReverseNestedAggregation.php
+++ b/src/Aggregation/ReverseNestedAggregation.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
 
 /**
  * Class representing ReverseNestedAggregation.
diff --git a/src/Aggregation/StatsAggregation.php b/src/Aggregation/StatsAggregation.php
index 4952837431f10725d6f31dd6e60a1783b863dfdf..515e8a37876d3f5c14e441aa60c740023d21095b 100644
--- a/src/Aggregation/StatsAggregation.php
+++ b/src/Aggregation/StatsAggregation.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\MetricTrait;
-use ONGR\ElasticsearchBundle\DSL\ScriptAwareTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\MetricTrait;
+use ONGR\ElasticsearchDSL\ScriptAwareTrait;
 
 /**
  * Class representing StatsAggregation.
diff --git a/src/Aggregation/SumAggregation.php b/src/Aggregation/SumAggregation.php
index 28b07f2a3e2873684dbd3818e5ed466df92ccc9b..0552b32eb7aa5542fd6e947b9518e5dfaafd77c5 100644
--- a/src/Aggregation/SumAggregation.php
+++ b/src/Aggregation/SumAggregation.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
 /**
  * Class representing Sum Aggregation.
diff --git a/src/Aggregation/TermsAggregation.php b/src/Aggregation/TermsAggregation.php
index a12ec388c2c708da74edef14d355241f658338a8..3726089aadabf1aa62a39f74ce783516ebc4fc25 100644
--- a/src/Aggregation/TermsAggregation.php
+++ b/src/Aggregation/TermsAggregation.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
-use ONGR\ElasticsearchBundle\DSL\ScriptAwareTrait;
+use ONGR\ElasticsearchDSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchDSL\ScriptAwareTrait;
 
 /**
  * Class representing TermsAggregation.
diff --git a/src/Aggregation/TopHitsAggregation.php b/src/Aggregation/TopHitsAggregation.php
index 125516c15d08a165541b8857381f2c21b88a8870..03f525d63dc16a1db720a19e3c5f6a49e6c4fc8f 100644
--- a/src/Aggregation/TopHitsAggregation.php
+++ b/src/Aggregation/TopHitsAggregation.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\MetricTrait;
-use ONGR\ElasticsearchBundle\DSL\Sort\Sorts;
+use ONGR\ElasticsearchDSL\Aggregation\Type\MetricTrait;
+use ONGR\ElasticsearchDSL\Sort\Sorts;
 
 /**
  * Top hits aggregation.
diff --git a/src/Aggregation/Type/BucketingTrait.php b/src/Aggregation/Type/BucketingTrait.php
index b0918e7562b09fdf17ceb621a4b0284d3b4b5487..6497ecb2432420d0cfc72391691e048101ccb2f0 100644
--- a/src/Aggregation/Type/BucketingTrait.php
+++ b/src/Aggregation/Type/BucketingTrait.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation\Type;
+namespace ONGR\ElasticsearchDSL\Aggregation\Type;
 
 /**
  * Trait used by Aggregations which supports nesting.
diff --git a/src/Aggregation/Type/MetricTrait.php b/src/Aggregation/Type/MetricTrait.php
index 26c1f922d35560bda29520bd382d344204bcc335..bdfbd2d12e317e8ab924c57b0766e0340fb2a77a 100644
--- a/src/Aggregation/Type/MetricTrait.php
+++ b/src/Aggregation/Type/MetricTrait.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation\Type;
+namespace ONGR\ElasticsearchDSL\Aggregation\Type;
 
 /**
  * Trait used by Aggregations which do not support nesting.
diff --git a/src/Aggregation/ValueCountAggregation.php b/src/Aggregation/ValueCountAggregation.php
index afcab235abdb49a97b8311fa23f32591fdd62e56..07286e6d61c900eb6483bf75952c41875a979590 100644
--- a/src/Aggregation/ValueCountAggregation.php
+++ b/src/Aggregation/ValueCountAggregation.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Aggregation;
 
 /**
  * Class representing Value Count Aggregation.
diff --git a/src/Bool/Bool.php b/src/Bool/Bool.php
index 976ce6ea98dd4424556fdb9b1bdf523bfb5e1e57..f652842c08e623238e26a65f234d4e292907ebdf 100644
--- a/src/Bool/Bool.php
+++ b/src/Bool/Bool.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Bool;
+namespace ONGR\ElasticsearchDSL\Bool;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\Query\BoolQuery;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\Query\BoolQuery;
 
 /**
  * Bool operator. Can be used for filters and queries.
  *
- * @deprecated Will be removed in 1.0. Use ONGR\ElasticsearchBundle\DSL\Query\BoolQuery.
+ * @deprecated Will be removed in 1.0. Use ONGR\ElasticsearchDSL\Query\BoolQuery.
  */
 class Bool extends BoolQuery
 {
@@ -29,7 +29,7 @@ class Bool extends BoolQuery
      *
      * @throws \UnexpectedValueException
      *
-     * @deprecated Will be removed in 1.0. Use ONGR\ElasticsearchBundle\DSL\Query\BoolQuery::add().
+     * @deprecated Will be removed in 1.0. Use ONGR\ElasticsearchDSL\Query\BoolQuery::add().
      */
     public function addToBool(BuilderInterface $bool, $type = BoolQuery::MUST)
     {
diff --git a/src/BuilderInterface.php b/src/BuilderInterface.php
index 1ac974717315717257d0ca69d00f1fddf98ea562..6e5b7f54a6d6f648576802f8a7f09af737c55259 100644
--- a/src/BuilderInterface.php
+++ b/src/BuilderInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL;
+namespace ONGR\ElasticsearchDSL;
 
 /**
  * Interface BuilderInterface.
diff --git a/src/DslTypeAwareTrait.php b/src/DslTypeAwareTrait.php
index 3e9412bbde203236015e4341e492abf4fef09154..122144e12938a58f0a354f1d1de911a90d72aa99 100644
--- a/src/DslTypeAwareTrait.php
+++ b/src/DslTypeAwareTrait.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL;
+namespace ONGR\ElasticsearchDSL;
 
 use Elasticsearch\Common\Exceptions\InvalidArgumentException;
 
diff --git a/src/Filter/AndFilter.php b/src/Filter/AndFilter.php
index a3bfb168b746a68e02c6c2380e85b7b2ee715cd1..7c4ac592e5c987d03be84319b73b973be749fcee 100644
--- a/src/Filter/AndFilter.php
+++ b/src/Filter/AndFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "and" filter.
diff --git a/src/Filter/BoolFilter.php b/src/Filter/BoolFilter.php
index 2db4e449a290a9563da5cfcbf48ab974e470f7e3..caf079b0e4ffa2461b8ead6ae62f8e21679b3dcc 100644
--- a/src/Filter/BoolFilter.php
+++ b/src/Filter/BoolFilter.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\Query\BoolQuery;
+use ONGR\ElasticsearchDSL\Query\BoolQuery;
 
 /**
  * Represents Elasticsearch "bool" filter.
diff --git a/src/Filter/ExistsFilter.php b/src/Filter/ExistsFilter.php
index fb91c674f352f2310670500785985988661b57c8..2c60b137a99b526f5f7a60887e77527cd0a1a9ac 100644
--- a/src/Filter/ExistsFilter.php
+++ b/src/Filter/ExistsFilter.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Represents Elasticsearch "exists" filter.
diff --git a/src/Filter/GeoBoundingBoxFilter.php b/src/Filter/GeoBoundingBoxFilter.php
index a91c641b866aaaff689d53bb7b90b558782925ff..22fb5a31f95a4fdfb3269cdab6805f5a4de6ff69 100644
--- a/src/Filter/GeoBoundingBoxFilter.php
+++ b/src/Filter/GeoBoundingBoxFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "Geo Bounding Box" filter.
diff --git a/src/Filter/GeoDistanceFilter.php b/src/Filter/GeoDistanceFilter.php
index f471b838c33c849201ed5e415ce1154935cd6702..73469185af0f62d3b6586a385aaf30e410740b5e 100644
--- a/src/Filter/GeoDistanceFilter.php
+++ b/src/Filter/GeoDistanceFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "Geo Distance Filter" filter.
diff --git a/src/Filter/GeoDistanceRangeFilter.php b/src/Filter/GeoDistanceRangeFilter.php
index 0552285b1905645dbcf76b9ee8904dc26c27e419..ba433ab926684289d29b740f3e2baa852eda5b2d 100644
--- a/src/Filter/GeoDistanceRangeFilter.php
+++ b/src/Filter/GeoDistanceRangeFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "Geo Distance Range Filter" filter.
diff --git a/src/Filter/GeoPolygonFilter.php b/src/Filter/GeoPolygonFilter.php
index 2a321de1811aba868f9ee0e5a3c88e6ec90177c2..541f3955b41f950afcc22b1c99bf0cf111e3468b 100644
--- a/src/Filter/GeoPolygonFilter.php
+++ b/src/Filter/GeoPolygonFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch geo polygon filter.
diff --git a/src/Filter/GeoShapeFilter.php b/src/Filter/GeoShapeFilter.php
index d05a398d1f73b15096ba2b20bc81ca1bacc5fe97..0c83b816fe1d1497a92f85855659f0e6a1f15877 100644
--- a/src/Filter/GeoShapeFilter.php
+++ b/src/Filter/GeoShapeFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch geo-shape filter.
diff --git a/src/Filter/GeohashCellFilter.php b/src/Filter/GeohashCellFilter.php
index de8d5bc6104b9ab0c1e7ea84782da4f6e6add742..993420c7a341e3b83b5ce918a662f61abb7f8b9b 100644
--- a/src/Filter/GeohashCellFilter.php
+++ b/src/Filter/GeohashCellFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "Geohash Cell" filter.
diff --git a/src/Filter/HasChildFilter.php b/src/Filter/HasChildFilter.php
index 020da73fd28a51ea4f58f48319059557536cb7ec..4f0c585d46d3c734eded66e19d43662fbbe84a07 100644
--- a/src/Filter/HasChildFilter.php
+++ b/src/Filter/HasChildFilter.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\DslTypeAwareTrait;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\DslTypeAwareTrait;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch has_child filter.
diff --git a/src/Filter/HasParentFilter.php b/src/Filter/HasParentFilter.php
index a4b601e5952be91a35aac1cd74263fdc0b60071f..5bb372d010b9667e4bc5f4c8a2a2b0b50339953a 100644
--- a/src/Filter/HasParentFilter.php
+++ b/src/Filter/HasParentFilter.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\DslTypeAwareTrait;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\DslTypeAwareTrait;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch has_parent filter.
diff --git a/src/Filter/IdsFilter.php b/src/Filter/IdsFilter.php
index 49684ba8686d84df6e2e9d92d69812bae6123413..4ceefa97f0c4479fa2631060ab05aa1356726ffb 100644
--- a/src/Filter/IdsFilter.php
+++ b/src/Filter/IdsFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "ids" filter.
diff --git a/src/Filter/IndicesFilter.php b/src/Filter/IndicesFilter.php
index 8e17a9cf521496b1fa96884dbee00078201cb840..0010552953c1378cd5170fa1f77b1717cf85b513 100644
--- a/src/Filter/IndicesFilter.php
+++ b/src/Filter/IndicesFilter.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Represents Elasticsearch "indices" filter.
@@ -67,7 +67,7 @@ class IndicesFilter implements BuilderInterface
         $output['filter'] = [$this->filter->getType() => $this->filter->toArray()];
 
         if ($this->noMatchFilter !== null) {
-            if (is_a($this->noMatchFilter, 'ONGR\ElasticsearchBundle\DSL\BuilderInterface')) {
+            if (is_a($this->noMatchFilter, 'ONGR\ElasticsearchDSL\BuilderInterface')) {
                 $output['no_match_filter'] = [$this->noMatchFilter->getType() => $this->noMatchFilter->toArray()];
             } else {
                 $output['no_match_filter'] = $this->noMatchFilter;
diff --git a/src/Filter/LimitFilter.php b/src/Filter/LimitFilter.php
index effdc099e3441b8ce2777782a2654875a6839cfa..18d254b522d25ea900bdb1c4b1170ed99851c781 100644
--- a/src/Filter/LimitFilter.php
+++ b/src/Filter/LimitFilter.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Represents Elasticsearch "limit" filter.
diff --git a/src/Filter/MatchAllFilter.php b/src/Filter/MatchAllFilter.php
index 3d0735dc91e009e5c7cdf65ecafad36df8b20254..a6d15215e5f8fd25bfcb8ebfa3683146e2f9f93b 100644
--- a/src/Filter/MatchAllFilter.php
+++ b/src/Filter/MatchAllFilter.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Represents Elasticsearch "match_all" filter.
diff --git a/src/Filter/MissingFilter.php b/src/Filter/MissingFilter.php
index 788adb213653f72933741876e99b495b7664db6d..776a1bd28f3cdbf7b06eff87ee684cbbf8426531 100644
--- a/src/Filter/MissingFilter.php
+++ b/src/Filter/MissingFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "missing" filter.
diff --git a/src/Filter/NestedFilter.php b/src/Filter/NestedFilter.php
index 397f1c1b7ae629a9918b8d3e1ac869911508de65..6b466a49eec316d0e92d39f3ae4f04e8cb065eff 100644
--- a/src/Filter/NestedFilter.php
+++ b/src/Filter/NestedFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Nested filter implementation.
diff --git a/src/Filter/NotFilter.php b/src/Filter/NotFilter.php
index 29be5e521c78dfcbdb48819ee17cff7c79448ca4..8590ba451779c780abc39d8ceb86763bfc5514f0 100644
--- a/src/Filter/NotFilter.php
+++ b/src/Filter/NotFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "not" filter.
diff --git a/src/Filter/OrFilter.php b/src/Filter/OrFilter.php
index 279c07c5612abb2d7d55fdbc87be302d96bf612e..53e22586bd4987714698ce27f5bc11d30d7c4fab 100644
--- a/src/Filter/OrFilter.php
+++ b/src/Filter/OrFilter.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
 /**
  * Represents Elasticsearch "or" filter.
diff --git a/src/Filter/PostFilter.php b/src/Filter/PostFilter.php
index b04b04ff2d18a4545bea9e1060fd93101ff60ab1..b085e3be1ce7b18229ca2d554ee76e012e60fcb8 100644
--- a/src/Filter/PostFilter.php
+++ b/src/Filter/PostFilter.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Represents Elasticsearch "post_filter" filter.
diff --git a/src/Filter/PrefixFilter.php b/src/Filter/PrefixFilter.php
index aab05a88a817078816b06818c4ce4c50361b2a53..4d37438b43f6aa7205ad79df1177c16b3aa720d4 100644
--- a/src/Filter/PrefixFilter.php
+++ b/src/Filter/PrefixFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "prefix" filter.
diff --git a/src/Filter/QueryFilter.php b/src/Filter/QueryFilter.php
index 1ea4b687714d47045cb71432e6ccffc65732135f..7144ba33bd8b233e56a96003c0032952bb0087d8 100644
--- a/src/Filter/QueryFilter.php
+++ b/src/Filter/QueryFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "query" filter.
diff --git a/src/Filter/RangeFilter.php b/src/Filter/RangeFilter.php
index 1f63d11c4082f5b88b4d06856c5fa1fe788fd4ac..970f56833c302bf9f1dd4e7060a2dba3d12a0a16 100644
--- a/src/Filter/RangeFilter.php
+++ b/src/Filter/RangeFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "range" filter.
diff --git a/src/Filter/RegexpFilter.php b/src/Filter/RegexpFilter.php
index 4bc7433fd4039e74e2cb941a55fd3b438cd6056d..20ef0e65c3b8598b594afb3c52e6916254cd3012 100644
--- a/src/Filter/RegexpFilter.php
+++ b/src/Filter/RegexpFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "regexp" filter.
diff --git a/src/Filter/ScriptFilter.php b/src/Filter/ScriptFilter.php
index 94e9bc8467ae011515de09a1db5471fbb04df402..1ee24665f1088ffed206728ac20ffea5abc8981f 100644
--- a/src/Filter/ScriptFilter.php
+++ b/src/Filter/ScriptFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "script" filter.
diff --git a/src/Filter/TermFilter.php b/src/Filter/TermFilter.php
index 4ba245789afd564b5078843321d05fe8d4c894b1..743108ad2bf0378d5ffe26cd961e597d41e0966d 100644
--- a/src/Filter/TermFilter.php
+++ b/src/Filter/TermFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "term" filter.
diff --git a/src/Filter/TermsFilter.php b/src/Filter/TermsFilter.php
index 32c218bd80d3194848b28f5ca411528f566ca989..672814a1d3580bba7ccc1a247e334f3e1400780e 100644
--- a/src/Filter/TermsFilter.php
+++ b/src/Filter/TermsFilter.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "terms" filter.
diff --git a/src/Filter/TypeFilter.php b/src/Filter/TypeFilter.php
index 82d99551f8f2774cf01c360a5cc2e0d0edad89b8..7d947a5823fdabdd616fe4d0b0e989a78da7b6a3 100644
--- a/src/Filter/TypeFilter.php
+++ b/src/Filter/TypeFilter.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Filter;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Represents Elasticsearch "type" filter.
diff --git a/src/Highlight/Field.php b/src/Highlight/Field.php
index cb9440684fb243688c5a533695efb1193fea59b7..536240c1842d07479880b27c34c25ba8d43aeed8 100644
--- a/src/Highlight/Field.php
+++ b/src/Highlight/Field.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Highlight;
+namespace ONGR\ElasticsearchDSL\Highlight;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\NamedBuilderInterface;
 
 /**
  * This class holds data for highlighting field.
diff --git a/src/Highlight/Highlight.php b/src/Highlight/Highlight.php
index 68601de46c1e77e80580c7fc9c19aec3c0bd97f3..13fa0d870e0574a67324a6161ba43d9cbe426a4f 100644
--- a/src/Highlight/Highlight.php
+++ b/src/Highlight/Highlight.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Highlight;
+namespace ONGR\ElasticsearchDSL\Highlight;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderBag;
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\NamedBuilderBag;
+use ONGR\ElasticsearchDSL\NamedBuilderInterface;
 
 /**
  * Data holder for highlight api.
diff --git a/src/NamedBuilderBag.php b/src/NamedBuilderBag.php
index a7e194c09b208961f813e70e797a37e8f9f36c5c..d1a22684a9013f6c2d0a48248453f64cc8e718c4 100644
--- a/src/NamedBuilderBag.php
+++ b/src/NamedBuilderBag.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL;
+namespace ONGR\ElasticsearchDSL;
 
 /**
  * Container for named builders.
diff --git a/src/NamedBuilderInterface.php b/src/NamedBuilderInterface.php
index 86cb1b65b1ab7598ee831ab6c6946d76ed17a4ad..fd6cac1a68e864da78d78151394f4f6eddfa86d9 100644
--- a/src/NamedBuilderInterface.php
+++ b/src/NamedBuilderInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL;
+namespace ONGR\ElasticsearchDSL;
 
 /**
  * Interface used by builders with names.
diff --git a/src/ParametersTrait.php b/src/ParametersTrait.php
index aa101ddef25f7670f5c65ea421e3f33232f7fa92..0a8e654fc856583979398eae0fd6d8881beade58 100644
--- a/src/ParametersTrait.php
+++ b/src/ParametersTrait.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL;
+namespace ONGR\ElasticsearchDSL;
 
 /**
  * A trait which handles the behavior of parameters in queries, filters, etc.
diff --git a/src/Query/BoolQuery.php b/src/Query/BoolQuery.php
index 51898314aa3cfb2f5114a8995cfde2fadead54dc..d8f9396ef23cbad3e4fc70df7832ea8343799afd 100644
--- a/src/Query/BoolQuery.php
+++ b/src/Query/BoolQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "bool" filter.
diff --git a/src/Query/BoostingQuery.php b/src/Query/BoostingQuery.php
index 2dcf23baeb99a094a0c977f83b798e3d4353c040..0365482c0defd937e66ea34b4af168dbc0d06f6d 100644
--- a/src/Query/BoostingQuery.php
+++ b/src/Query/BoostingQuery.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Elasticsearch boosting query class.
diff --git a/src/Query/CommonTermsQuery.php b/src/Query/CommonTermsQuery.php
index 0aed8cba92854bd0301fc17b7a10dd74146c9472..cc70fb8b0d663b6ea2c58f9f166209938010e749 100644
--- a/src/Query/CommonTermsQuery.php
+++ b/src/Query/CommonTermsQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Common terms query class.
diff --git a/src/Query/ConstantScoreQuery.php b/src/Query/ConstantScoreQuery.php
index a133a52ea738655734e56bcfc28bea440fc0ab6b..6c3b6bbbf91750692552d9c4efd001412c741d89 100644
--- a/src/Query/ConstantScoreQuery.php
+++ b/src/Query/ConstantScoreQuery.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\DslTypeAwareTrait;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\DslTypeAwareTrait;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Constant score query class.
diff --git a/src/Query/DisMaxQuery.php b/src/Query/DisMaxQuery.php
index c77daeb9ab43c8da20edd5a1ae26017890f7f8a6..de539d8ba858bedf49b4a8f1ee60ca8af8e05c26 100644
--- a/src/Query/DisMaxQuery.php
+++ b/src/Query/DisMaxQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch dis max query class.
diff --git a/src/Query/FilteredQuery.php b/src/Query/FilteredQuery.php
index f20040bf4a2899f5dfa18394d4ca339b0c688381..f7b3dbe8ea50f22140db5cb686d0eb6a305af4b7 100644
--- a/src/Query/FilteredQuery.php
+++ b/src/Query/FilteredQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Represents Elasticsearch "bool" filter.
diff --git a/src/Query/FunctionScoreQuery.php b/src/Query/FunctionScoreQuery.php
index d09cf6574cb5b97cc99fb3dc6d925e5ab5355407..9e09a52a3dea7a3bf89c737526275a58c6be8c28 100644
--- a/src/Query/FunctionScoreQuery.php
+++ b/src/Query/FunctionScoreQuery.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\DslTypeAwareTrait;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\DslTypeAwareTrait;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch function_score query class.
diff --git a/src/Query/FuzzyLikeThisFieldQuery.php b/src/Query/FuzzyLikeThisFieldQuery.php
index 39fc1f349941d67fe04b6134f0a49e86b8d84982..a4dbbcfa6e03b16ea7541eabc975a0e59f39b694 100644
--- a/src/Query/FuzzyLikeThisFieldQuery.php
+++ b/src/Query/FuzzyLikeThisFieldQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch fuzzy_like_this_field query class.
diff --git a/src/Query/FuzzyLikeThisQuery.php b/src/Query/FuzzyLikeThisQuery.php
index 85770ed2ed992d10665d846b34206047518083ff..cabbaf5799677bdbb315220de97820707d78d6d9 100644
--- a/src/Query/FuzzyLikeThisQuery.php
+++ b/src/Query/FuzzyLikeThisQuery.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
 /**
  * Elasticsearch fuzzy_like_this query class.
diff --git a/src/Query/FuzzyQuery.php b/src/Query/FuzzyQuery.php
index ef0990cdb083b19ed2e2c8b88de05bda104ec1b1..e22a47558dcfd30b6db9feffc9a32d7b910e5e7d 100644
--- a/src/Query/FuzzyQuery.php
+++ b/src/Query/FuzzyQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch fuzzy query class.
diff --git a/src/Query/HasChildQuery.php b/src/Query/HasChildQuery.php
index 876cedf89a899a6e056e1a57ab58db6715b41e53..b40462f9914bf0f9a1176d460134ce31758d9812 100644
--- a/src/Query/HasChildQuery.php
+++ b/src/Query/HasChildQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch has_child query class.
diff --git a/src/Query/HasParentQuery.php b/src/Query/HasParentQuery.php
index 9303b42494b965fb1b57b32067acc03f3bbaaa22..1fb1816b7281c518341952125f0f01ab142cd8ab 100644
--- a/src/Query/HasParentQuery.php
+++ b/src/Query/HasParentQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch has_parent query class.
diff --git a/src/Query/IdsQuery.php b/src/Query/IdsQuery.php
index e7bad584cc3c0d7f275f209c22dac31508ff80b0..5b2b3addf244412d1e0ce9493add564cb6d1bb8f 100644
--- a/src/Query/IdsQuery.php
+++ b/src/Query/IdsQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch ids query class.
diff --git a/src/Query/IndicesQuery.php b/src/Query/IndicesQuery.php
index 7b33ab35d86e95c9d526e74af3fede5fe97fb8a0..8633f210354468ba49447625c6f70bf24cc184e0 100644
--- a/src/Query/IndicesQuery.php
+++ b/src/Query/IndicesQuery.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Elasticsearch indices query class.
@@ -67,7 +67,7 @@ class IndicesQuery implements BuilderInterface
         $output['query'] = [$this->query->getType() => $this->query->toArray()];
 
         if ($this->noMatchQuery !== null) {
-            if (is_a($this->noMatchQuery, 'ONGR\ElasticsearchBundle\DSL\BuilderInterface')) {
+            if (is_a($this->noMatchQuery, 'ONGR\ElasticsearchDSL\BuilderInterface')) {
                 $output['no_match_query'] = [$this->noMatchQuery->getType() => $this->noMatchQuery->toArray()];
             } else {
                 $output['no_match_query'] = $this->noMatchQuery;
diff --git a/src/Query/MatchAllQuery.php b/src/Query/MatchAllQuery.php
index 5dc774d8947f1b903aede3c1919eeaff43e4e250..ef8e7efb3566dc6c7d9abb092bff1bff2015f9fc 100644
--- a/src/Query/MatchAllQuery.php
+++ b/src/Query/MatchAllQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch match_all query class.
diff --git a/src/Query/MatchQuery.php b/src/Query/MatchQuery.php
index e6a0330257dc7e7414144527c558c5a1543c58e5..4815ed2847459e1ab57c3279e904d369a6bc9478 100644
--- a/src/Query/MatchQuery.php
+++ b/src/Query/MatchQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch match query class.
diff --git a/src/Query/MoreLikeThisQuery.php b/src/Query/MoreLikeThisQuery.php
index 544dc9c6d258b9804d26afdf03e418947d89c259..1b7203929dc7cba46e0c61fbbc09a605cb2e7e6c 100644
--- a/src/Query/MoreLikeThisQuery.php
+++ b/src/Query/MoreLikeThisQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch more_like_this query class.
diff --git a/src/Query/MultiMatchQuery.php b/src/Query/MultiMatchQuery.php
index 8b33530fd92b6c2a4e4b2d9198dfd3ad939aab6a..ccf608d782590ad4595bbf63f4892725255fe4be 100644
--- a/src/Query/MultiMatchQuery.php
+++ b/src/Query/MultiMatchQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch multi_match query class.
diff --git a/src/Query/NestedQuery.php b/src/Query/NestedQuery.php
index df2eddcbb2954e996d6d3091d0ad698f0d14acae..7229d164b156b4418e2ca2af018d6798ac73181e 100644
--- a/src/Query/NestedQuery.php
+++ b/src/Query/NestedQuery.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Elasticsearch nested query class.
diff --git a/src/Query/PrefixQuery.php b/src/Query/PrefixQuery.php
index 51e9e11ad02d3efedc499673b4f5308b1fa708fe..09e655e8be99977926cd918608aee4a78603c7f3 100644
--- a/src/Query/PrefixQuery.php
+++ b/src/Query/PrefixQuery.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\PrefixFilter;
+use ONGR\ElasticsearchDSL\Filter\PrefixFilter;
 
 /**
  * Represents Elasticsearch "prefix" query.
diff --git a/src/Query/Query.php b/src/Query/Query.php
index f05e6684114aedec7c2ab8d0e4bb3d894e40daa4..abc10a9027fcf3d7e5237fd9dcd4996131d133f9 100644
--- a/src/Query/Query.php
+++ b/src/Query/Query.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Query class.
diff --git a/src/Query/QueryStringQuery.php b/src/Query/QueryStringQuery.php
index 82fb117e793396a8ce9290ab09cd8ff89bdbd03c..684e8bdf3bf8299470021f2576f4065744bb6192 100644
--- a/src/Query/QueryStringQuery.php
+++ b/src/Query/QueryStringQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch query_string query class.
diff --git a/src/Query/RangeQuery.php b/src/Query/RangeQuery.php
index 939212ac651d6bd06b4c8aeb1673d1899c9c376f..26a8338535bdadd30177f9c18a15bd7fd865d3a8 100644
--- a/src/Query/RangeQuery.php
+++ b/src/Query/RangeQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Range query class.
diff --git a/src/Query/RegexpQuery.php b/src/Query/RegexpQuery.php
index 73ea4439ae9a4cff97d87afb2aadb09f2e1ae084..e5ace954a2cb601e75ed2ab07b11162b471632d2 100644
--- a/src/Query/RegexpQuery.php
+++ b/src/Query/RegexpQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Regexp query class.
diff --git a/src/Query/SimpleQueryStringQuery.php b/src/Query/SimpleQueryStringQuery.php
index ab508ca804a9e72885b60aab5d87bfefc57dc281..3c08331960c20b8d05b92bdb2c7dce50ca823217 100644
--- a/src/Query/SimpleQueryStringQuery.php
+++ b/src/Query/SimpleQueryStringQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch simple_query_string query class.
diff --git a/src/Query/Span/SpanFirstQuery.php b/src/Query/Span/SpanFirstQuery.php
index 66a9ff84657a64e560e5c1a2f125156df7aa8ea1..40d222de2f417e406efec48625e1cfe8f43dc8a2 100644
--- a/src/Query/Span/SpanFirstQuery.php
+++ b/src/Query/Span/SpanFirstQuery.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch span first query.
diff --git a/src/Query/Span/SpanMultiTermQuery.php b/src/Query/Span/SpanMultiTermQuery.php
index 5162259f49ecb466e3957ab4bb7f1d0889bb39e9..c176188fa46b19d62d0112b5b9805decd57678d1 100644
--- a/src/Query/Span/SpanMultiTermQuery.php
+++ b/src/Query/Span/SpanMultiTermQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch span multi term query.
diff --git a/src/Query/Span/SpanNearQuery.php b/src/Query/Span/SpanNearQuery.php
index 564a2ca033e51c41a0bb10641c5267b8169c3dd5..f71a0cce7dfb73d019cb1fbaa8ab354de979ebb3 100644
--- a/src/Query/Span/SpanNearQuery.php
+++ b/src/Query/Span/SpanNearQuery.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Query\Span;
 
 /**
  * Elasticsearch span near query.
diff --git a/src/Query/Span/SpanNotQuery.php b/src/Query/Span/SpanNotQuery.php
index 9ce85c07b951c09f2f8d4f17867890c4505e9750..9e2359a19108569535d6ecc225fcece8315d7b9c 100644
--- a/src/Query/Span/SpanNotQuery.php
+++ b/src/Query/Span/SpanNotQuery.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch Span not query.
diff --git a/src/Query/Span/SpanOrQuery.php b/src/Query/Span/SpanOrQuery.php
index 5d351c40cebca6be93d09963abb11baac4a8481a..5b3c4321a571f5135527a6136d3bdf60e78cda28 100644
--- a/src/Query/Span/SpanOrQuery.php
+++ b/src/Query/Span/SpanOrQuery.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch span or query.
diff --git a/src/Query/Span/SpanQueryInterface.php b/src/Query/Span/SpanQueryInterface.php
index 45fdea9589f6f0b2c05c67fb456662d66e5642da..6d0efdffa92a14cd4243dec5e9778529f3a6ccb9 100644
--- a/src/Query/Span/SpanQueryInterface.php
+++ b/src/Query/Span/SpanQueryInterface.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Interface SpanQueryInterface to recognise span queries.
diff --git a/src/Query/Span/SpanTermQuery.php b/src/Query/Span/SpanTermQuery.php
index 7ccde21ca102e51255ea5abe9c903d2467238959..2a898e42841ba070925489081a4256f4d5dcea11 100644
--- a/src/Query/Span/SpanTermQuery.php
+++ b/src/Query/Span/SpanTermQuery.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Query\Span;
 
-use ONGR\ElasticsearchBundle\DSL\Query\TermQuery;
+use ONGR\ElasticsearchDSL\Query\TermQuery;
 
 /**
  * Elasticsearch span_term query class.
diff --git a/src/Query/TermQuery.php b/src/Query/TermQuery.php
index 9082c48c6cdec7d9a25aed50f8897e52663f0692..3a0bf24b60ce107b3a3784d3db6b4bfa8fd51702 100644
--- a/src/Query/TermQuery.php
+++ b/src/Query/TermQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch term query class.
diff --git a/src/Query/TermsQuery.php b/src/Query/TermsQuery.php
index 447d5819a47efb9823fa6faafba42dc2ffdd377a..a52c0624e3868c0cd9bc41a2f0e07edf4435350c 100644
--- a/src/Query/TermsQuery.php
+++ b/src/Query/TermsQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch terms query class.
diff --git a/src/Query/WildcardQuery.php b/src/Query/WildcardQuery.php
index 4697b057b8b69f239b46cb05ebcc6643a7a29557..eed28344cf8813faa4a1cecbc45a09feaa2752dd 100644
--- a/src/Query/WildcardQuery.php
+++ b/src/Query/WildcardQuery.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Query;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
 
 /**
  * Elasticsearch wildcard query class.
diff --git a/src/ScriptAwareTrait.php b/src/ScriptAwareTrait.php
index d9a40fe02262efa17c0eff81f767c06881252b23..72489ae6077a6d22f88b61d79d8fba0fa231a151 100644
--- a/src/ScriptAwareTrait.php
+++ b/src/ScriptAwareTrait.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL;
+namespace ONGR\ElasticsearchDSL;
 
 /**
  * A trait which handles elasticsearch aggregation script.
diff --git a/src/Search.php b/src/Search.php
index ff22cdc3a7e8f1f9317bc3c1765e518066dfed4c..5d12282e70fc4d929a0e9037e74f41e69dcf5dbe 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -9,15 +9,15 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL;
-
-use ONGR\ElasticsearchBundle\DSL\Aggregation\AbstractAggregation;
-use ONGR\ElasticsearchBundle\DSL\Highlight\Highlight;
-use ONGR\ElasticsearchBundle\DSL\SearchEndpoint\SearchEndpointFactory;
-use ONGR\ElasticsearchBundle\DSL\SearchEndpoint\SearchEndpointInterface;
-use ONGR\ElasticsearchBundle\DSL\Sort\AbstractSort;
-use ONGR\ElasticsearchBundle\DSL\Sort\Sorts;
-use ONGR\ElasticsearchBundle\DSL\Suggester\AbstractSuggester;
+namespace ONGR\ElasticsearchDSL;
+
+use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
+use ONGR\ElasticsearchDSL\Highlight\Highlight;
+use ONGR\ElasticsearchDSL\SearchEndpoint\SearchEndpointFactory;
+use ONGR\ElasticsearchDSL\SearchEndpoint\SearchEndpointInterface;
+use ONGR\ElasticsearchDSL\Sort\AbstractSort;
+use ONGR\ElasticsearchDSL\Sort\Sorts;
+use ONGR\ElasticsearchDSL\Suggester\AbstractSuggester;
 use ONGR\ElasticsearchBundle\Serializer\Normalizer\CustomReferencedNormalizer;
 use ONGR\ElasticsearchBundle\Serializer\OrderedSerializer;
 use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
diff --git a/src/SearchEndpoint/AbstractSearchEndpoint.php b/src/SearchEndpoint/AbstractSearchEndpoint.php
index 4effbf8ce55b4440ee2782279e3803b9eff5bd37..86bf72feeb7b625d6f22fcc4e58e8a10977b9055 100644
--- a/src/SearchEndpoint/AbstractSearchEndpoint.php
+++ b/src/SearchEndpoint/AbstractSearchEndpoint.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 use ONGR\ElasticsearchBundle\Serializer\Normalizer\AbstractNormalizable;
 
diff --git a/src/SearchEndpoint/AggregationsEndpoint.php b/src/SearchEndpoint/AggregationsEndpoint.php
index 16d4b8ce5d232c849abb0cf6fab0e6101afa4726..7c54f2d8e1fad18838beeb7febde711166e1d6bd 100644
--- a/src/SearchEndpoint/AggregationsEndpoint.php
+++ b/src/SearchEndpoint/AggregationsEndpoint.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderBag;
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\NamedBuilderBag;
+use ONGR\ElasticsearchDSL\NamedBuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/FilterEndpoint.php b/src/SearchEndpoint/FilterEndpoint.php
index 1ccfbcb6cf3f667d181950cfcea4fe81a85c6507..e898c40ed718c721c2305245512742915ef8b8fb 100644
--- a/src/SearchEndpoint/FilterEndpoint.php
+++ b/src/SearchEndpoint/FilterEndpoint.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\BoolFilter;
-use ONGR\ElasticsearchBundle\DSL\Query\FilteredQuery;
+use ONGR\ElasticsearchDSL\Filter\BoolFilter;
+use ONGR\ElasticsearchDSL\Query\FilteredQuery;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/HighlightEndpoint.php b/src/SearchEndpoint/HighlightEndpoint.php
index 5a2afbd0164cbf410aee611c5acecc8a37e397f9..eeaf5b7d34940c2f5310ae3c3c08d275d01b27d8 100644
--- a/src/SearchEndpoint/HighlightEndpoint.php
+++ b/src/SearchEndpoint/HighlightEndpoint.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/PostFilterEndpoint.php b/src/SearchEndpoint/PostFilterEndpoint.php
index 32d369f93e733f87df193814c43092fc1797d9b0..3b82a8ac3cf5556eae44a73b88d0832e8a16ac23 100644
--- a/src/SearchEndpoint/PostFilterEndpoint.php
+++ b/src/SearchEndpoint/PostFilterEndpoint.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchBundle\DSL\Filter\PostFilter;
+use ONGR\ElasticsearchDSL\Filter\PostFilter;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/QueryEndpoint.php b/src/SearchEndpoint/QueryEndpoint.php
index c74770b704d7594fabbe9fea581ff79c036a1757..bd02dac8520b6ff52e6d292ced201d7880871277 100644
--- a/src/SearchEndpoint/QueryEndpoint.php
+++ b/src/SearchEndpoint/QueryEndpoint.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
-use ONGR\ElasticsearchBundle\DSL\Query\BoolQuery;
-use ONGR\ElasticsearchBundle\DSL\Query\FilteredQuery;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\ParametersTrait;
+use ONGR\ElasticsearchDSL\Query\BoolQuery;
+use ONGR\ElasticsearchDSL\Query\FilteredQuery;
 use ONGR\ElasticsearchBundle\Serializer\Normalizer\OrderedNormalizerInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
diff --git a/src/SearchEndpoint/SearchEndpointFactory.php b/src/SearchEndpoint/SearchEndpointFactory.php
index d319c6527c799dd62471898872d867d4e1911548..291a631479b5f94eba66a6a4f6cda191e1348622 100644
--- a/src/SearchEndpoint/SearchEndpointFactory.php
+++ b/src/SearchEndpoint/SearchEndpointFactory.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 /**
  * Factory for search endpoints.
@@ -20,13 +20,13 @@ class SearchEndpointFactory
      * @var array Holds namespaces for endpoints.
      */
     private static $endpoints = [
-        'query' => 'ONGR\ElasticsearchBundle\DSL\SearchEndpoint\QueryEndpoint',
-        'filter' => 'ONGR\ElasticsearchBundle\DSL\SearchEndpoint\FilterEndpoint',
-        'post_filter' => 'ONGR\ElasticsearchBundle\DSL\SearchEndpoint\PostFilterEndpoint',
-        'sort' => 'ONGR\ElasticsearchBundle\DSL\SearchEndpoint\SortEndpoint',
-        'highlight' => 'ONGR\ElasticsearchBundle\DSL\SearchEndpoint\HighlightEndpoint',
-        'aggregations' => 'ONGR\ElasticsearchBundle\DSL\SearchEndpoint\AggregationsEndpoint',
-        'suggest' => 'ONGR\ElasticsearchBundle\DSL\SearchEndpoint\SuggestEndpoint',
+        'query' => 'ONGR\ElasticsearchDSL\SearchEndpoint\QueryEndpoint',
+        'filter' => 'ONGR\ElasticsearchDSL\SearchEndpoint\FilterEndpoint',
+        'post_filter' => 'ONGR\ElasticsearchDSL\SearchEndpoint\PostFilterEndpoint',
+        'sort' => 'ONGR\ElasticsearchDSL\SearchEndpoint\SortEndpoint',
+        'highlight' => 'ONGR\ElasticsearchDSL\SearchEndpoint\HighlightEndpoint',
+        'aggregations' => 'ONGR\ElasticsearchDSL\SearchEndpoint\AggregationsEndpoint',
+        'suggest' => 'ONGR\ElasticsearchDSL\SearchEndpoint\SuggestEndpoint',
     ];
 
     /**
diff --git a/src/SearchEndpoint/SearchEndpointInterface.php b/src/SearchEndpoint/SearchEndpointInterface.php
index a7f54d69ce73c5c32a2be100b07f60e8a65e6402..bdd5dc8cd6bd064483eb081105dc3410d513e91f 100644
--- a/src/SearchEndpoint/SearchEndpointInterface.php
+++ b/src/SearchEndpoint/SearchEndpointInterface.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizableInterface;
 
 /**
diff --git a/src/SearchEndpoint/SortEndpoint.php b/src/SearchEndpoint/SortEndpoint.php
index a05f89778341040675c1b63a366dffced318d174..578e63a126a976db1a17d2763f554dcc0dd6d582 100644
--- a/src/SearchEndpoint/SortEndpoint.php
+++ b/src/SearchEndpoint/SortEndpoint.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\Sort\Sorts;
+use ONGR\ElasticsearchDSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\Sort\Sorts;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
diff --git a/src/SearchEndpoint/SuggestEndpoint.php b/src/SearchEndpoint/SuggestEndpoint.php
index 5d5c0192139fe7c639256b9e0902f1db1239ff85..f2edd7a384d3ed651536379c44a92138676a0a81 100644
--- a/src/SearchEndpoint/SuggestEndpoint.php
+++ b/src/SearchEndpoint/SuggestEndpoint.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\SearchEndpoint;
+namespace ONGR\ElasticsearchDSL\SearchEndpoint;
 
 /**
  * Search suggesters dsl endpoint.
diff --git a/src/Sort/AbstractSort.php b/src/Sort/AbstractSort.php
index 46dd290e6cdbcca76df419e6836086fc1a91119f..0e1c1cde09d4afa81c8e479e81d75d6fdf3a5261 100644
--- a/src/Sort/AbstractSort.php
+++ b/src/Sort/AbstractSort.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Sort;
+namespace ONGR\ElasticsearchDSL\Sort;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Abstract class for sorting.
diff --git a/src/Sort/GeoSort.php b/src/Sort/GeoSort.php
index 068de8c785afff9c4d7d61dd2c23b7404da09d49..9f4fd523b742b98ec81f5a1bda8a80270bde6342 100644
--- a/src/Sort/GeoSort.php
+++ b/src/Sort/GeoSort.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Sort;
+namespace ONGR\ElasticsearchDSL\Sort;
 
 /**
  * A special type of sorting by distance.
diff --git a/src/Sort/ScriptSort.php b/src/Sort/ScriptSort.php
index 7ddd879faa4372a19c8f038d7563e1754927b58e..9106dbfd5da38f7c374c7b9afdc288e850b0153b 100644
--- a/src/Sort/ScriptSort.php
+++ b/src/Sort/ScriptSort.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Sort;
+namespace ONGR\ElasticsearchDSL\Sort;
 
 /**
  * Sort based on custom scripts.
diff --git a/src/Sort/Sort.php b/src/Sort/Sort.php
index a21946e302a732614c15411f221fb9780cf2e1e6..50068bd93d94df7a39b210ff7aa16c3978338aec 100644
--- a/src/Sort/Sort.php
+++ b/src/Sort/Sort.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Sort;
+namespace ONGR\ElasticsearchDSL\Sort;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Holds all the values required for basic sorting.
diff --git a/src/Sort/Sorts.php b/src/Sort/Sorts.php
index f4bc32d7c6fef88c2c65e9b75ebcfea37833c845..da1a9b04196cf34d8258b94d156d634b82b524b2 100644
--- a/src/Sort/Sorts.php
+++ b/src/Sort/Sorts.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Sort;
+namespace ONGR\ElasticsearchDSL\Sort;
 
-use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
+use ONGR\ElasticsearchDSL\BuilderInterface;
 
 /**
  * Container for sorts.
diff --git a/src/Suggester/AbstractSuggester.php b/src/Suggester/AbstractSuggester.php
index 5bf886bef4e8f4a77ec3a723ca44ec6411de0ac3..72f8a2ed591f0ef286342571158cd6dc6038bd60 100644
--- a/src/Suggester/AbstractSuggester.php
+++ b/src/Suggester/AbstractSuggester.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Suggester;
+namespace ONGR\ElasticsearchDSL\Suggester;
 
-use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
+use ONGR\ElasticsearchDSL\NamedBuilderInterface;
 
 /**
  * AbstractSuggester class.
diff --git a/src/Suggester/Completion.php b/src/Suggester/Completion.php
index bd045e251dcfca4c9241d35fd16be387359d593e..265da6b9bea4a6047099c103732b2555b49c1ec3 100644
--- a/src/Suggester/Completion.php
+++ b/src/Suggester/Completion.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Suggester;
+namespace ONGR\ElasticsearchDSL\Suggester;
 
 /**
  * Completion class.
diff --git a/src/Suggester/Context.php b/src/Suggester/Context.php
index af7ac4bce179ff2c7e98027d8c1adc0747b3d3a2..cf28cf0814879a0e135c49e8c881c52a77b0ba4c 100644
--- a/src/Suggester/Context.php
+++ b/src/Suggester/Context.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Suggester;
+namespace ONGR\ElasticsearchDSL\Suggester;
 
-use ONGR\ElasticsearchBundle\DSL\Suggester\Context\AbstractContext;
+use ONGR\ElasticsearchDSL\Suggester\Context\AbstractContext;
 
 /**
  * Context suggester.
diff --git a/src/Suggester/Context/AbstractContext.php b/src/Suggester/Context/AbstractContext.php
index 7dc69da853749ca850a95e37c6f0aa757c3d33df..1d2e4fc51e1c89fe8bdd3637af122c29c1e09e64 100644
--- a/src/Suggester/Context/AbstractContext.php
+++ b/src/Suggester/Context/AbstractContext.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Suggester\Context;
+namespace ONGR\ElasticsearchDSL\Suggester\Context;
 
 /**
  * Abstract context to be used by geo context and category context.
diff --git a/src/Suggester/Context/CategoryContext.php b/src/Suggester/Context/CategoryContext.php
index 9c1e875ec1919cbe07fa6936e3a906aae9a0942f..f78dbca0f5d202c12f7dbf15eb4cecbdabf1545a 100644
--- a/src/Suggester/Context/CategoryContext.php
+++ b/src/Suggester/Context/CategoryContext.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Suggester\Context;
+namespace ONGR\ElasticsearchDSL\Suggester\Context;
 
 /**
  * Category context to be used by context suggester.
diff --git a/src/Suggester/Context/GeoContext.php b/src/Suggester/Context/GeoContext.php
index 2d01eac1de42c3413a43472d0c3a79a07c407b33..6db0115991cb0d0494c65a8f52532aa647d5a1c0 100644
--- a/src/Suggester/Context/GeoContext.php
+++ b/src/Suggester/Context/GeoContext.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Suggester\Context;
+namespace ONGR\ElasticsearchDSL\Suggester\Context;
 
 /**
  * Geo context to be used by context suggester.
diff --git a/src/Suggester/Phrase.php b/src/Suggester/Phrase.php
index 95b182e40f8573c84a9f1de071eadd5722829783..5fff0aa6afd44680d30fc54816a240a6673192fa 100644
--- a/src/Suggester/Phrase.php
+++ b/src/Suggester/Phrase.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Suggester;
+namespace ONGR\ElasticsearchDSL\Suggester;
 
 /**
  * Phrase class.
diff --git a/src/Suggester/Term.php b/src/Suggester/Term.php
index d7bab96e8aec44e988e3680156360478dbfe62e3..9cc8ade8bb8976f085fcc0c5066bb5579be8ac18 100644
--- a/src/Suggester/Term.php
+++ b/src/Suggester/Term.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchBundle\DSL\Suggester;
+namespace ONGR\ElasticsearchDSL\Suggester;
 
 /**
  * Term class.