diff --git a/src/components/chart/statistics-chart.ts b/src/components/chart/statistics-chart.ts
index ea566c9fc7..c96c02055a 100644
--- a/src/components/chart/statistics-chart.ts
+++ b/src/components/chart/statistics-chart.ts
@@ -258,8 +258,8 @@ class StatisticsChart extends LitElement {
 
       if (!this.unit) {
         if (unit === undefined) {
-          unit = meta?.display_unit_of_measurement;
-        } else if (unit !== meta?.display_unit_of_measurement) {
+          unit = meta?.state_unit_of_measurement;
+        } else if (unit !== meta?.state_unit_of_measurement) {
           unit = null;
         }
       }
diff --git a/src/components/entity/ha-statistic-picker.ts b/src/components/entity/ha-statistic-picker.ts
index ebf129efaa..84e071f87f 100644
--- a/src/components/entity/ha-statistic-picker.ts
+++ b/src/components/entity/ha-statistic-picker.ts
@@ -121,7 +121,7 @@ export class HaStatisticPicker extends LitElement {
       if (includeDisplayUnitOfMeasurement) {
         const includeUnits = ensureArray(includeDisplayUnitOfMeasurement);
         statisticIds = statisticIds.filter((meta) =>
-          includeUnits.includes(meta.display_unit_of_measurement)
+          includeUnits.includes(meta.state_unit_of_measurement)
         );
       }
 
diff --git a/src/data/energy.ts b/src/data/energy.ts
index 8420419978..8078166963 100644
--- a/src/data/energy.ts
+++ b/src/data/energy.ts
@@ -642,8 +642,8 @@ export const getEnergyGasUnit = (
       continue;
     }
     const statisticIdWithMeta = statisticsMetaData[source.stat_energy_from];
-    if (statisticIdWithMeta?.display_unit_of_measurement) {
-      return statisticIdWithMeta.display_unit_of_measurement;
+    if (statisticIdWithMeta?.state_unit_of_measurement) {
+      return statisticIdWithMeta.state_unit_of_measurement;
     }
   }
   return undefined;
diff --git a/src/data/recorder.ts b/src/data/recorder.ts
index c13e8bc210..578b709e12 100644
--- a/src/data/recorder.ts
+++ b/src/data/recorder.ts
@@ -20,7 +20,7 @@ export interface StatisticValue {
 }
 
 export interface StatisticsMetaData {
-  display_unit_of_measurement: string;
+  state_unit_of_measurement: string;
   statistics_unit_of_measurement: string;
   statistic_id: string;
   source: string;
@@ -254,14 +254,14 @@ export const adjustStatisticsSum = (
   statistic_id: string,
   start_time: string,
   adjustment: number,
-  display_unit: string
+  adjustment_unit_of_measurement: string
 ): Promise<void> =>
   hass.callWS({
     type: "recorder/adjust_sum_statistics",
     statistic_id,
     start_time,
     adjustment,
-    display_unit,
+    adjustment_unit_of_measurement,
   });
 
 export const getStatisticLabel = (
diff --git a/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
index e98621f903..e2bacb7300 100644
--- a/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
+++ b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts
@@ -49,7 +49,7 @@ export class DialogEnergyGasSettings
     this._source = params.source
       ? { ...params.source }
       : emptyGasEnergyPreference();
-    this._pickedDisplayUnit = params.metadata?.display_unit_of_measurement;
+    this._pickedDisplayUnit = params.metadata?.state_unit_of_measurement;
     this._costs = this._source.entity_energy_price
       ? "entity"
       : this._source.number_energy_price
@@ -269,7 +269,7 @@ export class DialogEnergyGasSettings
       } else {
         this._pickedDisplayUnit = (
           await getStatisticMetadata(this.hass, [ev.detail.value])
-        )[0]?.display_unit_of_measurement;
+        )[0]?.state_unit_of_measurement;
       }
     } else {
       this._pickedDisplayUnit = undefined;
diff --git a/src/panels/developer-tools/statistics/developer-tools-statistics.ts b/src/panels/developer-tools/statistics/developer-tools-statistics.ts
index 8ea66e1083..d483fc84ce 100644
--- a/src/panels/developer-tools/statistics/developer-tools-statistics.ts
+++ b/src/panels/developer-tools/statistics/developer-tools-statistics.ts
@@ -74,7 +74,7 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
         hidden: this.narrow,
         width: "20%",
       },
-      display_unit_of_measurement: {
+      state_unit_of_measurement: {
         title: "Display unit",
         sortable: true,
         filterable: true,
@@ -220,7 +220,7 @@ class HaPanelDevStatistics extends SubscribeMixin(LitElement) {
         this._data.push({
           statistic_id: statisticId,
           statistics_unit_of_measurement: "",
-          display_unit_of_measurement: "",
+          state_unit_of_measurement: "",
           source: "",
           state: this.hass.states[statisticId],
           issues: issues[statisticId],
diff --git a/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts b/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts
index 8598bf54f1..c00b5dc5fd 100644
--- a/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts
+++ b/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts
@@ -135,7 +135,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
     } else {
       const data =
         this._stats5min.length >= 2 ? this._stats5min : this._statsHour;
-      const unit = this._params!.statistic.display_unit_of_measurement;
+      const unit = this._params!.statistic.state_unit_of_measurement;
       const rows: TemplateResult[] = [];
       for (let i = 1; i < data.length; i++) {
         const stat = data[i];
@@ -221,7 +221,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
         label="New Value"
         .hass=${this.hass}
         .selector=${this._amountSelector(
-          this._params!.statistic.display_unit_of_measurement
+          this._params!.statistic.state_unit_of_measurement
         )}
         .value=${this._amount}
         .disabled=${this._busy}
@@ -306,7 +306,7 @@ export class DialogStatisticsFixUnsupportedUnitMetadata extends LitElement {
         this._params!.statistic.statistic_id,
         this._chosenStat!.start,
         this._amount! - this._origAmount!,
-        this._params!.statistic.display_unit_of_measurement
+        this._params!.statistic.state_unit_of_measurement
       );
     } catch (err: any) {
       this._busy = false;
diff --git a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts
index 606b1d2166..8933560cd4 100644
--- a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts
@@ -205,7 +205,7 @@ export class HuiStatisticsGraphCardEditor
       ...this._config,
       stat_types: configured_stat_types,
     };
-    const displayUnit = this._metaDatas?.[0]?.display_unit_of_measurement;
+    const displayUnit = this._metaDatas?.[0]?.state_unit_of_measurement;
 
     return html`
       <ha-form