From fbafc00cef2ca10ac9b8d31ca285d2df468fc9fb Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Wed, 17 Dec 2025 09:50:51 +0100
Subject: [PATCH 1/2] Find Replace

---
 Zero_engine.alpx                              | 20 ++++-----
 .../ConnectionOwner/Code/Functions.java       | 12 +++---
 _alp/Agents/ConnectionOwner/Variables.xml     |  6 +--
 _alp/Agents/EnergyCoop/Code/Functions.java    | 32 +++++++-------
 _alp/Agents/EnergyCoop/Variables.xml          |  4 +-
 _alp/Agents/EnergyModel/Code/Functions.java   |  2 +-
 .../GCEnergyConversion/Code/Functions.java    |  2 +-
 _alp/Agents/GCGridBattery/Code/Functions.java |  2 +-
 _alp/Agents/GCIndustry/Code/Functions.java    |  2 +-
 .../Agents/GCNeighborhood/Code/Functions.java | 16 +++----
 .../GridConnection/AOC.GridConnection.xml     |  2 +-
 .../Agents/GridConnection/Code/Functions.java | 16 +++----
 _alp/Agents/GridConnection/Variables.xml      |  4 +-
 .../Code/AdditionalClassCode.java             |  2 +-
 .../Agents/UI_EnergyAsset/Code/Functions.java | 10 ++---
 _alp/Agents/UI_EnergyAsset/Variables.xml      |  2 +-
 _alp/Classes/Class.ActorMixin.java            |  2 +-
 _alp/Classes/Class.J_AVGC_data.java           | 14 +++----
 .../Classes/Class.J_ActivityTrackerTrips.java |  6 +--
 _alp/Classes/Class.J_ActorData.java           | 10 ++---
 ...va => Class.J_EAPetroleumFuelTractor.java} | 42 +++++++++----------
 ...va => Class.J_EAPetroleumFuelVehicle.java} | 24 +++++------
 _alp/Classes/Class.J_FlowsMapEnumMap.java     |  8 ++--
 _alp/Classes/Class.J_SimulationResults.java   | 12 +++---
 24 files changed, 126 insertions(+), 126 deletions(-)
 rename _alp/Classes/{Class.J_EADieselTractor.java => Class.J_EAPetroleumFuelTractor.java} (58%)
 rename _alp/Classes/{Class.J_EADieselVehicle.java => Class.J_EAPetroleumFuelVehicle.java} (78%)

diff --git a/Zero_engine.alpx b/Zero_engine.alpx
index f2227ea0..e83939e6 100644
--- a/Zero_engine.alpx
+++ b/Zero_engine.alpx
@@ -71,7 +71,7 @@
 				</Option>
 				<Option>
 					<Id>1668600528877</Id>
-					<Name><![CDATA[DIESEL]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL]]></Name>
 				</Option>
 			</OptionList>
 			<OptionList>
@@ -291,7 +291,7 @@
 				</Option>
 				<Option>
 					<Id>1685008578606</Id>
-					<Name><![CDATA[DIESEL_DEMAND]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_DEMAND]]></Name>
 				</Option>
 				<Option>
 					<Id>1685030175392</Id>
@@ -303,15 +303,15 @@
 				</Option>
 				<Option>
 					<Id>1668602156278</Id>
-					<Name><![CDATA[DIESEL_VEHICLE]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_VEHICLE]]></Name>
 				</Option>
 				<Option>
 					<Id>1700138621293</Id>
-					<Name><![CDATA[DIESEL_VAN]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_VAN]]></Name>
 				</Option>
 				<Option>
 					<Id>1699367407696</Id>
-					<Name><![CDATA[DIESEL_TRUCK]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_TRUCK]]></Name>
 				</Option>
 				<Option>
 					<Id>1660202624229</Id>
@@ -535,7 +535,7 @@
 				</Option>
 				<Option>
 					<Id>1679503416680</Id>
-					<Name><![CDATA[DIESEL_FIXED]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_FIXED]]></Name>
 				</Option>
 			</OptionList>
 			<OptionList>
@@ -908,11 +908,11 @@
 				</Option>
 				<Option>
 					<Id>1729599301974</Id>
-					<Name><![CDATA[DIESEL_PRODUCTION_KW]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_PRODUCTION_KW]]></Name>
 				</Option>
 				<Option>
 					<Id>1729161184713</Id>
-					<Name><![CDATA[DIESEL_CONSUMPTION_KW]]></Name>
+					<Name><![CDATA[PETROLEUM_FUEL_CONSUMPTION_KW]]></Name>
 				</Option>
 				<Option>
 					<Id>1729161184714</Id>
@@ -1440,7 +1440,7 @@
 			</JavaClass>
 			<JavaClass>
 				<Id>1711009967838</Id>
-				<Name><![CDATA[J_EADieselVehicle]]></Name>
+				<Name><![CDATA[J_EAPetroleumFuelVehicle]]></Name>
 				<Folder>1752677832758</Folder>
 			</JavaClass>
 			<JavaClass>
@@ -1495,7 +1495,7 @@
 			</JavaClass>
 			<JavaClass>
 				<Id>1737633433233</Id>
-				<Name><![CDATA[J_EADieselTractor]]></Name>
+				<Name><![CDATA[J_EAPetroleumFuelTractor]]></Name>
 				<Folder>1752677832758</Folder>
 			</JavaClass>
 			<JavaClass>
diff --git a/_alp/Agents/ConnectionOwner/Code/Functions.java b/_alp/Agents/ConnectionOwner/Code/Functions.java
index beb23f14..a343b6c4 100644
--- a/_alp/Agents/ConnectionOwner/Code/Functions.java
+++ b/_alp/Agents/ConnectionOwner/Code/Functions.java
@@ -81,7 +81,7 @@
 
 double f_updateFinances()
 {/*ALCODESTART::1660742520265*/
-//TODO: Diesel costs still missing!! [GH 21/11/2022] -> Won't be in anylogic model, but in postprocessing.
+//TODO: PetroleumFuel costs still missing!! [GH 21/11/2022] -> Won't be in anylogic model, but in postprocessing.
 
 // get current energy flows
 f_gatherEnergyFlows();
@@ -168,7 +168,7 @@ else if( v_energySupplierDistrictHeat instanceof EnergyCoop ) {
 	v_balanceHeat_eur -= transactionCost_eur;
 }
 
-v_balanceDiesel_eur += v_dieselVolume_kWh * .196; // TODO: UGLY HACK
+v_balancePetroleumFuel_eur += v_petroleumFuelVolume_kWh * .196; // TODO: UGLY HACK
 */
 /*ALCODEEND*/}
 
@@ -179,7 +179,7 @@ else if( v_energySupplierDistrictHeat instanceof EnergyCoop ) {
 v_heatVolume_kWh = 0;
 v_methaneVolume_kWh = 0;
 v_hydrogenVolume_kWh = 0;
-v_dieselVolume_kWh = 0;
+v_petroleumFuelVolume_kWh = 0;
 
 
 // gather electricity flows, convert to volume-per-timestep to facilitate financial transactions
@@ -188,14 +188,14 @@ else if( v_energySupplierDistrictHeat instanceof EnergyCoop ) {
 	v_heatVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.HEAT) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.HEAT)) * energyModel.p_timeStep_h;
 	v_methaneVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.METHANE) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.METHANE)) * energyModel.p_timeStep_h;
 	v_hydrogenVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.HYDROGEN) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.HYDROGEN)) * energyModel.p_timeStep_h;
-	v_dieselVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.DIESEL) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.DIESEL)) * energyModel.p_timeStep_h;
+	v_petroleumFuelVolume_kWh += (n.v_currentConsumptionFlows_kW.get(OL_EnergyCarriers.PETROLEUM_FUEL) - n.v_currentProductionFlows_kW.get(OL_EnergyCarriers.PETROLEUM_FUEL)) * energyModel.p_timeStep_h;
 }
 
 v_totalElectricityUsed_kWh += v_electricityVolume_kWh;
 v_totalHeatUsed_kWh += v_heatVolume_kWh;
 v_totalMethaneUsed_kWh += v_methaneVolume_kWh;
 v_totalHydrogenUsed_kWh += v_hydrogenVolume_kWh;
-v_totalDieselUsed_kWh += v_dieselVolume_kWh;
+v_totalPetroleumFuelUsed_kWh += v_petroleumFuelVolume_kWh;
 /*ALCODEEND*/}
 
 double f_updateIncentives()
