quintel · mabijkerk · Jun 22, 2026 · Jun 22, 2026 · Jun 22, 2026 · Jun 22, 2026
diff --git a/gqueries/general/emissions/emissions_overview_energetic_built_environment_co2.gql b/gqueries/general/emissions/emissions_overview_energetic_built_environment_co2.gql
@@ -1,6 +1,6 @@
 - query =
   SUM(
-      Q(co2_sheet_buildings_households_total_co2_emissions_only_energetic)
+      Q(co2_sheet_buildings_households_total_co2_emissions_energetic)
   )
 
-- unit = T
+- unit = T
diff --git a/gqueries/general/emissions/emissions_overview_energetic_industry_ghg.gql b/gqueries/general/emissions/emissions_overview_energetic_industry_ghg.gql
diff --git a/gqueries/general/emissions/emissions_overview_energetic_transport_co2.gql b/gqueries/general/emissions/emissions_overview_energetic_transport_co2.gql
@@ -1,6 +1,6 @@
 - query =
   SUM(
-      Q(co2_sheet_transport_total_co2_emissions_only_energetic)
+      Q(co2_sheet_transport_total_co2_emissions_energetic)
   )
 
-- unit = T
+- unit = T
diff --git a/gqueries/general/emissions/emissions_overview_non_energetic_agriculture_co2.gql b/gqueries/general/emissions/emissions_overview_non_energetic_agriculture_co2.gql
@@ -1,7 +1,7 @@
 - query =
   SUM(
-      Q(emissions_non_energetic_soil_cultivation_co2),
-      Q(emissions_non_energetic_manure_co2)
+      Q(emissions_non_energetic_agriculture_soil_cultivation_co2),
+      Q(emissions_non_energetic_agriculture_manure_co2)
   )
 
-- unit = T
+- unit = T
diff --git a/gqueries/general/emissions/emissions_overview_non_energetic_agriculture_ghg.gql b/gqueries/general/emissions/emissions_overview_non_energetic_agriculture_ghg.gql
@@ -1,7 +1,7 @@
 - query =
   SUM(
-      Q(emissions_non_energetic_soil_cultivation_other_ghg),
-      Q(emissions_non_energetic_manure_other_ghg)
+      Q(emissions_non_energetic_agriculture_soil_cultivation_other_ghg),
+      Q(emissions_non_energetic_agriculture_manure_other_ghg)
   )
 
-- unit = T
+- unit = T
diff --git a/gqueries/general/emissions/supply/power/emissions_captured_power_biogenic.gql b/gqueries/general/emissions/supply/power/emissions_captured_power_biogenic.gql
@@ -2,6 +2,6 @@
         SUM(
             Q(emissions_captured_energy_chp_ht_wood_pellets)
             Q(emissions_captured_energy_chp_mt_wood_pellets),
-            Q(emissions_captured_energy_chp_power_wood_pellets)
+            Q(emissions_captured_energy_power_wood_pellets)
         )
-- unit = tonne
+- unit = tonne
diff --git a/gqueries/general/emissions/supply/power/emissions_captured_power_non_biogenic.gql b/gqueries/general/emissions/supply/power/emissions_captured_power_non_biogenic.gql
@@ -1,3 +1,3 @@
 - query =
