diff --git a/docs/migrations/property-baseline-performance-table.md b/docs/migrations/property-baseline-performance-table.md
index 66864eb9..33e2171a 100644
--- a/docs/migrations/property-baseline-performance-table.md
+++ b/docs/migrations/property-baseline-performance-table.md
@@ -20,12 +20,12 @@ straight lift-and-shift of the columns below.
 | `property_id` | int, FK → `property.id`, **unique** | one Baseline Performance per Property |
 | `lodged_sap_score` | int | Lodged Performance — gov register, off the Effective EPC |
 | `lodged_epc_band` | text | the `Epc` enum, stored as its string value (e.g. `"C"`) |
-| `lodged_co2_emissions` | float | |
-| `lodged_primary_energy_intensity` | int | PEUI (kWh/m²/yr); **not** "heat demand" — see CONTEXT.md |
+| `lodged_co2_emissions_t_per_yr` | float | tonnes CO₂/yr (whole dwelling) |
+| `lodged_primary_energy_intensity_kwh_per_m2_yr` | int | PEUI (kWh/m²/yr); **not** "heat demand" — see CONTEXT.md |
 | `effective_sap_score` | int | Effective Performance — what modelling scored against |
 | `effective_epc_band` | text | |
-| `effective_co2_emissions` | float | |
-| `effective_primary_energy_intensity` | int | |
+| `effective_co2_emissions_t_per_yr` | float | tonnes CO₂/yr (whole dwelling) |
+| `effective_primary_energy_intensity_kwh_per_m2_yr` | int | kWh/m²/yr |
 | `rebaseline_reason` | text | `none` \| `pre_sap10` \| `physical_state_changed` \| `both` |
 | `space_heating_kwh` | float | off `renewable_heat_incentive`; deterministic (ADR-0006) |
 | `water_heating_kwh` | float | off `renewable_heat_incentive` |
diff --git a/infrastructure/postgres/property_baseline_performance_table.py b/infrastructure/postgres/property_baseline_performance_table.py
index f43d9f3e..0e5e1792 100644
--- a/infrastructure/postgres/property_baseline_performance_table.py
+++ b/infrastructure/postgres/property_baseline_performance_table.py
@@ -25,13 +25,13 @@ class PropertyBaselinePerformanceModel(SQLModel, table=True):
 
     lodged_sap_score: int
     lodged_epc_band: str
-    lodged_co2_emissions: float
-    lodged_primary_energy_intensity: int
+    lodged_co2_emissions_t_per_yr: float
+    lodged_primary_energy_intensity_kwh_per_m2_yr: int
 
     effective_sap_score: int
     effective_epc_band: str
-    effective_co2_emissions: float
-    effective_primary_energy_intensity: int
+    effective_co2_emissions_t_per_yr: float
+    effective_primary_energy_intensity_kwh_per_m2_yr: int
 
     rebaseline_reason: str
 
@@ -46,12 +46,12 @@ class PropertyBaselinePerformanceModel(SQLModel, table=True):
             property_id=property_id,
             lodged_sap_score=baseline.lodged.sap_score,
             lodged_epc_band=baseline.lodged.epc_band.value,
-            lodged_co2_emissions=baseline.lodged.co2_emissions,
-            lodged_primary_energy_intensity=baseline.lodged.primary_energy_intensity,
+            lodged_co2_emissions_t_per_yr=baseline.lodged.co2_emissions,
+            lodged_primary_energy_intensity_kwh_per_m2_yr=baseline.lodged.primary_energy_intensity,
             effective_sap_score=baseline.effective.sap_score,
             effective_epc_band=baseline.effective.epc_band.value,
-            effective_co2_emissions=baseline.effective.co2_emissions,
-            effective_primary_energy_intensity=baseline.effective.primary_energy_intensity,
+            effective_co2_emissions_t_per_yr=baseline.effective.co2_emissions,
+            effective_primary_energy_intensity_kwh_per_m2_yr=baseline.effective.primary_energy_intensity,
             rebaseline_reason=baseline.rebaseline_reason,
             space_heating_kwh=baseline.space_heating_kwh,
             water_heating_kwh=baseline.water_heating_kwh,
@@ -62,14 +62,14 @@ class PropertyBaselinePerformanceModel(SQLModel, table=True):
             lodged=Performance(
                 sap_score=self.lodged_sap_score,
                 epc_band=Epc(self.lodged_epc_band),
-                co2_emissions=self.lodged_co2_emissions,
-                primary_energy_intensity=self.lodged_primary_energy_intensity,
+                co2_emissions=self.lodged_co2_emissions_t_per_yr,
+                primary_energy_intensity=self.lodged_primary_energy_intensity_kwh_per_m2_yr,
             ),
             effective=Performance(
                 sap_score=self.effective_sap_score,
                 epc_band=Epc(self.effective_epc_band),
-                co2_emissions=self.effective_co2_emissions,
-                primary_energy_intensity=self.effective_primary_energy_intensity,
+                co2_emissions=self.effective_co2_emissions_t_per_yr,
+                primary_energy_intensity=self.effective_primary_energy_intensity_kwh_per_m2_yr,
             ),
             rebaseline_reason=cast(RebaselineReason, self.rebaseline_reason),
             space_heating_kwh=self.space_heating_kwh,