diff --git a/.mockery.yaml b/.mockery.yaml
index cf4e9f0b10c..c700d121cb2 100644
--- a/.mockery.yaml
+++ b/.mockery.yaml
@@ -64,7 +64,7 @@ packages:
   github.com/jaegertracing/jaeger/storage/dependencystore:
     interfaces:
       Reader:
-  github.com/jaegertracing/jaeger/storage/metricsstore:
+  github.com/jaegertracing/jaeger/storage/metricstore:
     config:
       all: true
   github.com/jaegertracing/jaeger/storage/samplingstore:
diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
index 686458ffa9f..63bfd7e7554 100644
--- a/cmd/all-in-one/main.go
+++ b/cmd/all-in-one/main.go
@@ -39,7 +39,7 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	"github.com/jaegertracing/jaeger/ports"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
-	"github.com/jaegertracing/jaeger/storage/metricsstore/metricstoremetrics"
+	"github.com/jaegertracing/jaeger/storage/metricstore/metricstoremetrics"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
diff --git a/cmd/jaeger/internal/extension/jaegerquery/server.go b/cmd/jaeger/internal/extension/jaegerquery/server.go
index f070338f283..8fbf840d1fd 100644
--- a/cmd/jaeger/internal/extension/jaegerquery/server.go
+++ b/cmd/jaeger/internal/extension/jaegerquery/server.go
@@ -21,8 +21,8 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/telemetry"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
-	"github.com/jaegertracing/jaeger/storage/metricsstore/metricstoremetrics"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore/metricstoremetrics"
 )
 
 var (
@@ -140,7 +140,7 @@ func (s *server) addArchiveStorage(opts *querysvc.QueryServiceOptions, host comp
 	return nil
 }
 
-func (s *server) createMetricReader(host component.Host) (metricsstore.Reader, error) {
+func (s *server) createMetricReader(host component.Host) (metricstore.Reader, error) {
 	if s.config.Storage.Metrics == "" {
 		s.telset.Logger.Info("Metric storage not configured")
 		return disabled.NewMetricsReader()
diff --git a/cmd/jaeger/internal/extension/jaegerquery/server_test.go b/cmd/jaeger/internal/extension/jaegerquery/server_test.go
index 54b3733f24c..130f435a108 100644
--- a/cmd/jaeger/internal/extension/jaegerquery/server_test.go
+++ b/cmd/jaeger/internal/extension/jaegerquery/server_test.go
@@ -30,8 +30,8 @@ import (
 	"github.com/jaegertracing/jaeger/storage"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
-	metricsstoremocks "github.com/jaegertracing/jaeger/storage/metricsstore/mocks"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
+	metricstoremocks "github.com/jaegertracing/jaeger/storage/metricstore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
@@ -80,11 +80,11 @@ func (fmf fakeMetricsFactory) Initialize(*zap.Logger) error {
 	return nil
 }
 
-func (fmf fakeMetricsFactory) CreateMetricsReader() (metricsstore.Reader, error) {
+func (fmf fakeMetricsFactory) CreateMetricsReader() (metricstore.Reader, error) {
 	if fmf.name == "need-metrics-reader-error" {
 		return nil, errors.New("test-error")
 	}
-	return &metricsstoremocks.Reader{}, nil
+	return &metricstoremocks.Reader{}, nil
 }
 
 type fakeStorageExt struct{}
diff --git a/cmd/query/app/grpc_handler.go b/cmd/query/app/grpc_handler.go
index 4e759098f12..64669ed3e4e 100644
--- a/cmd/query/app/grpc_handler.go
+++ b/cmd/query/app/grpc_handler.go
@@ -19,7 +19,7 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
@@ -242,7 +242,7 @@ func (g *GRPCHandler) GetLatencies(ctx context.Context, r *metrics.GetLatenciesR
 	if r.Quantile == 0 {
 		return nil, errMissingQuantile
 	}
-	queryParams := metricsstore.LatenciesQueryParameters{
+	queryParams := metricstore.LatenciesQueryParameters{
 		BaseQueryParameters: bqp,
 		Quantile:            r.Quantile,
 	}
@@ -259,7 +259,7 @@ func (g *GRPCHandler) GetCallRates(ctx context.Context, r *metrics.GetCallRatesR
 	if err := g.handleErr("failed to build parameters", err); err != nil {
 		return nil, err
 	}
-	queryParams := metricsstore.CallRateQueryParameters{
+	queryParams := metricstore.CallRateQueryParameters{
 		BaseQueryParameters: bqp,
 	}
 	m, err := g.metricsQueryService.GetCallRates(ctx, &queryParams)
@@ -275,7 +275,7 @@ func (g *GRPCHandler) GetErrorRates(ctx context.Context, r *metrics.GetErrorRate
 	if err := g.handleErr("failed to build parameters", err); err != nil {
 		return nil, err
 	}
-	queryParams := metricsstore.ErrorRateQueryParameters{
+	queryParams := metricstore.ErrorRateQueryParameters{
 		BaseQueryParameters: bqp,
 	}
 	m, err := g.metricsQueryService.GetErrorRates(ctx, &queryParams)
@@ -287,7 +287,7 @@ func (g *GRPCHandler) GetErrorRates(ctx context.Context, r *metrics.GetErrorRate
 
 // GetMinStepDuration is the gRPC handler to fetch the minimum step duration supported by the underlying metrics store.
 func (g *GRPCHandler) GetMinStepDuration(ctx context.Context, _ *metrics.GetMinStepDurationRequest) (*metrics.GetMinStepDurationResponse, error) {
-	minStep, err := g.metricsQueryService.GetMinStepDuration(ctx, &metricsstore.MinStepDurationQueryParameters{})
+	minStep, err := g.metricsQueryService.GetMinStepDuration(ctx, &metricstore.MinStepDurationQueryParameters{})
 	if err := g.handleErr("failed to fetch min step duration", err); err != nil {
 		return nil, err
 	}
@@ -312,7 +312,7 @@ func (g *GRPCHandler) handleErr(msg string, err error) error {
 	return status.Errorf(codes.Internal, "%s: %v", msg, err)
 }
 
-func (g *GRPCHandler) newBaseQueryParameters(r any) (bqp metricsstore.BaseQueryParameters, err error) {
+func (g *GRPCHandler) newBaseQueryParameters(r any) (bqp metricstore.BaseQueryParameters, err error) {
 	if r == nil {
 		return bqp, errNilRequest
 	}
diff --git a/cmd/query/app/grpc_handler_test.go b/cmd/query/app/grpc_handler_test.go
index a7201da4dd4..cca73efdfa9 100644
--- a/cmd/query/app/grpc_handler_test.go
+++ b/cmd/query/app/grpc_handler_test.go
@@ -29,8 +29,8 @@ import (
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
 	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
-	metricsmocks "github.com/jaegertracing/jaeger/storage/metricsstore/mocks"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
+	metricsmocks "github.com/jaegertracing/jaeger/storage/metricstore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
@@ -599,21 +599,21 @@ func TestGetMetricsSuccessGRPC(t *testing.T) {
 		}{
 			{
 				mockMethod:    "GetLatencies",
-				mockParamType: "*metricsstore.LatenciesQueryParameters",
+				mockParamType: "*metricstore.LatenciesQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetLatencies(context.Background(), &metrics.GetLatenciesRequest{Quantile: 0.95, BaseRequest: baseQueryParam})
 				},
 			},
 			{
 				mockMethod:    "GetCallRates",
-				mockParamType: "*metricsstore.CallRateQueryParameters",
+				mockParamType: "*metricstore.CallRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetCallRates(context.Background(), &metrics.GetCallRatesRequest{BaseRequest: baseQueryParam})
 				},
 			},
 			{
 				mockMethod:    "GetErrorRates",
-				mockParamType: "*metricsstore.ErrorRateQueryParameters",
+				mockParamType: "*metricstore.ErrorRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetErrorRates(context.Background(), &metrics.GetErrorRatesRequest{BaseRequest: baseQueryParam})
 				},
@@ -681,8 +681,8 @@ func TestGetMetricsUseDefaultParamsGRPC(t *testing.T) {
 			BaseRequest: baseQueryParam,
 		}
 		expectedMetrics := &metrics.MetricFamily{Name: "foo"}
-		expectedParams := &metricsstore.CallRateQueryParameters{
-			BaseQueryParameters: metricsstore.BaseQueryParameters{
+		expectedParams := &metricstore.CallRateQueryParameters{
+			BaseQueryParameters: metricstore.BaseQueryParameters{
 				ServiceNames: []string{"foo"},
 				EndTime:      &now,
 				Lookback:     &defaultMetricsQueryLookbackDuration,
@@ -722,8 +722,8 @@ func TestGetMetricsOverrideDefaultParamsGRPC(t *testing.T) {
 			BaseRequest: baseQueryParam,
 		}
 		expectedMetrics := &metrics.MetricFamily{Name: "foo"}
-		expectedParams := &metricsstore.CallRateQueryParameters{
-			BaseQueryParameters: metricsstore.BaseQueryParameters{
+		expectedParams := &metricstore.CallRateQueryParameters{
+			BaseQueryParameters: metricstore.BaseQueryParameters{
 				ServiceNames: baseQueryParam.ServiceNames,
 				EndTime:      &endTime,
 				Lookback:     &lookback,
@@ -755,7 +755,7 @@ func TestGetMetricsFailureGRPC(t *testing.T) {
 		}{
 			{
 				mockMethod:    "GetLatencies",
-				mockParamType: "*metricsstore.LatenciesQueryParameters",
+				mockParamType: "*metricstore.LatenciesQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetLatencies(context.Background(), &metrics.GetLatenciesRequest{Quantile: 0.95, BaseRequest: baseQueryParam})
 				},
@@ -763,7 +763,7 @@ func TestGetMetricsFailureGRPC(t *testing.T) {
 			},
 			{
 				mockMethod:    "GetCallRates",
-				mockParamType: "*metricsstore.CallRateQueryParameters",
+				mockParamType: "*metricstore.CallRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetCallRates(context.Background(), &metrics.GetCallRatesRequest{BaseRequest: baseQueryParam})
 				},
@@ -771,7 +771,7 @@ func TestGetMetricsFailureGRPC(t *testing.T) {
 			},
 			{
 				mockMethod:    "GetErrorRates",
-				mockParamType: "*metricsstore.ErrorRateQueryParameters",
+				mockParamType: "*metricstore.ErrorRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetErrorRates(context.Background(), &metrics.GetErrorRatesRequest{BaseRequest: baseQueryParam})
 				},
@@ -796,7 +796,7 @@ func TestGetMetricsFailureGRPC(t *testing.T) {
 func TestGetMinStepDurationSuccessGRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
 		m := server.metricsQueryService.(*metricsmocks.Reader)
-		m.On("GetMinStepDuration", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*metricsstore.MinStepDurationQueryParameters")).
+		m.On("GetMinStepDuration", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*metricstore.MinStepDurationQueryParameters")).
 			Return(time.Hour, nil).Once()
 
 		res, err := client.GetMinStepDuration(context.Background(), &metrics.GetMinStepDurationRequest{})
@@ -808,7 +808,7 @@ func TestGetMinStepDurationSuccessGRPC(t *testing.T) {
 func TestGetMinStepDurationFailureGRPC(t *testing.T) {
 	withServerAndClient(t, func(server *grpcServer, client *grpcClient) {
 		m := server.metricsQueryService.(*metricsmocks.Reader)
-		m.On("GetMinStepDuration", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*metricsstore.MinStepDurationQueryParameters")).
+		m.On("GetMinStepDuration", mock.AnythingOfType("*context.valueCtx"), mock.AnythingOfType("*metricstore.MinStepDurationQueryParameters")).
 			Return(time.Duration(0), errStorageGRPC).Once()
 
 		res, err := client.GetMinStepDuration(context.Background(), &metrics.GetMinStepDurationRequest{})
@@ -831,7 +831,7 @@ func TestGetMetricsInvalidParametersGRPC(t *testing.T) {
 			{
 				name:          "GetLatencies missing service names",
 				mockMethod:    "GetLatencies",
-				mockParamType: "*metricsstore.LatenciesQueryParameters",
+				mockParamType: "*metricstore.LatenciesQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetLatencies(context.Background(), &metrics.GetLatenciesRequest{Quantile: 0.95})
 				},
@@ -840,7 +840,7 @@ func TestGetMetricsInvalidParametersGRPC(t *testing.T) {
 			{
 				name:          "GetLatencies missing quantile",
 				mockMethod:    "GetLatencies",
-				mockParamType: "*metricsstore.LatenciesQueryParameters",
+				mockParamType: "*metricstore.LatenciesQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetLatencies(context.Background(), &metrics.GetLatenciesRequest{
 						BaseRequest: &metrics.MetricsQueryBaseRequest{
@@ -853,7 +853,7 @@ func TestGetMetricsInvalidParametersGRPC(t *testing.T) {
 			{
 				name:          "GetCallRates missing service names",
 				mockMethod:    "GetCallRates",
-				mockParamType: "*metricsstore.CallRateQueryParameters",
+				mockParamType: "*metricstore.CallRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetCallRates(context.Background(), &metrics.GetCallRatesRequest{}) // Test
 				},
@@ -862,7 +862,7 @@ func TestGetMetricsInvalidParametersGRPC(t *testing.T) {
 			{
 				name:          "GetErrorRates nil request",
 				mockMethod:    "GetErrorRates",
-				mockParamType: "*metricsstore.ErrorRateQueryParameters",
+				mockParamType: "*metricstore.ErrorRateQueryParameters",
 				testFn: func(client *grpcClient) (*metrics.GetMetricsResponse, error) {
 					return client.GetErrorRates(context.Background(), &metrics.GetErrorRatesRequest{})
 				},
diff --git a/cmd/query/app/http_handler.go b/cmd/query/app/http_handler.go
index 6fec4906525..bed670240a9 100644
--- a/cmd/query/app/http_handler.go
+++ b/cmd/query/app/http_handler.go
@@ -28,7 +28,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
@@ -306,8 +306,8 @@ func (aH *APIHandler) latencies(w http.ResponseWriter, r *http.Request) {
 		aH.handleError(w, newParseError(err, quantileParam), http.StatusBadRequest)
 		return
 	}
-	aH.metrics(w, r, func(ctx context.Context, baseParams metricsstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
-		return aH.metricsQueryService.GetLatencies(ctx, &metricsstore.LatenciesQueryParameters{
+	aH.metrics(w, r, func(ctx context.Context, baseParams metricstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
+		return aH.metricsQueryService.GetLatencies(ctx, &metricstore.LatenciesQueryParameters{
 			BaseQueryParameters: baseParams,
 			Quantile:            q,
 		})
@@ -315,23 +315,23 @@ func (aH *APIHandler) latencies(w http.ResponseWriter, r *http.Request) {
 }
 
 func (aH *APIHandler) calls(w http.ResponseWriter, r *http.Request) {
-	aH.metrics(w, r, func(ctx context.Context, baseParams metricsstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
-		return aH.metricsQueryService.GetCallRates(ctx, &metricsstore.CallRateQueryParameters{
+	aH.metrics(w, r, func(ctx context.Context, baseParams metricstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
+		return aH.metricsQueryService.GetCallRates(ctx, &metricstore.CallRateQueryParameters{
 			BaseQueryParameters: baseParams,
 		})
 	})
 }
 
 func (aH *APIHandler) errors(w http.ResponseWriter, r *http.Request) {
-	aH.metrics(w, r, func(ctx context.Context, baseParams metricsstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
-		return aH.metricsQueryService.GetErrorRates(ctx, &metricsstore.ErrorRateQueryParameters{
+	aH.metrics(w, r, func(ctx context.Context, baseParams metricstore.BaseQueryParameters) (*metrics.MetricFamily, error) {
+		return aH.metricsQueryService.GetErrorRates(ctx, &metricstore.ErrorRateQueryParameters{
 			BaseQueryParameters: baseParams,
 		})
 	})
 }
 
 func (aH *APIHandler) minStep(w http.ResponseWriter, r *http.Request) {
-	minStep, err := aH.metricsQueryService.GetMinStepDuration(r.Context(), &metricsstore.MinStepDurationQueryParameters{})
+	minStep, err := aH.metricsQueryService.GetMinStepDuration(r.Context(), &metricstore.MinStepDurationQueryParameters{})
 	if aH.handleError(w, err, http.StatusInternalServerError) {
 		return
 	}
@@ -342,7 +342,7 @@ func (aH *APIHandler) minStep(w http.ResponseWriter, r *http.Request) {
 	aH.writeJSON(w, r, &structuredRes)
 }
 
-func (aH *APIHandler) metrics(w http.ResponseWriter, r *http.Request, getMetrics func(context.Context, metricsstore.BaseQueryParameters) (*metrics.MetricFamily, error)) {
+func (aH *APIHandler) metrics(w http.ResponseWriter, r *http.Request, getMetrics func(context.Context, metricstore.BaseQueryParameters) (*metrics.MetricFamily, error)) {
 	requestParams, err := aH.queryParser.parseMetricsQueryParams(r)
 	if aH.handleError(w, err, http.StatusBadRequest) {
 		return
diff --git a/cmd/query/app/http_handler_test.go b/cmd/query/app/http_handler_test.go
index 251c9d09bfa..d2eb34fa4d7 100644
--- a/cmd/query/app/http_handler_test.go
+++ b/cmd/query/app/http_handler_test.go
@@ -39,7 +39,7 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
 	depsmocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks"
-	metricsmocks "github.com/jaegertracing/jaeger/storage/metricsstore/mocks"
+	metricsmocks "github.com/jaegertracing/jaeger/storage/metricstore/mocks"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 	spanstoremocks "github.com/jaegertracing/jaeger/storage/spanstore/mocks"
 )
diff --git a/cmd/query/app/query_parser.go b/cmd/query/app/query_parser.go
index 523f1af6aee..74e2e220512 100644
--- a/cmd/query/app/query_parser.go
+++ b/cmd/query/app/query_parser.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
 
@@ -232,7 +232,7 @@ func (p *queryParser) parseDependenciesQueryParams(r *http.Request) (dqp depende
 //	spanKinds ::= spanKind | spanKind '&' spanKinds
 //	spanKind ::= 'spanKind=' spanKindType
 //	spanKindType ::= "unspecified" | "internal" | "server" | "client" | "producer" | "consumer"
-func (p *queryParser) parseMetricsQueryParams(r *http.Request) (bqp metricsstore.BaseQueryParameters, err error) {
+func (p *queryParser) parseMetricsQueryParams(r *http.Request) (bqp metricstore.BaseQueryParameters, err error) {
 	query := r.URL.Query()
 	services, ok := query[serviceParam]
 	if !ok {
diff --git a/cmd/query/app/querysvc/metrics_query_service.go b/cmd/query/app/querysvc/metrics_query_service.go
index 469bb193e9a..44ab30bc7a7 100644
--- a/cmd/query/app/querysvc/metrics_query_service.go
+++ b/cmd/query/app/querysvc/metrics_query_service.go
@@ -3,9 +3,9 @@
 
 package querysvc
 
-import "github.com/jaegertracing/jaeger/storage/metricsstore"
+import "github.com/jaegertracing/jaeger/storage/metricstore"
 
 // MetricsQueryService provides a means of querying R.E.D metrics from an underlying metrics store.
 type MetricsQueryService interface {
-	metricsstore.Reader
+	metricstore.Reader
 }
diff --git a/cmd/query/main.go b/cmd/query/main.go
index 7f02676b4e8..b16bd0cbf3a 100644
--- a/cmd/query/main.go
+++ b/cmd/query/main.go
@@ -32,7 +32,7 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/metricstore"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 	"github.com/jaegertracing/jaeger/ports"
-	"github.com/jaegertracing/jaeger/storage/metricsstore/metricstoremetrics"
+	"github.com/jaegertracing/jaeger/storage/metricstore/metricstoremetrics"
 )
 
 func main() {
diff --git a/plugin/metricstore/disabled/factory.go b/plugin/metricstore/disabled/factory.go
index fa7aa9f529d..711de28df49 100644
--- a/plugin/metricstore/disabled/factory.go
+++ b/plugin/metricstore/disabled/factory.go
@@ -10,7 +10,7 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/jaegertracing/jaeger/plugin"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
 var _ plugin.Configurable = (*Factory)(nil)
@@ -35,6 +35,6 @@ func (*Factory) Initialize(_ *zap.Logger) error {
 }
 
 // CreateMetricsReader implements storage.MetricsFactory.
-func (*Factory) CreateMetricsReader() (metricsstore.Reader, error) {
+func (*Factory) CreateMetricsReader() (metricstore.Reader, error) {
 	return NewMetricsReader()
 }
diff --git a/plugin/metricstore/disabled/reader.go b/plugin/metricstore/disabled/reader.go
index 91c8c87965b..593a1406985 100644
--- a/plugin/metricstore/disabled/reader.go
+++ b/plugin/metricstore/disabled/reader.go
@@ -8,11 +8,11 @@ import (
 	"time"
 
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
 type (
-	// MetricsReader represents a "disabled" metricsstore.Reader implementation where
+	// MetricsReader represents a "disabled" metricstore.Reader implementation where
 	// the METRICS_STORAGE_TYPE has not been set.
 	MetricsReader struct{}
 
@@ -33,21 +33,21 @@ func NewMetricsReader() (*MetricsReader, error) {
 }
 
 // GetLatencies gets the latency metrics for the given set of latency query parameters.
-func (*MetricsReader) GetLatencies(context.Context, *metricsstore.LatenciesQueryParameters) (*metrics.MetricFamily, error) {
+func (*MetricsReader) GetLatencies(context.Context, *metricstore.LatenciesQueryParameters) (*metrics.MetricFamily, error) {
 	return nil, ErrDisabled
 }
 
 // GetCallRates gets the call rate metrics for the given set of call rate query parameters.
-func (*MetricsReader) GetCallRates(context.Context, *metricsstore.CallRateQueryParameters) (*metrics.MetricFamily, error) {
+func (*MetricsReader) GetCallRates(context.Context, *metricstore.CallRateQueryParameters) (*metrics.MetricFamily, error) {
 	return nil, ErrDisabled
 }
 
 // GetErrorRates gets the error rate metrics for the given set of error rate query parameters.
-func (*MetricsReader) GetErrorRates(context.Context, *metricsstore.ErrorRateQueryParameters) (*metrics.MetricFamily, error) {
+func (*MetricsReader) GetErrorRates(context.Context, *metricstore.ErrorRateQueryParameters) (*metrics.MetricFamily, error) {
 	return nil, ErrDisabled
 }
 
 // GetMinStepDuration gets the minimum step duration (the smallest possible duration between two data points in a time series) supported.
-func (*MetricsReader) GetMinStepDuration(context.Context, *metricsstore.MinStepDurationQueryParameters) (time.Duration, error) {
+func (*MetricsReader) GetMinStepDuration(context.Context, *metricstore.MinStepDurationQueryParameters) (time.Duration, error) {
 	return 0, ErrDisabled
 }
diff --git a/plugin/metricstore/disabled/reader_test.go b/plugin/metricstore/disabled/reader_test.go
index 01f58ad2db5..49c947ff39b 100644
--- a/plugin/metricstore/disabled/reader_test.go
+++ b/plugin/metricstore/disabled/reader_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
 func TestGetLatencies(t *testing.T) {
@@ -18,7 +18,7 @@ func TestGetLatencies(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, reader)
 
-	qParams := &metricsstore.LatenciesQueryParameters{}
+	qParams := &metricstore.LatenciesQueryParameters{}
 	r, err := reader.GetLatencies(context.Background(), qParams)
 	assert.Zero(t, r)
 	require.ErrorIs(t, err, ErrDisabled)
@@ -30,7 +30,7 @@ func TestGetCallRates(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, reader)
 
-	qParams := &metricsstore.CallRateQueryParameters{}
+	qParams := &metricstore.CallRateQueryParameters{}
 	r, err := reader.GetCallRates(context.Background(), qParams)
 	assert.Zero(t, r)
 	require.ErrorIs(t, err, ErrDisabled)
@@ -42,7 +42,7 @@ func TestGetErrorRates(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, reader)
 
-	qParams := &metricsstore.ErrorRateQueryParameters{}
+	qParams := &metricstore.ErrorRateQueryParameters{}
 	r, err := reader.GetErrorRates(context.Background(), qParams)
 	assert.Zero(t, r)
 	require.ErrorIs(t, err, ErrDisabled)
@@ -54,7 +54,7 @@ func TestGetMinStepDurations(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, reader)
 
-	qParams := &metricsstore.MinStepDurationQueryParameters{}
+	qParams := &metricstore.MinStepDurationQueryParameters{}
 	r, err := reader.GetMinStepDuration(context.Background(), qParams)
 	assert.Zero(t, r)
 	require.ErrorIs(t, err, ErrDisabled)
diff --git a/plugin/metricstore/factory.go b/plugin/metricstore/factory.go
index 2dc9069f014..94e7a5279c5 100644
--- a/plugin/metricstore/factory.go
+++ b/plugin/metricstore/factory.go
@@ -14,7 +14,7 @@ import (
 	"github.com/jaegertracing/jaeger/plugin/metricstore/disabled"
 	"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus"
 	"github.com/jaegertracing/jaeger/storage"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
 const (
@@ -71,7 +71,7 @@ func (f *Factory) Initialize(logger *zap.Logger) error {
 }
 
 // CreateMetricsReader implements storage.MetricsFactory.
-func (f *Factory) CreateMetricsReader() (metricsstore.Reader, error) {
+func (f *Factory) CreateMetricsReader() (metricstore.Reader, error) {
 	factory, ok := f.factories[f.MetricsStorageType]
 	if !ok {
 		return nil, fmt.Errorf("no %q backend registered for metrics store", f.MetricsStorageType)
diff --git a/plugin/metricstore/prometheus/factory.go b/plugin/metricstore/prometheus/factory.go
index 89c864f08f5..cb67bd9a68f 100644
--- a/plugin/metricstore/prometheus/factory.go
+++ b/plugin/metricstore/prometheus/factory.go
@@ -14,7 +14,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/prometheus/config"
 	"github.com/jaegertracing/jaeger/plugin"
 	prometheusstore "github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricsstore"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
 var _ plugin.Configurable = (*Factory)(nil)
@@ -53,7 +53,7 @@ func (f *Factory) Initialize(logger *zap.Logger) error {
 }
 
 // CreateMetricsReader implements storage.MetricsFactory.
-func (f *Factory) CreateMetricsReader() (metricsstore.Reader, error) {
+func (f *Factory) CreateMetricsReader() (metricstore.Reader, error) {
 	return prometheusstore.NewMetricsReader(f.options.Configuration, f.logger, f.tracer)
 }
 
diff --git a/plugin/metricstore/prometheus/metricsstore/reader.go b/plugin/metricstore/prometheus/metricsstore/reader.go
index 0ec86a412b0..6ed5251287f 100644
--- a/plugin/metricstore/prometheus/metricsstore/reader.go
+++ b/plugin/metricstore/prometheus/metricsstore/reader.go
@@ -26,7 +26,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/prometheus/config"
 	"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricsstore/dbmodel"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
 const (
@@ -54,7 +54,7 @@ type (
 	}
 
 	metricsQueryParams struct {
-		metricsstore.BaseQueryParameters
+		metricstore.BaseQueryParameters
 		groupByHistBucket bool
 		metricName        string
 		metricDesc        string
@@ -96,7 +96,7 @@ func NewMetricsReader(cfg config.Configuration, logger *zap.Logger, tracer trace
 }
 
 // GetLatencies gets the latency metrics for the given set of latency query parameters.
-func (m MetricsReader) GetLatencies(ctx context.Context, requestParams *metricsstore.LatenciesQueryParameters) (*metrics.MetricFamily, error) {
+func (m MetricsReader) GetLatencies(ctx context.Context, requestParams *metricstore.LatenciesQueryParameters) (*metrics.MetricFamily, error) {
 	metricsParams := metricsQueryParams{
 		BaseQueryParameters: requestParams.BaseQueryParameters,
 		groupByHistBucket:   true,
@@ -140,7 +140,7 @@ func buildFullLatencyMetricName(cfg config.Configuration) string {
 }
 
 // GetCallRates gets the call rate metrics for the given set of call rate query parameters.
-func (m MetricsReader) GetCallRates(ctx context.Context, requestParams *metricsstore.CallRateQueryParameters) (*metrics.MetricFamily, error) {
+func (m MetricsReader) GetCallRates(ctx context.Context, requestParams *metricstore.CallRateQueryParameters) (*metrics.MetricFamily, error) {
 	metricsParams := metricsQueryParams{
 		BaseQueryParameters: requestParams.BaseQueryParameters,
 		metricName:          "service_call_rate",
@@ -174,7 +174,7 @@ func buildFullCallsMetricName(cfg config.Configuration) string {
 }
 
 // GetErrorRates gets the error rate metrics for the given set of error rate query parameters.
-func (m MetricsReader) GetErrorRates(ctx context.Context, requestParams *metricsstore.ErrorRateQueryParameters) (*metrics.MetricFamily, error) {
+func (m MetricsReader) GetErrorRates(ctx context.Context, requestParams *metricstore.ErrorRateQueryParameters) (*metrics.MetricFamily, error) {
 	metricsParams := metricsQueryParams{
 		BaseQueryParameters: requestParams.BaseQueryParameters,
 		metricName:          "service_error_rate",
@@ -199,7 +199,7 @@ func (m MetricsReader) GetErrorRates(ctx context.Context, requestParams *metrics
 
 	// Check for the presence of call rate metrics to differentiate the absence of error rate from
 	// the absence of call rate metrics altogether.
-	callMetrics, err := m.GetCallRates(ctx, &metricsstore.CallRateQueryParameters{BaseQueryParameters: requestParams.BaseQueryParameters})
+	callMetrics, err := m.GetCallRates(ctx, &metricstore.CallRateQueryParameters{BaseQueryParameters: requestParams.BaseQueryParameters})
 	if err != nil {
 		return nil, fmt.Errorf("failed getting call metrics: %w", err)
 	}
@@ -223,7 +223,7 @@ func (m MetricsReader) GetErrorRates(ctx context.Context, requestParams *metrics
 }
 
 // GetMinStepDuration gets the minimum step duration (the smallest possible duration between two data points in a time series) supported.
-func (MetricsReader) GetMinStepDuration(_ context.Context, _ *metricsstore.MinStepDurationQueryParameters) (time.Duration, error) {
+func (MetricsReader) GetMinStepDuration(_ context.Context, _ *metricstore.MinStepDurationQueryParameters) (time.Duration, error) {
 	return minStep, nil
 }
 
diff --git a/plugin/metricstore/prometheus/metricsstore/reader_test.go b/plugin/metricstore/prometheus/metricsstore/reader_test.go
index 207070b44c6..16e46c96ed4 100644
--- a/plugin/metricstore/prometheus/metricsstore/reader_test.go
+++ b/plugin/metricstore/prometheus/metricsstore/reader_test.go
@@ -29,7 +29,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/prometheus/config"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
 type (
@@ -91,7 +91,7 @@ func TestNewMetricsReaderInvalidAddress(t *testing.T) {
 }
 
 func TestGetMinStepDuration(t *testing.T) {
-	params := metricsstore.MinStepDurationQueryParameters{}
+	params := metricstore.MinStepDurationQueryParameters{}
 	logger := zap.NewNop()
 	tracer, _, closer := tracerProvider(t)
 	defer closer()
@@ -116,8 +116,8 @@ func TestMetricsServerError(t *testing.T) {
 	step := time.Millisecond
 	ratePer := 10 * time.Minute
 
-	params := metricsstore.CallRateQueryParameters{
-		BaseQueryParameters: metricsstore.BaseQueryParameters{
+	params := metricstore.CallRateQueryParameters{
+		BaseQueryParameters: metricstore.BaseQueryParameters{
 			EndTime:  &endTime,
 			Lookback: &lookback,
 			Step:     &step,
@@ -228,7 +228,7 @@ func TestGetLatencies(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			params := metricsstore.LatenciesQueryParameters{
+			params := metricstore.LatenciesQueryParameters{
 				BaseQueryParameters: buildTestBaseQueryParametersFrom(tc),
 				Quantile:            0.95,
 			}
@@ -329,7 +329,7 @@ func TestGetCallRates(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			params := metricsstore.CallRateQueryParameters{
+			params := metricstore.CallRateQueryParameters{
 				BaseQueryParameters: buildTestBaseQueryParametersFrom(tc),
 			}
 			tracer, exp, closer := tracerProvider(t)
@@ -453,7 +453,7 @@ func TestGetErrorRates(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			params := metricsstore.ErrorRateQueryParameters{
+			params := metricstore.ErrorRateQueryParameters{
 				BaseQueryParameters: buildTestBaseQueryParametersFrom(tc),
 			}
 			tracer, exp, closer := tracerProvider(t)
@@ -474,7 +474,7 @@ func TestGetErrorRates(t *testing.T) {
 }
 
 func TestGetErrorRatesZero(t *testing.T) {
-	params := metricsstore.ErrorRateQueryParameters{
+	params := metricstore.ErrorRateQueryParameters{
 		BaseQueryParameters: buildTestBaseQueryParametersFrom(metricsTestCase{
 			serviceNames: []string{"emailservice"},
 			spanKinds:    []string{"SPAN_KIND_SERVER"},
@@ -537,7 +537,7 @@ func TestGetErrorRatesZero(t *testing.T) {
 }
 
 func TestGetErrorRatesNull(t *testing.T) {
-	params := metricsstore.ErrorRateQueryParameters{
+	params := metricstore.ErrorRateQueryParameters{
 		BaseQueryParameters: buildTestBaseQueryParametersFrom(metricsTestCase{
 			serviceNames: []string{"emailservice"},
 			spanKinds:    []string{"SPAN_KIND_SERVER"},
@@ -608,7 +608,7 @@ func TestGetErrorRatesErrors(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			params := metricsstore.ErrorRateQueryParameters{
+			params := metricstore.ErrorRateQueryParameters{
 				BaseQueryParameters: buildTestBaseQueryParametersFrom(metricsTestCase{
 					serviceNames: []string{"emailservice"},
 					spanKinds:    []string{"SPAN_KIND_SERVER"},
@@ -691,7 +691,7 @@ func TestInvalidLatencyUnit(t *testing.T) {
 }
 
 func TestWarningResponse(t *testing.T) {
-	params := metricsstore.ErrorRateQueryParameters{
+	params := metricstore.ErrorRateQueryParameters{
 		BaseQueryParameters: buildTestBaseQueryParametersFrom(metricsTestCase{serviceNames: []string{"foo"}}),
 	}
 	tracer, exp, closer := tracerProvider(t)
@@ -896,13 +896,13 @@ func sendResponse(t *testing.T, w http.ResponseWriter, responseFile string) {
 	require.NoError(t, err)
 }
 
-func buildTestBaseQueryParametersFrom(tc metricsTestCase) metricsstore.BaseQueryParameters {
+func buildTestBaseQueryParametersFrom(tc metricsTestCase) metricstore.BaseQueryParameters {
 	endTime := time.Now()
 	lookback := time.Minute
 	step := time.Millisecond
 	ratePer := 10 * time.Minute
 
-	return metricsstore.BaseQueryParameters{
+	return metricstore.BaseQueryParameters{
 		ServiceNames:     tc.serviceNames,
 		GroupByOperation: tc.groupByOperation,
 		EndTime:          &endTime,
@@ -913,7 +913,7 @@ func buildTestBaseQueryParametersFrom(tc metricsTestCase) metricsstore.BaseQuery
 	}
 }
 
-func prepareMetricsReaderAndServer(t *testing.T, cfg config.Configuration, wantPromQlQuery string, wantWarnings []string, tracer trace.TracerProvider) (metricsstore.Reader, *httptest.Server) {
+func prepareMetricsReaderAndServer(t *testing.T, cfg config.Configuration, wantPromQlQuery string, wantWarnings []string, tracer trace.TracerProvider) (metricstore.Reader, *httptest.Server) {
 	mockPrometheus := startMockPrometheusServer(t, wantPromQlQuery, wantWarnings)
 
 	logger := zap.NewNop()
diff --git a/storage/factory.go b/storage/factory.go
index ca4afe34259..2caf14e127a 100644
--- a/storage/factory.go
+++ b/storage/factory.go
@@ -13,7 +13,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/distributedlock"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 	"github.com/jaegertracing/jaeger/storage/samplingstore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 )
@@ -88,6 +88,6 @@ type MetricsFactory interface {
 	// It is called after all configuration of the factory itself has been done.
 	Initialize(logger *zap.Logger) error
 
-	// CreateMetricsReader creates a metricsstore.Reader.
-	CreateMetricsReader() (metricsstore.Reader, error)
+	// CreateMetricsReader creates a metricstore.Reader.
+	CreateMetricsReader() (metricstore.Reader, error)
 }
diff --git a/storage/metricsstore/empty_test.go b/storage/metricstore/empty_test.go
similarity index 91%
rename from storage/metricsstore/empty_test.go
rename to storage/metricstore/empty_test.go
index e98698eda74..b32d41135a6 100644
--- a/storage/metricsstore/empty_test.go
+++ b/storage/metricstore/empty_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2021 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package metricsstore
+package metricstore
 
 import (
 	"testing"
diff --git a/storage/metricsstore/interface.go b/storage/metricstore/interface.go
similarity index 99%
rename from storage/metricsstore/interface.go
rename to storage/metricstore/interface.go
index 05b1f67be97..d0f4fa03d28 100644
--- a/storage/metricsstore/interface.go
+++ b/storage/metricstore/interface.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2021 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package metricsstore
+package metricstore
 
 import (
 	"context"
diff --git a/storage/metricsstore/metricstoremetrics/decorator.go b/storage/metricstore/metricstoremetrics/decorator.go
similarity index 75%
rename from storage/metricsstore/metricstoremetrics/decorator.go
rename to storage/metricstore/metricstoremetrics/decorator.go
index cb62dae8c9e..8511751aac4 100644
--- a/storage/metricsstore/metricstoremetrics/decorator.go
+++ b/storage/metricstore/metricstoremetrics/decorator.go
@@ -9,12 +9,12 @@ import (
 
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	protometrics "github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
-// ReadMetricsDecorator wraps a metricsstore.Reader and collects metrics around each read operation.
+// ReadMetricsDecorator wraps a metricstore.Reader and collects metrics around each read operation.
 type ReadMetricsDecorator struct {
-	reader                    metricsstore.Reader
+	reader                    metricstore.Reader
 	getLatenciesMetrics       *queryMetrics
 	getCallRatesMetrics       *queryMetrics
 	getErrorRatesMetrics      *queryMetrics
@@ -39,7 +39,7 @@ func (q *queryMetrics) emit(err error, latency time.Duration) {
 }
 
 // NewReadMetricsDecorator returns a new ReadMetricsDecorator.
-func NewReaderDecorator(reader metricsstore.Reader, metricsFactory metrics.Factory) *ReadMetricsDecorator {
+func NewReaderDecorator(reader metricstore.Reader, metricsFactory metrics.Factory) *ReadMetricsDecorator {
 	return &ReadMetricsDecorator{
 		reader:                    reader,
 		getLatenciesMetrics:       buildQueryMetrics("get_latencies", metricsFactory),
@@ -56,32 +56,32 @@ func buildQueryMetrics(operation string, metricsFactory metrics.Factory) *queryM
 	return qMetrics
 }
 
-// GetLatencies implements metricsstore.Reader#GetLatencies
-func (m *ReadMetricsDecorator) GetLatencies(ctx context.Context, params *metricsstore.LatenciesQueryParameters) (*protometrics.MetricFamily, error) {
+// GetLatencies implements metricstore.Reader#GetLatencies
+func (m *ReadMetricsDecorator) GetLatencies(ctx context.Context, params *metricstore.LatenciesQueryParameters) (*protometrics.MetricFamily, error) {
 	start := time.Now()
 	retMe, err := m.reader.GetLatencies(ctx, params)
 	m.getLatenciesMetrics.emit(err, time.Since(start))
 	return retMe, err
 }
 
-// GetCallRates implements metricsstore.Reader#GetCallRates
-func (m *ReadMetricsDecorator) GetCallRates(ctx context.Context, params *metricsstore.CallRateQueryParameters) (*protometrics.MetricFamily, error) {
+// GetCallRates implements metricstore.Reader#GetCallRates
+func (m *ReadMetricsDecorator) GetCallRates(ctx context.Context, params *metricstore.CallRateQueryParameters) (*protometrics.MetricFamily, error) {
 	start := time.Now()
 	retMe, err := m.reader.GetCallRates(ctx, params)
 	m.getCallRatesMetrics.emit(err, time.Since(start))
 	return retMe, err
 }
 
-// GetErrorRates implements metricsstore.Reader#GetErrorRates
-func (m *ReadMetricsDecorator) GetErrorRates(ctx context.Context, params *metricsstore.ErrorRateQueryParameters) (*protometrics.MetricFamily, error) {
+// GetErrorRates implements metricstore.Reader#GetErrorRates
+func (m *ReadMetricsDecorator) GetErrorRates(ctx context.Context, params *metricstore.ErrorRateQueryParameters) (*protometrics.MetricFamily, error) {
 	start := time.Now()
 	retMe, err := m.reader.GetErrorRates(ctx, params)
 	m.getErrorRatesMetrics.emit(err, time.Since(start))
 	return retMe, err
 }
 
-// GetMinStepDuration implements metricsstore.Reader#GetMinStepDuration
-func (m *ReadMetricsDecorator) GetMinStepDuration(ctx context.Context, params *metricsstore.MinStepDurationQueryParameters) (time.Duration, error) {
+// GetMinStepDuration implements metricstore.Reader#GetMinStepDuration
+func (m *ReadMetricsDecorator) GetMinStepDuration(ctx context.Context, params *metricstore.MinStepDurationQueryParameters) (time.Duration, error) {
 	start := time.Now()
 	retMe, err := m.reader.GetMinStepDuration(ctx, params)
 	m.getMinStepDurationMetrics.emit(err, time.Since(start))
diff --git a/storage/metricsstore/metricstoremetrics/decorator_test.go b/storage/metricstore/metricstoremetrics/decorator_test.go
similarity index 87%
rename from storage/metricsstore/metricstoremetrics/decorator_test.go
rename to storage/metricstore/metricstoremetrics/decorator_test.go
index 16aabc94364..443e3ae0df7 100644
--- a/storage/metricsstore/metricstoremetrics/decorator_test.go
+++ b/storage/metricstore/metricstoremetrics/decorator_test.go
@@ -14,9 +14,9 @@ import (
 	"github.com/jaegertracing/jaeger/internal/metricstest"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
 	protometrics "github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore"
-	"github.com/jaegertracing/jaeger/storage/metricsstore/metricstoremetrics"
-	"github.com/jaegertracing/jaeger/storage/metricsstore/mocks"
+	"github.com/jaegertracing/jaeger/storage/metricstore"
+	"github.com/jaegertracing/jaeger/storage/metricstore/metricstoremetrics"
+	"github.com/jaegertracing/jaeger/storage/metricstore/mocks"
 )
 
 func TestSuccessfulUnderlyingCalls(t *testing.T) {
@@ -24,22 +24,22 @@ func TestSuccessfulUnderlyingCalls(t *testing.T) {
 
 	mockReader := mocks.Reader{}
 	mrs := metricstoremetrics.NewReaderDecorator(&mockReader, mf)
-	glParams := &metricsstore.LatenciesQueryParameters{}
+	glParams := &metricstore.LatenciesQueryParameters{}
 	mockReader.On("GetLatencies", context.Background(), glParams).
 		Return(&protometrics.MetricFamily{}, nil)
 	mrs.GetLatencies(context.Background(), glParams)
 
-	gcrParams := &metricsstore.CallRateQueryParameters{}
+	gcrParams := &metricstore.CallRateQueryParameters{}
 	mockReader.On("GetCallRates", context.Background(), gcrParams).
 		Return(&protometrics.MetricFamily{}, nil)
 	mrs.GetCallRates(context.Background(), gcrParams)
 
-	gerParams := &metricsstore.ErrorRateQueryParameters{}
+	gerParams := &metricstore.ErrorRateQueryParameters{}
 	mockReader.On("GetErrorRates", context.Background(), gerParams).
 		Return(&protometrics.MetricFamily{}, nil)
 	mrs.GetErrorRates(context.Background(), gerParams)
 
-	msdParams := &metricsstore.MinStepDurationQueryParameters{}
+	msdParams := &metricstore.MinStepDurationQueryParameters{}
 	mockReader.On("GetMinStepDuration", context.Background(), msdParams).
 		Return(time.Second, nil)
 	mrs.GetMinStepDuration(context.Background(), msdParams)
@@ -97,22 +97,22 @@ func TestFailingUnderlyingCalls(t *testing.T) {
 
 	mockReader := mocks.Reader{}
 	mrs := metricstoremetrics.NewReaderDecorator(&mockReader, mf)
-	glParams := &metricsstore.LatenciesQueryParameters{}
+	glParams := &metricstore.LatenciesQueryParameters{}
 	mockReader.On("GetLatencies", context.Background(), glParams).
 		Return(&protometrics.MetricFamily{}, errors.New("failure"))
 	mrs.GetLatencies(context.Background(), glParams)
 
-	gcrParams := &metricsstore.CallRateQueryParameters{}
+	gcrParams := &metricstore.CallRateQueryParameters{}
 	mockReader.On("GetCallRates", context.Background(), gcrParams).
 		Return(&protometrics.MetricFamily{}, errors.New("failure"))
 	mrs.GetCallRates(context.Background(), gcrParams)
 
-	gerParams := &metricsstore.ErrorRateQueryParameters{}
+	gerParams := &metricstore.ErrorRateQueryParameters{}
 	mockReader.On("GetErrorRates", context.Background(), gerParams).
 		Return(&protometrics.MetricFamily{}, errors.New("failure"))
 	mrs.GetErrorRates(context.Background(), gerParams)
 
-	msdParams := &metricsstore.MinStepDurationQueryParameters{}
+	msdParams := &metricstore.MinStepDurationQueryParameters{}
 	mockReader.On("GetMinStepDuration", context.Background(), msdParams).
 		Return(time.Second, errors.New("failure"))
 	mrs.GetMinStepDuration(context.Background(), msdParams)
diff --git a/storage/metricsstore/mocks/Reader.go b/storage/metricstore/mocks/Reader.go
similarity index 62%
rename from storage/metricsstore/mocks/Reader.go
rename to storage/metricstore/mocks/Reader.go
index aa920d53c3c..fdcea9b19f2 100644
--- a/storage/metricsstore/mocks/Reader.go
+++ b/storage/metricstore/mocks/Reader.go
@@ -11,7 +11,7 @@ import (
 	context "context"
 
 	metrics "github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
-	metricsstore "github.com/jaegertracing/jaeger/storage/metricsstore"
+	metricstore "github.com/jaegertracing/jaeger/storage/metricstore"
 
 	mock "github.com/stretchr/testify/mock"
 
@@ -24,7 +24,7 @@ type Reader struct {
 }
 
 // GetCallRates provides a mock function with given fields: ctx, params
-func (_m *Reader) GetCallRates(ctx context.Context, params *metricsstore.CallRateQueryParameters) (*metrics.MetricFamily, error) {
+func (_m *Reader) GetCallRates(ctx context.Context, params *metricstore.CallRateQueryParameters) (*metrics.MetricFamily, error) {
 	ret := _m.Called(ctx, params)
 
 	if len(ret) == 0 {
@@ -33,10 +33,10 @@ func (_m *Reader) GetCallRates(ctx context.Context, params *metricsstore.CallRat
 
 	var r0 *metrics.MetricFamily
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *metricsstore.CallRateQueryParameters) (*metrics.MetricFamily, error)); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *metricstore.CallRateQueryParameters) (*metrics.MetricFamily, error)); ok {
 		return rf(ctx, params)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, *metricsstore.CallRateQueryParameters) *metrics.MetricFamily); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *metricstore.CallRateQueryParameters) *metrics.MetricFamily); ok {
 		r0 = rf(ctx, params)
 	} else {
 		if ret.Get(0) != nil {
@@ -44,7 +44,7 @@ func (_m *Reader) GetCallRates(ctx context.Context, params *metricsstore.CallRat
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, *metricsstore.CallRateQueryParameters) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *metricstore.CallRateQueryParameters) error); ok {
 		r1 = rf(ctx, params)
 	} else {
 		r1 = ret.Error(1)
@@ -54,7 +54,7 @@ func (_m *Reader) GetCallRates(ctx context.Context, params *metricsstore.CallRat
 }
 
 // GetErrorRates provides a mock function with given fields: ctx, params
-func (_m *Reader) GetErrorRates(ctx context.Context, params *metricsstore.ErrorRateQueryParameters) (*metrics.MetricFamily, error) {
+func (_m *Reader) GetErrorRates(ctx context.Context, params *metricstore.ErrorRateQueryParameters) (*metrics.MetricFamily, error) {
 	ret := _m.Called(ctx, params)
 
 	if len(ret) == 0 {
@@ -63,10 +63,10 @@ func (_m *Reader) GetErrorRates(ctx context.Context, params *metricsstore.ErrorR
 
 	var r0 *metrics.MetricFamily
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *metricsstore.ErrorRateQueryParameters) (*metrics.MetricFamily, error)); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *metricstore.ErrorRateQueryParameters) (*metrics.MetricFamily, error)); ok {
 		return rf(ctx, params)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, *metricsstore.ErrorRateQueryParameters) *metrics.MetricFamily); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *metricstore.ErrorRateQueryParameters) *metrics.MetricFamily); ok {
 		r0 = rf(ctx, params)
 	} else {
 		if ret.Get(0) != nil {
@@ -74,7 +74,7 @@ func (_m *Reader) GetErrorRates(ctx context.Context, params *metricsstore.ErrorR
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, *metricsstore.ErrorRateQueryParameters) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *metricstore.ErrorRateQueryParameters) error); ok {
 		r1 = rf(ctx, params)
 	} else {
 		r1 = ret.Error(1)
@@ -84,7 +84,7 @@ func (_m *Reader) GetErrorRates(ctx context.Context, params *metricsstore.ErrorR
 }
 
 // GetLatencies provides a mock function with given fields: ctx, params
-func (_m *Reader) GetLatencies(ctx context.Context, params *metricsstore.LatenciesQueryParameters) (*metrics.MetricFamily, error) {
+func (_m *Reader) GetLatencies(ctx context.Context, params *metricstore.LatenciesQueryParameters) (*metrics.MetricFamily, error) {
 	ret := _m.Called(ctx, params)
 
 	if len(ret) == 0 {
@@ -93,10 +93,10 @@ func (_m *Reader) GetLatencies(ctx context.Context, params *metricsstore.Latenci
 
 	var r0 *metrics.MetricFamily
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *metricsstore.LatenciesQueryParameters) (*metrics.MetricFamily, error)); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *metricstore.LatenciesQueryParameters) (*metrics.MetricFamily, error)); ok {
 		return rf(ctx, params)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, *metricsstore.LatenciesQueryParameters) *metrics.MetricFamily); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *metricstore.LatenciesQueryParameters) *metrics.MetricFamily); ok {
 		r0 = rf(ctx, params)
 	} else {
 		if ret.Get(0) != nil {
@@ -104,7 +104,7 @@ func (_m *Reader) GetLatencies(ctx context.Context, params *metricsstore.Latenci
 		}
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, *metricsstore.LatenciesQueryParameters) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *metricstore.LatenciesQueryParameters) error); ok {
 		r1 = rf(ctx, params)
 	} else {
 		r1 = ret.Error(1)
@@ -114,7 +114,7 @@ func (_m *Reader) GetLatencies(ctx context.Context, params *metricsstore.Latenci
 }
 
 // GetMinStepDuration provides a mock function with given fields: ctx, params
-func (_m *Reader) GetMinStepDuration(ctx context.Context, params *metricsstore.MinStepDurationQueryParameters) (time.Duration, error) {
+func (_m *Reader) GetMinStepDuration(ctx context.Context, params *metricstore.MinStepDurationQueryParameters) (time.Duration, error) {
 	ret := _m.Called(ctx, params)
 
 	if len(ret) == 0 {
@@ -123,16 +123,16 @@ func (_m *Reader) GetMinStepDuration(ctx context.Context, params *metricsstore.M
 
 	var r0 time.Duration
 	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *metricsstore.MinStepDurationQueryParameters) (time.Duration, error)); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *metricstore.MinStepDurationQueryParameters) (time.Duration, error)); ok {
 		return rf(ctx, params)
 	}
-	if rf, ok := ret.Get(0).(func(context.Context, *metricsstore.MinStepDurationQueryParameters) time.Duration); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *metricstore.MinStepDurationQueryParameters) time.Duration); ok {
 		r0 = rf(ctx, params)
 	} else {
 		r0 = ret.Get(0).(time.Duration)
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, *metricsstore.MinStepDurationQueryParameters) error); ok {
+	if rf, ok := ret.Get(1).(func(context.Context, *metricstore.MinStepDurationQueryParameters) error); ok {
 		r1 = rf(ctx, params)
 	} else {
 		r1 = ret.Error(1)
diff --git a/storage/mocks/MetricsFactory.go b/storage/mocks/MetricsFactory.go
index 4d5d5823450..35a6ff1e341 100644
--- a/storage/mocks/MetricsFactory.go
+++ b/storage/mocks/MetricsFactory.go
@@ -8,7 +8,7 @@
 package mocks
 
 import (
-	metricsstore "github.com/jaegertracing/jaeger/storage/metricsstore"
+	metricstore "github.com/jaegertracing/jaeger/storage/metricstore"
 	mock "github.com/stretchr/testify/mock"
 
 	zap "go.uber.org/zap"
@@ -20,23 +20,23 @@ type MetricsFactory struct {
 }
 
 // CreateMetricsReader provides a mock function with given fields:
-func (_m *MetricsFactory) CreateMetricsReader() (metricsstore.Reader, error) {
+func (_m *MetricsFactory) CreateMetricsReader() (metricstore.Reader, error) {
 	ret := _m.Called()
 
 	if len(ret) == 0 {
 		panic("no return value specified for CreateMetricsReader")
 	}
 
-	var r0 metricsstore.Reader
+	var r0 metricstore.Reader
 	var r1 error
-	if rf, ok := ret.Get(0).(func() (metricsstore.Reader, error)); ok {
+	if rf, ok := ret.Get(0).(func() (metricstore.Reader, error)); ok {
 		return rf()
 	}
-	if rf, ok := ret.Get(0).(func() metricsstore.Reader); ok {
+	if rf, ok := ret.Get(0).(func() metricstore.Reader); ok {
 		r0 = rf()
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(metricsstore.Reader)
+			r0 = ret.Get(0).(metricstore.Reader)
 		}
 	}