diff --git a/static/app/views/starfish/views/spans/spanTimeCharts.tsx b/static/app/views/starfish/views/spans/spanTimeCharts.tsx
index 454ddb4dd6d12..6a2c747e968c9 100644
--- a/static/app/views/starfish/views/spans/spanTimeCharts.tsx
+++ b/static/app/views/starfish/views/spans/spanTimeCharts.tsx
@@ -18,6 +18,7 @@ import {useSpansQuery} from 'sentry/views/starfish/utils/useSpansQuery';
 import {useErrorRateQuery as useErrorCountQuery} from 'sentry/views/starfish/views/spans/queries';
 import {
   DataTitles,
+  getDurationChartTitle,
   getThroughputChartTitle,
 } from 'sentry/views/starfish/views/spans/types';
 import {NULL_SPAN_CATEGORY} from 'sentry/views/starfish/views/webServiceView/spanGroupBreakdownContainer';
@@ -65,7 +66,7 @@ export function SpanTimeCharts({moduleName, appliedFilters, spanCategory}: Props
   > = {
     [ModuleName.ALL]: [
       {title: getThroughputChartTitle(moduleName), Comp: ThroughputChart},
-      {title: DataTitles.avg, Comp: DurationChart},
+      {title: getDurationChartTitle(moduleName), Comp: DurationChart},
     ],
     [ModuleName.DB]: [],
     [ModuleName.HTTP]: [{title: DataTitles.errorCount, Comp: ErrorChart}],
diff --git a/static/app/views/starfish/views/spans/spansTable.tsx b/static/app/views/starfish/views/spans/spansTable.tsx
index c7e48e626aaba..4ba48ab004cf2 100644
--- a/static/app/views/starfish/views/spans/spansTable.tsx
+++ b/static/app/views/starfish/views/spans/spansTable.tsx
@@ -225,7 +225,7 @@ function getDescriptionHeader(moduleName: ModuleName, spanCategory?: string) {
     return 'URL Request';
   }
   if (moduleName === ModuleName.DB) {
-    return 'Database Query';
+    return 'Query Description';
   }
   if (spanCategory === 'cache') {
     return 'Cache Query';
diff --git a/static/app/views/starfish/views/spans/types.tsx b/static/app/views/starfish/views/spans/types.tsx
index e301d12cf15ba..1198c057ce52c 100644
--- a/static/app/views/starfish/views/spans/types.tsx
+++ b/static/app/views/starfish/views/spans/types.tsx
@@ -24,7 +24,7 @@ export const DataTitles: Record<DataKey, string> = {
   p50p95: t('Duration (P50, P95)'),
   p50: t('Duration (P50)'),
   p95: t('Duration (P95)'),
-  avg: t('Average Duration'),
+  avg: t('Avg Duration'),
   duration: t('Duration'),
   errorCount: t('5XX Responses'),
   throughput: t('Throughput'),
@@ -51,7 +51,7 @@ export const getTooltip = (
 
 export const getThroughputTitle = (spanOp?: string) => {
   if (spanOp?.startsWith('db')) {
-    return t('Queries');
+    return t('Queries Per Min');
   }
   if (defined(spanOp)) {
     return t('Requests');
@@ -59,6 +59,14 @@ export const getThroughputTitle = (spanOp?: string) => {
   return '--';
 };
 
+export const getDurationChartTitle = (spanOp?: string) => {
+  if (spanOp) {
+    return t('Average Duration');
+  }
+
+  return '--';
+};
+
 export const getThroughputChartTitle = (spanOp?: string) => {
   if (spanOp?.startsWith('db')) {
     return t('Queries Per Minute');