diff --git a/cmd/query/app/http_handler_test.go b/cmd/query/app/http_handler_test.go
index d2eb34fa4d7..e7b4d43f779 100644
--- a/cmd/query/app/http_handler_test.go
+++ b/cmd/query/app/http_handler_test.go
@@ -693,31 +693,31 @@ func TestGetMetricsSuccess(t *testing.T) {
 			name:                       "latencies",
 			urlPath:                    "/api/metrics/latencies?service=emailservice&quantile=0.95",
 			mockedQueryMethod:          "GetLatencies",
-			mockedQueryMethodParamType: "*metricsstore.LatenciesQueryParameters",
+			mockedQueryMethodParamType: "*metricstore.LatenciesQueryParameters",
 		},
 		{
 			name:                       "call rates",
 			urlPath:                    "/api/metrics/calls?service=emailservice",
 			mockedQueryMethod:          "GetCallRates",
-			mockedQueryMethodParamType: "*metricsstore.CallRateQueryParameters",
+			mockedQueryMethodParamType: "*metricstore.CallRateQueryParameters",
 		},
 		{
 			name:                       "error rates",
 			urlPath:                    "/api/metrics/errors?service=emailservice",
 			mockedQueryMethod:          "GetErrorRates",
-			mockedQueryMethodParamType: "*metricsstore.ErrorRateQueryParameters",
+			mockedQueryMethodParamType: "*metricstore.ErrorRateQueryParameters",
 		},
 		{
 			name:                       "error rates with pretty print",
 			urlPath:                    "/api/metrics/errors?service=emailservice&prettyPrint=true",
 			mockedQueryMethod:          "GetErrorRates",
-			mockedQueryMethodParamType: "*metricsstore.ErrorRateQueryParameters",
+			mockedQueryMethodParamType: "*metricstore.ErrorRateQueryParameters",
 		},
 		{
 			name:                       "error rates with spanKinds",
 			urlPath:                    "/api/metrics/errors?service=emailservice&spanKind=client",
 			mockedQueryMethod:          "GetErrorRates",
-			mockedQueryMethodParamType: "*metricsstore.ErrorRateQueryParameters",
+			mockedQueryMethodParamType: "*metricstore.ErrorRateQueryParameters",
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
@@ -754,14 +754,14 @@ func TestMetricsReaderError(t *testing.T) {
 		{
 			urlPath:                    "/api/metrics/calls?service=emailservice",
 			mockedQueryMethod:          "GetCallRates",
-			mockedQueryMethodParamType: "*metricsstore.CallRateQueryParameters",
+			mockedQueryMethodParamType: "*metricstore.CallRateQueryParameters",
 			mockedResponse:             nil,
 			wantErrorMessage:           "error fetching call rates",
 		},
 		{
 			urlPath:                    "/api/metrics/minstep",
 			mockedQueryMethod:          "GetMinStepDuration",
-			mockedQueryMethodParamType: "*metricsstore.MinStepDurationQueryParameters",
+			mockedQueryMethodParamType: "*metricstore.MinStepDurationQueryParameters",
 			mockedResponse:             time.Duration(0),
 			wantErrorMessage:           "error fetching min step duration",
 		},
@@ -826,7 +826,7 @@ func TestGetMinStep(t *testing.T) {
 	metricsReader.On(
 		"GetMinStepDuration",
 		mock.AnythingOfType("*context.valueCtx"),
-		mock.AnythingOfType("*metricsstore.MinStepDurationQueryParameters"),
+		mock.AnythingOfType("*metricstore.MinStepDurationQueryParameters"),
 	).Return(5*time.Millisecond, nil).Once()
 
 	// Test
diff --git a/plugin/metricstore/prometheus/factory.go b/plugin/metricstore/prometheus/factory.go
index cb67bd9a68f..ee39089523a 100644
--- a/plugin/metricstore/prometheus/factory.go
+++ b/plugin/metricstore/prometheus/factory.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/jaegertracing/jaeger/pkg/prometheus/config"
 	"github.com/jaegertracing/jaeger/plugin"
-	prometheusstore "github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricsstore"
+	prometheusstore "github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricstore"
 	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
 
diff --git a/plugin/metricstore/prometheus/metricsstore/dbmodel/to_domain.go b/plugin/metricstore/prometheus/metricstore/dbmodel/to_domain.go
similarity index 100%
rename from plugin/metricstore/prometheus/metricsstore/dbmodel/to_domain.go
rename to plugin/metricstore/prometheus/metricstore/dbmodel/to_domain.go
diff --git a/plugin/metricstore/prometheus/metricsstore/dbmodel/to_domain_test.go b/plugin/metricstore/prometheus/metricstore/dbmodel/to_domain_test.go
similarity index 100%
rename from plugin/metricstore/prometheus/metricsstore/dbmodel/to_domain_test.go
rename to plugin/metricstore/prometheus/metricstore/dbmodel/to_domain_test.go
diff --git a/plugin/metricstore/prometheus/metricsstore/reader.go b/plugin/metricstore/prometheus/metricstore/reader.go
similarity index 99%
rename from plugin/metricstore/prometheus/metricsstore/reader.go
rename to plugin/metricstore/prometheus/metricstore/reader.go
index 6ed5251287f..122ed3f52d2 100644
--- a/plugin/metricstore/prometheus/metricsstore/reader.go
+++ b/plugin/metricstore/prometheus/metricstore/reader.go
@@ -1,7 +1,7 @@
 // Copyright (c) 2021 The Jaeger Authors.
 // SPDX-License-Identifier: Apache-2.0
 
-package metricsstore
+package metricstore
 
 import (
 	"context"
@@ -24,7 +24,7 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/bearertoken"
 	"github.com/jaegertracing/jaeger/pkg/otelsemconv"
 	"github.com/jaegertracing/jaeger/pkg/prometheus/config"
-	"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricsstore/dbmodel"
+	"github.com/jaegertracing/jaeger/plugin/metricstore/prometheus/metricstore/dbmodel"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2/metrics"
 	"github.com/jaegertracing/jaeger/storage/metricstore"
 )
diff --git a/plugin/metricstore/prometheus/metricsstore/reader_test.go b/plugin/metricstore/prometheus/metricstore/reader_test.go
similarity index 99%
rename from plugin/metricstore/prometheus/metricsstore/reader_test.go
rename to plugin/metricstore/prometheus/metricstore/reader_test.go
index 16e46c96ed4..046da949a2b 100644
--- a/plugin/metricstore/prometheus/metricsstore/reader_test.go
+++ b/plugin/metricstore/prometheus/metricstore/reader_test.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/plugin/metricstore/prometheus/metricsstore/testdata/empty_response.json b/plugin/metricstore/prometheus/metricstore/testdata/empty_response.json
similarity index 100%
rename from plugin/metricstore/prometheus/metricsstore/testdata/empty_response.json
rename to plugin/metricstore/prometheus/metricstore/testdata/empty_response.json
diff --git a/plugin/metricstore/prometheus/metricsstore/testdata/service_datapoint_response.json b/plugin/metricstore/prometheus/metricstore/testdata/service_datapoint_response.json
similarity index 100%
rename from plugin/metricstore/prometheus/metricsstore/testdata/service_datapoint_response.json
rename to plugin/metricstore/prometheus/metricstore/testdata/service_datapoint_response.json
diff --git a/plugin/metricstore/prometheus/metricsstore/testdata/service_span_name_datapoint_response.json b/plugin/metricstore/prometheus/metricstore/testdata/service_span_name_datapoint_response.json
similarity index 100%
rename from plugin/metricstore/prometheus/metricsstore/testdata/service_span_name_datapoint_response.json
rename to plugin/metricstore/prometheus/metricstore/testdata/service_span_name_datapoint_response.json
diff --git a/plugin/metricstore/prometheus/metricsstore/testdata/warning_response.json b/plugin/metricstore/prometheus/metricstore/testdata/warning_response.json
similarity index 100%
rename from plugin/metricstore/prometheus/metricsstore/testdata/warning_response.json
rename to plugin/metricstore/prometheus/metricstore/testdata/warning_response.json