diff --git a/promql/engine.go b/promql/engine.go
index 907800be47..9b0a328797 100644
--- a/promql/engine.go
+++ b/promql/engine.go
@@ -1643,7 +1643,7 @@ func (ev *evaluator) vectorSelectorSingle(it *storage.MemoizedSeriesIterator, no
 	}
 
 	if ok {
-		t, v = it.Values()
+		t, v = it.At()
 	}
 
 	if !ok || t > refTime {
@@ -1763,7 +1763,7 @@ func (ev *evaluator) matrixIterSlice(it *storage.BufferedSeriesIterator, mint, m
 	}
 	// The seeked sample might also be in the range.
 	if ok {
-		t, v := it.Values()
+		t, v := it.At()
 		if t == maxt && !value.IsStaleNaN(v) {
 			if ev.currentSamples >= ev.maxSamples {
 				ev.error(ErrTooManySamples(env))
diff --git a/storage/buffer.go b/storage/buffer.go
index 68cda5f946..3c7e11b3ef 100644
--- a/storage/buffer.go
+++ b/storage/buffer.go
@@ -89,7 +89,7 @@ func (b *BufferedSeriesIterator) Seek(t int64) bool {
 		if !b.ok {
 			return false
 		}
-		b.lastTime, _ = b.Values()
+		b.lastTime, _ = b.At()
 	}
 
 	if b.lastTime >= t {
@@ -115,14 +115,14 @@ func (b *BufferedSeriesIterator) Next() bool {
 
 	b.ok = b.it.Next()
 	if b.ok {
-		b.lastTime, _ = b.Values()
+		b.lastTime, _ = b.At()
 	}
 
 	return b.ok
 }
 
-// Values returns the current element of the iterator.
-func (b *BufferedSeriesIterator) Values() (int64, float64) {
+// At returns the current element of the iterator.
+func (b *BufferedSeriesIterator) At() (int64, float64) {
 	return b.it.At()
 }
 
diff --git a/storage/buffer_test.go b/storage/buffer_test.go
index b67af6de94..3e05626843 100644
--- a/storage/buffer_test.go
+++ b/storage/buffer_test.go
@@ -99,7 +99,7 @@ func TestBufferedSeriesIterator(t *testing.T) {
 		require.Equal(t, exp, b, "buffer mismatch")
 	}
 	sampleEq := func(ets int64, ev float64) {
-		ts, v := it.Values()
+		ts, v := it.At()
 		require.Equal(t, ets, ts, "timestamp mismatch")
 		require.Equal(t, ev, v, "value mismatch")
 	}
diff --git a/storage/memoized_iterator.go b/storage/memoized_iterator.go
index 0c40bb9d0e..3538c7f486 100644
--- a/storage/memoized_iterator.go
+++ b/storage/memoized_iterator.go
@@ -112,8 +112,8 @@ func (b *MemoizedSeriesIterator) Next() bool {
 	return b.ok
 }
 
-// Values returns the current element of the iterator.
-func (b *MemoizedSeriesIterator) Values() (int64, float64) {
+// At returns the current element of the iterator.
+func (b *MemoizedSeriesIterator) At() (int64, float64) {
 	return b.it.At()
 }
 
diff --git a/storage/memoized_iterator_test.go b/storage/memoized_iterator_test.go
index 8492565873..ef773ee0f8 100644
--- a/storage/memoized_iterator_test.go
+++ b/storage/memoized_iterator_test.go
@@ -23,7 +23,7 @@ func TestMemoizedSeriesIterator(t *testing.T) {
 	var it *MemoizedSeriesIterator
 
 	sampleEq := func(ets int64, ev float64) {
-		ts, v := it.Values()
+		ts, v := it.At()
 		require.Equal(t, ets, ts, "timestamp mismatch")
 		require.Equal(t, ev, v, "value mismatch")
 	}
diff --git a/web/federate.go b/web/federate.go
index c7a2ff61d7..44880d0e6d 100644
--- a/web/federate.go
+++ b/web/federate.go
@@ -113,7 +113,7 @@ func (h *Handler) federation(w http.ResponseWriter, req *http.Request) {
 
 		ok := it.Seek(maxt)
 		if ok {
-			t, v = it.Values()
+			t, v = it.At()
 		} else {
 			t, v, ok = it.PeekBack(1)
 			if !ok {