diff --git a/pkg/tsdb/tempo/metrics_stream.go b/pkg/tsdb/tempo/metrics_stream.go
index b2ec7e30a95..e48f544aa8c 100644
--- a/pkg/tsdb/tempo/metrics_stream.go
+++ b/pkg/tsdb/tempo/metrics_stream.go
@@ -8,7 +8,7 @@ import (
 	"io"
 
 	"github.com/grafana/grafana/pkg/tsdb/tempo/traceql"
-	"github.com/grafana/grafana/pkg/tsdb/tempo/util"
+	stream_utils "github.com/grafana/grafana/pkg/tsdb/tempo/utils"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
@@ -64,7 +64,7 @@ func (s *Service) runMetricsStream(ctx context.Context, req *backend.RunStreamRe
 	qrr.Start = uint64(backendQuery.TimeRange.From.UnixNano())
 	qrr.End = uint64(backendQuery.TimeRange.To.UnixNano())
 
-	ctx = util.AppendHeadersToOutgoingContext(ctx, req)
+	ctx = stream_utils.AppendHeadersToOutgoingContext(ctx, req)
 
 	if isInstantQuery(tempoQuery.MetricsQueryType) {
 		instantQuery := &tempopb.QueryInstantRequest{
diff --git a/pkg/tsdb/tempo/search_stream.go b/pkg/tsdb/tempo/search_stream.go
index 5496c0a7a3e..e88aaf10dd3 100644
--- a/pkg/tsdb/tempo/search_stream.go
+++ b/pkg/tsdb/tempo/search_stream.go
@@ -11,7 +11,7 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend/tracing"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/tsdb/tempo/kinds/dataquery"
-	"github.com/grafana/grafana/pkg/tsdb/tempo/util"
+	stream_utils "github.com/grafana/grafana/pkg/tsdb/tempo/utils"
 	"github.com/grafana/tempo/pkg/tempopb"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
@@ -60,7 +60,7 @@ func (s *Service) runSearchStream(ctx context.Context, req *backend.RunStreamReq
 	sr.Start = uint32(backendQuery.TimeRange.From.Unix())
 	sr.End = uint32(backendQuery.TimeRange.To.Unix())
 
-	ctx = util.AppendHeadersToOutgoingContext(ctx, req)
+	ctx = stream_utils.AppendHeadersToOutgoingContext(ctx, req)
 
 	stream, err := datasource.StreamingClient.Search(ctx, sr)
 	if err != nil {
diff --git a/pkg/tsdb/tempo/stream_handler.go b/pkg/tsdb/tempo/stream_handler.go
index c9fbb942f94..946bd7c69f4 100644
--- a/pkg/tsdb/tempo/stream_handler.go
+++ b/pkg/tsdb/tempo/stream_handler.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/tsdb/tempo/util"
+	stream_utils "github.com/grafana/grafana/pkg/tsdb/tempo/utils"
 )
 
 func (s *Service) SubscribeStream(_ context.Context, req *backend.SubscribeStreamRequest) (*backend.SubscribeStreamResponse, error) {
@@ -43,7 +43,7 @@ func (s *Service) RunStream(ctx context.Context, request *backend.RunStreamReque
 	tempoDatasource, dsInfoErr := s.getDSInfo(ctx, request.PluginContext)
 
 	// get incoming and team http headers and append to stream request.
-	headers, err := util.SetHeadersFromIncomingContext(ctx)
+	headers, err := stream_utils.SetHeadersFromIncomingContext(ctx)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/tsdb/tempo/util/stream_util.go b/pkg/tsdb/tempo/utils/stream_utils.go
similarity index 99%
rename from pkg/tsdb/tempo/util/stream_util.go
rename to pkg/tsdb/tempo/utils/stream_utils.go
index 2cf75631f25..e5a75286a5c 100644
--- a/pkg/tsdb/tempo/util/stream_util.go
+++ b/pkg/tsdb/tempo/utils/stream_utils.go
@@ -1,4 +1,4 @@
-package util
+package stream_utils
 
 import (
 	"context"
diff --git a/pkg/tsdb/tempo/util/stream_util_test.go b/pkg/tsdb/tempo/utils/stream_utils_test.go
similarity index 99%
rename from pkg/tsdb/tempo/util/stream_util_test.go
rename to pkg/tsdb/tempo/utils/stream_utils_test.go
index 2a91433d139..fdd7ef6d76b 100644
--- a/pkg/tsdb/tempo/util/stream_util_test.go
+++ b/pkg/tsdb/tempo/utils/stream_utils_test.go
@@ -1,4 +1,4 @@
-package util
+package stream_utils
 
 import (
 	"context"