diff --git a/storage/reads/store.go b/storage/reads/store.go
index a7adbbb1d3..044c54743d 100644
--- a/storage/reads/store.go
+++ b/storage/reads/store.go
@@ -83,11 +83,11 @@ type Store interface {
 	GetSource(orgID, bucketID uint64) proto.Message
 }
 
-// WindowAggregateCapability describes what is supported by WindowAggregateReader.
+// WindowAggregateCapability describes what is supported by WindowAggregateStore.
 type WindowAggregateCapability struct{}
 
-// WindowAggregateReader implements the WindowAggregate capability.
-type WindowAggregateReader interface {
+// WindowAggregateStore implements the WindowAggregate capability.
+type WindowAggregateStore interface {
 	// HasWindowAggregateCapability checks if this Store supports the capability.
 	// If WindowAggregateCapability is passed to the method, then the struct
 	// is filled with a detailed list of what the RPC call supports.
diff --git a/tenant/http_server_onboarding_test.go b/tenant/http_server_onboarding_test.go
index ec1b4fbc32..dfd89c4583 100644
--- a/tenant/http_server_onboarding_test.go
+++ b/tenant/http_server_onboarding_test.go
@@ -6,11 +6,11 @@ import (
 	"testing"
 
 	"github.com/go-chi/chi"
+	"github.com/influxdata/influxdb/v2"
 	ihttp "github.com/influxdata/influxdb/v2/http"
 	"github.com/influxdata/influxdb/v2/kv"
 	"github.com/influxdata/influxdb/v2/tenant"
 	itesting "github.com/influxdata/influxdb/v2/testing"
-	"github.com/influxdata/influxdb/v2"
 	"go.uber.org/zap/zaptest"
 )