-        Q(emssions_captured_power_total) - Q(emissions_captured_power_biogenic)
-- unit = tonne
+        Q(emissions_captured_power_total) - Q(emissions_captured_power_biogenic)
+- unit = tonne
diff --git a/gqueries/general/merit/user_sortable/user_sortable_power_to_heat_capacity.gql b/gqueries/general/merit/user_sortable/user_sortable_power_to_heat_capacity.gql
diff --git a/gqueries/modules/etflex/etflex_electricity_demand.gql b/gqueries/modules/etflex/etflex_electricity_demand.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_amount_of_appliances.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_amount_of_appliances.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_co2_emissions_per_household.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_co2_emissions_per_household.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_cooling_demand.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_cooling_demand.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_electricity_fraction.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_electricity_fraction.gql
diff --git a/...odules/etflex/etflex_level_2/etflex_households_final_demand_electricity_per_household.gql b/...odules/etflex/etflex_level_2/etflex_households_final_demand_electricity_per_household.gql
diff --git a/...ies/modules/etflex/etflex_level_2/etflex_households_final_demand_energy_per_household.gql b/...ies/modules/etflex/etflex_level_2/etflex_households_final_demand_energy_per_household.gql
diff --git a/...odules/etflex/etflex_level_2/etflex_households_final_demand_network_gas_per_household.gql b/...odules/etflex/etflex_level_2/etflex_households_final_demand_network_gas_per_household.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_heat_demand_per_person.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_heat_demand_per_person.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_heat_fraction.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_heat_fraction.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_heating_technology_in_use.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_heating_technology_in_use.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_insulation_level.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_insulation_level.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_investment_per_household.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_investment_per_household.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_lighting_technology_in_use.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_lighting_technology_in_use.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_monthly_energy_bill.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_monthly_energy_bill.gql
diff --git a/...les/etflex/etflex_level_2/etflex_households_percentage_renewable_energy_per_household.gql b/...les/etflex/etflex_level_2/etflex_households_percentage_renewable_energy_per_household.gql
diff --git a/...ex/etflex_level_2/etflex_households_renewability_percentage_electricity_per_household.gql b/...ex/etflex_level_2/etflex_households_renewability_percentage_electricity_per_household.gql
diff --git a/...es/etflex/etflex_level_2/etflex_households_renewability_percentage_heat_per_household.gql b/...es/etflex/etflex_level_2/etflex_households_renewability_percentage_heat_per_household.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_score.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_score.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_score_base.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_score_base.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_score_co2.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_score_co2.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_score_costs.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_score_costs.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_score_energy_use.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_score_energy_use.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_score_investment.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_score_investment.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_solar_pv_installed.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_solar_pv_installed.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_households_solar_thermal_installed.gql b/gqueries/modules/etflex/etflex_level_2/etflex_households_solar_thermal_installed.gql
diff --git a/gqueries/modules/etflex/etflex_level_2/etflex_score_renewable_energy_percentage.gql b/gqueries/modules/etflex/etflex_level_2/etflex_score_renewable_energy_percentage.gql
diff --git a/gqueries/modules/etflex/etflex_score.gql b/gqueries/modules/etflex/etflex_score.gql
diff --git a/gqueries/modules/etflex/etflex_score_base.gql b/gqueries/modules/etflex/etflex_score_base.gql
diff --git a/gqueries/modules/etflex/etflex_score_co2.gql b/gqueries/modules/etflex/etflex_score_co2.gql
diff --git a/gqueries/modules/etflex/etflex_score_cost.gql b/gqueries/modules/etflex/etflex_score_cost.gql
diff --git a/gqueries/modules/etflex/etflex_score_deviations_from_reference_scenario.gql b/gqueries/modules/etflex/etflex_score_deviations_from_reference_scenario.gql
diff --git a/gqueries/modules/etflex/etflex_score_electric_car.gql b/gqueries/modules/etflex/etflex_score_electric_car.gql
diff --git a/gqueries/modules/etflex/etflex_score_greengas.gql b/gqueries/modules/etflex/etflex_score_greengas.gql
diff --git a/gqueries/modules/etflex/etflex_score_heatpump.gql b/gqueries/modules/etflex/etflex_score_heatpump.gql
diff --git a/gqueries/modules/etflex/etflex_score_imbalance.gql b/gqueries/modules/etflex/etflex_score_imbalance.gql
diff --git a/gqueries/modules/etflex/etflex_score_led.gql b/gqueries/modules/etflex/etflex_score_led.gql
diff --git a/gqueries/modules/etflex/etflex_score_nuclear_waste.gql b/gqueries/modules/etflex/etflex_score_nuclear_waste.gql