diff --git a/Aggregation/AbstractAggregation.php b/Aggregation/AbstractAggregation.php
index 88f786f2bb7829f9772bd3d1199c941c41d0d097..01cd487e9e721799b8b286ca2f45839a2621daf0 100644
--- a/Aggregation/AbstractAggregation.php
+++ b/Aggregation/AbstractAggregation.php
@@ -11,13 +11,13 @@
 
 namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
 
-use ONGR\ElasticsearchBundle\DSL\FriendlyBuilderBag;
-use ONGR\ElasticsearchBundle\DSL\FriendlyBuilderInterface;
+use ONGR\ElasticsearchBundle\DSL\NamedBuilderBag;
+use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
 
 /**
  * AbstractAggregation class.
  */
-abstract class AbstractAggregation implements FriendlyBuilderInterface
+abstract class AbstractAggregation implements NamedBuilderInterface
 {
     const PREFIX = 'agg_';
 
@@ -32,7 +32,7 @@ abstract class AbstractAggregation implements FriendlyBuilderInterface
     protected $name;
 
     /**
-     * @var FriendlyBuilderBag
+     * @var NamedBuilderBag
      */
     public $aggregations;
 
@@ -61,7 +61,7 @@ abstract class AbstractAggregation implements FriendlyBuilderInterface
     public function __construct($name)
     {
         $this->name = $name;
-        $this->aggregations = new FriendlyBuilderBag();
+        $this->aggregations = new NamedBuilderBag();
     }
 
     /**
diff --git a/Highlight/Field.php b/Highlight/Field.php
index 10eecb4eabe25a583157183818a31fe88453d4fa..92e584f86cfba0889cfd29d17656bd2d1b5aef2e 100644
--- a/Highlight/Field.php
+++ b/Highlight/Field.php
@@ -12,12 +12,12 @@
 namespace ONGR\ElasticsearchBundle\DSL\Highlight;
 
 use ONGR\ElasticsearchBundle\DSL\BuilderInterface;
-use ONGR\ElasticsearchBundle\DSL\FriendlyBuilderInterface;
+use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
 
 /**
  * This class holds data for highlighting field.
  */
-class Field implements FriendlyBuilderInterface
+class Field implements NamedBuilderInterface
 {
     const TYPE_PLAIN = 'plain';
     const TYPE_POSTINGS = 'postings';
diff --git a/Highlight/Highlight.php b/Highlight/Highlight.php
index 33a0ff3727736ecf5ac0e35fb8e0501d8eedc229..cee68eed71c641bf66e0fdb1b859f4294127dcef 100644
--- a/Highlight/Highlight.php
+++ b/Highlight/Highlight.php
@@ -11,13 +11,13 @@
 
 namespace ONGR\ElasticsearchBundle\DSL\Highlight;
 
-use ONGR\ElasticsearchBundle\DSL\FriendlyBuilderBag;
-use ONGR\ElasticsearchBundle\DSL\FriendlyBuilderInterface;
+use ONGR\ElasticsearchBundle\DSL\NamedBuilderBag;
+use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
 
 /**
  * Data holder for highlight api.
  */
-class Highlight extends FriendlyBuilderBag
+class Highlight extends NamedBuilderBag
 {
     const TYPE_PLAIN = 'plain';
     const TYPE_POSTINGS = 'postings';
@@ -58,7 +58,7 @@ class Highlight extends FriendlyBuilderBag
      *
      * @return Highlight
      */
-    public function add(FriendlyBuilderInterface $builder)
+    public function add(NamedBuilderInterface $builder)
     {
         parent::add($builder);
 
@@ -197,7 +197,7 @@ class Highlight extends FriendlyBuilderBag
             }
         }
 
-        /** @var FriendlyBuilderInterface $field */
+        /** @var NamedBuilderInterface $field */
         foreach ($this->all() as $field) {
             $highlight['fields'][$field->getName()] = $field->toArray();
         }
diff --git a/FriendlyBuilderBag.php b/NamedBuilderBag.php
similarity index 79%
rename from FriendlyBuilderBag.php
rename to NamedBuilderBag.php
index dd90e94d741af1b7a8b500a014d1cd841e68e4f1..2d90543479326b5e3b08a67f268a155107c1145a 100644
--- a/FriendlyBuilderBag.php
+++ b/NamedBuilderBag.php
@@ -12,17 +12,17 @@
 namespace ONGR\ElasticsearchBundle\DSL;
 
 /**
- * Container for friendly builders.
+ * Container for named builders.
  */
-class FriendlyBuilderBag
+class NamedBuilderBag
 {
     /**
-     * @var FriendlyBuilderInterface[]
+     * @var NamedBuilderInterface[]
      */
     private $bag = [];
 
     /**
-     * @param FriendlyBuilderInterface[] $builders
+     * @param NamedBuilderInterface[] $builders
      */
     public function __construct(array $builders = [])
     {
@@ -32,7 +32,7 @@ class FriendlyBuilderBag
     /**
      * Replaces builders with new ones.
      *
-     * @param FriendlyBuilderInterface[] $builders
+     * @param NamedBuilderInterface[] $builders
      */
     public function set(array $builders)
     {
@@ -44,9 +44,9 @@ class FriendlyBuilderBag
     /**
      * Adds a builder.
      *
-     * @param FriendlyBuilderInterface $builder
+     * @param NamedBuilderInterface $builder
      */
-    public function add(FriendlyBuilderInterface $builder)
+    public function add(NamedBuilderInterface $builder)
     {
         $this->bag[$builder->getName()] = $builder;
     }
@@ -86,7 +86,7 @@ class FriendlyBuilderBag
      *
      * @param string $name Builder name.
      *
-     * @return FriendlyBuilderInterface
+     * @return NamedBuilderInterface
      */
     public function get($name)
     {
@@ -98,14 +98,14 @@ class FriendlyBuilderBag
      *
      * @param string|null $name Builder name.
      *
-     * @return FriendlyBuilderInterface[]
+     * @return NamedBuilderInterface[]
      */
     public function all($name = null)
     {
         return array_filter(
             $this->bag,
             function ($builder) use ($name) {
-                /** @var FriendlyBuilderInterface $builder */
+                /** @var NamedBuilderInterface $builder */
 
                 return $name === null || $builder->getName() == $name;
             }
diff --git a/FriendlyBuilderInterface.php b/NamedBuilderInterface.php
similarity index 87%
rename from FriendlyBuilderInterface.php
rename to NamedBuilderInterface.php
index a4e1e4b31fd89d59953509a114972fbb05f9308c..86cb1b65b1ab7598ee831ab6c6946d76ed17a4ad 100644
--- a/FriendlyBuilderInterface.php
+++ b/NamedBuilderInterface.php
@@ -14,7 +14,7 @@ namespace ONGR\ElasticsearchBundle\DSL;
 /**
  * Interface used by builders with names.
  */
-interface FriendlyBuilderInterface extends BuilderInterface
+interface NamedBuilderInterface extends BuilderInterface
 {
     /**
      * Returns builder name.
diff --git a/Search.php b/Search.php
index 0328cf6a83df7e8b455a36e92186335c52277e7a..1564ad73cdf577c8fdbc10252230686dd3c01816 100644
--- a/Search.php
+++ b/Search.php
@@ -89,7 +89,7 @@ class Search
     private $scriptFields;
 
     /**
-     * @var FriendlyBuilderBag
+     * @var NamedBuilderBag
      */
     private $suggesters;
 
@@ -114,7 +114,7 @@ class Search
     private $stats;
 
     /**
-     * @var FriendlyBuilderBag
+     * @var NamedBuilderBag
      */
     private $aggregations;
 
@@ -359,7 +359,7 @@ class Search
     public function addAggregation($agg)
     {
         if ($this->aggregations === null) {
-            $this->aggregations = new FriendlyBuilderBag();
+            $this->aggregations = new NamedBuilderBag();
         }
         $this->aggregations->add($agg);
 
@@ -404,7 +404,7 @@ class Search
     public function addSuggester(AbstractSuggester $suggester)
     {
         if ($this->suggesters === null) {
-            $this->suggesters = new FriendlyBuilderBag();
+            $this->suggesters = new NamedBuilderBag();
         }
         $this->suggesters->add($suggester);
 
@@ -473,7 +473,7 @@ class Search
     }
 
     /**
-     * @return FriendlyBuilderBag
+     * @return NamedBuilderBag
      */
     public function getAggregations()
     {
@@ -609,7 +609,7 @@ class Search
     }
 
     /**
-     * @return FriendlyBuilderBag
+     * @return NamedBuilderBag
      */
     public function getSuggesters()
     {
diff --git a/Suggester/AbstractSuggester.php b/Suggester/AbstractSuggester.php
index ecef664b2ffe4aef9868a0b3f0daa4a8c02ee5a8..5bf886bef4e8f4a77ec3a723ca44ec6411de0ac3 100644
--- a/Suggester/AbstractSuggester.php
+++ b/Suggester/AbstractSuggester.php
@@ -11,12 +11,12 @@
 
 namespace ONGR\ElasticsearchBundle\DSL\Suggester;
 
-use ONGR\ElasticsearchBundle\DSL\FriendlyBuilderInterface;
+use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
 
 /**
  * AbstractSuggester class.
  */
-abstract class AbstractSuggester implements FriendlyBuilderInterface
+abstract class AbstractSuggester implements NamedBuilderInterface
 {
     /**
      * @var string