diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java b/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java
index cbfd20b4a278..40abcb7205c8 100644
--- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java
+++ b/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregator.java
@@ -65,7 +65,7 @@ public TimestampAggregator(
   @Override
   public void aggregate()
   {
-    Long value = TimestampAggregatorFactory.convertLong(timestampSpec, selector.get());
+    Long value = TimestampAggregatorFactory.convertLong(timestampSpec, selector.getObject());
 
     if (value != null) {
       most = comparator.compare(most, value) > 0 ? most : value;
diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java b/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java
index 7b9fe52f86ad..abb98917695d 100644
--- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java
+++ b/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampAggregatorFactory.java
@@ -106,7 +106,7 @@ public void reset(ColumnValueSelector selector)
       private long getTimestamp(ColumnValueSelector selector)
       {
         if (selector instanceof ObjectColumnSelector) {
-          Object input = ((ObjectColumnSelector) selector).get();
+          Object input = ((ObjectColumnSelector) selector).getObject();
           return convertLong(timestampSpec, input);
         } else {
           return selector.getLong();
diff --git a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampBufferAggregator.java b/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampBufferAggregator.java
index 1d70deb75896..133e7e93c649 100644
--- a/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampBufferAggregator.java
+++ b/extensions-contrib/time-min-max/src/main/java/io/druid/query/aggregation/TimestampBufferAggregator.java
@@ -54,7 +54,7 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    Long newTime = TimestampAggregatorFactory.convertLong(timestampSpec, selector.get());
+    Long newTime = TimestampAggregatorFactory.convertLong(timestampSpec, selector.getObject());
     if (newTime != null) {
       long prev = buf.getLong(position);
       buf.putLong(position, comparator.compare(prev, newTime) > 0 ? prev : newTime);
diff --git a/extensions-contrib/virtual-columns/src/main/java/io/druid/segment/MapVirtualColumn.java b/extensions-contrib/virtual-columns/src/main/java/io/druid/segment/MapVirtualColumn.java
index ccfa85154e57..932c8c2837a9 100644
--- a/extensions-contrib/virtual-columns/src/main/java/io/druid/segment/MapVirtualColumn.java
+++ b/extensions-contrib/virtual-columns/src/main/java/io/druid/segment/MapVirtualColumn.java
@@ -81,7 +81,7 @@ public Class classOfObject()
         }
 
         @Override
-        public Map get()
+        public Map getObject()
         {
           final IndexedInts keyIndices = keySelector.getRow();
           final IndexedInts valueIndices = valueSelector.getRow();
@@ -116,7 +116,7 @@ public Class classOfObject()
         }
 
         @Override
-        public String get()
+        public String getObject()
         {
           final IndexedInts keyIndices = keySelector.getRow();
           final IndexedInts valueIndices = valueSelector.getRow();
@@ -142,7 +142,7 @@ public Class classOfObject()
         }
 
         @Override
-        public String get()
+        public String getObject()
         {
           final IndexedInts keyIndices = keySelector.getRow();
           final IndexedInts valueIndices = valueSelector.getRow();
diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java
index ca81b0dd2822..8d2df6fb9a63 100644
--- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java
+++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregator.java
@@ -43,7 +43,7 @@ public SketchAggregator(ObjectColumnSelector selector, int size)
   @Override
   public void aggregate()
   {
-    Object update = selector.get();
+    Object update = selector.getObject();
     if (update == null) {
       return;
     }
diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java
index 0bf8ee09e5e7..8ec4afd55d95 100644
--- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java
+++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchAggregatorFactory.java
@@ -123,7 +123,7 @@ public void reset(ColumnValueSelector selector)
       public void fold(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        SketchHolder other = ((ObjectColumnSelector<SketchHolder>) selector).get();
+        SketchHolder other = ((ObjectColumnSelector<SketchHolder>) selector).getObject();
         // SketchAggregatorFactory.combine() delegates to SketchHolder.combine() and it doesn't check for nulls, so we
         // neither.
         other.updateUnion(union);
@@ -138,7 +138,7 @@ public Class<SketchHolder> classOfObject()
 
       @Nullable
       @Override
-      public SketchHolder get()
+      public SketchHolder getObject()
       {
         return combined;
       }
diff --git a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java
index 4ffc76e42c68..266bdf176986 100644
--- a/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java
+++ b/extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchBufferAggregator.java
@@ -58,7 +58,7 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    Object update = selector.get();
+    Object update = selector.getObject();
     if (update == null) {
       return;
     }
diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java
index 40dffb786b20..1cfb11de856f 100644
--- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java
+++ b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramAggregatorFactory.java
@@ -128,7 +128,7 @@ public AggregateCombiner makeAggregateCombiner()
       public void reset(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        ApproximateHistogram first = ((ObjectColumnSelector<ApproximateHistogram>) selector).get();
+        ApproximateHistogram first = ((ObjectColumnSelector<ApproximateHistogram>) selector).getObject();
         combined.copy(first);
       }
 
@@ -136,7 +136,7 @@ public void reset(ColumnValueSelector selector)
       public void fold(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        ApproximateHistogram other = ((ObjectColumnSelector<ApproximateHistogram>) selector).get();
+        ApproximateHistogram other = ((ObjectColumnSelector<ApproximateHistogram>) selector).getObject();
         combined.foldFast(other);
       }
 
@@ -148,7 +148,7 @@ public Class<ApproximateHistogram> classOfObject()
 
       @Nullable
       @Override
-      public ApproximateHistogram get()
+      public ApproximateHistogram getObject()
       {
         return combined;
       }
diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java
index 7497738daeab..a21f3ab3e81f 100644
--- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java
+++ b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregator.java
@@ -54,7 +54,7 @@ public ApproximateHistogramFoldingAggregator(
   @Override
   public void aggregate()
   {
-    ApproximateHistogram h = selector.get();
+    ApproximateHistogram h = selector.getObject();
     if (h == null) {
       return;
     }
diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java
index 79da4ef5968f..f465cf6e3e0d 100644
--- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java
+++ b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingAggregatorFactory.java
@@ -70,7 +70,7 @@ public Class<ApproximateHistogram> classOfObject()
         }
 
         @Override
-        public ApproximateHistogram get()
+        public ApproximateHistogram getObject()
         {
           return new ApproximateHistogram(0);
         }
@@ -111,7 +111,7 @@ public Class<ApproximateHistogram> classOfObject()
         }
 
         @Override
-        public ApproximateHistogram get()
+        public ApproximateHistogram getObject()
         {
           return new ApproximateHistogram(0);
         }
diff --git a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java
index 4a448036de85..2491688bc5f4 100644
--- a/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java
+++ b/extensions-core/histogram/src/main/java/io/druid/query/aggregation/histogram/ApproximateHistogramFoldingBufferAggregator.java
@@ -71,7 +71,7 @@ public void aggregate(ByteBuffer buf, int position)
     ApproximateHistogram h0 = ApproximateHistogram.fromBytesDense(mutationBuffer);
     h0.setLowerLimit(lowerLimit);
     h0.setUpperLimit(upperLimit);
-    ApproximateHistogram hNext = selector.get();
+    ApproximateHistogram hNext = selector.getObject();
     h0.foldFast(hNext, tmpBufferP, tmpBufferB);
 
     mutationBuffer.position(position);
diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java
index 5803b765f7d5..f4c6763e5e9c 100644
--- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java
+++ b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregator.java
@@ -116,7 +116,7 @@ public ObjectVarianceAggregator(ObjectColumnSelector selector)
     @Override
     public void aggregate()
     {
-      VarianceAggregatorCollector.combineValues(holder, selector.get());
+      VarianceAggregatorCollector.combineValues(holder, selector.getObject());
     }
   }
 }
diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java
index de27f1e0c10a..9561151e6d9b 100644
--- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java
+++ b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceAggregatorFactory.java
@@ -157,7 +157,7 @@ public AggregateCombiner makeAggregateCombiner()
       public void reset(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        VarianceAggregatorCollector first = ((ObjectColumnSelector<VarianceAggregatorCollector>) selector).get();
+        VarianceAggregatorCollector first = ((ObjectColumnSelector<VarianceAggregatorCollector>) selector).getObject();
         combined.copyFrom(first);
       }
 
@@ -165,7 +165,7 @@ public void reset(ColumnValueSelector selector)
       public void fold(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        VarianceAggregatorCollector other = ((ObjectColumnSelector<VarianceAggregatorCollector>) selector).get();
+        VarianceAggregatorCollector other = ((ObjectColumnSelector<VarianceAggregatorCollector>) selector).getObject();
         combined.fold(other);
       }
 
@@ -176,7 +176,7 @@ public Class<VarianceAggregatorCollector> classOfObject()
       }
 
       @Override
-      public VarianceAggregatorCollector get()
+      public VarianceAggregatorCollector getObject()
       {
         return combined;
       }
diff --git a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceBufferAggregator.java b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceBufferAggregator.java
index db3dea400a89..af851e8c548f 100644
--- a/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceBufferAggregator.java
+++ b/extensions-core/stats/src/main/java/io/druid/query/aggregation/variance/VarianceBufferAggregator.java
@@ -162,7 +162,7 @@ public ObjectVarianceAggregator(String name, ObjectColumnSelector selector)
     @Override
     public void aggregate(ByteBuffer buf, int position)
     {
-      VarianceAggregatorCollector holder2 = (VarianceAggregatorCollector) selector.get();
+      VarianceAggregatorCollector holder2 = (VarianceAggregatorCollector) selector.getObject();
 
       long count = buf.getLong(position + COUNT_OFFSET);
       if (count == 0) {
diff --git a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java b/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java
index 0c4aaaa36de8..9817edc2daaf 100644
--- a/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java
+++ b/extensions-core/stats/src/test/java/io/druid/query/aggregation/variance/VarianceAggregatorCollectorTest.java
@@ -163,7 +163,7 @@ public Class classOfObject()
     }
 
     @Override
-    public Object get()
+    public Object getObject()
     {
       return v;
     }
diff --git a/processing/src/main/java/io/druid/query/aggregation/AggregateCombiner.java b/processing/src/main/java/io/druid/query/aggregation/AggregateCombiner.java
index e873c82ed94f..bf691bd8e85c 100644
--- a/processing/src/main/java/io/druid/query/aggregation/AggregateCombiner.java
+++ b/processing/src/main/java/io/druid/query/aggregation/AggregateCombiner.java
@@ -38,14 +38,14 @@
  * @see DoubleAggregateCombiner
  * @see ObjectAggregateCombiner
  */
-public interface AggregateCombiner extends ColumnValueSelector
+public interface AggregateCombiner<T> extends ColumnValueSelector<T>
 {
   /**
    * Resets this AggregateCombiner's state value to the value of the given selector, e. g. after calling this method
    * combiner.get*() should return the same value as selector.get*().
    *
    * If the selector is an {@link io.druid.segment.ObjectColumnSelector}, the object returned from {@link
-   * io.druid.segment.ObjectColumnSelector#get()} must not be modified, and must not become a subject for modification
+   * io.druid.segment.ObjectColumnSelector#getObject()} must not be modified, and must not become a subject for modification
    * during subsequent {@link #fold} calls.
    */
   void reset(ColumnValueSelector selector);
@@ -57,7 +57,7 @@ public interface AggregateCombiner extends ColumnValueSelector
    * aggregatorFactory.combine(combiner.get*(), selector.get*())} call.
    *
    * Unlike {@link AggregatorFactory#combine}, if the selector is an {@link io.druid.segment.ObjectColumnSelector}, the
-   * object returned from {@link io.druid.segment.ObjectColumnSelector#get()} must not be modified, and must not become
+   * object returned from {@link io.druid.segment.ObjectColumnSelector#getObject()} must not be modified, and must not become
    * a subject for modification during subsequent fold() calls.
    *
    * Since the state of AggregateCombiner is undefined before {@link #reset} is ever called on it, the effects of
diff --git a/processing/src/main/java/io/druid/query/aggregation/DoubleAggregateCombiner.java b/processing/src/main/java/io/druid/query/aggregation/DoubleAggregateCombiner.java
index 821a070e1b23..daad0a7520ad 100644
--- a/processing/src/main/java/io/druid/query/aggregation/DoubleAggregateCombiner.java
+++ b/processing/src/main/java/io/druid/query/aggregation/DoubleAggregateCombiner.java
@@ -25,7 +25,7 @@
 /**
  * Specialization of {@link AggregateCombiner} for primitive double aggregations.
  */
-public abstract class DoubleAggregateCombiner implements AggregateCombiner, DoubleColumnSelector
+public abstract class DoubleAggregateCombiner implements AggregateCombiner<Double>, DoubleColumnSelector
 {
   @Override
   public void inspectRuntimeShape(RuntimeShapeInspector inspector)
diff --git a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java
index 1bccb8dcaed4..e360836ddde8 100644
--- a/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/HistogramAggregatorFactory.java
@@ -104,7 +104,7 @@ public AggregateCombiner makeAggregateCombiner()
       public void reset(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        Histogram first = ((ObjectColumnSelector<Histogram>) selector).get();
+        Histogram first = ((ObjectColumnSelector<Histogram>) selector).getObject();
         if (combined == null) {
           combined = new Histogram(first);
         } else {
@@ -116,7 +116,7 @@ public void reset(ColumnValueSelector selector)
       public void fold(ColumnValueSelector selector)
       {
         @SuppressWarnings("unchecked")
-        Histogram other = ((ObjectColumnSelector<Histogram>) selector).get();
+        Histogram other = ((ObjectColumnSelector<Histogram>) selector).getObject();
         combined.fold(other);
       }
 
@@ -128,7 +128,7 @@ public Class<Histogram> classOfObject()
 
       @Nullable
       @Override
-      public Histogram get()
+      public Histogram getObject()
       {
         return combined;
       }
diff --git a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java
index afcc71bd22a3..10e438c189b7 100644
--- a/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/JavaScriptAggregatorFactory.java
@@ -347,7 +347,7 @@ public double aggregate(final double current, final ObjectColumnSelector[] selec
         for (int i = 0; i < size; i++) {
           final ObjectColumnSelector selector = selectorList[i];
           if (selector != null) {
-            final Object arg = selector.get();
+            final Object arg = selector.getObject();
             if (arg != null && arg.getClass().isArray()) {
               // Context.javaToJS on an array sort of works, although it returns false for Array.isArray(...) and
               // may have other issues too. Let's just copy the array and wrap that.
diff --git a/processing/src/main/java/io/druid/query/aggregation/LongAggregateCombiner.java b/processing/src/main/java/io/druid/query/aggregation/LongAggregateCombiner.java
index 949f4164a27f..4c9414decffc 100644
--- a/processing/src/main/java/io/druid/query/aggregation/LongAggregateCombiner.java
+++ b/processing/src/main/java/io/druid/query/aggregation/LongAggregateCombiner.java
@@ -25,7 +25,7 @@
 /**
  * Specialization of {@link AggregateCombiner} for primitive long aggregations.
  */
-public abstract class LongAggregateCombiner implements AggregateCombiner, LongColumnSelector
+public abstract class LongAggregateCombiner implements AggregateCombiner<Long>, LongColumnSelector
 {
   @Override
   public void inspectRuntimeShape(RuntimeShapeInspector inspector)
diff --git a/processing/src/main/java/io/druid/query/aggregation/ObjectAggregateCombiner.java b/processing/src/main/java/io/druid/query/aggregation/ObjectAggregateCombiner.java
index 29bc0950982f..bc19ba476e7a 100644
--- a/processing/src/main/java/io/druid/query/aggregation/ObjectAggregateCombiner.java
+++ b/processing/src/main/java/io/druid/query/aggregation/ObjectAggregateCombiner.java
@@ -24,6 +24,6 @@
 /**
  * Specialization of {@link AggregateCombiner} for object aggregations.
  */
-public abstract class ObjectAggregateCombiner<T> implements AggregateCombiner, ObjectColumnSelector<T>
+public abstract class ObjectAggregateCombiner<T> implements AggregateCombiner<T>, ObjectColumnSelector<T>
 {
 }
diff --git a/processing/src/main/java/io/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java b/processing/src/main/java/io/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java
index 86d8c972c859..023581faf5e3 100644
--- a/processing/src/main/java/io/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java
+++ b/processing/src/main/java/io/druid/query/aggregation/cardinality/HyperLogLogCollectorAggregateCombiner.java
@@ -42,7 +42,7 @@ public void reset(ColumnValueSelector selector)
   public void fold(ColumnValueSelector selector)
   {
     @SuppressWarnings("unchecked")
-    HyperLogLogCollector other = ((ObjectColumnSelector<HyperLogLogCollector>) selector).get();
+    HyperLogLogCollector other = ((ObjectColumnSelector<HyperLogLogCollector>) selector).getObject();
     if (other == null) {
       return;
     }
@@ -60,7 +60,7 @@ public Class<HyperLogLogCollector> classOfObject()
 
   @Nullable
   @Override
-  public HyperLogLogCollector get()
+  public HyperLogLogCollector getObject()
   {
     return combined;
   }
diff --git a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java
index 783ba82d2b3b..1fb8564484d8 100644
--- a/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/first/DoubleFirstAggregatorFactory.java
@@ -124,7 +124,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate()
           {
-            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.get();
+            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.getObject();
             if (pair.lhs < firstTime) {
               firstTime = pair.lhs;
               firstValue = pair.rhs;
@@ -142,7 +142,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate(ByteBuffer buf, int position)
           {
-            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.get();
+            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.getObject();
             long firstTime = buf.getLong(position);
             if (pair.lhs < firstTime) {
               buf.putLong(position, pair.lhs);
diff --git a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregatorFactory.java
index e26b0228f8a2..69a824f83bb9 100644
--- a/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/first/FloatFirstAggregatorFactory.java
@@ -124,7 +124,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate()
           {
-            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.get();
+            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.getObject();
             if (pair.lhs < firstTime) {
               firstTime = pair.lhs;
               firstValue = pair.rhs;
@@ -142,7 +142,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate(ByteBuffer buf, int position)
           {
-            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.get();
+            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.getObject();
             long firstTime = buf.getLong(position);
             if (pair.lhs < firstTime) {
               buf.putLong(position, pair.lhs);
diff --git a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java
index 96ff43d2792d..867c99b184b2 100644
--- a/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/first/LongFirstAggregatorFactory.java
@@ -117,7 +117,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate()
           {
-            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.get();
+            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.getObject();
             if (pair.lhs < firstTime) {
               firstTime = pair.lhs;
               firstValue = pair.rhs;
@@ -135,7 +135,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate(ByteBuffer buf, int position)
           {
-            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.get();
+            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.getObject();
             long firstTime = buf.getLong(position);
             if (pair.lhs < firstTime) {
               buf.putLong(position, pair.lhs);
diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java
index c30a0916d9d3..1ad811a9d827 100644
--- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesAggregator.java
@@ -43,7 +43,7 @@ public HyperUniquesAggregator(
   @Override
   public void aggregate()
   {
-    collector.fold((HyperLogLogCollector) selector.get());
+    collector.fold((HyperLogLogCollector) selector.getObject());
   }
 
   @Override
diff --git a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java
index d3d2bd9c86ca..e98712a8a87d 100644
--- a/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java
+++ b/processing/src/main/java/io/druid/query/aggregation/hyperloglog/HyperUniquesBufferAggregator.java
@@ -51,7 +51,7 @@ public void init(ByteBuffer buf, int position)
   @Override
   public void aggregate(ByteBuffer buf, int position)
   {
-    HyperLogLogCollector collector = (HyperLogLogCollector) selector.get();
+    HyperLogLogCollector collector = (HyperLogLogCollector) selector.getObject();
 
     if (collector == null) {
       return;
diff --git a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java
index ddaec8698897..8a73efca0db4 100644
--- a/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/last/DoubleLastAggregatorFactory.java
@@ -115,7 +115,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate()
           {
-            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.get();
+            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.getObject();
             if (pair.lhs >= lastTime) {
               lastTime = pair.lhs;
               lastValue = pair.rhs;
@@ -133,7 +133,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate(ByteBuffer buf, int position)
           {
-            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.get();
+            SerializablePair<Long, Double> pair = (SerializablePair<Long, Double>) selector.getObject();
             long lastTime = buf.getLong(position);
             if (pair.lhs >= lastTime) {
               buf.putLong(position, pair.lhs);
diff --git a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregatorFactory.java
index 34f818e490bf..9bb88ec91a5f 100644
--- a/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/last/FloatLastAggregatorFactory.java
@@ -115,7 +115,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate()
           {
-            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.get();
+            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.getObject();
             if (pair.lhs >= lastTime) {
               lastTime = pair.lhs;
               lastValue = pair.rhs;
@@ -133,7 +133,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate(ByteBuffer buf, int position)
           {
-            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.get();
+            SerializablePair<Long, Float> pair = (SerializablePair<Long, Float>) selector.getObject();
             long lastTime = buf.getLong(position);
             if (pair.lhs >= lastTime) {
               buf.putLong(position, pair.lhs);
diff --git a/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregatorFactory.java b/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregatorFactory.java
index 23bd19345231..ca9f991ae76c 100644
--- a/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregatorFactory.java
+++ b/processing/src/main/java/io/druid/query/aggregation/last/LongLastAggregatorFactory.java
@@ -113,7 +113,7 @@ public Aggregator factorize(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate()
           {
-            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.get();
+            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.getObject();
             if (pair.lhs >= lastTime) {
               lastTime = pair.lhs;
               lastValue = pair.rhs;
@@ -131,7 +131,7 @@ public BufferAggregator factorizeBuffered(ColumnSelectorFactory metricFactory)
           @Override
           public void aggregate(ByteBuffer buf, int position)
           {
-            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.get();
+            SerializablePair<Long, Long> pair = (SerializablePair<Long, Long>) selector.getObject();
             long lastTime = buf.getLong(position);
             if (pair.lhs >= lastTime) {
               buf.putLong(position, pair.lhs);
diff --git a/processing/src/main/java/io/druid/query/groupby/RowBasedColumnSelectorFactory.java b/processing/src/main/java/io/druid/query/groupby/RowBasedColumnSelectorFactory.java
index 80133c6120f3..0128eef462ee 100644
--- a/processing/src/main/java/io/druid/query/groupby/RowBasedColumnSelectorFactory.java
+++ b/processing/src/main/java/io/druid/query/groupby/RowBasedColumnSelectorFactory.java
@@ -437,7 +437,7 @@ public Class classOfObject()
         }
 
         @Override
-        public Object get()
+        public Object getObject()
         {
           return row.get().getTimestampFromEpoch();
         }
@@ -452,7 +452,7 @@ public Class classOfObject()
         }
 
         @Override
-        public Object get()
+        public Object getObject()
         {
           return row.get().getRaw(columnName);
         }
diff --git a/processing/src/main/java/io/druid/query/scan/ScanQueryEngine.java b/processing/src/main/java/io/druid/query/scan/ScanQueryEngine.java
index b8e39fb5f8e6..4896bdc6012a 100644
--- a/processing/src/main/java/io/druid/query/scan/ScanQueryEngine.java
+++ b/processing/src/main/java/io/druid/query/scan/ScanQueryEngine.java
@@ -241,9 +241,9 @@ private Object getColumnValue(int i)
                             final Object value;
 
                             if (legacy && allColumns.get(i).equals(LEGACY_TIMESTAMP_KEY)) {
-                              value = DateTimes.utc((long) selector.get());
+                              value = DateTimes.utc((long) selector.getObject());
                             } else {
-                              value = selector == null ? null : selector.get();
+                              value = selector == null ? null : selector.getObject();
                             }
 
                             return value;
diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryEngine.java b/processing/src/main/java/io/druid/query/select/SelectQueryEngine.java
index 78a0e1829e19..71b81335dedf 100644
--- a/processing/src/main/java/io/druid/query/select/SelectQueryEngine.java
+++ b/processing/src/main/java/io/druid/query/select/SelectQueryEngine.java
@@ -315,7 +315,7 @@ public static Map<String, Object> singleEvent(
       if (selector == null) {
         theEvent.put(metric, null);
       } else {
-        theEvent.put(metric, selector.get());
+        theEvent.put(metric, selector.getObject());
       }
     }
     return theEvent;
diff --git a/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java b/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java
index ddc5541e1b7e..b793bc221efd 100644
--- a/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java
+++ b/processing/src/main/java/io/druid/query/topn/PooledTopNAlgorithm.java
@@ -39,9 +39,9 @@
 import io.druid.segment.column.ValueType;
 import io.druid.segment.data.IndexedInts;
 import io.druid.segment.data.Offset;
+import io.druid.segment.historical.HistoricalColumnSelector;
 import io.druid.segment.historical.HistoricalCursor;
 import io.druid.segment.historical.HistoricalDimensionSelector;
-import io.druid.segment.historical.HistoricalColumnSelector;
 import io.druid.segment.historical.SingleValueHistoricalDimensionSelector;
 
 import java.nio.ByteBuffer;
diff --git a/processing/src/main/java/io/druid/segment/ColumnValueSelector.java b/processing/src/main/java/io/druid/segment/ColumnValueSelector.java
index 2ca6e623b335..142c72a21274 100644
--- a/processing/src/main/java/io/druid/segment/ColumnValueSelector.java
+++ b/processing/src/main/java/io/druid/segment/ColumnValueSelector.java
@@ -19,6 +19,8 @@
 
 package io.druid.segment;
 
+import javax.annotation.Nullable;
+
 /**
  * Base type for interfaces that manage column value selection, e.g. DimensionSelector, LongColumnSelector
  *
@@ -26,11 +28,16 @@
  * Druid: Sum, Min, Max, etc: {@link #getFloat()}, {@link #getDouble()} and {@link #getLong()} to support "polymorphic"
  * rollup aggregation during index merging.
  */
-public interface ColumnValueSelector
+public interface ColumnValueSelector<T>
 {
   float getFloat();
 
   double getDouble();
 
   long getLong();
+
+  @Nullable
+  T getObject();
+
+  Class<T> classOfObject();
 }
diff --git a/processing/src/main/java/io/druid/segment/DimensionSelector.java b/processing/src/main/java/io/druid/segment/DimensionSelector.java
index fa56c30928b4..6b6b8f3eec02 100644
--- a/processing/src/main/java/io/druid/segment/DimensionSelector.java
+++ b/processing/src/main/java/io/druid/segment/DimensionSelector.java
@@ -147,4 +147,24 @@ default long getLong()
   {
     throw new UnsupportedOperationException("DimensionSelector cannot be operated as numeric ColumnValueSelector");
   }
+
+  /**
+   * @deprecated always throws {@link UnsupportedOperationException}
+   */
+  @Deprecated
+  @Override
+  default Object getObject()
+  {
+    throw new UnsupportedOperationException("DimensionSelector cannot be operated as object ColumnValueSelector");
+  }
+
+  /**
+   * @deprecated always throws {@link UnsupportedOperationException}
+   */
+  @Deprecated
+  @Override
+  default Class classOfObject()
+  {
+    throw new UnsupportedOperationException("DimensionSelector cannot be operated as object ColumnValueSelector");
+  }
 }
diff --git a/processing/src/main/java/io/druid/segment/DoubleColumnSelector.java b/processing/src/main/java/io/druid/segment/DoubleColumnSelector.java
index d38e241b7808..fe595dab8298 100644
--- a/processing/src/main/java/io/druid/segment/DoubleColumnSelector.java
+++ b/processing/src/main/java/io/druid/segment/DoubleColumnSelector.java
@@ -23,7 +23,7 @@
 import io.druid.query.monomorphicprocessing.HotLoopCallee;
 
 
-public interface DoubleColumnSelector extends ColumnValueSelector, HotLoopCallee
+public interface DoubleColumnSelector extends ColumnValueSelector<Double>, HotLoopCallee
 {
   @CalledFromHotLoop
   @Override
@@ -54,4 +54,28 @@ default long getLong()
   {
     return (long) getDouble();
   }
+
+  /**
+   * @deprecated This method is marked as deprecated in DoubleColumnSelector to minimize the probability of accidential
+   * calling. "Polymorphism" of DoubleColumnSelector should be used only when operating on {@link ColumnValueSelector}
+   * objects.
+   */
+  @Deprecated
+  @Override
+  default Double getObject()
+  {
+    return getDouble();
+  }
+
+  /**
+   * @deprecated This method is marked as deprecated in DoubleColumnSelector to minimize the probability of accidential
+   * calling. "Polymorphism" of DoubleColumnSelector should be used only when operating on {@link ColumnValueSelector}
+   * objects.
+   */
+  @Deprecated
+  @Override
+  default Class<Double> classOfObject()
+  {
+    return Double.class;
+  }
 }
diff --git a/processing/src/main/java/io/druid/segment/FloatColumnSelector.java b/processing/src/main/java/io/druid/segment/FloatColumnSelector.java
index a62eb697227f..eb75c6764ee7 100644
--- a/processing/src/main/java/io/druid/segment/FloatColumnSelector.java
+++ b/processing/src/main/java/io/druid/segment/FloatColumnSelector.java
@@ -27,7 +27,7 @@
  * FloatColumnSelector has a handle onto some other stateful object (e.g. an Offset) which is changing between calls
  * to get() (though, that doesn't have to be the case if you always want the same value...).
  */
-public interface FloatColumnSelector extends ColumnValueSelector, HotLoopCallee
+public interface FloatColumnSelector extends ColumnValueSelector<Float>, HotLoopCallee
 {
   @CalledFromHotLoop
   @Override
@@ -58,4 +58,28 @@ default long getLong()
   {
     return (long) getFloat();
   }
+
+  /**
+   * @deprecated This method is marked as deprecated in FloatColumnSelector to minimize the probability of accidential
+   * calling. "Polymorphism" of FloatColumnSelector should be used only when operating on {@link ColumnValueSelector}
+   * objects.
+   */
+  @Deprecated
+  @Override
+  default Float getObject()
+  {
+    return getFloat();
+  }
+
+  /**
+   * @deprecated This method is marked as deprecated in FloatColumnSelector to minimize the probability of accidential
+   * calling. "Polymorphism" of FloatColumnSelector should be used only when operating on {@link ColumnValueSelector}
+   * objects.
+   */
+  @Deprecated
+  @Override
+  default Class<Float> classOfObject()
+  {
+    return Float.class;
+  }
 }
diff --git a/processing/src/main/java/io/druid/segment/LongColumnSelector.java b/processing/src/main/java/io/druid/segment/LongColumnSelector.java
index d796b73a2138..c62041a8937f 100644
--- a/processing/src/main/java/io/druid/segment/LongColumnSelector.java
+++ b/processing/src/main/java/io/druid/segment/LongColumnSelector.java
@@ -24,7 +24,7 @@
 
 /**
  */
-public interface LongColumnSelector extends ColumnValueSelector, HotLoopCallee
+public interface LongColumnSelector extends ColumnValueSelector<Long>, HotLoopCallee
 {
   @CalledFromHotLoop
   @Override
@@ -55,4 +55,28 @@ default double getDouble()
   {
     return (double) getLong();
   }
+
+  /**
+   * @deprecated This method is marked as deprecated in LongColumnSelector to minimize the probability of accidential
+   * calling. "Polymorphism" of LongColumnSelector should be used only when operating on {@link ColumnValueSelector}
+   * objects.
+   */
+  @Deprecated
+  @Override
+  default Long getObject()
+  {
+    return getLong();
+  }
+
+  /**
+   * @deprecated This method is marked as deprecated in LongColumnSelector to minimize the probability of accidential
+   * calling. "Polymorphism" of LongColumnSelector should be used only when operating on {@link ColumnValueSelector}
+   * objects.
+   */
+  @Deprecated
+  @Override
+  default Class<Long> classOfObject()
+  {
+    return Long.class;
+  }
 }
diff --git a/processing/src/main/java/io/druid/segment/NullStringObjectColumnSelector.java b/processing/src/main/java/io/druid/segment/NullStringObjectColumnSelector.java
index 63c92d988d9c..09c9ed52144c 100644
--- a/processing/src/main/java/io/druid/segment/NullStringObjectColumnSelector.java
+++ b/processing/src/main/java/io/druid/segment/NullStringObjectColumnSelector.java
@@ -39,7 +39,7 @@ public Class<String> classOfObject()
   }
 
   @Override
-  public String get()
+  public String getObject()
   {
     return null;
   }
diff --git a/processing/src/main/java/io/druid/segment/ObjectColumnSelector.java b/processing/src/main/java/io/druid/segment/ObjectColumnSelector.java
index 498aa6273752..31aa1a959a45 100644
--- a/processing/src/main/java/io/druid/segment/ObjectColumnSelector.java
+++ b/processing/src/main/java/io/druid/segment/ObjectColumnSelector.java
@@ -19,19 +19,8 @@
 
 package io.druid.segment;
 
-import javax.annotation.Nullable;
-
-public interface ObjectColumnSelector<T> extends ColumnValueSelector
+public interface ObjectColumnSelector<T> extends ColumnValueSelector<T>
 {
-  public Class<T> classOfObject();
-
-  /**
-   * This method is not annotated with {@link io.druid.query.monomorphicprocessing.CalledFromHotLoop}, because
-   * ObjectColumnSelector doesn't extend {@link io.druid.query.monomorphicprocessing.HotLoopCallee} yet. If it will,
-   * this method should be annotated.
-   */
-  @Nullable
-  public T get();
 
   /**
    * @deprecated This method is marked as deprecated in ObjectColumnSelector to minimize the probability of accidential
@@ -42,7 +31,7 @@ public interface ObjectColumnSelector<T> extends ColumnValueSelector
   @Override
   default float getFloat()
   {
-    T value = get();
+    T value = getObject();
     if (value == null) {
       return 0;
     }
@@ -58,7 +47,7 @@ default float getFloat()
   @Override
   default double getDouble()
   {
-    T value = get();
+    T value = getObject();
     if (value == null) {
       return 0;
     }
@@ -74,7 +63,7 @@ default double getDouble()
   @Override
   default long getLong()
   {
-    T value = get();
+    T value = getObject();
     if (value == null) {
       return 0;
     }
diff --git a/processing/src/main/java/io/druid/segment/QueryableIndexColumnSelectorFactory.java b/processing/src/main/java/io/druid/segment/QueryableIndexColumnSelectorFactory.java
index 41f8115284f8..1db2cc295f3a 100644
--- a/processing/src/main/java/io/druid/segment/QueryableIndexColumnSelectorFactory.java
+++ b/processing/src/main/java/io/druid/segment/QueryableIndexColumnSelectorFactory.java
@@ -252,7 +252,7 @@ public Class<Float> classOfObject()
           }
 
           @Override
-          public Float get()
+          public Float getObject()
           {
             return columnVals.getFloatSingleValueRow(offset.getOffset());
           }
@@ -268,7 +268,7 @@ public Class<Double> classOfObject()
           }
 
           @Override
-          public Double get()
+          public Double getObject()
           {
             return columnVals.getDoubleSingleValueRow(offset.getOffset());
           }
@@ -284,7 +284,7 @@ public Class<Long> classOfObject()
           }
 
           @Override
-          public Long get()
+          public Long getObject()
           {
             return columnVals.getLongSingleValueRow(offset.getOffset());
           }
@@ -300,7 +300,7 @@ public Class<String> classOfObject()
           }
 
           @Override
-          public String get()
+          public String getObject()
           {
             return columnVals.getStringSingleValueRow(offset.getOffset());
           }
@@ -321,7 +321,7 @@ public Class<Object> classOfObject()
 
           @Override
           @Nullable
-          public Object get()
+          public Object getObject()
           {
             final IndexedInts multiValueRow = columnVals.getMultiValueRow(offset.getOffset());
             if (multiValueRow.size() == 0) {
@@ -347,7 +347,7 @@ public Class<String> classOfObject()
           }
 
           @Override
-          public String get()
+          public String getObject()
           {
             return columnVals.lookupName(columnVals.getSingleValueRow(offset.getOffset()));
           }
@@ -365,7 +365,7 @@ public Class classOfObject()
       }
 
       @Override
-      public Object get()
+      public Object getObject()
       {
         return columnVals.getRowValue(offset.getOffset());
       }
diff --git a/processing/src/main/java/io/druid/segment/ZeroFloatColumnSelector.java b/processing/src/main/java/io/druid/segment/ZeroFloatColumnSelector.java
index 39d9eb13bc2d..85ce8c3c78a2 100644
--- a/processing/src/main/java/io/druid/segment/ZeroFloatColumnSelector.java
+++ b/processing/src/main/java/io/druid/segment/ZeroFloatColumnSelector.java
@@ -22,7 +22,7 @@
 import io.druid.query.monomorphicprocessing.RuntimeShapeInspector;
 import io.druid.segment.historical.HistoricalColumnSelector;
 
-public final class ZeroFloatColumnSelector implements FloatColumnSelector, HistoricalColumnSelector
+public final class ZeroFloatColumnSelector implements FloatColumnSelector, HistoricalColumnSelector<Float>
 {
   private static final ZeroFloatColumnSelector INSTANCE = new ZeroFloatColumnSelector();
 
diff --git a/processing/src/main/java/io/druid/segment/data/IndexedDoubles.java b/processing/src/main/java/io/druid/segment/data/IndexedDoubles.java
index 222b8585bafc..3de423b3e2aa 100644
--- a/processing/src/main/java/io/druid/segment/data/IndexedDoubles.java
+++ b/processing/src/main/java/io/druid/segment/data/IndexedDoubles.java
@@ -38,7 +38,7 @@ public interface IndexedDoubles extends Closeable
 
   default DoubleColumnSelector makeDoubleColumnSelector(ReadableOffset offset)
   {
-    class HistoricalDoubleColumnSelector implements DoubleColumnSelector, HistoricalColumnSelector
+    class HistoricalDoubleColumnSelector implements DoubleColumnSelector, HistoricalColumnSelector<Double>
     {
       @Override
       public double getDouble()
@@ -64,7 +64,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
 
   default FloatColumnSelector makeFloatColumnSelector(ReadableOffset offset)
   {
-    class HistoricalFloatColumnSelector implements FloatColumnSelector, HistoricalColumnSelector
+    class HistoricalFloatColumnSelector implements FloatColumnSelector, HistoricalColumnSelector<Float>
     {
       @Override
       public float getFloat()
@@ -90,7 +90,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
 
   default LongColumnSelector makeLongColumnSelector(ReadableOffset offset)
   {
-    class HistoricalLongColumnSelector implements LongColumnSelector, HistoricalColumnSelector
+    class HistoricalLongColumnSelector implements LongColumnSelector, HistoricalColumnSelector<Long>
     {
       @Override
       public long getLong()
diff --git a/processing/src/main/java/io/druid/segment/data/IndexedFloats.java b/processing/src/main/java/io/druid/segment/data/IndexedFloats.java
index 38ebc6a6c608..909b897f6d67 100644
--- a/processing/src/main/java/io/druid/segment/data/IndexedFloats.java
+++ b/processing/src/main/java/io/druid/segment/data/IndexedFloats.java
@@ -41,7 +41,7 @@ public interface IndexedFloats extends Closeable
 
   default FloatColumnSelector makeFloatColumnSelector(ReadableOffset offset)
   {
-    class HistoricalFloatColumnSelector implements FloatColumnSelector, HistoricalColumnSelector
+    class HistoricalFloatColumnSelector implements FloatColumnSelector, HistoricalColumnSelector<Float>
     {
       @Override
       public float getFloat()
@@ -67,7 +67,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
 
   default DoubleColumnSelector makeDoubleColumnSelector(ReadableOffset offset)
   {
-    class HistoricalDoubleColumnSelector implements DoubleColumnSelector, HistoricalColumnSelector
+    class HistoricalDoubleColumnSelector implements DoubleColumnSelector, HistoricalColumnSelector<Double>
     {
       @Override
       public double getDouble()
@@ -93,7 +93,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
 
   default LongColumnSelector makeLongColumnSelector(ReadableOffset offset)
   {
-    class HistoricalLongColumnSelector implements LongColumnSelector, HistoricalColumnSelector
+    class HistoricalLongColumnSelector implements LongColumnSelector, HistoricalColumnSelector<Long>
     {
       @Override
       public long getLong()
diff --git a/processing/src/main/java/io/druid/segment/data/IndexedLongs.java b/processing/src/main/java/io/druid/segment/data/IndexedLongs.java
index 62bbf61af4da..5e248ac9d272 100644
--- a/processing/src/main/java/io/druid/segment/data/IndexedLongs.java
+++ b/processing/src/main/java/io/druid/segment/data/IndexedLongs.java
@@ -41,7 +41,7 @@ public interface IndexedLongs extends Closeable
 
   default LongColumnSelector makeLongColumnSelector(ReadableOffset offset)
   {
-    class HistoricalLongColumnSelector implements LongColumnSelector, HistoricalColumnSelector
+    class HistoricalLongColumnSelector implements LongColumnSelector, HistoricalColumnSelector<Long>
     {
       @Override
       public long getLong()
@@ -67,7 +67,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
 
   default FloatColumnSelector makeFloatColumnSelector(ReadableOffset offset)
   {
-    class HistoricalFloatColumnSelector implements FloatColumnSelector, HistoricalColumnSelector
+    class HistoricalFloatColumnSelector implements FloatColumnSelector, HistoricalColumnSelector<Float>
     {
       @Override
       public float getFloat()
@@ -93,7 +93,7 @@ public void inspectRuntimeShape(RuntimeShapeInspector inspector)
 
   default DoubleColumnSelector makeDoubleColumnSelector(ReadableOffset offset)
   {
-    class HistoricalDoubleColumnSelector implements DoubleColumnSelector, HistoricalColumnSelector
+    class HistoricalDoubleColumnSelector implements DoubleColumnSelector, HistoricalColumnSelector<Double>
     {
       @Override
       public double getDouble()
diff --git a/processing/src/main/java/io/druid/segment/historical/HistoricalColumnSelector.java b/processing/src/main/java/io/druid/segment/historical/HistoricalColumnSelector.java
index f73835e8a798..a27ef0b2c54a 100644
--- a/processing/src/main/java/io/druid/segment/historical/HistoricalColumnSelector.java
+++ b/processing/src/main/java/io/druid/segment/historical/HistoricalColumnSelector.java
@@ -22,7 +22,7 @@
 import io.druid.query.monomorphicprocessing.CalledFromHotLoop;
 import io.druid.segment.ColumnValueSelector;
 
-public interface HistoricalColumnSelector extends ColumnValueSelector
+public interface HistoricalColumnSelector<T> extends ColumnValueSelector<T>
 {
   @CalledFromHotLoop
   double getDouble(int offset);
diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
index 6c8daf2ad22c..324f95414d97 100644
--- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
+++ b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
@@ -166,7 +166,7 @@ public Class classOfObject()
             }
 
             @Override
-            public Object get()
+            public Object getObject()
             {
               return extractor.extractValue(in.get(), column);
             }
diff --git a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java
index 6433b2774124..8b9ae75f57b6 100644
--- a/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java
+++ b/processing/src/main/java/io/druid/segment/incremental/IncrementalIndexColumnSelectorFactory.java
@@ -260,7 +260,7 @@ public Class<Long> classOfObject()
         }
 
         @Override
-        public Long get()
+        public Long getObject()
         {
           return timeAndDimsHolder.getKey().getTimestamp();
         }
@@ -280,7 +280,7 @@ public Class classOfObject()
         }
 
         @Override
-        public Object get()
+        public Object getObject()
         {
           return index.getMetricObjectValue(
               timeAndDimsHolder.getValue(),
@@ -308,7 +308,7 @@ public Class classOfObject()
         }
 
         @Override
-        public Object get()
+        public Object getObject()
         {
           IncrementalIndex.TimeAndDims key = timeAndDimsHolder.getKey();
           if (key == null) {
diff --git a/processing/src/main/java/io/druid/segment/virtual/ExpressionObjectSelector.java b/processing/src/main/java/io/druid/segment/virtual/ExpressionObjectSelector.java
index bb0217958678..941c25c3f2cd 100644
--- a/processing/src/main/java/io/druid/segment/virtual/ExpressionObjectSelector.java
+++ b/processing/src/main/java/io/druid/segment/virtual/ExpressionObjectSelector.java
@@ -119,11 +119,11 @@ static Supplier<Object> supplierFromObjectSelector(final ObjectColumnSelector se
     final Class<?> clazz = selector.classOfObject();
     if (Number.class.isAssignableFrom(clazz) || String.class.isAssignableFrom(clazz)) {
       // Number, String supported as-is.
-      return selector::get;
+      return selector::getObject;
     } else if (clazz.isAssignableFrom(Number.class) || clazz.isAssignableFrom(String.class)) {
       // Might be Numbers and Strings. Use a selector that double-checks.
       return () -> {
-        final Object val = selector.get();
+        final Object val = selector.getObject();
         if (val instanceof Number || val instanceof String) {
           return val;
         } else {
@@ -143,7 +143,7 @@ public Class<ExprEval> classOfObject()
   }
 
   @Override
-  public ExprEval get()
+  public ExprEval getObject()
   {
     return expression.eval(bindings);
   }
diff --git a/processing/src/main/java/io/druid/segment/virtual/ExpressionSelectors.java b/processing/src/main/java/io/druid/segment/virtual/ExpressionSelectors.java
index 7733975007d3..9d2b2aaeeaff 100644
--- a/processing/src/main/java/io/druid/segment/virtual/ExpressionSelectors.java
+++ b/processing/src/main/java/io/druid/segment/virtual/ExpressionSelectors.java
@@ -57,7 +57,7 @@ class ExpressionLongColumnSelector implements LongColumnSelector
       @Override
       public long getLong()
       {
-        final ExprEval exprEval = baseSelector.get();
+        final ExprEval exprEval = baseSelector.getObject();
         return exprEval.isNull() ? nullValue : exprEval.asLong();
       }
 
@@ -82,7 +82,7 @@ class ExpressionFloatColumnSelector implements FloatColumnSelector
       @Override
       public float getFloat()
       {
-        final ExprEval exprEval = baseSelector.get();
+        final ExprEval exprEval = baseSelector.getObject();
         return exprEval.isNull() ? nullValue : (float) exprEval.asDouble();
       }
 
@@ -107,7 +107,7 @@ class ExpressionDoubleColumnSelector implements DoubleColumnSelector
       @Override
       public double getDouble()
       {
-        final ExprEval exprEval = baseSelector.get();
+        final ExprEval exprEval = baseSelector.getObject();
         return exprEval.isNull() ? nullValue : exprEval.asDouble();
       }
 
@@ -134,7 +134,7 @@ class DefaultExpressionDimensionSelector extends BaseSingleValueDimensionSelecto
         @Override
         protected String getValue()
         {
-          return Strings.emptyToNull(baseSelector.get().asString());
+          return Strings.emptyToNull(baseSelector.getObject().asString());
         }
 
         @Override
@@ -150,7 +150,7 @@ class ExtractionExpressionDimensionSelector extends BaseSingleValueDimensionSele
         @Override
         protected String getValue()
         {
-          return extractionFn.apply(Strings.emptyToNull(baseSelector.get().asString()));
+          return extractionFn.apply(Strings.emptyToNull(baseSelector.getObject().asString()));
         }
 
         @Override
diff --git a/processing/src/main/java/io/druid/segment/virtual/ExpressionVirtualColumn.java b/processing/src/main/java/io/druid/segment/virtual/ExpressionVirtualColumn.java
index 19075c1e01ce..c57ae36da96b 100644
--- a/processing/src/main/java/io/druid/segment/virtual/ExpressionVirtualColumn.java
+++ b/processing/src/main/java/io/druid/segment/virtual/ExpressionVirtualColumn.java
@@ -101,9 +101,9 @@ public Class classOfObject()
       }
 
       @Override
-      public Object get()
+      public Object getObject()
       {
-        return baseSelector.get().value();
+        return baseSelector.getObject().value();
       }
     };
   }
diff --git a/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java b/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java
index 1700b2d40d84..6c57a8db980e 100644
--- a/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java
+++ b/processing/src/test/java/io/druid/query/aggregation/MetricSelectorUtils.java
@@ -36,7 +36,7 @@ public Class<Float> classOfObject()
       }
 
       @Override
-      public Float get()
+      public Float getObject()
       {
         return selector.getFloat();
       }
@@ -54,7 +54,7 @@ public Class<Double> classOfObject()
       }
 
       @Override
-      public Double get()
+      public Double getObject()
       {
         return selector.getDouble();
       }
diff --git a/processing/src/test/java/io/druid/query/aggregation/TestObjectColumnSelector.java b/processing/src/test/java/io/druid/query/aggregation/TestObjectColumnSelector.java
index 7abe0da479db..7502c25935be 100644
--- a/processing/src/test/java/io/druid/query/aggregation/TestObjectColumnSelector.java
+++ b/processing/src/test/java/io/druid/query/aggregation/TestObjectColumnSelector.java
@@ -41,7 +41,7 @@ public Class classOfObject()
   }
 
   @Override
-  public Object get()
+  public Object getObject()
   {
     return objects[index];
   }
diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java b/processing/src/test/java/io/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java
index e6c68eaf867d..a022d7a73c72 100644
--- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java
+++ b/processing/src/test/java/io/druid/query/groupby/epinephelinae/TestColumnSelectorFactory.java
@@ -85,7 +85,7 @@ public Class classOfObject()
       }
 
       @Override
-      public Object get()
+      public Object getObject()
       {
         return row.get().getRaw(columnName);
       }
diff --git a/processing/src/test/java/io/druid/segment/virtual/ExpressionObjectSelectorTest.java b/processing/src/test/java/io/druid/segment/virtual/ExpressionObjectSelectorTest.java
index 82c54d5544b7..272da8f504a4 100644
--- a/processing/src/test/java/io/druid/segment/virtual/ExpressionObjectSelectorTest.java
+++ b/processing/src/test/java/io/druid/segment/virtual/ExpressionObjectSelectorTest.java
@@ -156,7 +156,7 @@ public Class<T> classOfObject()
       }
 
       @Override
-      public T get()
+      public T getObject()
       {
         return supplier.get();
       }
diff --git a/processing/src/test/java/io/druid/segment/virtual/ExpressionVirtualColumnTest.java b/processing/src/test/java/io/druid/segment/virtual/ExpressionVirtualColumnTest.java
index 92b718bfab4a..d8e0569fb6f4 100644
--- a/processing/src/test/java/io/druid/segment/virtual/ExpressionVirtualColumnTest.java
+++ b/processing/src/test/java/io/druid/segment/virtual/ExpressionVirtualColumnTest.java
@@ -95,16 +95,16 @@ public void testObjectSelector()
     final ObjectColumnSelector selector = XPLUSY.makeObjectColumnSelector("expr", COLUMN_SELECTOR_FACTORY);
 
     COLUMN_SELECTOR_FACTORY.setRow(ROW0);
-    Assert.assertEquals(null, selector.get());
+    Assert.assertEquals(null, selector.getObject());
 
     COLUMN_SELECTOR_FACTORY.setRow(ROW1);
-    Assert.assertEquals(4.0d, selector.get());
+    Assert.assertEquals(4.0d, selector.getObject());
 
     COLUMN_SELECTOR_FACTORY.setRow(ROW2);
-    Assert.assertEquals(5.1d, selector.get());
+    Assert.assertEquals(5.1d, selector.getObject());
 
     COLUMN_SELECTOR_FACTORY.setRow(ROW3);
-    Assert.assertEquals(5L, selector.get());
+    Assert.assertEquals(5L, selector.getObject());
   }
 
   @Test
diff --git a/processing/src/test/java/io/druid/segment/virtual/VirtualColumnsTest.java b/processing/src/test/java/io/druid/segment/virtual/VirtualColumnsTest.java
index d2a27b3c8331..d6d6fad58b41 100644
--- a/processing/src/test/java/io/druid/segment/virtual/VirtualColumnsTest.java
+++ b/processing/src/test/java/io/druid/segment/virtual/VirtualColumnsTest.java
@@ -103,7 +103,7 @@ public void testMakeSelectors()
     final FloatColumnSelector floatSelector = virtualColumns.makeFloatColumnSelector("expr", null);
     final LongColumnSelector longSelector = virtualColumns.makeLongColumnSelector("expr", null);
 
-    Assert.assertEquals(1L, objectSelector.get());
+    Assert.assertEquals(1L, objectSelector.getObject());
     Assert.assertEquals("1", dimensionSelector.lookupName(dimensionSelector.getRow().get(0)));
     Assert.assertEquals("0.5", extractionDimensionSelector.lookupName(extractionDimensionSelector.getRow().get(0)));
     Assert.assertEquals(1.0f, floatSelector.getFloat(), 0.0f);
@@ -122,7 +122,7 @@ public void testMakeSelectorsWithDotSupport()
     final FloatColumnSelector floatSelector = virtualColumns.makeFloatColumnSelector("foo.5", null);
     final LongColumnSelector longSelector = virtualColumns.makeLongColumnSelector("foo.5", null);
 
-    Assert.assertEquals(5L, objectSelector.get());
+    Assert.assertEquals(5L, objectSelector.getObject());
     Assert.assertEquals("5", dimensionSelector.lookupName(dimensionSelector.getRow().get(0)));
     Assert.assertEquals(5.0f, floatSelector.getFloat(), 0.0f);
     Assert.assertEquals(5L, longSelector.getLong());
@@ -140,7 +140,7 @@ public void testMakeSelectorsWithDotSupportBaseNameOnly()
     final FloatColumnSelector floatSelector = virtualColumns.makeFloatColumnSelector("foo", null);
     final LongColumnSelector longSelector = virtualColumns.makeLongColumnSelector("foo", null);
 
-    Assert.assertEquals(-1L, objectSelector.get());
+    Assert.assertEquals(-1L, objectSelector.getObject());
     Assert.assertEquals("-1", dimensionSelector.lookupName(dimensionSelector.getRow().get(0)));
     Assert.assertEquals(-1.0f, floatSelector.getFloat(), 0.0f);
     Assert.assertEquals(-1L, longSelector.getLong());
@@ -319,7 +319,7 @@ public Class classOfObject()
         }
 
         @Override
-        public Object get()
+        public Object getObject()
         {
           return selector.getLong();
         }
diff --git a/server/src/main/java/io/druid/segment/realtime/firehose/IngestSegmentFirehose.java b/server/src/main/java/io/druid/segment/realtime/firehose/IngestSegmentFirehose.java
index 1e4c5a725cd4..2d114ef66b86 100644
--- a/server/src/main/java/io/druid/segment/realtime/firehose/IngestSegmentFirehose.java
+++ b/server/src/main/java/io/druid/segment/realtime/firehose/IngestSegmentFirehose.java
@@ -149,7 +149,7 @@ public InputRow next()
                                         for (Map.Entry<String, ObjectColumnSelector> metSelector : metSelectors.entrySet()) {
                                           final String metric = metSelector.getKey();
                                           final ObjectColumnSelector selector = metSelector.getValue();
-                                          theEvent.put(metric, selector.get());
+                                          theEvent.put(metric, selector.getObject());
                                         }
                                         cursor.advance();
                                         return new MapBasedInputRow(timestamp, dims, theEvent);
diff --git a/services/src/main/java/io/druid/cli/DumpSegment.java b/services/src/main/java/io/druid/cli/DumpSegment.java
index ce23c12e1e20..9bd8697aae71 100644
--- a/services/src/main/java/io/druid/cli/DumpSegment.java
+++ b/services/src/main/java/io/druid/cli/DumpSegment.java
@@ -288,7 +288,7 @@ public Object apply(Cursor cursor)
 
                       for (int i = 0; i < columnNames.size(); i++) {
                         final String columnName = columnNames.get(i);
-                        final Object value = selectors.get(i).get();
+                        final Object value = selectors.get(i).getObject();
 
                         if (timeISO8601 && columnNames.get(i).equals(Column.TIME_COLUMN_NAME)) {
                           row.put(columnName, new DateTime(value, DateTimeZone.UTC).toString());
@@ -525,7 +525,7 @@ public Class<List> classOfObject()
           }
 
           @Override
-          public List<String> get()
+          public List<String> getObject()
           {
             final IndexedInts row = dimensionSelector.getRow();
             if (row.size() == 0) {
@@ -549,7 +549,7 @@ public Class<String> classOfObject()
           }
 
           @Override
-          public String get()
+          public String getObject()
           {
             final IndexedInts row = dimensionSelector.getRow();
             return row.size() == 0 ? null : dimensionSelector.lookupName(row.get(0));
@@ -572,7 +572,7 @@ public Class classOfObject()
           }
 
           @Override
-          public Object get()
+          public Object getObject()
           {
             return null;
           }