Rename AggregatorBuilder and all of its subclasses to

AggregationBuilder, in keeping consistent with the Java APIs.

Closes #18377
Closes #18367

9 files changed, 80 insertions, 80 deletions

diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java
index fbf4269c26..0121da2fa9 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/AbstractRangeBuilder.java
@@ -25,7 +25,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.search.aggregations.bucket.range.RangeAggregator.Range;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
-import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorBuilder;
+import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.Objects;
 
 public abstract class AbstractRangeBuilder<AB extends AbstractRangeBuilder<AB, R>, R extends Range>
-        extends ValuesSourceAggregatorBuilder<ValuesSource.Numeric, AB> {
+        extends ValuesSourceAggregationBuilder<ValuesSource.Numeric, AB> {
 
     protected final InternalRange.Factory<?, ?> rangeFactory;
     protected List<R> ranges = new ArrayList<>();
@@ -103,4 +103,4 @@ public abstract class AbstractRangeBuilder<AB extends AbstractRangeBuilder<AB, R
         return Objects.equals(ranges, other.ranges)
                 && Objects.equals(keyed, other.keyed);
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java
index 8347625b09..c4ba10ed6d 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregatorBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregationBuilder.java
@@ -30,18 +30,18 @@ import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
 
 import java.io.IOException;
 
-public class RangeAggregatorBuilder extends AbstractRangeBuilder<RangeAggregatorBuilder, Range> {
+public class RangeAggregationBuilder extends AbstractRangeBuilder<RangeAggregationBuilder, Range> {
     public static final String NAME = InternalRange.TYPE.name();
     public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME);
 
-    public RangeAggregatorBuilder(String name) {
+    public RangeAggregationBuilder(String name) {
         super(name, InternalRange.FACTORY);
     }
 
     /**
      * Read from a stream.
      */
-    public RangeAggregatorBuilder(StreamInput in) throws IOException {
+    public RangeAggregationBuilder(StreamInput in) throws IOException {
         super(in, InternalRange.FACTORY, Range::new);
     }
 
@@ -55,7 +55,7 @@ public class RangeAggregatorBuilder extends AbstractRangeBuilder<RangeAggregator
      * @param to
      *            the upper bound on the distances, exclusive
      */
-    public RangeAggregatorBuilder addRange(String key, double from, double to) {
+    public RangeAggregationBuilder addRange(String key, double from, double to) {
         addRange(new Range(key, from, to));
         return this;
     }
@@ -65,7 +65,7 @@ public class RangeAggregatorBuilder extends AbstractRangeBuilder<RangeAggregator
      * automatically generated based on <code>from</code> and
      * <code>to</code>.
      */
-    public RangeAggregatorBuilder addRange(double from, double to) {
+    public RangeAggregationBuilder addRange(double from, double to) {
         return addRange(null, from, to);
     }
 
@@ -77,7 +77,7 @@ public class RangeAggregatorBuilder extends AbstractRangeBuilder<RangeAggregator
      * @param to
      *            the upper bound on the distances, exclusive
      */
-    public RangeAggregatorBuilder addUnboundedTo(String key, double to) {
+    public RangeAggregationBuilder addUnboundedTo(String key, double to) {
         addRange(new Range(key, null, to));
         return this;
     }
@@ -86,7 +86,7 @@ public class RangeAggregatorBuilder extends AbstractRangeBuilder<RangeAggregator
      * Same as {@link #addUnboundedTo(String, double)} but the key will be
      * computed automatically.
      */
-    public RangeAggregatorBuilder addUnboundedTo(double to) {
+    public RangeAggregationBuilder addUnboundedTo(double to) {
         return addUnboundedTo(null, to);
     }
 
@@ -98,7 +98,7 @@ public class RangeAggregatorBuilder extends AbstractRangeBuilder<RangeAggregator
      * @param from
      *            the lower bound on the distances, inclusive
      */
-    public RangeAggregatorBuilder addUnboundedFrom(String key, double from) {
+    public RangeAggregationBuilder addUnboundedFrom(String key, double from) {
         addRange(new Range(key, from, null));
         return this;
     }
@@ -107,7 +107,7 @@ public class RangeAggregatorBuilder extends AbstractRangeBuilder<RangeAggregator
      * Same as {@link #addUnboundedFrom(String, double)} but the key will be
      * computed automatically.
      */
-    public RangeAggregatorBuilder addUnboundedFrom(double from) {
+    public RangeAggregationBuilder addUnboundedFrom(double from) {
         return addUnboundedFrom(null, from);
     }
 
@@ -122,4 +122,4 @@ public class RangeAggregatorBuilder extends AbstractRangeBuilder<RangeAggregator
     public String getWriteableName() {
         return NAME;
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeParser.java
index 8a441f2f3a..6ebd413d2d 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeParser.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeParser.java
@@ -51,7 +51,7 @@ public class RangeParser extends NumericValuesSourceParser {
     @Override
     protected AbstractRangeBuilder<?, ?> createFactory(String aggregationName, ValuesSourceType valuesSourceType,
             ValueType targetValueType, Map<ParseField, Object> otherOptions) {
-        RangeAggregatorBuilder factory = new RangeAggregatorBuilder(aggregationName);
+        RangeAggregationBuilder factory = new RangeAggregationBuilder(aggregationName);
         @SuppressWarnings("unchecked")
         List<? extends Range> ranges = (List<? extends Range>) otherOptions.get(RangeAggregator.RANGES_FIELD);
         for (Range range : ranges) {
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeAggregationBuilder.java
index 9c28461df6..392744a4f1 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeAggregatorBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeAggregationBuilder.java
@@ -33,18 +33,18 @@ import org.joda.time.DateTime;
 
 import java.io.IOException;
 
-public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAggregatorBuilder, RangeAggregator.Range> {
+public class DateRangeAggregationBuilder extends AbstractRangeBuilder<DateRangeAggregationBuilder, RangeAggregator.Range> {
     public static final String NAME = InternalDateRange.TYPE.name();
     public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME);
 
-    public DateRangeAggregatorBuilder(String name) {
+    public DateRangeAggregationBuilder(String name) {
         super(name, InternalDateRange.FACTORY);
     }
 
     /**
      * Read from a stream.
      */
-    public DateRangeAggregatorBuilder(StreamInput in) throws IOException {
+    public DateRangeAggregationBuilder(StreamInput in) throws IOException {
         super(in, InternalDateRange.FACTORY, Range::new);
     }
 
@@ -63,7 +63,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * @param to
      *            the upper bound on the dates, exclusive
      */
-    public DateRangeAggregatorBuilder addRange(String key, String from, String to) {
+    public DateRangeAggregationBuilder addRange(String key, String from, String to) {
         addRange(new Range(key, from, to));
         return this;
     }
@@ -72,7 +72,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * Same as {@link #addRange(String, String, String)} but the key will be
      * automatically generated based on <code>from</code> and <code>to</code>.
      */
-    public DateRangeAggregatorBuilder addRange(String from, String to) {
+    public DateRangeAggregationBuilder addRange(String from, String to) {
         return addRange(null, from, to);
     }
 
@@ -84,7 +84,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * @param to
      *            the upper bound on the dates, exclusive
      */
-    public DateRangeAggregatorBuilder addUnboundedTo(String key, String to) {
+    public DateRangeAggregationBuilder addUnboundedTo(String key, String to) {
         addRange(new Range(key, null, to));
         return this;
     }
@@ -93,7 +93,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * Same as {@link #addUnboundedTo(String, String)} but the key will be
      * computed automatically.
      */
-    public DateRangeAggregatorBuilder addUnboundedTo(String to) {
+    public DateRangeAggregationBuilder addUnboundedTo(String to) {
         return addUnboundedTo(null, to);
     }
 
@@ -105,7 +105,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * @param from
      *            the lower bound on the distances, inclusive
      */
-    public DateRangeAggregatorBuilder addUnboundedFrom(String key, String from) {
+    public DateRangeAggregationBuilder addUnboundedFrom(String key, String from) {
         addRange(new Range(key, from, null));
         return this;
     }
@@ -114,7 +114,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * Same as {@link #addUnboundedFrom(String, String)} but the key will be
      * computed automatically.
      */
-    public DateRangeAggregatorBuilder addUnboundedFrom(String from) {
+    public DateRangeAggregationBuilder addUnboundedFrom(String from) {
         return addUnboundedFrom(null, from);
     }
 
@@ -128,7 +128,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * @param to
      *            the upper bound on the dates, exclusive
      */
-    public DateRangeAggregatorBuilder addRange(String key, double from, double to) {
+    public DateRangeAggregationBuilder addRange(String key, double from, double to) {
         addRange(new Range(key, from, to));
         return this;
     }
@@ -137,7 +137,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * Same as {@link #addRange(String, double, double)} but the key will be
      * automatically generated based on <code>from</code> and <code>to</code>.
      */
-    public DateRangeAggregatorBuilder addRange(double from, double to) {
+    public DateRangeAggregationBuilder addRange(double from, double to) {
         return addRange(null, from, to);
     }
 
@@ -149,7 +149,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * @param to
      *            the upper bound on the dates, exclusive
      */
-    public DateRangeAggregatorBuilder addUnboundedTo(String key, double to) {
+    public DateRangeAggregationBuilder addUnboundedTo(String key, double to) {
         addRange(new Range(key, null, to));
         return this;
     }
@@ -158,7 +158,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * Same as {@link #addUnboundedTo(String, double)} but the key will be
      * computed automatically.
      */
-    public DateRangeAggregatorBuilder addUnboundedTo(double to) {
+    public DateRangeAggregationBuilder addUnboundedTo(double to) {
         return addUnboundedTo(null, to);
     }
 
@@ -170,7 +170,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * @param from
      *            the lower bound on the distances, inclusive
      */
-    public DateRangeAggregatorBuilder addUnboundedFrom(String key, double from) {
+    public DateRangeAggregationBuilder addUnboundedFrom(String key, double from) {
         addRange(new Range(key, from, null));
         return this;
     }
@@ -179,7 +179,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * Same as {@link #addUnboundedFrom(String, double)} but the key will be
      * computed automatically.
      */
-    public DateRangeAggregatorBuilder addUnboundedFrom(double from) {
+    public DateRangeAggregationBuilder addUnboundedFrom(double from) {
         return addUnboundedFrom(null, from);
     }
 
@@ -193,7 +193,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * @param to
      *            the upper bound on the dates, exclusive
      */
-    public DateRangeAggregatorBuilder addRange(String key, DateTime from, DateTime to) {
+    public DateRangeAggregationBuilder addRange(String key, DateTime from, DateTime to) {
         addRange(new Range(key, convertDateTime(from), convertDateTime(to)));
         return this;
     }
@@ -210,7 +210,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * Same as {@link #addRange(String, DateTime, DateTime)} but the key will be
      * automatically generated based on <code>from</code> and <code>to</code>.
      */
-    public DateRangeAggregatorBuilder addRange(DateTime from, DateTime to) {
+    public DateRangeAggregationBuilder addRange(DateTime from, DateTime to) {
         return addRange(null, from, to);
     }
 
@@ -222,7 +222,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * @param to
      *            the upper bound on the dates, exclusive
      */
-    public DateRangeAggregatorBuilder addUnboundedTo(String key, DateTime to) {
+    public DateRangeAggregationBuilder addUnboundedTo(String key, DateTime to) {
         addRange(new Range(key, null, convertDateTime(to)));
         return this;
     }
@@ -231,7 +231,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * Same as {@link #addUnboundedTo(String, DateTime)} but the key will be
      * computed automatically.
      */
-    public DateRangeAggregatorBuilder addUnboundedTo(DateTime to) {
+    public DateRangeAggregationBuilder addUnboundedTo(DateTime to) {
         return addUnboundedTo(null, to);
     }
 
@@ -243,7 +243,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * @param from
      *            the lower bound on the distances, inclusive
      */
-    public DateRangeAggregatorBuilder addUnboundedFrom(String key, DateTime from) {
+    public DateRangeAggregationBuilder addUnboundedFrom(String key, DateTime from) {
         addRange(new Range(key, convertDateTime(from), null));
         return this;
     }
@@ -252,7 +252,7 @@ public class DateRangeAggregatorBuilder extends AbstractRangeBuilder<DateRangeAg
      * Same as {@link #addUnboundedFrom(String, DateTime)} but the key will be
      * computed automatically.
      */
-    public DateRangeAggregatorBuilder addUnboundedFrom(DateTime from) {
+    public DateRangeAggregationBuilder addUnboundedFrom(DateTime from) {
         return addUnboundedFrom(null, from);
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeParser.java
index cc6dca1e54..f8eff715ab 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeParser.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/date/DateRangeParser.java
@@ -38,9 +38,9 @@ public class DateRangeParser extends RangeParser {
     }
 
     @Override
-    protected DateRangeAggregatorBuilder createFactory(String aggregationName, ValuesSourceType valuesSourceType,
-            ValueType targetValueType, Map<ParseField, Object> otherOptions) {
-        DateRangeAggregatorBuilder factory = new DateRangeAggregatorBuilder(aggregationName);
+    protected DateRangeAggregationBuilder createFactory(String aggregationName, ValuesSourceType valuesSourceType,
+                                                        ValueType targetValueType, Map<ParseField, Object> otherOptions) {
+        DateRangeAggregationBuilder factory = new DateRangeAggregationBuilder(aggregationName);
         @SuppressWarnings("unchecked")
         List<Range> ranges = (List<Range>) otherOptions.get(RangeAggregator.RANGES_FIELD);
         for (Range range : ranges) {
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceAggregationBuilder.java
index a72b4fd322..e82a769431 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceAggregatorBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceAggregationBuilder.java
@@ -33,7 +33,7 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregator;
 import org.elasticsearch.search.aggregations.bucket.range.geodistance.GeoDistanceParser.Range;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
-import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorBuilder;
+import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
 
@@ -42,7 +42,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<ValuesSource.GeoPoint, GeoDistanceAggregatorBuilder> {
+public class GeoDistanceAggregationBuilder extends ValuesSourceAggregationBuilder<ValuesSource.GeoPoint, GeoDistanceAggregationBuilder> {
     public static final String NAME = InternalGeoDistance.TYPE.name();
     public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME);
 
@@ -52,12 +52,12 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
     private GeoDistance distanceType = GeoDistance.DEFAULT;
     private boolean keyed = false;
 
-    public GeoDistanceAggregatorBuilder(String name, GeoPoint origin) {
+    public GeoDistanceAggregationBuilder(String name, GeoPoint origin) {
         this(name, origin, InternalGeoDistance.FACTORY);
     }
 
-    private GeoDistanceAggregatorBuilder(String name, GeoPoint origin,
-            InternalRange.Factory<InternalGeoDistance.Bucket, InternalGeoDistance> rangeFactory) {
+    private GeoDistanceAggregationBuilder(String name, GeoPoint origin,
+                                          InternalRange.Factory<InternalGeoDistance.Bucket, InternalGeoDistance> rangeFactory) {
         super(name, rangeFactory.type(), rangeFactory.getValueSourceType(), rangeFactory.getValueType());
         if (origin == null) {
             throw new IllegalArgumentException("[origin] must not be null: [" + name + "]");
@@ -68,7 +68,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
     /**
      * Read from a stream.
      */
-    public GeoDistanceAggregatorBuilder(StreamInput in) throws IOException {
+    public GeoDistanceAggregationBuilder(StreamInput in) throws IOException {
         super(in, InternalGeoDistance.FACTORY.type(), InternalGeoDistance.FACTORY.getValueSourceType(),
                 InternalGeoDistance.FACTORY.getValueType());
         origin = new GeoPoint(in.readDouble(), in.readDouble());
@@ -95,7 +95,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
         unit.writeTo(out);
     }
 
-    public GeoDistanceAggregatorBuilder addRange(Range range) {
+    public GeoDistanceAggregationBuilder addRange(Range range) {
         if (range == null) {
             throw new IllegalArgumentException("[range] must not be null: [" + name + "]");
         }
@@ -113,7 +113,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
      * @param to
      *            the upper bound on the distances, exclusive
      */
-    public GeoDistanceAggregatorBuilder addRange(String key, double from, double to) {
+    public GeoDistanceAggregationBuilder addRange(String key, double from, double to) {
         ranges.add(new Range(key, from, to));
         return this;
     }
@@ -123,7 +123,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
      * automatically generated based on <code>from</code> and
      * <code>to</code>.
      */
-    public GeoDistanceAggregatorBuilder addRange(double from, double to) {
+    public GeoDistanceAggregationBuilder addRange(double from, double to) {
         return addRange(null, from, to);
     }
 
@@ -135,7 +135,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
      * @param to
      *            the upper bound on the distances, exclusive
      */
-    public GeoDistanceAggregatorBuilder addUnboundedTo(String key, double to) {
+    public GeoDistanceAggregationBuilder addUnboundedTo(String key, double to) {
         ranges.add(new Range(key, null, to));
         return this;
     }
@@ -144,7 +144,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
      * Same as {@link #addUnboundedTo(String, double)} but the key will be
      * computed automatically.
      */
-    public GeoDistanceAggregatorBuilder addUnboundedTo(double to) {
+    public GeoDistanceAggregationBuilder addUnboundedTo(double to) {
         return addUnboundedTo(null, to);
     }
 
@@ -156,7 +156,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
      * @param from
      *            the lower bound on the distances, inclusive
      */
-    public GeoDistanceAggregatorBuilder addUnboundedFrom(String key, double from) {
+    public GeoDistanceAggregationBuilder addUnboundedFrom(String key, double from) {
         addRange(new Range(key, from, null));
         return this;
     }
@@ -165,7 +165,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
      * Same as {@link #addUnboundedFrom(String, double)} but the key will be
      * computed automatically.
      */
-    public GeoDistanceAggregatorBuilder addUnboundedFrom(double from) {
+    public GeoDistanceAggregationBuilder addUnboundedFrom(double from) {
         return addUnboundedFrom(null, from);
     }
 
@@ -178,7 +178,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
         return NAME;
     }
 
-    public GeoDistanceAggregatorBuilder unit(DistanceUnit unit) {
+    public GeoDistanceAggregationBuilder unit(DistanceUnit unit) {
         if (unit == null) {
             throw new IllegalArgumentException("[unit] must not be null: [" + name + "]");
         }
@@ -190,7 +190,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
         return unit;
     }
 
-    public GeoDistanceAggregatorBuilder distanceType(GeoDistance distanceType) {
+    public GeoDistanceAggregationBuilder distanceType(GeoDistance distanceType) {
         if (distanceType == null) {
             throw new IllegalArgumentException("[distanceType] must not be null: [" + name + "]");
         }
@@ -202,7 +202,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
         return distanceType;
     }
 
-    public GeoDistanceAggregatorBuilder keyed(boolean keyed) {
+    public GeoDistanceAggregationBuilder keyed(boolean keyed) {
         this.keyed = keyed;
         return this;
     }
@@ -236,7 +236,7 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
 
     @Override
     protected boolean innerEquals(Object obj) {
-        GeoDistanceAggregatorBuilder other = (GeoDistanceAggregatorBuilder) obj;
+        GeoDistanceAggregationBuilder other = (GeoDistanceAggregationBuilder) obj;
         return Objects.equals(origin, other.origin)
                 && Objects.equals(ranges, other.ranges)
                 && Objects.equals(keyed, other.keyed)
@@ -244,4 +244,4 @@ public class GeoDistanceAggregatorBuilder extends ValuesSourceAggregatorBuilder<
                 && Objects.equals(unit, other.unit);
     }
 
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceParser.java
index ed6d6a67e2..b98757aae5 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceParser.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceParser.java
@@ -85,10 +85,10 @@ public class GeoDistanceParser extends GeoPointValuesSourceParser {
     }
 
     @Override
-    protected GeoDistanceAggregatorBuilder createFactory(
+    protected GeoDistanceAggregationBuilder createFactory(
             String aggregationName, ValuesSourceType valuesSourceType, ValueType targetValueType, Map<ParseField, Object> otherOptions) {
         GeoPoint origin = (GeoPoint) otherOptions.get(ORIGIN_FIELD);
-        GeoDistanceAggregatorBuilder factory = new GeoDistanceAggregatorBuilder(aggregationName, origin);
+        GeoDistanceAggregationBuilder factory = new GeoDistanceAggregationBuilder(aggregationName, origin);
         @SuppressWarnings("unchecked")
         List<Range> ranges = (List<Range>) otherOptions.get(RangeAggregator.RANGES_FIELD);
         for (Range range : ranges) {
@@ -171,4 +171,4 @@ public class GeoDistanceParser extends GeoPointValuesSourceParser {
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ip/IpRangeAggregatorBuilder.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ip/IpRangeAggregationBuilder.java
index c56a2952f8..243db5f75e 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ip/IpRangeAggregatorBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ip/IpRangeAggregationBuilder.java
@@ -44,14 +44,14 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeAggregator;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.search.aggregations.support.ValueType;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
-import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorBuilder;
+import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceConfig;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 
 
-public final class IpRangeAggregatorBuilder
-        extends ValuesSourceAggregatorBuilder<ValuesSource.Bytes, IpRangeAggregatorBuilder> {
+public final class IpRangeAggregationBuilder
+        extends ValuesSourceAggregationBuilder<ValuesSource.Bytes, IpRangeAggregationBuilder> {
     private static final String NAME = "ip_range";
     public static final ParseField AGGREGATION_NAME_FIELD = new ParseField(NAME);
     private static final InternalAggregation.Type TYPE = new InternalAggregation.Type(NAME);
@@ -163,7 +163,7 @@ public final class IpRangeAggregatorBuilder
     private boolean keyed = false;
     private List<Range> ranges = new ArrayList<>();
 
-    public IpRangeAggregatorBuilder(String name) {
+    public IpRangeAggregationBuilder(String name) {
         super(name, TYPE, ValuesSourceType.BYTES, ValueType.IP);
     }
 
@@ -172,7 +172,7 @@ public final class IpRangeAggregatorBuilder
         return NAME;
     }
 
-    public IpRangeAggregatorBuilder keyed(boolean keyed) {
+    public IpRangeAggregationBuilder keyed(boolean keyed) {
         this.keyed = keyed;
         return this;
     }
@@ -187,7 +187,7 @@ public final class IpRangeAggregatorBuilder
     }
 
     /** Add a new {@link Range} to this aggregation. */
-    public IpRangeAggregatorBuilder addRange(Range range) {
+    public IpRangeAggregationBuilder addRange(Range range) {
         ranges.add(range);
         return this;
     }
@@ -202,7 +202,7 @@ public final class IpRangeAggregatorBuilder
      * @param to
      *            the upper bound on the distances, exclusive
      */
-    public IpRangeAggregatorBuilder addRange(String key, String from, String to) {
+    public IpRangeAggregationBuilder addRange(String key, String from, String to) {
         addRange(new Range(key, from, to));
         return this;
     }
@@ -210,7 +210,7 @@ public final class IpRangeAggregatorBuilder
     /**
      * Add a new range to this aggregation using the CIDR notation.
      */
-    public IpRangeAggregatorBuilder addMaskRange(String key, String mask) {
+    public IpRangeAggregationBuilder addMaskRange(String key, String mask) {
         return addRange(new Range(key, mask));
     }
 
@@ -218,7 +218,7 @@ public final class IpRangeAggregatorBuilder
      * Same as {@link #addMaskRange(String, String)} but uses the mask itself as
      * a key.
      */
-    public IpRangeAggregatorBuilder addMaskRange(String mask) {
+    public IpRangeAggregationBuilder addMaskRange(String mask) {
         return addRange(new Range(mask, mask));
     }
 
@@ -226,7 +226,7 @@ public final class IpRangeAggregatorBuilder
      * Same as {@link #addRange(String, String, String)} but the key will be
      * automatically generated.
      */
-    public IpRangeAggregatorBuilder addRange(String from, String to) {
+    public IpRangeAggregationBuilder addRange(String from, String to) {
         return addRange(null, from, to);
     }
 
@@ -234,7 +234,7 @@ public final class IpRangeAggregatorBuilder
      * Same as {@link #addRange(String, String, String)} but there will be no
      * lower bound.
      */
-    public IpRangeAggregatorBuilder addUnboundedTo(String key, String to) {
+    public IpRangeAggregationBuilder addUnboundedTo(String key, String to) {
         addRange(new Range(key, null, to));
         return this;
     }
@@ -243,7 +243,7 @@ public final class IpRangeAggregatorBuilder
      * Same as {@link #addUnboundedTo(String, String)} but the key will be
      * generated automatically.
      */
-    public IpRangeAggregatorBuilder addUnboundedTo(String to) {
+    public IpRangeAggregationBuilder addUnboundedTo(String to) {
         return addUnboundedTo(null, to);
     }
 
@@ -251,13 +251,13 @@ public final class IpRangeAggregatorBuilder
      * Same as {@link #addRange(String, String, String)} but there will be no
      * upper bound.
      */
-    public IpRangeAggregatorBuilder addUnboundedFrom(String key, String from) {
+    public IpRangeAggregationBuilder addUnboundedFrom(String key, String from) {
         addRange(new Range(key, from, null));
         return this;
     }
 
     @Override
-    public IpRangeAggregatorBuilder script(Script script) {
+    public IpRangeAggregationBuilder script(Script script) {
         throw new IllegalArgumentException("[ip_range] does not support scripts");
     }
 
@@ -265,11 +265,11 @@ public final class IpRangeAggregatorBuilder
      * Same as {@link #addUnboundedFrom(String, String)} but the key will be
      * generated automatically.
      */
-    public IpRangeAggregatorBuilder addUnboundedFrom(String from) {
+    public IpRangeAggregationBuilder addUnboundedFrom(String from) {
         return addUnboundedFrom(null, from);
     }
 
-    public IpRangeAggregatorBuilder(StreamInput in) throws IOException {
+    public IpRangeAggregationBuilder(StreamInput in) throws IOException {
         super(in, TYPE, ValuesSourceType.BYTES, ValueType.IP);
         final int numRanges = in.readVInt();
         for (int i = 0; i < numRanges; ++i) {
@@ -323,7 +323,7 @@ public final class IpRangeAggregatorBuilder
 
     @Override
     protected boolean innerEquals(Object obj) {
-        IpRangeAggregatorBuilder that = (IpRangeAggregatorBuilder) obj;
+        IpRangeAggregationBuilder that = (IpRangeAggregationBuilder) obj;
         return keyed == that.keyed
                 && ranges.equals(that.ranges);
     }
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ip/IpRangeParser.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ip/IpRangeParser.java
index 64ed77d42f..8445fb2d45 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ip/IpRangeParser.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ip/IpRangeParser.java
@@ -30,10 +30,10 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.elasticsearch.search.aggregations.support.AbstractValuesSourceParser.BytesValuesSourceParser;
 import org.elasticsearch.search.aggregations.bucket.range.RangeAggregator;
-import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregatorBuilder.Range;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder.Range;
 import org.elasticsearch.search.aggregations.support.ValueType;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
-import org.elasticsearch.search.aggregations.support.ValuesSourceAggregatorBuilder;
+import org.elasticsearch.search.aggregations.support.ValuesSourceAggregationBuilder;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 
 /**
@@ -48,10 +48,10 @@ public class IpRangeParser extends BytesValuesSourceParser {
     }
 
     @Override
-    protected ValuesSourceAggregatorBuilder<ValuesSource.Bytes, ?> createFactory(
+    protected ValuesSourceAggregationBuilder<ValuesSource.Bytes, ?> createFactory(
             String aggregationName, ValuesSourceType valuesSourceType,
             ValueType targetValueType, Map<ParseField, Object> otherOptions) {
-        IpRangeAggregatorBuilder range = new IpRangeAggregatorBuilder(aggregationName);
+        IpRangeAggregationBuilder range = new IpRangeAggregationBuilder(aggregationName);
         @SuppressWarnings("unchecked")
         Iterable<Range> ranges = (Iterable<Range>) otherOptions.get(RangeAggregator.RANGES_FIELD);
         if (otherOptions.containsKey(RangeAggregator.RANGES_FIELD)) {