@@ -719,7 +719,7 @@ else if( v_energySupplierDistrictHeat instanceof EnergyCoop ) {
 double f_resetStates()
 {/*ALCODESTART::1704371830113*/
 // Reset energytotals
-//v_totalElectricityUsed_kWh = v_totalHeatUsed_kWh = v_totalMethaneUsed_kWh = v_totalHydrogenUsed_kWh = v_totalDieselUsed_kWh = 0;
+//v_totalElectricityUsed_kWh = v_totalHeatUsed_kWh = v_totalMethaneUsed_kWh = v_totalHydrogenUsed_kWh = v_totalPetroleumFuelUsed_kWh = 0;
 // Reset finances
 //v_balanceElectricity_eur = v_balanceElectricityDelivery_eur = v_balanceElectricityTransport_eur = v_balanceElectricityTax_eur = 0;
 
diff --git a/_alp/Agents/ConnectionOwner/Variables.xml b/_alp/Agents/ConnectionOwner/Variables.xml
index eb865b66..b9299fee 100644
--- a/_alp/Agents/ConnectionOwner/Variables.xml
+++ b/_alp/Agents/ConnectionOwner/Variables.xml
@@ -481,7 +481,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1669024165241</Id>
-		<Name><![CDATA[v_dieselVolume_kWh]]></Name>
+		<Name><![CDATA[v_petroleumFuelVolume_kWh]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>740</X>
 		<Y>770</Y>
@@ -504,7 +504,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1669024172107</Id>
-		<Name><![CDATA[v_balanceDiesel_eur]]></Name>
+		<Name><![CDATA[v_balancePetroleumFuel_eur]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-240</X>
 		<Y>750</Y>
@@ -870,7 +870,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1676900973470</Id>
-		<Name><![CDATA[v_totalDieselUsed_kWh]]></Name>
+		<Name><![CDATA[v_totalPetroleumFuelUsed_kWh]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>550</X>
 		<Y>770</Y>
diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index de53b091..1a0dfe82 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -335,7 +335,7 @@
 
 //Total selfconsumption, selfsufficiency
 double totalSelfConsumption_fr = 1 - (v_electricityExported_kWh + v_methaneExported_kWh + v_hydrogenExported_kWh + v_heatExported_kWh)/energyProduced_kWh;
-double totalSelfSufficiency_fr = 1 - (v_electricityImported_kWh + v_methaneImported_kWh + v_hydrogenImported_kWh + v_heatImported_kWh + v_dieselImported_kWh)/energyConsumed_kWh;
+double totalSelfSufficiency_fr = 1 - (v_electricityImported_kWh + v_methaneImported_kWh + v_hydrogenImported_kWh + v_heatImported_kWh + v_petroleumFuelImported_kWh)/energyConsumed_kWh;
 
 double totalSelfSufficiency_fr_check = (energyProduced_kWh - (v_electricityExported_kWh + v_methaneExported_kWh + v_hydrogenExported_kWh + v_heatExported_kWh))/energyConsumed_kWh;
 traceln("Coop selfconsumption: " + totalSelfConsumption_fr + "%");
@@ -859,14 +859,14 @@
 double v_currentPowerElectricity_kW = - v_electricitySurplus_kW;
 double v_currentPowerMethane_kW = v_methaneVolume_kWh / energyModel.p_timeStep_h;
 double v_currentPowerHydrogen_kW = v_hydrogenVolume_kWh / energyModel.p_timeStep_h;
-double v_currentPowerDiesel_kW = v_dieselVolume_kWh / energyModel.p_timeStep_h;
+double v_currentPowerPetroleumFuel_kW = v_petroleumFuelVolume_kWh / energyModel.p_timeStep_h;
 double v_currentPowerHeat_kW = v_heatVolume_kWh / energyModel.p_timeStep_h;
 
-//double currentImport_kW = (max(0,v_currentPowerElectricity_kW) + max(0,v_currentPowerHeat_kW) + max(0,v_currentPowerMethane_kW) + max(0,v_currentPowerHydrogen_kW) + max(0,v_currentPowerDiesel_kW));
-//double currentExport_kW = (max(0,-v_currentPowerElectricity_kW) + max(0,-v_currentPowerHeat_kW) + max(0,-v_currentPowerMethane_kW) + max(0,-v_currentPowerHydrogen_kW) + max(0,-v_currentPowerDiesel_kW));
+//double currentImport_kW = (max(0,v_currentPowerElectricity_kW) + max(0,v_currentPowerHeat_kW) + max(0,v_currentPowerMethane_kW) + max(0,v_currentPowerHydrogen_kW) + max(0,v_currentPowerPetroleumFuel_kW));
+//double currentExport_kW = (max(0,-v_currentPowerElectricity_kW) + max(0,-v_currentPowerHeat_kW) + max(0,-v_currentPowerMethane_kW) + max(0,-v_currentPowerHydrogen_kW) + max(0,-v_currentPowerPetroleumFuel_kW));
 
-double currentImport_MWh = (max(0,v_electricityVolume_kWh) + max(0,v_heatVolume_kWh) + max(0,v_methaneVolume_kWh) + max(0,v_hydrogenVolume_kWh) + max(0,v_dieselVolume_kWh))/1000;
-double currentExport_MWh = (max(0,-v_electricityVolume_kWh) + max(0,-v_heatVolume_kWh) + max(0,-v_methaneVolume_kWh) + max(0,-v_hydrogenVolume_kWh) + max(0,-v_dieselVolume_kWh))/1000;
+double currentImport_MWh = (max(0,v_electricityVolume_kWh) + max(0,v_heatVolume_kWh) + max(0,v_methaneVolume_kWh) + max(0,v_hydrogenVolume_kWh) + max(0,v_petroleumFuelVolume_kWh))/1000;
+double currentExport_MWh = (max(0,-v_electricityVolume_kWh) + max(0,-v_heatVolume_kWh) + max(0,-v_methaneVolume_kWh) + max(0,-v_hydrogenVolume_kWh) + max(0,-v_petroleumFuelVolume_kWh))/1000;
 double currentImport_kW = currentImport_MWh * 1000 / energyModel.p_timeStep_h;
 double currentExport_kW = currentExport_MWh * 1000 / energyModel.p_timeStep_h;
 //traceln("ElectricityVolume_kWh: %s kWh, current production: %s kW", v_electricityVolume_kWh, v_currentOwnElectricityProduction_kW);	
@@ -883,7 +883,7 @@
 
 acc_annualMethaneBalance_kW.addStep( v_methaneVolume_kWh/energyModel.p_timeStep_h);
 acc_annualHydrogenBalance_kW.addStep( v_hydrogenVolume_kWh/energyModel.p_timeStep_h);
-acc_annualDieselBalance_kW.addStep( v_dieselVolume_kWh/energyModel.p_timeStep_h);
+acc_annualPetroleumFuelBalance_kW.addStep( v_petroleumFuelVolume_kWh/energyModel.p_timeStep_h);
 
 // Demand
 v_dailyBaseloadElectricityDemand_kW += v_fixedConsumptionElectric_kW;
@@ -891,7 +891,7 @@
 v_dailyElectricVehicleDemand_kW += max(0,v_evChargingPowerElectric_kW);
 v_dailyBatteriesDemand_kW += max(0,v_batteryPowerElectric_kW);
 v_dailyNaturalGasDemand_kW += max(0, v_currentPowerMethane_kW);
-v_dailyDieselDemand_kW += max(0, v_currentPowerDiesel_kW);
+v_dailyPetroleumFuelDemand_kW += max(0, v_currentPowerPetroleumFuel_kW);
 v_dailyHydrogenDemand_kW += max(0, v_currentPowerHydrogen_kW);
 //v_dailyDistrictHeatDemand_kWh += 
 // Supply
@@ -913,7 +913,7 @@
 	data_annualElectricVehicleDemand_kW.add(energyModel.t_h, v_dailyElectricVehicleDemand_kW/(24 / energyModel.p_timeStep_h));
 	data_annualBatteriesDemand_kW.add(energyModel.t_h, v_dailyBatteriesDemand_kW/(24 / energyModel.p_timeStep_h));
 	data_annualNaturalGasDemand_kW.add(energyModel.t_h, v_dailyNaturalGasDemand_kW/(24 / energyModel.p_timeStep_h));
-	data_annualDieselDemand_kW.add(energyModel.t_h, v_dailyDieselDemand_kW/(24 / energyModel.p_timeStep_h));
+	data_annualPetroleumFuelDemand_kW.add(energyModel.t_h, v_dailyPetroleumFuelDemand_kW/(24 / energyModel.p_timeStep_h));
 	data_annualHydrogenDemand_kW.add(energyModel.t_h, v_dailyHydrogenDemand_kW/(24 / energyModel.p_timeStep_h));
 	//data_annualDistrictHeatSupply_MWh.add(energyModel.t_h, v_dailyDistrictHeatDemand_kWh/(24 / energyModel.p_timeStep_h));
 	// Supply
@@ -933,7 +933,7 @@
 	v_dailyElectricVehicleDemand_kW = 0;
 	v_dailyBatteriesDemand_kW = 0;
 	v_dailyNaturalGasDemand_kW = 0;
-	v_dailyDieselDemand_kW = 0;
+	v_dailyPetroleumFuelDemand_kW = 0;
 	v_dailyHydrogenDemand_kW = 0;
 	//v_dailyDistrictHeatDemand_kWh = 0;
 	v_dailyPVGeneration_kW = 0;
@@ -953,7 +953,7 @@
 	data_summerWeekElectricVehicleDemand_kW.add(energyModel.t_h, max(0,v_evChargingPowerElectric_kW));
 	data_summerWeekBatteriesDemand_kW.add(energyModel.t_h, max(0,v_batteryPowerElectric_kW));
 	data_summerWeekNaturalGasDemand_kW.add(energyModel.t_h, max(0, v_currentPowerMethane_kW));
-	data_summerWeekDieselDemand_kW.add(energyModel.t_h, max(0, v_currentPowerDiesel_kW));
+	data_summerWeekPetroleumFuelDemand_kW.add(energyModel.t_h, max(0, v_currentPowerPetroleumFuel_kW));
 	data_summerWeekHydrogenDemand_kW.add(energyModel.t_h, max(0, v_currentPowerHydrogen_kW));
 	
 	data_summerWeekPVGeneration_kW.add(energyModel.t_h, v_pvProductionElectric_kW);
@@ -966,7 +966,7 @@
 	acc_summerElectricityBalance_kW.addStep(v_currentPowerElectricity_kW);
 	acc_summerMethaneBalance_kW.addStep(v_currentPowerMethane_kW);
 	acc_summerHydrogenBalance_kW.addStep(v_currentPowerHydrogen_kW);
-	acc_summerDieselBalance_kW.addStep(v_currentPowerDiesel_kW);
+	acc_summerPetroleumFuelBalance_kW.addStep(v_currentPowerPetroleumFuel_kW);
 	acc_summerHeatBalance_kW.addStep(v_currentPowerHeat_kW);
 	acc_summerTotalImport_kW.addStep(currentImport_kW);
 	acc_summerTotalExport_kW.addStep(currentExport_kW);
@@ -987,7 +987,7 @@
 	data_winterWeekElectricVehicleDemand_kW.add(energyModel.t_h, max(0, v_evChargingPowerElectric_kW));
 	data_winterWeekBatteriesDemand_kW.add(energyModel.t_h, max(0, v_batteryPowerElectric_kW));
 	data_winterWeekNaturalGasDemand_kW.add(energyModel.t_h, max(0, v_currentPowerMethane_kW));
-	data_winterWeekDieselDemand_kW.add(energyModel.t_h, max(0, v_currentPowerDiesel_kW));
+	data_winterWeekPetroleumFuelDemand_kW.add(energyModel.t_h, max(0, v_currentPowerPetroleumFuel_kW));
 	data_winterWeekHydrogenDemand_kW.add(energyModel.t_h, max(0, v_currentPowerHydrogen_kW));
 	
 	data_winterWeekPVGeneration_kW.add(energyModel.t_h, v_pvProductionElectric_kW);
@@ -1000,7 +1000,7 @@
 	acc_winterElectricityBalance_kW.addStep(v_currentPowerElectricity_kW);
 	acc_winterMethaneBalance_kW.addStep(v_currentPowerMethane_kW);
 	acc_winterHydrogenBalance_kW.addStep(v_currentPowerHydrogen_kW);
-	acc_winterDieselBalance_kW.addStep(v_currentPowerDiesel_kW);
+	acc_winterPetroleumFuelBalance_kW.addStep(v_currentPowerPetroleumFuel_kW);
 	acc_winterHeatBalance_kW.addStep(v_currentPowerHeat_kW);
 	acc_winterTotalImport_kW.addStep(currentImport_kW);
 	acc_winterTotalExport_kW.addStep(currentExport_kW);
@@ -1024,7 +1024,7 @@
 	v_daytimeEnergyProduced_MWh += v_currentEnergyProduction_kW / 1000 * energyModel.p_timeStep_h;
 		
 	v_daytimeMethaneImport_MWh += v_currentPowerMethane_kW / 1000 * energyModel.p_timeStep_h;
-	v_daytimeDieselImport_MWh += v_currentPowerDiesel_kW / 1000 * energyModel.p_timeStep_h;
+	v_daytimePetroleumFuelImport_MWh += v_currentPowerPetroleumFuel_kW / 1000 * energyModel.p_timeStep_h;
 	v_daytimeHydrogenImport_MWh += max(0, v_currentPowerHydrogen_kW) / 1000 * energyModel.p_timeStep_h;
 	v_daytimeHydrogenExport_MWh += max(0, -v_currentPowerHydrogen_kW) / 1000 * energyModel.p_timeStep_h;
 	
@@ -1044,7 +1044,7 @@
 	v_weekdayEnergyProduced_MWh += v_currentEnergyProduction_kW * energyModel.p_timeStep_h/1000;
 	
 	v_weekdayMethaneImport_MWh += v_currentPowerMethane_kW / 1000 * energyModel.p_timeStep_h;
-	v_weekdayDieselImport_MWh += v_currentPowerDiesel_kW / 1000 * energyModel.p_timeStep_h;
+	v_weekdayPetroleumFuelImport_MWh += v_currentPowerPetroleumFuel_kW / 1000 * energyModel.p_timeStep_h;
 	v_weekdayHydrogenImport_MWh += max(0, v_currentPowerHydrogen_kW) / 1000 * energyModel.p_timeStep_h;
 	v_weekdayHydrogenExport_MWh += max(0, -v_currentPowerHydrogen_kW) / 1000 * energyModel.p_timeStep_h;
 	
diff --git a/_alp/Agents/EnergyCoop/Variables.xml b/_alp/Agents/EnergyCoop/Variables.xml
index d83e5388..31c2cdd7 100644
--- a/_alp/Agents/EnergyCoop/Variables.xml
+++ b/_alp/Agents/EnergyCoop/Variables.xml
@@ -323,7 +323,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1669024099515</Id>
-		<Name><![CDATA[v_dieselVolume_kWh]]></Name>
+		<Name><![CDATA[v_petroleumFuelVolume_kWh]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-320</X>
 		<Y>1000</Y>
@@ -346,7 +346,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1669024644541</Id>
-		<Name><![CDATA[v_balanceDiesel_eur]]></Name>
+		<Name><![CDATA[v_balancePetroleumFuel_eur]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
 		<X>-330</X>
 		<Y>820</Y>
diff --git a/_alp/Agents/EnergyModel/Code/Functions.java b/_alp/Agents/EnergyModel/Code/Functions.java
index 2008244e..043723f5 100644
--- a/_alp/Agents/EnergyModel/Code/Functions.java
+++ b/_alp/Agents/EnergyModel/Code/Functions.java
@@ -1013,7 +1013,7 @@ EnergyCoop f_addProductionEnergyCarrier(OL_EnergyCarriers EC)
 	totalElectricitySelfConsumption_fr = 1 - fm_totalExports_MWh.get(OL_EnergyCarriers.ELECTRICITY)/v_totalElectricityProduced_MWh;
 }*/
 
-//v_modelSelfSufficiency_fr = 1 - (v_totalElectricityImport_MWh + max(0,v_totalMethaneImport_MWh - v_totalMethaneExport_MWh) + max(0,v_totalHydrogenImport_MWh - v_totalHydrogenExport_MWh) + v_totalDieselImport_MWh - v_batteryStoredEnergyDeltaSinceStart_MWh - deltaThermalEnergySinceStart_MWh) / v_totalEnergyUsed_MWh;
+//v_modelSelfSufficiency_fr = 1 - (v_totalElectricityImport_MWh + max(0,v_totalMethaneImport_MWh - v_totalMethaneExport_MWh) + max(0,v_totalHydrogenImport_MWh - v_totalHydrogenExport_MWh) + v_totalPetroleumFuelImport_MWh - v_batteryStoredEnergyDeltaSinceStart_MWh - deltaThermalEnergySinceStart_MWh) / v_totalEnergyUsed_MWh;
 v_modelSelfSufficiency_fr = v_totalEnergySelfConsumed_MWh / v_totalEnergyConsumed_MWh; // Calculation based on (total_consumption - total_import) / total_consumption. Positive delta-stored energy is contained in v_totalSelfConsumedEnergy_MWh. 
 //v_modelSelfSufficiency_fr = v_totalSelfConsumedEnergy_MWh / totalEnergyUsed_MWh; // Calculation based on (total_consumption - total_import) / total_consumption. Positive delta-stored energy is contained in v_totalSelfConsumedEnergy_MWh. 
 
diff --git a/_alp/Agents/GCEnergyConversion/Code/Functions.java b/_alp/Agents/GCEnergyConversion/Code/Functions.java
index aa724f70..d0d65875 100644
--- a/_alp/Agents/GCEnergyConversion/Code/Functions.java
+++ b/_alp/Agents/GCEnergyConversion/Code/Functions.java
@@ -56,7 +56,7 @@
 		v_currentPowerMethane_kW += v.methaneConsumption_kW - v.methaneProduction_kW;
 		v_currentPowerHydrogen_kW += v.hydrogenConsumption_kW - v.hydrogenProduction_kW;
 		v_currentPowerHeat_kW += v.heatConsumption_kW - v.heatProduction_kW;
-		v_currentPowerDiesel_kW += v.dieselConsumption_kW;
+		v_currentPowerPetroleumFuel_kW += v.petroleumFuelConsumption_kW;
 	} */
 }
 
diff --git a/_alp/Agents/GCGridBattery/Code/Functions.java b/_alp/Agents/GCGridBattery/Code/Functions.java
index c9f876ef..cd733bfe 100644
--- a/_alp/Agents/GCGridBattery/Code/Functions.java
+++ b/_alp/Agents/GCGridBattery/Code/Functions.java
@@ -80,7 +80,7 @@ else if(EA.j_ea instanceof J_EAStorageElectric && ((J_EAStorageElectric)EA.j_ea)
 v_currentPowerMethane_kW = 0;
 v_currentPowerHydrogen_kW = 0;
 v_currentPowerHeat_kW = 0;
-v_currentPowerDiesel_kW = 0;
+v_currentPowerPetroleumFuel_kW = 0;
 
 v_currentElectricityConsumption_kW = 0;
 v_currentElectricityProduction_kW = 0;
diff --git a/_alp/Agents/GCIndustry/Code/Functions.java b/_alp/Agents/GCIndustry/Code/Functions.java
index fb1c07ba..8c1653b9 100644
--- a/_alp/Agents/GCIndustry/Code/Functions.java
+++ b/_alp/Agents/GCIndustry/Code/Functions.java
@@ -114,7 +114,7 @@ else if( ea.p_energyAssetType == OL_EnergyAssetType.HEAT_DEMAND ) {
 		//v_currentPowerMethane_kW += v.methaneConsumption_kW - v.methaneProduction_kW;
 		//v_currentPowerHydrogen_kW += v.hydrogenConsumption_kW - v.hydrogenProduction_kW;
 		//v_currentPowerHeat_kW += v.heatConsumption_kW - v.heatProduction_kW;
-		//v_currentPowerDiesel_kW += v.dieselConsumption_kW;
+		//v_currentPowerPetroleumFuel_kW += v.petroleumFuelConsumption_kW;
 	}
 	
 	//traceln("Agroenergyhub logic!");
diff --git a/_alp/Agents/GCNeighborhood/Code/Functions.java b/_alp/Agents/GCNeighborhood/Code/Functions.java
index b58f7d3c..77038d37 100644
--- a/_alp/Agents/GCNeighborhood/Code/Functions.java
+++ b/_alp/Agents/GCNeighborhood/Code/Functions.java
@@ -154,8 +154,8 @@
 
 if (j_ea instanceof J_EAVehicle) {
 	J_EAVehicle vehicle = (J_EAVehicle)j_ea;
-	if (vehicle instanceof J_EADieselVehicle) {
-		c_dieselVehicles.add( (J_EADieselVehicle)vehicle );		
+	if (vehicle instanceof J_EAPetroleumFuelVehicle) {
+		c_petroleumFuelVehicles.add( (J_EAPetroleumFuelVehicle)vehicle );		
 	} else if (vehicle instanceof J_EAHydrogenVehicle) {
 		c_hydrogenVehicles.add((J_EAHydrogenVehicle)vehicle);		
 	} else if (vehicle instanceof J_EAEV) {
@@ -165,10 +165,10 @@
 	c_vehicleAssets.add(vehicle);		
 	J_ActivityTrackerTrips tripTracker = vehicle.getTripTracker();
 	if (tripTracker == null) { // Only provide tripTracker when vehicle doesn't have it yet!
-		if (vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK) {
+		if (vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK) {
 			int rowIndex = uniform_discr(1, 7);//getIndex() % 200;	
 			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsExcel, rowIndex, energyModel.t_h*60, vehicle);
-		} else if (vehicle.energyAssetType == OL_EnergyAssetType.DIESEL_VAN || vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN) {// No mobility pattern for business vans available yet!! Falling back to truck mobility pattern
+		} else if (vehicle.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN || vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN) {// No mobility pattern for business vans available yet!! Falling back to truck mobility pattern
 			int rowIndex = uniform_discr(1, 7);//getIndex() % 200;	
 			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsExcel, rowIndex, energyModel.t_h*60, vehicle);
 		} else {
@@ -315,8 +315,8 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 
 if (j_ea instanceof J_EAVehicle) {
 	J_EAVehicle vehicle = (J_EAVehicle)j_ea;
-	if (vehicle instanceof J_EADieselVehicle) {
-		c_dieselVehicles.add( (J_EADieselVehicle)vehicle );		
+	if (vehicle instanceof J_EAPetroleumFuelVehicle) {
+		c_petroleumFuelVehicles.add( (J_EAPetroleumFuelVehicle)vehicle );		
 	} else if (vehicle instanceof J_EAHydrogenVehicle) {
 		c_hydrogenVehicles.add((J_EAHydrogenVehicle)vehicle);		
 	} else if (vehicle instanceof J_EAEV) {
@@ -327,10 +327,10 @@ else if (j_ea.energyAssetType == OL_EnergyAssetType.WINDMILL) {
 	c_vehicleAssets.add(vehicle);		
 	J_ActivityTrackerTrips tripTracker = vehicle.getTripTracker();
 	if (tripTracker == null) { // Only provide tripTracker when vehicle doesn't have it yet!
-		if (vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK) {
+		if (vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK) {
 			int rowIndex = uniform_discr(1, 7);//getIndex() % 200;	
 			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsCsv, rowIndex, energyModel.t_h*60, vehicle);
-		} else if (vehicle.energyAssetType == OL_EnergyAssetType.DIESEL_VAN || vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN) {// No mobility pattern for business vans available yet!! Falling back to truck mobility pattern
+		} else if (vehicle.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN || vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN) {// No mobility pattern for business vans available yet!! Falling back to truck mobility pattern
 			int rowIndex = uniform_discr(1, 7);//getIndex() % 200;	
 			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsCsv, rowIndex, energyModel.t_h*60, vehicle);
 			tripTracker.setAnnualDistance_km(30_000);
diff --git a/_alp/Agents/GridConnection/AOC.GridConnection.xml b/_alp/Agents/GridConnection/AOC.GridConnection.xml
index 718abdbd..b1ef43cb 100644
--- a/_alp/Agents/GridConnection/AOC.GridConnection.xml
+++ b/_alp/Agents/GridConnection/AOC.GridConnection.xml
@@ -47,7 +47,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
     @JsonSubTypes.Type(value = GCPublicCharger.class, name = "GCPublicCharger"),
     @JsonSubTypes.Type(value = GCUtility.class, name = "GCUtility"),
     //@JsonSubTypes.Type(value = J_EAEV.class, name = "J_EAEV"),
-    //@JsonSubTypes.Type(value = J_EADieselVehicle.class, name = "J_EADieselVehicle"),
+    //@JsonSubTypes.Type(value = J_EAPetroleumFuelVehicle.class, name = "J_EAPetroleumFuelVehicle"),
     
     // Add other known subtypes here if needed
 })
diff --git a/_alp/Agents/GridConnection/Code/Functions.java b/_alp/Agents/GridConnection/Code/Functions.java
index 596e5b55..e73d6969 100644
--- a/_alp/Agents/GridConnection/Code/Functions.java
+++ b/_alp/Agents/GridConnection/Code/Functions.java
@@ -192,7 +192,7 @@
 
 double f_operateFixedAssets()
 {/*ALCODESTART::1668528300576*/
-c_dieselVehicles.forEach(v -> v.f_updateAllFlows());
+c_petroleumFuelVehicles.forEach(v -> v.f_updateAllFlows());
 c_hydrogenVehicles.forEach(v -> v.f_updateAllFlows());
 c_consumptionAssets.forEach(c -> c.f_updateAllFlows());
 c_productionAssets.forEach(p -> p.f_updateAllFlows());
@@ -443,8 +443,8 @@
 }
 
 if (j_ea instanceof J_EAVehicle vehicle) {
-	if (vehicle instanceof J_EADieselVehicle dieselVehicle) {
-		c_dieselVehicles.add( dieselVehicle );		
+	if (vehicle instanceof J_EAPetroleumFuelVehicle petroleumFuelVehicle) {
+		c_petroleumFuelVehicles.add( petroleumFuelVehicle );		
 	} else if (vehicle instanceof J_EAHydrogenVehicle hydrogenVehicle) {
 		c_hydrogenVehicles.add(hydrogenVehicle);		
 	} else if (vehicle instanceof J_EAEV ev) {
@@ -458,10 +458,10 @@
 	c_vehicleAssets.add(vehicle);		
 	J_ActivityTrackerTrips tripTracker = vehicle.getTripTracker();
 	if (tripTracker == null) { // Only provide tripTracker when vehicle doesn't have it yet!
-		if (vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK) {
+		if (vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK) {
 			int rowIndex = uniform_discr(1, 7);//getIndex() % 200;	
 			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, vehicle);
-		} else if (vehicle.energyAssetType == OL_EnergyAssetType.DIESEL_VAN || vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN) {// No mobility pattern for business vans available yet!! Falling back to truck mobility pattern
+		} else if (vehicle.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN || vehicle.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN || vehicle.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN) {// No mobility pattern for business vans available yet!! Falling back to truck mobility pattern
 			int rowIndex = uniform_discr(1, 7);//getIndex() % 200;	
 			tripTracker = new J_ActivityTrackerTrips(energyModel, energyModel.p_truckTripsCsv, rowIndex, (energyModel.t_h-energyModel.p_runStartTime_h)*60, vehicle);
 			tripTracker.setAnnualDistance_km(30_000);
@@ -554,7 +554,7 @@ else if (productionAsset.energyAssetType == OL_EnergyAssetType.PHOTOTHERMAL){
 	}
 } else if  (j_ea instanceof J_EAProfile profileAsset) {
 	c_profileAssets.add(profileAsset);
-} else if (j_ea instanceof J_EADieselTractor tractor) {
+} else if (j_ea instanceof J_EAPetroleumFuelTractor tractor) {
 	c_profileAssets.add(tractor);
 } else if (j_ea instanceof J_EAChargePoint charger) {
 	if(p_chargingManagement == null){
@@ -774,8 +774,8 @@ else if (j_ea.getEAType() == OL_EnergyAssetType.WINDMILL) {
 
 if (j_ea instanceof J_EAVehicle) {
 	J_EAVehicle vehicle = (J_EAVehicle)j_ea;
-	if (vehicle instanceof J_EADieselVehicle) {
-		c_dieselVehicles.remove( (J_EADieselVehicle)vehicle );		
+	if (vehicle instanceof J_EAPetroleumFuelVehicle) {
+		c_petroleumFuelVehicles.remove( (J_EAPetroleumFuelVehicle)vehicle );		
 	} else if (vehicle instanceof J_EAHydrogenVehicle) {
 		c_hydrogenVehicles.remove((J_EAHydrogenVehicle)vehicle);		
 	} else if (vehicle instanceof J_EAEV) {
diff --git a/_alp/Agents/GridConnection/Variables.xml b/_alp/Agents/GridConnection/Variables.xml
index 1fd7c9cb..b9da29bd 100644
--- a/_alp/Agents/GridConnection/Variables.xml
+++ b/_alp/Agents/GridConnection/Variables.xml
@@ -1440,7 +1440,7 @@
 	</Variable>
 	<Variable Class="CollectionVariable">
 		<Id>1669115948280</Id>
-		<Name><![CDATA[c_dieselVehicles]]></Name>
+		<Name><![CDATA[c_petroleumFuelVehicles]]></Name>
 		<X>620</X>
 		<Y>580</Y>
 		<Label>
@@ -1452,7 +1452,7 @@
 		<ShowLabel>true</ShowLabel>
 		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
 			<CollectionClass>ArrayList</CollectionClass>
-			<ElementClass>J_EADieselVehicle</ElementClass>
+			<ElementClass>J_EAPetroleumFuelVehicle</ElementClass>
 			<ValueElementClass>String</ValueElementClass>
 		</Properties>
 	</Variable>
diff --git a/_alp/Agents/UI_EnergyAsset/Code/AdditionalClassCode.java b/_alp/Agents/UI_EnergyAsset/Code/AdditionalClassCode.java
index fa0a335f..26521326 100644
--- a/_alp/Agents/UI_EnergyAsset/Code/AdditionalClassCode.java
+++ b/_alp/Agents/UI_EnergyAsset/Code/AdditionalClassCode.java
@@ -8,5 +8,5 @@ public String toString() {
 			+ v_currentConsumptionHeat_kW - v_currentProductionHeat_kW
 			+ v_currentConsumptionHydrogen_kW - v_currentProductionHydrogen_kW
 			+ v_currentConsumptionMethane_kW - v_currentProductionMethane_kW
-			+ v_currentConsumptionDiesel_kW),2);
+			+ v_currentConsumptionPetroleumFuel_kW),2);
 	}*/
\ No newline at end of file
diff --git a/_alp/Agents/UI_EnergyAsset/Code/Functions.java b/_alp/Agents/UI_EnergyAsset/Code/Functions.java
index 1be64bf6..759c731c 100644
--- a/_alp/Agents/UI_EnergyAsset/Code/Functions.java
+++ b/_alp/Agents/UI_EnergyAsset/Code/Functions.java
@@ -10,7 +10,7 @@
 	v_currentConsumptionHydrogen_kW = j_ea.hydrogenConsumption_kW;
 	v_currentProductionHeat_kW = j_ea.heatProduction_kW;
 	v_currentConsumptionHeat_kW = j_ea.heatConsumption_kW;
-	v_currentConsumptionDiesel_kW = j_ea.dieselConsumption_kW;
+	v_currentConsumptionPetroleumFuel_kW = j_ea.petroleumFuelConsumption_kW;
 	v_currentStateOfCharge_r = j_ea.getCurrentStateOfCharge();
 	v_powerFraction_fr = j_ea.v_powerFraction_fr;
 	*/
@@ -40,7 +40,7 @@
 v_currentConsumptionHydrogen_kW = arr[6];
 v_currentProductionHeat_kW = arr[3];
 v_currentConsumptionHeat_kW = arr[7];
-v_currentConsumptionDiesel_kW = arr[8];
+v_currentConsumptionPetroleumFuel_kW = arr[8];
 /*ALCODEEND*/}
 
 double f_setCoordinatesUIElements()
@@ -81,7 +81,7 @@
 v_currentConsumptionHydrogen_kW += arr[6];
 v_currentProductionHeat_kW += arr[3];
 v_currentConsumptionHeat_kW += arr[7];
-v_currentConsumptionDiesel_kW += arr[8];
+v_currentConsumptionPetroleumFuel_kW += arr[8];
 /*ALCODEEND*/}
 
 double f_addFlows(J_FlowsMap flowsMap)
@@ -94,7 +94,7 @@
 v_currentConsumptionHydrogen_kW = max(0, flowsMap.get(OL_EnergyCarriers.HYDROGEN));
 v_currentProductionHeat_kW = max(0, -flowsMap.get(OL_EnergyCarriers.HEAT));
 v_currentConsumptionHeat_kW = max(0, flowsMap.get(OL_EnergyCarriers.HEAT));
-v_currentConsumptionDiesel_kW = max(0, flowsMap.get(OL_EnergyCarriers.DIESEL));
+v_currentConsumptionPetroleumFuel_kW = max(0, flowsMap.get(OL_EnergyCarriers.PETROLEUM_FUEL));
 
 
 /*ALCODEEND*/}
@@ -109,7 +109,7 @@
 v_currentConsumptionHydrogen_kW = max(0, flowsMap.get(OL_EnergyCarriers.HYDROGEN));
 v_currentProductionHeat_kW = max(0, -flowsMap.get(OL_EnergyCarriers.HEAT));
 v_currentConsumptionHeat_kW = max(0, flowsMap.get(OL_EnergyCarriers.HEAT));
-v_currentConsumptionDiesel_kW = max(0, flowsMap.get(OL_EnergyCarriers.DIESEL));
+v_currentConsumptionPetroleumFuel_kW = max(0, flowsMap.get(OL_EnergyCarriers.PETROLEUM_FUEL));
 
 
 /*ALCODEEND*/}
diff --git a/_alp/Agents/UI_EnergyAsset/Variables.xml b/_alp/Agents/UI_EnergyAsset/Variables.xml
index 41482f14..5fd96411 100644
--- a/_alp/Agents/UI_EnergyAsset/Variables.xml
+++ b/_alp/Agents/UI_EnergyAsset/Variables.xml
@@ -218,7 +218,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1668601315863</Id>
-		<Name><![CDATA[v_currentConsumptionDiesel_kW]]></Name>
+		<Name><![CDATA[v_currentConsumptionPetroleumFuel_kW]]></Name>
 		<X>90</X>
 		<Y>500</Y>
 		<Label>
diff --git a/_alp/Classes/Class.ActorMixin.java b/_alp/Classes/Class.ActorMixin.java
index aa9fe399..e42b720a 100644
--- a/_alp/Classes/Class.ActorMixin.java
+++ b/_alp/Classes/Class.ActorMixin.java
@@ -29,7 +29,7 @@
    // @JsonSubTypes.Type(value = J_EAConversionGasBurner.class, name = "J_EAConversionGasBurner"),
    // @JsonSubTypes.Type(value = J_EAConversionHeatPump.class, name = "J_EAConversionHeatPump"),
    // @JsonSubTypes.Type(value = J_EAEV.class, name = "J_EAEV"),
-   // @JsonSubTypes.Type(value = J_EADieselVehicle.class, name = "J_EADieselVehicle"),
+   // @JsonSubTypes.Type(value = J_EAPetroleumFuelVehicle.class, name = "J_EAPetroleumFuelVehicle"),
     
     // Add other known subtypes here if needed
 })
diff --git a/_alp/Classes/Class.J_AVGC_data.java b/_alp/Classes/Class.J_AVGC_data.java
index 731b3f2f..8a24730c 100644
--- a/_alp/Classes/Class.J_AVGC_data.java
+++ b/_alp/Classes/Class.J_AVGC_data.java
@@ -17,7 +17,7 @@ public class J_AVGC_data implements Serializable {
 	public double p_avgEVStorageTruck_kWh;
 	public double p_ratioHouseInstalledPV;
 	public double p_gas_kWhpm3;
-	public double p_diesel_kWhpl;
+	public double p_petroleumFuel_kWhpl;
 	public double p_gasoline_kWhpl;
 	public double p_waterHeatCapacity_JpkgK;
 	public double p_waterDensity_kgpm3;
@@ -36,14 +36,14 @@ public class J_AVGC_data implements Serializable {
 	public double p_avgEVEnergyConsumptionCar_kWhpkm;
 	public double p_avgEVEnergyConsumptionVan_kWhpkm;
 	public double p_avgEVEnergyConsumptionTruck_kWhpkm;	
-	public double p_avgDieselConsumptionCar_kmpl;
+	public double p_avgPetroleumFuelConsumptionCar_kmpl;
 	public double p_avgGasolineConsumptionCar_kmpl;	
-	public double p_avgDieselConsumptionCar_kWhpkm;
+	public double p_avgPetroleumFuelConsumptionCar_kWhpkm;
 	public double p_avgGasolineConsumptionCar_kWhpkm;
-	public double p_avgDieselConsumptionVan_kmpl;
-	public double p_avgDieselConsumptionVan_kWhpkm;
-	public double p_avgDieselConsumptionTruck_kmpl;
-	public double p_avgDieselConsumptionTruck_kWhpkm;
+	public double p_avgPetroleumFuelConsumptionVan_kmpl;
+	public double p_avgPetroleumFuelConsumptionVan_kWhpkm;
+	public double p_avgPetroleumFuelConsumptionTruck_kmpl;
+	public double p_avgPetroleumFuelConsumptionTruck_kWhpkm;
 	public double p_avgHydrogenConsumptionCar_kWhpkm;
 	public double p_avgHydrogenConsumptionVan_kWhpkm;
 	public double p_avgHydrogenConsumptionTruck_kWhpkm;
diff --git a/_alp/Classes/Class.J_ActivityTrackerTrips.java b/_alp/Classes/Class.J_ActivityTrackerTrips.java
index b92216f8..e6558cc9 100644
--- a/_alp/Classes/Class.J_ActivityTrackerTrips.java
+++ b/_alp/Classes/Class.J_ActivityTrackerTrips.java
@@ -126,9 +126,9 @@ public void manageActivities(double t_h) {
     		}
 
     	} else {
-    		if (Vehicle instanceof J_EADieselVehicle) {
-    			J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)Vehicle;
-    			dieselVehicle.progressTrip(v_tripDist_km / currentTripTimesteps_n);
+    		if (Vehicle instanceof J_EAPetroleumFuelVehicle) {
+    			J_EAPetroleumFuelVehicle petroleumFuelVehicle = (J_EAPetroleumFuelVehicle)Vehicle;
+    			petroleumFuelVehicle.progressTrip(v_tripDist_km / currentTripTimesteps_n);
     		}
     		else if (Vehicle instanceof J_EAHydrogenVehicle) {
     			J_EAHydrogenVehicle hydrogenVehicle = (J_EAHydrogenVehicle)Vehicle;
diff --git a/_alp/Classes/Class.J_ActorData.java b/_alp/Classes/Class.J_ActorData.java
index 8ee86195..f1e5ff9b 100644
--- a/_alp/Classes/Class.J_ActorData.java
+++ b/_alp/Classes/Class.J_ActorData.java
@@ -14,7 +14,7 @@ public class J_ActorData implements Serializable {
 	public String heatVolume_kWh;
 	public String methaneVolume_kWh;
 	public String hydrogenVolume_kWh;
-	public String dieselVolume_kWh;
+	public String petroleumFuelVolume_kWh;
 	//public String electricityContractType;
 	//public String heatContractType;
 	//public String methaneContractType;
@@ -49,7 +49,7 @@ public J_ActorData(String actorID, String group) {
 		this.heatVolume_kWh = "";
 		this.methaneVolume_kWh = "";
 		this.hydrogenVolume_kWh = "";
-		this.dieselVolume_kWh = "";
+		this.petroleumFuelVolume_kWh = "";
 		//this.electricityContractType = "";
 		//this.heatContractType = "";
 		//this.methaneContractType = "";
@@ -80,7 +80,7 @@ public String toString() {
 			"heatVolume_kWh = " + heatVolume_kWh +" " +
 			"methaneVolume_kWh = " + methaneVolume_kWh +" " +
 			"hydrogenVolume_kWh = " + hydrogenVolume_kWh +" " +
-			"dieselVolume_kWh = " + dieselVolume_kWh + " " +
+			"petroleumFuelVolume_kWh = " + petroleumFuelVolume_kWh + " " +
 			//"electricityContractType = " + electricityContractType +" " +
 			//"heatContractType = " + heatContractType +" " +
 			//"methaneContractType = " + methaneContractType +" " +
@@ -94,7 +94,7 @@ public String toString() {
 			"taxContractScope = " + taxContractScope + " ";
 	}
 
-	public void updateData(String actorID, String group, String gridOperator, String parentCoop, String energySupplier, String ownedGridConnection, String energySupplierDistrictHeat,double electricityVolume_kWh, double heatVolume_kWh, double methaneVolume_kWh, double hydrogenVolume_kWh, double dieselVolume_kWh, /*String electricityContractType, String heatContractType, String methaneContractType, String hydrogenContractType,*/ double balanceElectricity_eur, double balanceElectricityDelivery_eur, double balanceElectricityTransport_eur, double balanceElectricityTax_eur, String deliveryContractScope, String transportContractScope, String taxContractScope, boolean b_methaneUsedWithoutContracts, boolean b_hydrogenUsedWithoutContracts) {
+	public void updateData(String actorID, String group, String gridOperator, String parentCoop, String energySupplier, String ownedGridConnection, String energySupplierDistrictHeat,double electricityVolume_kWh, double heatVolume_kWh, double methaneVolume_kWh, double hydrogenVolume_kWh, double petroleumFuelVolume_kWh, /*String electricityContractType, String heatContractType, String methaneContractType, String hydrogenContractType,*/ double balanceElectricity_eur, double balanceElectricityDelivery_eur, double balanceElectricityTransport_eur, double balanceElectricityTax_eur, String deliveryContractScope, String transportContractScope, String taxContractScope, boolean b_methaneUsedWithoutContracts, boolean b_hydrogenUsedWithoutContracts) {
 		this.actorID = actorID;
 		this.group = group;
 		this.gridOperator = gridOperator;
@@ -106,7 +106,7 @@ public void updateData(String actorID, String group, String gridOperator, String
 		this.heatVolume_kWh = heatVolume_kWh  + "";
 		this.methaneVolume_kWh = methaneVolume_kWh + "";
 		this.hydrogenVolume_kWh = hydrogenVolume_kWh + "";
-		this.dieselVolume_kWh = dieselVolume_kWh + "";
+		this.petroleumFuelVolume_kWh = petroleumFuelVolume_kWh + "";
 		//this.electricityContractType = electricityContractType + "";
 		//this.heatContractType = heatContractType + "";
 		//this.methaneContractType = methaneContractType + "";
diff --git a/_alp/Classes/Class.J_EADieselTractor.java b/_alp/Classes/Class.J_EAPetroleumFuelTractor.java
similarity index 58%
rename from _alp/Classes/Class.J_EADieselTractor.java
rename to _alp/Classes/Class.J_EAPetroleumFuelTractor.java
index ab1038db..ad64d4a9 100644
--- a/_alp/Classes/Class.J_EADieselTractor.java
+++ b/_alp/Classes/Class.J_EAPetroleumFuelTractor.java
@@ -1,38 +1,38 @@
 import java.util.*;
 
-public class J_EADieselTractor extends J_EAProfile implements Serializable {
-    final static double DIESEL_ENERGY_DENSITY_KWH_PER_L = 9.7;
+public class J_EAPetroleumFuelTractor extends J_EAProfile implements Serializable {
+    final static double PETROLEUM_FUEL_ENERGY_DENSITY_KWH_PER_L = 9.7;
     
-    final double[] dieselConsumptionPerWeek_L;
+    final double[] petroleumFuelConsumptionPerWeek_L;
     final double workDayStart_h = 6;
     final double workDayEnd_h = 17;
  
     /**
      * @param parentAgent
-     * @param yearlyDieselConsumption_l diesel consumption of a single tractor for a whole year
-     * @param dieselConsumptionPerWeek profile of a year of diesel consumption. 
+     * @param yearlyPetroleumFuelConsumption_l petroleumFuel consumption of a single tractor for a whole year
+     * @param petroleumFuelConsumptionPerWeek profile of a year of petroleumFuel consumption. 
      *  Usually expressed in L per ha per week for a specific crop or mix of crops. 
      *  For our purpose the unit doesn't matter.
      * @param timeStep_h
      */
-    public J_EADieselTractor(Agent parentAgent, double yearlyDieselConsumption_L, double[] dieselConsumptionPerWeek, double timeStep_h) {
+    public J_EAPetroleumFuelTractor(Agent parentAgent, double yearlyPetroleumFuelConsumption_L, double[] petroleumFuelConsumptionPerWeek, double timeStep_h) {
         if (parentAgent == null) {
-            throw new RuntimeException("Diesel tractor missing parent agent");
+            throw new RuntimeException("PetroleumFuel tractor missing parent agent");
         }
         
-        if (yearlyDieselConsumption_L <= 100.0) {
+        if (yearlyPetroleumFuelConsumption_L <= 100.0) {
             throw new RuntimeException(
-                String.format("Diesel tractor fuel usage conspicuously low: %d L", yearlyDieselConsumption_L)
+                String.format("PetroleumFuel tractor fuel usage conspicuously low: %d L", yearlyPetroleumFuelConsumption_L)
             );
         }
         
-        if (dieselConsumptionPerWeek == null) {
-            throw new RuntimeException("Tractor diesel consumption profile is null");
+        if (petroleumFuelConsumptionPerWeek == null) {
+            throw new RuntimeException("Tractor petroleumFuel consumption profile is null");
         }
         
-        if (dieselConsumptionPerWeek.length != 52) {
+        if (petroleumFuelConsumptionPerWeek.length != 52) {
             throw new RuntimeException(
-                String.format("Tractor diesel consumption profile has %d weeks instead of 52", dieselConsumptionPerWeek.length)
+                String.format("Tractor petroleumFuel consumption profile has %d weeks instead of 52", petroleumFuelConsumptionPerWeek.length)
             );
         }
         
@@ -41,10 +41,10 @@ public J_EADieselTractor(Agent parentAgent, double yearlyDieselConsumption_L, do
         }
         
         this.parentAgent = parentAgent;
-        this.dieselConsumptionPerWeek_L = calculateDieselConsumptionPerWeek_L(yearlyDieselConsumption_L, dieselConsumptionPerWeek);
+        this.petroleumFuelConsumptionPerWeek_L = calculatePetroleumFuelConsumptionPerWeek_L(yearlyPetroleumFuelConsumption_L, petroleumFuelConsumptionPerWeek);
         this.timestep_h = timeStep_h;
         
-        this.activeConsumptionEnergyCarriers.add(OL_EnergyCarriers.DIESEL);
+        this.activeConsumptionEnergyCarriers.add(OL_EnergyCarriers.PETROLEUM_FUEL);
         registerEnergyAsset();
     }
     
@@ -68,16 +68,16 @@ public void operate(double t_h) {
         
         double currentPower_kW = currentPower_kW(t_h);    
         
-        this.flowsMap.put(OL_EnergyCarriers.DIESEL, currentPower_kW);
+        this.flowsMap.put(OL_EnergyCarriers.PETROLEUM_FUEL, currentPower_kW);
         this.energyUse_kW = currentPower_kW;
         this.energyUsed_kWh += currentPower_kW * timestep_h;    
     }
     
-    private static double[] calculateDieselConsumptionPerWeek_L(double yearlyDieselConsumption_l, double[] weekProfile) {
+    private static double[] calculatePetroleumFuelConsumptionPerWeek_L(double yearlyPetroleumFuelConsumption_l, double[] weekProfile) {
         var profileSum = Arrays.stream(weekProfile).sum();
         
         return Arrays.stream(weekProfile)
-                .map(weekValue -> yearlyDieselConsumption_l * weekValue / profileSum)
+                .map(weekValue -> yearlyPetroleumFuelConsumption_l * weekValue / profileSum)
                 .toArray();
     }
     
@@ -108,9 +108,9 @@ private double currentPower_kW(double currentStep_h) {
         if(week == 52) {
         	week = 51;
         }
-        double thisWeekDieselConsumption_L = this.dieselConsumptionPerWeek_L[week];
-        double thisWeekDieselConsumption_kWh = thisWeekDieselConsumption_L * DIESEL_ENERGY_DENSITY_KWH_PER_L;
-        double power_kW = thisWeekDieselConsumption_kWh / workHoursPerWeek();
+        double thisWeekPetroleumFuelConsumption_L = this.petroleumFuelConsumptionPerWeek_L[week];
+        double thisWeekPetroleumFuelConsumption_kWh = thisWeekPetroleumFuelConsumption_L * PETROLEUM_FUEL_ENERGY_DENSITY_KWH_PER_L;
+        double power_kW = thisWeekPetroleumFuelConsumption_kWh / workHoursPerWeek();
         return power_kW;
     }
     
diff --git a/_alp/Classes/Class.J_EADieselVehicle.java b/_alp/Classes/Class.J_EAPetroleumFuelVehicle.java
similarity index 78%
rename from _alp/Classes/Class.J_EADieselVehicle.java
rename to _alp/Classes/Class.J_EAPetroleumFuelVehicle.java
index f01c92bb..31d28024 100644
--- a/_alp/Classes/Class.J_EADieselVehicle.java
+++ b/_alp/Classes/Class.J_EAPetroleumFuelVehicle.java
@@ -1,28 +1,28 @@
 /**
- * J_EAConversionDieselVehicle
+ * J_EAConversionPetroleumFuelVehicle
  */
-public class J_EADieselVehicle extends J_EAVehicle implements Serializable {
+public class J_EAPetroleumFuelVehicle extends J_EAVehicle implements Serializable {
 
-	private OL_EnergyCarriers energyCarrierConsumed = OL_EnergyCarriers.DIESEL;
+	private OL_EnergyCarriers energyCarrierConsumed = OL_EnergyCarriers.PETROLEUM_FUEL;
 
 	/**
      * Default constructor
      */
-    public J_EADieselVehicle() {
+    public J_EAPetroleumFuelVehicle() {
     }
 
     /**
      * Constructor initializing the fields
      */
-    public J_EADieselVehicle(Agent ownerAssetAgent, double energyConsumption_kWhpkm, double timestep_h, double vehicleScaling, OL_EnergyAssetType energyAssetType, J_ActivityTrackerTrips tripTracker ) {
+    public J_EAPetroleumFuelVehicle(Agent ownerAssetAgent, double energyConsumption_kWhpkm, double timestep_h, double vehicleScaling, OL_EnergyAssetType energyAssetType, J_ActivityTrackerTrips tripTracker ) {
 	    this.parentAgent = ownerAssetAgent;
 	    this.energyConsumption_kWhpkm = energyConsumption_kWhpkm;
-	    /*if (energyAssetType == OL_EnergyAssetType.DIESEL_VAN) {
-	    	traceln("DieselVan energyconsumption: %s", energyConsumption_kWhpkm);
+	    /*if (energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN) {
+	    	traceln("PetroleumFuelVan energyconsumption: %s", energyConsumption_kWhpkm);
 	    }*/
 	    this.timestep_h = timestep_h;
 	    this.vehicleScaling = vehicleScaling;
-	    this.energyAssetType = energyAssetType; //OL_EnergyAssetType.DIESEL_VEHICLE; // AANPASSING ATE, scheelt code in Interface
+	    this.energyAssetType = energyAssetType; //OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE; // AANPASSING ATE, scheelt code in Interface
 	    this.tripTracker = tripTracker; 
 	    if (tripTracker != null) {
 	    	tripTracker.Vehicle=this;
@@ -34,7 +34,7 @@ public J_EADieselVehicle(Agent ownerAssetAgent, double energyConsumption_kWhpkm,
     @Override
     public void f_updateAllFlows() {
     	
-    	flowsMap.put(OL_EnergyCarriers.DIESEL, this.energyUse_kW);
+    	flowsMap.put(OL_EnergyCarriers.PETROLEUM_FUEL, this.energyUse_kW);
 
     	if (parentAgent instanceof GridConnection) {
     		((GridConnection)parentAgent).f_addFlows(flowsMap, this.energyUse_kW, assetFlowsMap, this);
@@ -42,7 +42,7 @@ public void f_updateAllFlows() {
     	this.lastFlowsMap = flowsMap;
     	this.lastEnergyUse_kW = this.energyUse_kW;
     	/*if (Double.isNaN(this.energyUse_kW)) {
-    		throw new RuntimeException("Diesel vehicle energyUse_kW is NaN!");
+    		throw new RuntimeException("PetroleumFuel vehicle energyUse_kW is NaN!");
     	}*/
     	//Pair<J_FlowsMap, Double> flowspair = new Pair(this.flowsMap, this.energyUse_kW);
     	clear(); 
@@ -57,7 +57,7 @@ public void f_updateAllFlows() {
 	public boolean startTrip() {
 		if (available) {
 			this.available = false;
-			//traceln("Diesel vehicle starting trip!");
+			//traceln("PetroleumFuel vehicle starting trip!");
 			return true;
 		} else {
 			traceln("Trip not started because vehicle not available!");
@@ -86,7 +86,7 @@ public boolean progressTrip(double marginalTripDist_km) {
 			mileage_km += marginalTripDist_km;
 	    	double energyUsedThisTimestep_kWh = marginalTripDist_km * vehicleScaling * energyConsumption_kWhpkm;
 	    	energyUsed_kWh += energyUsedThisTimestep_kWh;
-	    	//dieselConsumption_kW = energyUsedThisTimestep_kWh / timestep_h;
+	    	//petroleumFuelConsumption_kW = energyUsedThisTimestep_kWh / timestep_h;
 	    	energyUse_kW += energyUsedThisTimestep_kWh / timestep_h;
 			return true;
 		}
diff --git a/_alp/Classes/Class.J_FlowsMapEnumMap.java b/_alp/Classes/Class.J_FlowsMapEnumMap.java
index 256bf061..cd2df70f 100644
--- a/_alp/Classes/Class.J_FlowsMapEnumMap.java
+++ b/_alp/Classes/Class.J_FlowsMapEnumMap.java
@@ -136,8 +136,8 @@ public  OL_FlowsMapKeys translateMapKeys(OL_EnergyCarriers energyCarrier, boolea
 	    			return HEAT_CONSUMPTION_KW;
 	    		case METHANE:
 	    			return METHANE_CONSUMPTION_KW;
-	    		case DIESEL:
-	    			return DIESEL_CONSUMPTION_KW;
+	    		case PETROLEUM_FUEL:
+	    			return PETROLEUM_FUEL_CONSUMPTION_KW;
 	    		case HYDROGEN:
 	    			return HYDROGEN_CONSUMPTION_KW;
 	    		default:
@@ -152,8 +152,8 @@ public  OL_FlowsMapKeys translateMapKeys(OL_EnergyCarriers energyCarrier, boolea
 	    			return HEAT_PRODUCTION_KW;
 	    		case METHANE:
 	    			return METHANE_PRODUCTION_KW;
-	    		case DIESEL:
-	    			return DIESEL_PRODUCTION_KW;
+	    		case PETROLEUM_FUEL:
+	    			return PETROLEUM_FUEL_PRODUCTION_KW;
 	    		case HYDROGEN:
 	    			return HYDROGEN_PRODUCTION_KW;
 	    		default:
diff --git a/_alp/Classes/Class.J_SimulationResults.java b/_alp/Classes/Class.J_SimulationResults.java
index 6cf1a3d8..f5af9430 100644
--- a/_alp/Classes/Class.J_SimulationResults.java
+++ b/_alp/Classes/Class.J_SimulationResults.java
@@ -20,7 +20,7 @@ public class J_SimulationResults implements Serializable {
 	public double totalMethaneExport_MWh;
 	public double totalHydrogenImport_MWh;
 	public double totalHydrogenExport_MWh;
-	public double totalDieselImport_MWh;
+	public double totalPetroleumFuelImport_MWh;
 	public Map<String,Double> totalBatteryUnitsInstalled = new LinkedHashMap<String,Double>();
 	public Map<String,Double> totalBatteryChargeAmount_MWh = new LinkedHashMap<String,Double>();
 	public Map<String,Double> totalBatteryDischargeAmount_MWh = new LinkedHashMap<String,Double>();
@@ -46,7 +46,7 @@ public J_SimulationResults() {
     /**
      * Constructor initializing the fields
      */
-    public J_SimulationResults( double v_gridNodeLoadElectricityHSMS_kW, double v_gridNodeLoadElectricityMSLS_kW, double cumulativeCapacityHS, double cumulativeCapacityLS, double netOverload_pct, LinkedHashMap<String,Double> c_timesOfNodePeakLoads_h, LinkedHashMap<String,Double> gridConnectionMaxLoad_fr, double MSLSnodePeakPositiveLoadElectricity_kW, double MSLSnodePeakNegativeLoadElectricity_kW, double totalElectricityImport_MWh, double totalElectricityExport_MWh, double totalMethaneImport_MWh, double totalMethaneExport_MWh, double totalHydrogenImport_MWh, double totalHydrogenExport_MWh, double totalDieselImport_MWh, LinkedHashMap<String,Double> totalBatteryUnitsInstalled, LinkedHashMap<String,Double> totalBatteryChargeAmount_MWh, LinkedHashMap<String,Double> totalBatteryDischargeAmount_MWh, LinkedHashMap<String,Double> totalBatteryInstalledCapacity_MWh, LinkedHashMap<Integer,Double> c_globalElectricityImportProfile_MWhph, LinkedHashMap<Integer,Double> c_globalElectricityExportProfile_MWhph, LinkedHashMap<Integer,Double> totalEVHourlyChargingProfile_kWh, LinkedHashMap<Integer,Double> totalEHGVHourlyChargingProfile_kWh, LinkedHashMap<Integer,Double> totalBatteryHourlyChargingProfile_kWh, double totalSelfConsumption_fr, double totalSelfSufficiency_fr, double TotalEnergyUsed_MWh, double TotalEnergyProduced_MWh, double TotalEnergyCurtailed_MWh, double shareElectricvehiclesInHouseholds) {
+    public J_SimulationResults( double v_gridNodeLoadElectricityHSMS_kW, double v_gridNodeLoadElectricityMSLS_kW, double cumulativeCapacityHS, double cumulativeCapacityLS, double netOverload_pct, LinkedHashMap<String,Double> c_timesOfNodePeakLoads_h, LinkedHashMap<String,Double> gridConnectionMaxLoad_fr, double MSLSnodePeakPositiveLoadElectricity_kW, double MSLSnodePeakNegativeLoadElectricity_kW, double totalElectricityImport_MWh, double totalElectricityExport_MWh, double totalMethaneImport_MWh, double totalMethaneExport_MWh, double totalHydrogenImport_MWh, double totalHydrogenExport_MWh, double totalPetroleumFuelImport_MWh, LinkedHashMap<String,Double> totalBatteryUnitsInstalled, LinkedHashMap<String,Double> totalBatteryChargeAmount_MWh, LinkedHashMap<String,Double> totalBatteryDischargeAmount_MWh, LinkedHashMap<String,Double> totalBatteryInstalledCapacity_MWh, LinkedHashMap<Integer,Double> c_globalElectricityImportProfile_MWhph, LinkedHashMap<Integer,Double> c_globalElectricityExportProfile_MWhph, LinkedHashMap<Integer,Double> totalEVHourlyChargingProfile_kWh, LinkedHashMap<Integer,Double> totalEHGVHourlyChargingProfile_kWh, LinkedHashMap<Integer,Double> totalBatteryHourlyChargingProfile_kWh, double totalSelfConsumption_fr, double totalSelfSufficiency_fr, double TotalEnergyUsed_MWh, double TotalEnergyProduced_MWh, double TotalEnergyCurtailed_MWh, double shareElectricvehiclesInHouseholds) {
 		this.HSMSPeakLoadElectricity_kW = v_gridNodeLoadElectricityHSMS_kW;
 		this.MSLSPeakLoadElectricity_kW = v_gridNodeLoadElectricityMSLS_kW;
 		this.cumulativeCapacityHS = cumulativeCapacityHS;
@@ -62,7 +62,7 @@ public J_SimulationResults( double v_gridNodeLoadElectricityHSMS_kW, double v_gr
 		this.totalMethaneExport_MWh = totalMethaneExport_MWh;
 		this.totalHydrogenImport_MWh = totalHydrogenImport_MWh;
 		this.totalHydrogenExport_MWh = totalHydrogenExport_MWh;
-		this.totalDieselImport_MWh = totalDieselImport_MWh;
+		this.totalPetroleumFuelImport_MWh = totalPetroleumFuelImport_MWh;
 		this.totalBatteryUnitsInstalled = totalBatteryUnitsInstalled;
 		this.totalBatteryChargeAmount_MWh = totalBatteryChargeAmount_MWh;
 		this.totalBatteryDischargeAmount_MWh = totalBatteryDischargeAmount_MWh;
@@ -95,7 +95,7 @@ public String toString() {
 			"totalMethaneExport_MWh = " + totalMethaneExport_MWh + " " +
 			"totalHydrogenImport_MWh = " + totalHydrogenImport_MWh + " " +
 			"totalHydrogenExport_MWh = " + totalHydrogenExport_MWh + " "+
-			"totalDieselImport_MWh = " + totalDieselImport_MWh + " " +
+			"totalPetroleumFuelImport_MWh = " + totalPetroleumFuelImport_MWh + " " +
 			"totalBatteryUnitsInstalled = " + totalBatteryUnitsInstalled + " "+
 			"totalBatteryChargeAmount_MWh = " + totalBatteryChargeAmount_MWh + " "+
 			"totalBatteryDischargeAmount_MWh = " + totalBatteryDischargeAmount_MWh + " "+
@@ -113,7 +113,7 @@ public String toString() {
 			"shareElectricvehiclesInHouseholds = " + shareElectricvehiclesInHouseholds + " fr";
 	}
 
-	public void updateData( double v_gridNodePeakLoadElectricityHSMS_kW, double v_gridNodePeakLoadElectricityMSLS_kW, double cumulativeCapacityHS, double cumulativeCapacityLS, double netOverload_pct, LinkedHashMap<String,Double> c_timesOfNodePeakLoads_h, LinkedHashMap<String,Double> gridConnectionMaxLoad_fr, double MSLSnodePeakPositiveLoadElectricity_kW, double MSLSnodePeakNegativeLoadElectricity_kW, double totalElectricityImport_MWh, double totalElectricityExport_MWh, double totalMethaneImport_MWh, double totalMethaneExport_MWh, double totalHydrogenImport_MWh, double totalHydrogenExport_MWh, double totalDieselImport_MWh, LinkedHashMap<String,Double> totalBatteryUnitsInstalled, LinkedHashMap<String,Double> totalBatteryChargeAmount_MWh, LinkedHashMap<String,Double> totalBatteryDischargeAmount_MWh, LinkedHashMap<String,Double> totalBatteryInstalledCapacity_MWh, double totalSelfConsumption_fr, double totalSelfSufficiency_fr, double TotalEnergyUsed_MWh, double TotalEnergyProduced_MWh, double TotalEnergyCurtailed_MWh, double shareElectricvehiclesInHouseholds) {
+	public void updateData( double v_gridNodePeakLoadElectricityHSMS_kW, double v_gridNodePeakLoadElectricityMSLS_kW, double cumulativeCapacityHS, double cumulativeCapacityLS, double netOverload_pct, LinkedHashMap<String,Double> c_timesOfNodePeakLoads_h, LinkedHashMap<String,Double> gridConnectionMaxLoad_fr, double MSLSnodePeakPositiveLoadElectricity_kW, double MSLSnodePeakNegativeLoadElectricity_kW, double totalElectricityImport_MWh, double totalElectricityExport_MWh, double totalMethaneImport_MWh, double totalMethaneExport_MWh, double totalHydrogenImport_MWh, double totalHydrogenExport_MWh, double totalPetroleumFuelImport_MWh, LinkedHashMap<String,Double> totalBatteryUnitsInstalled, LinkedHashMap<String,Double> totalBatteryChargeAmount_MWh, LinkedHashMap<String,Double> totalBatteryDischargeAmount_MWh, LinkedHashMap<String,Double> totalBatteryInstalledCapacity_MWh, double totalSelfConsumption_fr, double totalSelfSufficiency_fr, double TotalEnergyUsed_MWh, double TotalEnergyProduced_MWh, double TotalEnergyCurtailed_MWh, double shareElectricvehiclesInHouseholds) {
 		this.HSMSPeakLoadElectricity_kW = v_gridNodePeakLoadElectricityHSMS_kW;
 		this.MSLSPeakLoadElectricity_kW = v_gridNodePeakLoadElectricityMSLS_kW;
 		this.cumulativeCapacityHS =cumulativeCapacityHS;
@@ -129,7 +129,7 @@ public void updateData( double v_gridNodePeakLoadElectricityHSMS_kW, double v_gr
 		this.totalMethaneExport_MWh = roundToDecimal( totalMethaneExport_MWh, 2 );
 		this.totalHydrogenImport_MWh = roundToDecimal( totalHydrogenImport_MWh, 2 );
 		this.totalHydrogenExport_MWh = roundToDecimal( totalHydrogenExport_MWh, 2 );
-		this.totalDieselImport_MWh = roundToDecimal( totalDieselImport_MWh, 2 );
+		this.totalPetroleumFuelImport_MWh = roundToDecimal( totalPetroleumFuelImport_MWh, 2 );
 		this.totalBatteryUnitsInstalled = totalBatteryUnitsInstalled;
 		this.totalBatteryChargeAmount_MWh = totalBatteryChargeAmount_MWh;
 		this.totalBatteryDischargeAmount_MWh = totalBatteryDischargeAmount_MWh;

From 3adf0482d978eefcf7b47502a7474d70a8d34939 Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Wed, 17 Dec 2025 10:21:14 +0100
Subject: [PATCH 2/2] rollback refactor in avgc

---
 _alp/Classes/Class.J_AVGC_data.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/_alp/Classes/Class.J_AVGC_data.java b/_alp/Classes/Class.J_AVGC_data.java
index 8a24730c..731b3f2f 100644
--- a/_alp/Classes/Class.J_AVGC_data.java
+++ b/_alp/Classes/Class.J_AVGC_data.java
@@ -17,7 +17,7 @@ public class J_AVGC_data implements Serializable {
 	public double p_avgEVStorageTruck_kWh;
 	public double p_ratioHouseInstalledPV;
 	public double p_gas_kWhpm3;
-	public double p_petroleumFuel_kWhpl;
+	public double p_diesel_kWhpl;
 	public double p_gasoline_kWhpl;
 	public double p_waterHeatCapacity_JpkgK;
 	public double p_waterDensity_kgpm3;
@@ -36,14 +36,14 @@ public class J_AVGC_data implements Serializable {
 	public double p_avgEVEnergyConsumptionCar_kWhpkm;
 	public double p_avgEVEnergyConsumptionVan_kWhpkm;
 	public double p_avgEVEnergyConsumptionTruck_kWhpkm;	
-	public double p_avgPetroleumFuelConsumptionCar_kmpl;
+	public double p_avgDieselConsumptionCar_kmpl;
 	public double p_avgGasolineConsumptionCar_kmpl;	
-	public double p_avgPetroleumFuelConsumptionCar_kWhpkm;
+	public double p_avgDieselConsumptionCar_kWhpkm;
 	public double p_avgGasolineConsumptionCar_kWhpkm;
-	public double p_avgPetroleumFuelConsumptionVan_kmpl;
-	public double p_avgPetroleumFuelConsumptionVan_kWhpkm;
-	public double p_avgPetroleumFuelConsumptionTruck_kmpl;
-	public double p_avgPetroleumFuelConsumptionTruck_kWhpkm;
+	public double p_avgDieselConsumptionVan_kmpl;
+	public double p_avgDieselConsumptionVan_kWhpkm;
+	public double p_avgDieselConsumptionTruck_kmpl;
+	public double p_avgDieselConsumptionTruck_kWhpkm;
 	public double p_avgHydrogenConsumptionCar_kWhpkm;
 	public double p_avgHydrogenConsumptionVan_kWhpkm;
 	public double p_avgHydrogenConsumptionTruck_kWhpkm;