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

---
 _alp/Agents/AVGC_data/Code/Functions.java     |  14 +-
 _alp/Agents/AVGC_data/Variables.xml           |  26 +-
 _alp/Agents/UI_company/Code/Functions.java    | 346 ++++++-------
 _alp/Agents/UI_company/Code/Functions.xml     |   2 +-
 _alp/Agents/UI_company/Levels/Level.level.xml |  60 +--
 _alp/Agents/UI_company/Variables.xml          |  18 +-
 .../Agents/Zero_Interface/Code/Functions.java |   8 +-
 _alp/Agents/Zero_Interface/Variables.xml      |   2 +-
 _alp/Agents/Zero_Loader/Code/Functions.java   | 100 ++--
 _alp/Agents/Zero_Loader/Code/Functions.xml    |   6 +-
 _alp/Agents/Zero_Loader/EmbeddedObjects.xml   |  14 +-
 _alp/Agents/tabMobility/Code/Functions.java   | 454 +++++++++---------
 _alp/Agents/tabMobility/Code/Functions.xml    |  22 +-
 .../Agents/tabMobility/Levels/Level.level.xml |   6 +-
 _alp/Classes/Class.J_ModelSave.java           |   6 +-
 _alp/Classes/Class.J_scenario_Current.java    |  30 +-
 16 files changed, 557 insertions(+), 557 deletions(-)

diff --git a/_alp/Agents/AVGC_data/Code/Functions.java b/_alp/Agents/AVGC_data/Code/Functions.java
index 6f777c1..1df466e 100644
--- a/_alp/Agents/AVGC_data/Code/Functions.java
+++ b/_alp/Agents/AVGC_data/Code/Functions.java
@@ -18,7 +18,7 @@
 dataAVGC.p_avgEVStorageTruck_kWh = p_avgEVStorageTruck_kWh;
 dataAVGC.p_ratioHouseInstalledPV = p_ratioHouseInstalledPV;
 dataAVGC.p_gas_kWhpm3 = p_gas_kWhpm3;
-dataAVGC.p_diesel_kWhpl = p_diesel_kWhpl;
+dataAVGC.p_petroleumFuel_kWhpl = p_petroleumFuel_kWhpl;
 dataAVGC.p_gasoline_kWhpl = p_gasoline_kWhpl;
 dataAVGC.p_waterHeatCapacity_JpkgK = p_waterHeatCapacity_JpkgK;
 dataAVGC.p_waterDensity_kgpm3 = p_waterDensity_kgpm3;
@@ -31,20 +31,20 @@
 dataAVGC.p_avgEVEnergyConsumptionVan_kWhpkm = p_avgEVEnergyConsumptionVan_kWhpkm;
 dataAVGC.p_avgEVEnergyConsumptionTruck_kWhpkm = p_avgEVEnergyConsumptionTruck_kWhpkm;
 dataAVGC.p_hydrogenEnergyDensity_kWh_Nm3 = p_hydrogenEnergyDensity_kWh_Nm3;
-dataAVGC.p_avgDieselConsumptionCar_kmpl = p_avgDieselConsumptionCar_kmpl;
+dataAVGC.p_avgPetroleumFuelConsumptionCar_kmpl = p_avgPetroleumFuelConsumptionCar_kmpl;
 dataAVGC.p_avgGasolineConsumptionCar_kmpl = p_avgGasolineConsumptionCar_kmpl;
 dataAVGC.p_hydrogenSpecificEnergy_kWh_kg = p_hydrogenSpecificEnergy_kWh_kg;
 dataAVGC.p_hydrogenDensity_kg_Nm3 = p_hydrogenDensity_kg_Nm3;
 dataAVGC.p_oxygenDensity_kg_Nm3 = p_oxygenDensity_kg_Nm3;
 dataAVGC.p_avgCOPHeatpump = p_avgCOPHeatpump;
 dataAVGC.p_avgEfficiencyHeatpump_fr = p_avgEfficiencyHeatpump_fr;
-dataAVGC.p_avgDieselConsumptionCar_kWhpkm = p_avgDieselConsumptionCar_kWhpkm;
+dataAVGC.p_avgPetroleumFuelConsumptionCar_kWhpkm = p_avgPetroleumFuelConsumptionCar_kWhpkm;
 dataAVGC.p_oxygenProduction_kgO2pkgH2 = p_oxygenProduction_kgO2pkgH2;
 dataAVGC.p_avgGasolineConsumptionCar_kWhpkm = p_avgGasolineConsumptionCar_kWhpkm;
-dataAVGC.p_avgDieselConsumptionVan_kmpl = p_avgDieselConsumptionVan_kmpl;
-dataAVGC.p_avgDieselConsumptionVan_kWhpkm = p_avgDieselConsumptionVan_kWhpkm;
-dataAVGC.p_avgDieselConsumptionTruck_kmpl = p_avgDieselConsumptionTruck_kmpl;
-dataAVGC.p_avgDieselConsumptionTruck_kWhpkm = p_avgDieselConsumptionTruck_kWhpkm;
+dataAVGC.p_avgPetroleumFuelConsumptionVan_kmpl = p_avgPetroleumFuelConsumptionVan_kmpl;
+dataAVGC.p_avgPetroleumFuelConsumptionVan_kWhpkm = p_avgPetroleumFuelConsumptionVan_kWhpkm;
+dataAVGC.p_avgPetroleumFuelConsumptionTruck_kmpl = p_avgPetroleumFuelConsumptionTruck_kmpl;
+dataAVGC.p_avgPetroleumFuelConsumptionTruck_kWhpkm = p_avgPetroleumFuelConsumptionTruck_kWhpkm;
 dataAVGC.p_avgOutputTemperatureElectricHeatpump_degC = p_avgOutputTemperatureElectricHeatpump_degC;
 dataAVGC.p_avgOutputTemperatureHybridHeatpump_degC = p_avgOutputTemperatureHybridHeatpump_degC;
 dataAVGC.p_avgHydrogenConsumptionCar_kWhpkm = p_avgHydrogenConsumptionCar_kWhpkm;
diff --git a/_alp/Agents/AVGC_data/Variables.xml b/_alp/Agents/AVGC_data/Variables.xml
index 97a4987..2072b25 100644
--- a/_alp/Agents/AVGC_data/Variables.xml
+++ b/_alp/Agents/AVGC_data/Variables.xml
@@ -766,7 +766,7 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205651</Id>
-		<Name><![CDATA[p_diesel_kWhpl]]></Name>
+		<Name><![CDATA[p_petroleumFuel_kWhpl]]></Name>
 		<Description><![CDATA[https://www.joostdevree.nl/shtmls/calorische_waarde.shtml]]></Description>
 		<X>1070</X>
 		<Y>250</Y>
@@ -795,7 +795,7 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205654</Id>
-		<Name><![CDATA[p_avgDieselConsumptionCar_kmpl]]></Name>
+		<Name><![CDATA[p_avgPetroleumFuelConsumptionCar_kmpl]]></Name>
 		<Description><![CDATA[https://www.unitedconsumers.com/blog/auto/zuinig-rijden.jsp]]></Description>
 		<X>570</X>
 		<Y>400</Y>
@@ -882,7 +882,7 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205663</Id>
-		<Name><![CDATA[p_avgDieselConsumptionCar_kWhpkm]]></Name>
+		<Name><![CDATA[p_avgPetroleumFuelConsumptionCar_kWhpkm]]></Name>
 		<X>570</X>
 		<Y>450</Y>
 		<Label>
@@ -897,7 +897,7 @@ MM O = 16 g/mol
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[p_diesel_kWhpl/p_avgDieselConsumptionCar_kmpl]]></Code>
+				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgPetroleumFuelConsumptionCar_kmpl]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205661</Id>
@@ -938,8 +938,8 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205669</Id>
-		<Name><![CDATA[p_avgDieselConsumptionVan_kmpl]]></Name>
-		<Description><![CDATA[https://www.webfleet.com/nl_nl/webfleet/blog/hoeveel-diesel-verbruikt-een-vrachtwagen-per-kilometer/
+		<Name><![CDATA[p_avgPetroleumFuelConsumptionVan_kmpl]]></Name>
+		<Description><![CDATA[https://www.webfleet.com/nl_nl/webfleet/blog/hoeveel-petroleumFuel-verbruikt-een-vrachtwagen-per-kilometer/
 
 11 liter per 100 km = 9.1 km per liter.
 ]]></Description>
@@ -970,7 +970,7 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205672</Id>
-		<Name><![CDATA[p_avgDieselConsumptionVan_kWhpkm]]></Name>
+		<Name><![CDATA[p_avgPetroleumFuelConsumptionVan_kWhpkm]]></Name>
 		<X>570</X>
 		<Y>530</Y>
 		<Label>
@@ -985,7 +985,7 @@ MM O = 16 g/mol
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[p_diesel_kWhpl/p_avgDieselConsumptionVan_kmpl]]></Code>
+				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgPetroleumFuelConsumptionVan_kmpl]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205670</Id>
@@ -998,8 +998,8 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205675</Id>
-		<Name><![CDATA[p_avgDieselConsumptionTruck_kmpl]]></Name>
-		<Description><![CDATA[https://www.webfleet.com/nl_nl/webfleet/blog/hoeveel-diesel-verbruikt-een-vrachtwagen-per-kilometer/
+		<Name><![CDATA[p_avgPetroleumFuelConsumptionTruck_kmpl]]></Name>
+		<Description><![CDATA[https://www.webfleet.com/nl_nl/webfleet/blog/hoeveel-petroleumFuel-verbruikt-een-vrachtwagen-per-kilometer/
 
 --> 25 - 30 - 40 liter per 100 km. = 4 - 3.33 - 2.5 km per l
 Heavely dependend on load, city/highway, etc.
@@ -1031,7 +1031,7 @@ For now: Picking 3.33 km per l]]></Description>
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205678</Id>
-		<Name><![CDATA[p_avgDieselConsumptionTruck_kWhpkm]]></Name>
+		<Name><![CDATA[p_avgPetroleumFuelConsumptionTruck_kWhpkm]]></Name>
 		<X>570</X>
 		<Y>580</Y>
 		<Label>
@@ -1046,7 +1046,7 @@ For now: Picking 3.33 km per l]]></Description>
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[p_diesel_kWhpl/p_avgDieselConsumptionTruck_kmpl]]></Code>
+				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgPetroleumFuelConsumptionTruck_kmpl]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205676</Id>
@@ -1120,7 +1120,7 @@ Gemiddelde COP is 4.]]></Description>
 	<Variable Class="Parameter">
 		<Id>1726584205687</Id>
 		<Name><![CDATA[p_ratioElectricTrucks]]></Name>
-		<Description><![CDATA[Ratio of how many trucks are electric vs diesel.
+		<Description><![CDATA[Ratio of how many trucks are electric vs petroleumFuel.
 ???
 https://nos.nl/artikel/2483604-elektrische-vrachtwagens-blijven-achter-door-complexe-serie-aan-uitdagingen --> 'volgens cbs nog geen half procent.']]></Description>
 		<X>50</X>
diff --git a/_alp/Agents/UI_company/Code/Functions.java b/_alp/Agents/UI_company/Code/Functions.java
index 66c4e7e..e171281 100644
--- a/_alp/Agents/UI_company/Code/Functions.java
+++ b/_alp/Agents/UI_company/Code/Functions.java
@@ -70,17 +70,17 @@
 //Cars (VOLGORDE BELANGRIJK)
 sl_hydrogenCarsCompany.setValue(p_scenarioSettings_Future.getPlannedHydrogenCars(), true);
 sl_electricCarsCompany.setValue(p_scenarioSettings_Future.getPlannedEVCars(), true);
-//sl_dieselCarsCompany.setValue(c_scenarioSettings_Future.getPlannedDieselCars(), true);
+//sl_petroleumFuelCarsCompany.setValue(c_scenarioSettings_Future.getPlannedPetroleumFuelCars(), true);
 
 //Vans (VOLGORDE BELANGRIJK)
 sl_hydrogenVansCompany.setValue(p_scenarioSettings_Future.getPlannedHydrogenVans(), true);
 sl_electricVansCompany.setValue(p_scenarioSettings_Future.getPlannedEVVans(), true);
-//sl_dieselVansCompany.setValue(c_scenarioSettings_Future.getPlannedDieselVans(), true);
+//sl_petroleumFuelVansCompany.setValue(c_scenarioSettings_Future.getPlannedPetroleumFuelVans(), true);
 
 //Trucks (VOLGORDE BELANGRIJK)
 sl_hydrogenTrucksCompany.setValue(p_scenarioSettings_Future.getPlannedHydrogenTrucks(), true);
 sl_electricTrucksCompany.setValue(p_scenarioSettings_Future.getPlannedEVTrucks(), true);
-//sl_dieselTrucksCompany.setValue(c_scenarioSettings_Future.getPlannedDieselTrucks(), true);
+//sl_petroleumFuelTrucksCompany.setValue(c_scenarioSettings_Future.getPlannedPetroleumFuelTrucks(), true);
 
 //set active if active in future
 p_gridConnection.f_setActive(p_scenarioSettings_Future.getIsActiveInFuture());
@@ -201,17 +201,17 @@
 //Cars (VOLGORDE BELANGRIJK)
 sl_hydrogenCarsCompany.setValue(p_scenarioSettings_Current.getCurrentHydrogenCars(), true);
 sl_electricCarsCompany.setValue(p_scenarioSettings_Current.getCurrentEVCars(), true);
-//sl_dieselCarsCompany.setValue(c_scenarioSettings_Current.getCurrentDieselCars(), true);
+//sl_petroleumFuelCarsCompany.setValue(c_scenarioSettings_Current.getCurrentPetroleumFuelCars(), true);
 
 //Vans (VOLGORDE BELANGRIJK)
 sl_hydrogenVansCompany.setValue(p_scenarioSettings_Current.getCurrentHydrogenVans(), true);
 sl_electricVansCompany.setValue(p_scenarioSettings_Current.getCurrentEVVans(), true);
-//sl_dieselVansCompany.setValue(c_scenarioSettings_Current.getCurrentDieselVans(), true);
+//sl_petroleumFuelVansCompany.setValue(c_scenarioSettings_Current.getCurrentPetroleumFuelVans(), true);
 
 //Trucks (VOLGORDE BELANGRIJK)
 sl_hydrogenTrucksCompany.setValue(p_scenarioSettings_Current.getCurrentHydrogenTrucks(), true);
 sl_electricTrucksCompany.setValue(p_scenarioSettings_Current.getCurrentEVTrucks(), true);
-//sl_dieselTrucksCompany.setValue(c_scenarioSettings_Current.getCurrentDieselTrucks(), true);
+//sl_petroleumFuelTrucksCompany.setValue(c_scenarioSettings_Current.getCurrentPetroleumFuelTrucks(), true);
 
 //set active if active in present
 p_gridConnection.f_setActive(p_scenarioSettings_Current.getIsCurrentlyActive());
@@ -548,36 +548,36 @@
 {/*ALCODESTART::1714140108358*/
 //Set back end range (to prevent anylogic errors)
 sl_electricCarsCompany.setRange(0, 500);
-sl_dieselCarsCompany.setRange(0, 500);
+sl_petroleumFuelCarsCompany.setRange(0, 500);
 sl_hydrogenCarsCompany.setRange(0, 500);
 
 
 //Get default values
 int default_nbEVCars = p_scenarioSettings_Current.getCurrentEVCars();
-int default_nbDieselCars = p_scenarioSettings_Current.getCurrentDieselCars();
+int default_nbPetroleumFuelCars = p_scenarioSettings_Current.getCurrentPetroleumFuelCars();
 int default_nbHydrogenCars = p_scenarioSettings_Current.getCurrentHydrogenCars();
 
 //Set minimum value
 v_minEVCarSlider = default_nbEVCars;
-v_minDieselCarSlider = 0;
+v_minPetroleumFuelCarSlider = 0;
 v_minHydrogenCarSlider = 0;
 
 //Determine realistic max additional vehicles
-int max_additonal_vehicles = p_maxAddedVehicles; //min((default_nbEVCars + default_nbDieselCars + default_nbHydrogenCars)*1, 20);
+int max_additonal_vehicles = p_maxAddedVehicles; //min((default_nbEVCars + default_nbPetroleumFuelCars + default_nbHydrogenCars)*1, 20);
 
 //Set maximum
-v_maxEVCarSlider = default_nbEVCars + default_nbDieselCars + default_nbHydrogenCars + max_additonal_vehicles; // loading of EV is included in the quarter electricity data --> Cant filter --> cant get less EV than atm.
-v_maxDieselCarSlider = default_nbDieselCars + default_nbHydrogenCars + max_additonal_vehicles;
-v_maxHydrogenCarSlider = default_nbDieselCars + default_nbHydrogenCars + max_additonal_vehicles;
+v_maxEVCarSlider = default_nbEVCars + default_nbPetroleumFuelCars + default_nbHydrogenCars + max_additonal_vehicles; // loading of EV is included in the quarter electricity data --> Cant filter --> cant get less EV than atm.
+v_maxPetroleumFuelCarSlider = default_nbPetroleumFuelCars + default_nbHydrogenCars + max_additonal_vehicles;
+v_maxHydrogenCarSlider = default_nbPetroleumFuelCars + default_nbHydrogenCars + max_additonal_vehicles;
 
 //Set default values
 v_nbEVCars = default_nbEVCars;
-v_nbDieselCars = default_nbDieselCars;
+v_nbPetroleumFuelCars = default_nbPetroleumFuelCars;
 v_nbHydrogenCars = default_nbHydrogenCars;
 
 //Set slider knobs
 sl_electricCarsCompany.setValue(v_nbEVCars, false);
-sl_dieselCarsCompany.setValue(v_nbDieselCars, false);
+sl_petroleumFuelCarsCompany.setValue(v_nbPetroleumFuelCars, false);
 sl_hydrogenCarsCompany.setValue(v_nbHydrogenCars, false);
 
 /*ALCODEEND*/}
@@ -586,35 +586,35 @@
 {/*ALCODESTART::1714140134819*/
 //Set back end range (to prevent anylogic errors)
 sl_electricVansCompany.setRange(0, 500);
-sl_dieselVansCompany.setRange(0, 500);
+sl_petroleumFuelVansCompany.setRange(0, 500);
 sl_hydrogenVansCompany.setRange(0, 500);
 
 //Get default values
 int default_nbEVVans = p_scenarioSettings_Current.getCurrentEVVans();
-int default_nbDieselVans = p_scenarioSettings_Current.getCurrentDieselVans();
+int default_nbPetroleumFuelVans = p_scenarioSettings_Current.getCurrentPetroleumFuelVans();
 int default_nbHydrogenVans = p_scenarioSettings_Current.getCurrentHydrogenVans();
 
 //Set minimum value
 v_minEVVanSlider = default_nbEVVans;
-v_minDieselVanSlider = 0;
+v_minPetroleumFuelVanSlider = 0;
 v_minHydrogenVanSlider = 0;
 
 //Determine realistic max additional vehicles
-int max_additonal_vehicles = p_maxAddedVehicles; //min((default_nbEVVans + default_nbDieselVans + default_nbHydrogenVans)*2, 20);
+int max_additonal_vehicles = p_maxAddedVehicles; //min((default_nbEVVans + default_nbPetroleumFuelVans + default_nbHydrogenVans)*2, 20);
 
 //Set maximum
-v_maxEVVanSlider = default_nbEVVans + default_nbDieselVans + default_nbHydrogenVans + max_additonal_vehicles; // loading of EV is included in the quarter electricity data --> Cant filter --> cant get less EV than atm.
-v_maxDieselVanSlider = default_nbDieselVans + default_nbHydrogenVans + max_additonal_vehicles;
-v_maxHydrogenVanSlider = default_nbDieselVans + default_nbHydrogenVans + max_additonal_vehicles;
+v_maxEVVanSlider = default_nbEVVans + default_nbPetroleumFuelVans + default_nbHydrogenVans + max_additonal_vehicles; // loading of EV is included in the quarter electricity data --> Cant filter --> cant get less EV than atm.
+v_maxPetroleumFuelVanSlider = default_nbPetroleumFuelVans + default_nbHydrogenVans + max_additonal_vehicles;
+v_maxHydrogenVanSlider = default_nbPetroleumFuelVans + default_nbHydrogenVans + max_additonal_vehicles;
 
 //Set default values
 v_nbEVVans = default_nbEVVans;
-v_nbDieselVans = default_nbDieselVans;
+v_nbPetroleumFuelVans = default_nbPetroleumFuelVans;
 v_nbHydrogenVans = default_nbHydrogenVans;
 
 //Set slider knob
 sl_electricVansCompany.setValue(v_nbEVVans, false);
-sl_dieselVansCompany.setValue(v_nbDieselVans, false);
+sl_petroleumFuelVansCompany.setValue(v_nbPetroleumFuelVans, false);
 sl_hydrogenVansCompany.setValue(v_nbHydrogenVans, false);
 
 /*ALCODEEND*/}
@@ -623,35 +623,35 @@
 {/*ALCODESTART::1714140156233*/
 //Set back end range (to prevent anylogic errors)
 sl_electricTrucksCompany.setRange(0, 500);
-sl_dieselTrucksCompany.setRange(0, 500);
+sl_petroleumFuelTrucksCompany.setRange(0, 500);
 sl_hydrogenTrucksCompany.setRange(0, 500);
 
 //Get default values
 int default_nbEVTrucks = p_scenarioSettings_Current.getCurrentEVTrucks();
-int default_nbDieselTrucks = p_scenarioSettings_Current.getCurrentDieselTrucks();
+int default_nbPetroleumFuelTrucks = p_scenarioSettings_Current.getCurrentPetroleumFuelTrucks();
 int default_nbHydrogenTrucks = p_scenarioSettings_Current.getCurrentHydrogenTrucks();
 
 //Set minimum value
 v_minEVTruckSlider = default_nbEVTrucks;
-v_minDieselTruckSlider = 0;
+v_minPetroleumFuelTruckSlider = 0;
 v_minHydrogenTruckSlider = 0;
 
 //Determine realistic max additional vehicles
-int max_additonal_vehicles = p_maxAddedVehicles; //min((default_nbEVTrucks + default_nbDieselTrucks + default_nbHydrogenTrucks)*2, 20);
+int max_additonal_vehicles = p_maxAddedVehicles; //min((default_nbEVTrucks + default_nbPetroleumFuelTrucks + default_nbHydrogenTrucks)*2, 20);
 
 //Set maximum
-v_maxEVTruckSlider = default_nbEVTrucks + default_nbDieselTrucks + default_nbHydrogenTrucks + max_additonal_vehicles; // loading of EV is included in the quarter electricity data --> Cant filter --> cant get less EV than atm.
-v_maxDieselTruckSlider = default_nbDieselTrucks + default_nbHydrogenTrucks + max_additonal_vehicles;
-v_maxHydrogenTruckSlider = default_nbDieselTrucks + default_nbHydrogenTrucks + max_additonal_vehicles;
+v_maxEVTruckSlider = default_nbEVTrucks + default_nbPetroleumFuelTrucks + default_nbHydrogenTrucks + max_additonal_vehicles; // loading of EV is included in the quarter electricity data --> Cant filter --> cant get less EV than atm.
+v_maxPetroleumFuelTruckSlider = default_nbPetroleumFuelTrucks + default_nbHydrogenTrucks + max_additonal_vehicles;
+v_maxHydrogenTruckSlider = default_nbPetroleumFuelTrucks + default_nbHydrogenTrucks + max_additonal_vehicles;
 
 //Set default values
 v_nbEVTrucks = default_nbEVTrucks;
-v_nbDieselTrucks = default_nbDieselTrucks;
+v_nbPetroleumFuelTrucks = default_nbPetroleumFuelTrucks;
 v_nbHydrogenTrucks = default_nbHydrogenTrucks;
 
 //Set slider knob
 sl_electricTrucksCompany.setValue(v_nbEVTrucks, false);
-sl_dieselTrucksCompany.setValue(v_nbDieselTrucks, false);
+sl_petroleumFuelTrucksCompany.setValue(v_nbPetroleumFuelTrucks, false);
 sl_hydrogenTrucksCompany.setValue(v_nbHydrogenTrucks, false);
 
 /*ALCODEEND*/}
@@ -700,33 +700,33 @@
 	}
 }
 
-else if (vehicleType == OL_EnergyAssetType.DIESEL_VEHICLE || vehicleType == OL_EnergyAssetType.DIESEL_VAN || vehicleType == OL_EnergyAssetType.DIESEL_TRUCK ){ // Create diesel vehicles
+else if (vehicleType == OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE || vehicleType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN || vehicleType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK ){ // Create petroleumFuel vehicles
 	switch (vehicleType){
 		
-		case DIESEL_VEHICLE:
-			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionCar_kWhpkm;
+		case PETROLEUM_FUEL_VEHICLE:
+			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionCar_kWhpkm;
 		break;
 		
-		case DIESEL_VAN:
-			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionVan_kWhpkm;
+		case PETROLEUM_FUEL_VAN:
+			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionVan_kWhpkm;
 		break;
 		
-		case DIESEL_TRUCK:
-			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
+		case PETROLEUM_FUEL_TRUCK:
+			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
 		break;
 	}
 	
-	//Create Diesel vehicle and connect to GC and selected trip tracker
-	J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(parentGC, energyConsumption_kWhpkm, timestep_h, vehicleScaling, vehicleType, tripTracker);
-	dieselVehicle.available = available;
+	//Create PetroleumFuel vehicle and connect to GC and selected trip tracker
+	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(parentGC, energyConsumption_kWhpkm, timestep_h, vehicleScaling, vehicleType, tripTracker);
+	petroleumFuelVehicle.available = available;
 	
 	
 	
 	if (isAdditionalVehicle){
-		zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).add(dieselVehicle);
+		zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).add(petroleumFuelVehicle);
 	}
 	else{
-		zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
+		zero_Interface.c_orderedVehicles.add(0, petroleumFuelVehicle);
 	}
 }
 
@@ -764,51 +764,51 @@ else if (vehicleType == OL_EnergyAssetType.DIESEL_VEHICLE || vehicleType == OL_E
 int f_setElectricVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,int setAmountOfVehicles)
 {/*ALCODESTART::1714411599586*/
 int local_EV_nb;
-int local_DieselV_nb;
+int local_PetroleumFuelV_nb;
 int local_HydrogenV_nb;
-int max_amount_diesel_vehicles;
+int max_amount_petroleumFuel_vehicles;
 
-OL_EnergyAssetType vehicleType_diesel;
+OL_EnergyAssetType vehicleType_petroleumFuel;
 OL_EnergyAssetType vehicleType_hydrogen;
 
 switch (vehicleType){
 	
 	case ELECTRIC_VEHICLE:
 
-	vehicleType_diesel = OL_EnergyAssetType.DIESEL_VEHICLE;
+	vehicleType_petroleumFuel = OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE;
 	vehicleType_hydrogen = OL_EnergyAssetType.HYDROGEN_VEHICLE;
 
 	local_EV_nb = v_nbEVCars;
-	local_DieselV_nb = v_nbDieselCars;
+	local_PetroleumFuelV_nb = v_nbPetroleumFuelCars;
 	local_HydrogenV_nb = v_nbHydrogenCars;
 	
-	max_amount_diesel_vehicles = v_maxDieselCarSlider;
+	max_amount_petroleumFuel_vehicles = v_maxPetroleumFuelCarSlider;
 	
 	break;
 	
 	case ELECTRIC_VAN:
 	
-	vehicleType_diesel = OL_EnergyAssetType.DIESEL_VAN;
+	vehicleType_petroleumFuel = OL_EnergyAssetType.PETROLEUM_FUEL_VAN;
 	vehicleType_hydrogen = OL_EnergyAssetType.HYDROGEN_VAN;
 	
 	local_EV_nb = v_nbEVVans;
-	local_DieselV_nb = v_nbDieselVans;
+	local_PetroleumFuelV_nb = v_nbPetroleumFuelVans;
 	local_HydrogenV_nb = v_nbHydrogenVans;
 	
-	max_amount_diesel_vehicles = v_maxDieselVanSlider;
+	max_amount_petroleumFuel_vehicles = v_maxPetroleumFuelVanSlider;
 	
 	break;
 	
 	case ELECTRIC_TRUCK:
 
-	vehicleType_diesel = OL_EnergyAssetType.DIESEL_TRUCK;
+	vehicleType_petroleumFuel = OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK;
 	vehicleType_hydrogen = OL_EnergyAssetType.HYDROGEN_TRUCK;
 	
 	local_EV_nb = v_nbEVTrucks;
-	local_DieselV_nb = v_nbDieselTrucks;
+	local_PetroleumFuelV_nb = v_nbPetroleumFuelTrucks;
 	local_HydrogenV_nb = v_nbHydrogenTrucks;
 	
-	max_amount_diesel_vehicles = v_maxDieselTruckSlider;
+	max_amount_petroleumFuel_vehicles = v_maxPetroleumFuelTruckSlider;
 		
 	break;
 	
@@ -821,27 +821,27 @@ int f_setElectricVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 if (setAmountOfVehicles > local_EV_nb){ // Slider has increased the amount of selected vehicles
 	
 	//First convert all other existing additional vehicles
-	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_diesel || p.energyAssetType == vehicleType_hydrogen).size();
+	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_petroleumFuel || p.energyAssetType == vehicleType_hydrogen).size();
 	while(setAmountOfVehicles > local_EV_nb && nbOfOtherAdditionalVehiclesOfThisClass > 0 ){
 		
-		// Find an additional Diesel vehicle
-		J_EAVehicle dieselVehicle = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_diesel);
+		// Find an additional PetroleumFuel vehicle
+		J_EAVehicle petroleumFuelVehicle = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_petroleumFuel);
 		
-		if(dieselVehicle != null){
-			J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
+		if(petroleumFuelVehicle != null){
+			J_ActivityTrackerTrips tripTracker = petroleumFuelVehicle.tripTracker;
 			
-			// Remove Diesel vehicle		
-			boolean available = dieselVehicle.getAvailability();
-			dieselVehicle.removeEnergyAsset();
-			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(dieselVehicle);
-			zero_Interface.c_orderedVehicles.remove(dieselVehicle);
+			// Remove PetroleumFuel vehicle		
+			boolean available = petroleumFuelVehicle.getAvailability();
+			petroleumFuelVehicle.removeEnergyAsset();
+			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(petroleumFuelVehicle);
+			zero_Interface.c_orderedVehicles.remove(petroleumFuelVehicle);
 			
 			//Create new additional EV
 			f_createVehicle(GC, vehicleType, tripTracker, available, true);			
 
 			//Update local variables
 			local_EV_nb++;
-			local_DieselV_nb--;
+			local_PetroleumFuelV_nb--;
 			nbOfOtherAdditionalVehiclesOfThisClass--;
 		}
 		else{
@@ -865,23 +865,23 @@ int f_setElectricVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 		}
 	}
 	
-	while ( setAmountOfVehicles > local_EV_nb && local_DieselV_nb > 0) {
+	while ( setAmountOfVehicles > local_EV_nb && local_PetroleumFuelV_nb > 0) {
 		
-		// Find a Diesel vehicle
-		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType_diesel && ((GridConnection)p.getParentAgent()) == GC);
-		J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker; 
+		// Find a PetroleumFuel vehicle
+		J_EAPetroleumFuelVehicle petroleumFuelVehicle = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType_petroleumFuel && ((GridConnection)p.getParentAgent()) == GC);
+		J_ActivityTrackerTrips tripTracker = petroleumFuelVehicle.tripTracker; 
 		
-		// Remove Diesel vehicle		
-		boolean available = dieselVehicle.getAvailability();
-		zero_Interface.c_orderedVehicles.remove(dieselVehicle);
-		dieselVehicle.removeEnergyAsset();
+		// Remove PetroleumFuel vehicle		
+		boolean available = petroleumFuelVehicle.getAvailability();
+		zero_Interface.c_orderedVehicles.remove(petroleumFuelVehicle);
+		petroleumFuelVehicle.removeEnergyAsset();
 
 		//Create new EV
 		f_createVehicle(GC, vehicleType, tripTracker, available, false);
 			
 		//Update variables
 		local_EV_nb++;
-		local_DieselV_nb--;
+		local_PetroleumFuelV_nb--;
 	}
 	while (setAmountOfVehicles > local_EV_nb && local_HydrogenV_nb > 0){
 	
@@ -928,7 +928,7 @@ else if(setAmountOfVehicles < local_EV_nb){ // Slider has decreased the amount o
 		//Update variable
 		local_EV_nb--;
 	}
-	while ( setAmountOfVehicles < local_EV_nb && local_DieselV_nb < max_amount_diesel_vehicles) {
+	while ( setAmountOfVehicles < local_EV_nb && local_PetroleumFuelV_nb < max_amount_petroleumFuel_vehicles) {
 
 		//Find a to be removed EV
 		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType && !zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).contains(p)  && ((GridConnection)p.getParentAgent()) == GC);
@@ -939,11 +939,11 @@ else if(setAmountOfVehicles < local_EV_nb){ // Slider has decreased the amount o
 		zero_Interface.c_orderedVehicles.remove(ev);
 		ev.removeEnergyAsset();
 		
-		// Create diesel vehicle	
-		f_createVehicle(GC, vehicleType_diesel, tripTracker, available, false);				
+		// Create petroleumFuel vehicle	
+		f_createVehicle(GC, vehicleType_petroleumFuel, tripTracker, available, false);				
 		
 		local_EV_nb--;
-		local_DieselV_nb++;
+		local_PetroleumFuelV_nb++;
 		}
 }
 
@@ -955,7 +955,7 @@ else if(setAmountOfVehicles < local_EV_nb){ // Slider has decreased the amount o
 	case ELECTRIC_VEHICLE:
 	
 	v_nbEVCars = local_EV_nb;
-	v_nbDieselCars = local_DieselV_nb;
+	v_nbPetroleumFuelCars = local_PetroleumFuelV_nb;
 	v_nbHydrogenCars = local_HydrogenV_nb;
 	
 	break;
@@ -963,7 +963,7 @@ else if(setAmountOfVehicles < local_EV_nb){ // Slider has decreased the amount o
 	case ELECTRIC_VAN:
 	
 	v_nbEVVans = local_EV_nb;
-	v_nbDieselVans = local_DieselV_nb;
+	v_nbPetroleumFuelVans = local_PetroleumFuelV_nb;
 	v_nbHydrogenVans = local_HydrogenV_nb;
 	
 	break;
@@ -971,17 +971,17 @@ else if(setAmountOfVehicles < local_EV_nb){ // Slider has decreased the amount o
 	case ELECTRIC_TRUCK:
 	
 	v_nbEVTrucks = local_EV_nb;
-	v_nbDieselTrucks = local_DieselV_nb;
+	v_nbPetroleumFuelTrucks = local_PetroleumFuelV_nb;
 	v_nbHydrogenTrucks = local_HydrogenV_nb;
 		
 	break;
 }
 /*ALCODEEND*/}
 
-int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,int setAmountOfVehicles)
+int f_setPetroleumFuelVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,int setAmountOfVehicles)
 {/*ALCODESTART::1714471183392*/
 int local_EV_nb;
-int local_DieselV_nb;
+int local_PetroleumFuelV_nb;
 int local_HydrogenV_nb;
 
 int min_amount_EV;
@@ -992,13 +992,13 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 	
 switch (vehicleType){
 	
-	case DIESEL_VEHICLE:
+	case PETROLEUM_FUEL_VEHICLE:
 
 	vehicleType_electric = OL_EnergyAssetType.ELECTRIC_VEHICLE;
 	vehicleType_hydrogen = OL_EnergyAssetType.HYDROGEN_VEHICLE;
 
 	local_EV_nb = v_nbEVCars;
-	local_DieselV_nb = v_nbDieselCars;
+	local_PetroleumFuelV_nb = v_nbPetroleumFuelCars;
 	local_HydrogenV_nb = v_nbHydrogenCars;
 	
 	min_amount_EV = v_minEVCarSlider;
@@ -1006,13 +1006,13 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 	
 	break;
 	
-	case DIESEL_VAN:
+	case PETROLEUM_FUEL_VAN:
 	
 	vehicleType_electric = OL_EnergyAssetType.ELECTRIC_VAN;
 	vehicleType_hydrogen = OL_EnergyAssetType.HYDROGEN_VAN;
 	
 	local_EV_nb = v_nbEVVans;
-	local_DieselV_nb = v_nbDieselVans;
+	local_PetroleumFuelV_nb = v_nbPetroleumFuelVans;
 	local_HydrogenV_nb = v_nbHydrogenVans;
 	
 	min_amount_EV = v_minEVVanSlider;
@@ -1020,13 +1020,13 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 	
 	break;
 	
-	case DIESEL_TRUCK:
+	case PETROLEUM_FUEL_TRUCK:
 
 	vehicleType_electric = OL_EnergyAssetType.ELECTRIC_TRUCK;
 	vehicleType_hydrogen = OL_EnergyAssetType.HYDROGEN_TRUCK;
 	
 	local_EV_nb = v_nbEVTrucks;
-	local_DieselV_nb = v_nbDieselTrucks;
+	local_PetroleumFuelV_nb = v_nbPetroleumFuelTrucks;
 	local_HydrogenV_nb = v_nbHydrogenTrucks;
 	
 	min_amount_EV = v_minEVTruckSlider;
@@ -1040,10 +1040,10 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 }
 
 
-if (setAmountOfVehicles > local_DieselV_nb){ // Slider has increased the amount of selected vehicles
+if (setAmountOfVehicles > local_PetroleumFuelV_nb){ // Slider has increased the amount of selected vehicles
 	//First convert all other existing additional vehicles
 	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_hydrogen || p.energyAssetType == vehicleType_electric).size();
-	while(setAmountOfVehicles > local_DieselV_nb && nbOfOtherAdditionalVehiclesOfThisClass > 0 ){
+	while(setAmountOfVehicles > local_PetroleumFuelV_nb && nbOfOtherAdditionalVehiclesOfThisClass > 0 ){
 
 		// Find an additional EV vehicle
 		J_EAVehicle ev = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_electric);
@@ -1057,11 +1057,11 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(ev);
 			zero_Interface.c_orderedVehicles.remove(ev);
 			
-			//Create new additional Diesel vehicle
+			//Create new additional PetroleumFuel vehicle
 			f_createVehicle(GC, vehicleType, tripTracker, available, true);
 
 			//Update local variables
-			local_DieselV_nb++;
+			local_PetroleumFuelV_nb++;
 			local_EV_nb--;
 			nbOfOtherAdditionalVehiclesOfThisClass--;
 		}
@@ -1076,16 +1076,16 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(hydrogenVehicle);
 			zero_Interface.c_orderedVehicles.remove(hydrogenVehicle);
 			
-			//Create new additional Diesel vehicle
+			//Create new additional PetroleumFuel vehicle
 			f_createVehicle(GC, vehicleType, tripTracker, available, true);
 
 			//Update local variables
-			local_DieselV_nb++;
+			local_PetroleumFuelV_nb++;
 			local_HydrogenV_nb--;
 			nbOfOtherAdditionalVehiclesOfThisClass--;
 		}
 	}
-	while ( setAmountOfVehicles > local_DieselV_nb && local_EV_nb > min_amount_EV) {
+	while ( setAmountOfVehicles > local_PetroleumFuelV_nb && local_EV_nb > min_amount_EV) {
 
 		// Find an EV
 		J_EAEV ev = (J_EAEV)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType_electric  && ((GridConnection)p.getParentAgent()) == GC);
@@ -1096,14 +1096,14 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 		zero_Interface.c_orderedVehicles.remove(ev);
 		ev.removeEnergyAsset();
 		
-		//Create new Diesel vehicle
+		//Create new PetroleumFuel vehicle
 		f_createVehicle(GC, vehicleType, tripTracker, available, false);
 			
 		//Update variables
-		local_DieselV_nb++;
+		local_PetroleumFuelV_nb++;
 		local_EV_nb--;
 	}
-	while (setAmountOfVehicles > local_DieselV_nb && local_HydrogenV_nb > 0){
+	while (setAmountOfVehicles > local_PetroleumFuelV_nb && local_HydrogenV_nb > 0){
 	
 		// Find a Hydrogen vehicle
 		J_EAHydrogenVehicle hydrogenVehicle = (J_EAHydrogenVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType_hydrogen  && ((GridConnection)p.getParentAgent()) == GC);
@@ -1114,53 +1114,53 @@ int f_setDieselVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,i
 		zero_Interface.c_orderedVehicles.remove(hydrogenVehicle);
 		hydrogenVehicle.removeEnergyAsset();
 		
-		//Create new Diesel vehicle
+		//Create new PetroleumFuel vehicle
 		f_createVehicle(GC, vehicleType, tripTracker, available, false);
 	
 		//Update variables
-		local_DieselV_nb++;
+		local_PetroleumFuelV_nb++;
 		local_HydrogenV_nb--;
 	}
-	while (setAmountOfVehicles > local_DieselV_nb){ // Create additional vehicles
+	while (setAmountOfVehicles > local_PetroleumFuelV_nb){ // Create additional vehicles
 	
 	f_createVehicle(GC, vehicleType, null, true, true);
 
-	local_DieselV_nb++;
+	local_PetroleumFuelV_nb++;
 	}
 }
-else if(setAmountOfVehicles < local_DieselV_nb){ // Slider has decreased the amount of selected vehicles
+else if(setAmountOfVehicles < local_PetroleumFuelV_nb){ // Slider has decreased the amount of selected vehicles
 	
 	ArrayList<J_EAVehicle> additionalVehicles = new ArrayList<J_EAVehicle>(findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), vehicle -> vehicle.energyAssetType == vehicleType ));
-	while(setAmountOfVehicles < local_DieselV_nb && additionalVehicles.size() > 0){ //Remove additional Diesel vehicles first
+	while(setAmountOfVehicles < local_PetroleumFuelV_nb && additionalVehicles.size() > 0){ //Remove additional PetroleumFuel vehicles first
 	
 	//Find additional created vehicle
-	J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)additionalVehicles.get(additionalVehicles.size()-1); // Get latest added
+	J_EAPetroleumFuelVehicle petroleumFuelVehicle = (J_EAPetroleumFuelVehicle)additionalVehicles.get(additionalVehicles.size()-1); // Get latest added
 	
-	// Remove diesel vehicle
-	additionalVehicles.remove(dieselVehicle);
-	zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(dieselVehicle);
-	dieselVehicle.removeEnergyAsset();
-	zero_Interface.c_orderedVehicles.remove(dieselVehicle);
+	// Remove petroleumFuel vehicle
+	additionalVehicles.remove(petroleumFuelVehicle);
+	zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(petroleumFuelVehicle);
+	petroleumFuelVehicle.removeEnergyAsset();
+	zero_Interface.c_orderedVehicles.remove(petroleumFuelVehicle);
 	
 	//Update variable
-	local_DieselV_nb--;
+	local_PetroleumFuelV_nb--;
 	}
-	while ( setAmountOfVehicles < local_DieselV_nb && local_EV_nb < max_amount_EV) {
+	while ( setAmountOfVehicles < local_PetroleumFuelV_nb && local_EV_nb < max_amount_EV) {
 	
-	// Find a to be removed Diesel vehicle
-		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType && !zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).contains(p)  && ((GridConnection)p.getParentAgent()) == GC);
-		J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
+	// Find a to be removed PetroleumFuel vehicle
+		J_EAPetroleumFuelVehicle petroleumFuelVehicle = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType && !zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).contains(p)  && ((GridConnection)p.getParentAgent()) == GC);
+		J_ActivityTrackerTrips tripTracker = petroleumFuelVehicle.tripTracker;
 		
-		// Remove diesel vehicle		
-		boolean available = dieselVehicle.getAvailability();
-		zero_Interface.c_orderedVehicles.remove(dieselVehicle);
-		dieselVehicle.removeEnergyAsset();
+		// Remove petroleumFuel vehicle		
+		boolean available = petroleumFuelVehicle.getAvailability();
+		zero_Interface.c_orderedVehicles.remove(petroleumFuelVehicle);
+		petroleumFuelVehicle.removeEnergyAsset();
 		
 		//Create new EV
 		f_createVehicle(GC, vehicleType_electric, tripTracker, available, false);
 			
 		//Update variables
-		local_DieselV_nb--;
+		local_PetroleumFuelV_nb--;
 		local_EV_nb++;
 	}
 }
@@ -1170,21 +1170,21 @@ else if(setAmountOfVehicles < local_DieselV_nb){ // Slider has decreased the amo
 //Update variables
 switch (vehicleType){
 	
-	case DIESEL_VEHICLE:
+	case PETROLEUM_FUEL_VEHICLE:
 	v_nbEVCars = local_EV_nb;
-	v_nbDieselCars = local_DieselV_nb;
+	v_nbPetroleumFuelCars = local_PetroleumFuelV_nb;
 	v_nbHydrogenCars = local_HydrogenV_nb;
 	break;
 	
-	case DIESEL_VAN:
+	case PETROLEUM_FUEL_VAN:
 	v_nbEVVans = local_EV_nb;
-	v_nbDieselVans = local_DieselV_nb;
+	v_nbPetroleumFuelVans = local_PetroleumFuelV_nb;
 	v_nbHydrogenVans = local_HydrogenV_nb;
 	break;
 	
-	case DIESEL_TRUCK:
+	case PETROLEUM_FUEL_TRUCK:
 	v_nbEVTrucks = local_EV_nb;
-	v_nbDieselTrucks = local_DieselV_nb;
+	v_nbPetroleumFuelTrucks = local_PetroleumFuelV_nb;
 	v_nbHydrogenTrucks = local_HydrogenV_nb;
 	break;
 }
@@ -1193,24 +1193,24 @@ else if(setAmountOfVehicles < local_DieselV_nb){ // Slider has decreased the amo
 int f_setHydrogenVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType,int setAmountOfVehicles)
 {/*ALCODESTART::1714474430338*/
 int local_EV_nb;
-int local_DieselV_nb;
+int local_PetroleumFuelV_nb;
 int local_HydrogenV_nb;
 
 int min_amount_EV;
 int	max_amount_EV;
 
 OL_EnergyAssetType vehicleType_electric;
-OL_EnergyAssetType vehicleType_diesel;
+OL_EnergyAssetType vehicleType_petroleumFuel;
 	
 switch (vehicleType){
 	
 	case HYDROGEN_VEHICLE:
 
 	vehicleType_electric = OL_EnergyAssetType.ELECTRIC_VEHICLE;
-	vehicleType_diesel = OL_EnergyAssetType.DIESEL_VEHICLE;
+	vehicleType_petroleumFuel = OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE;
 
 	local_EV_nb = v_nbEVCars;
-	local_DieselV_nb = v_nbDieselCars;
+	local_PetroleumFuelV_nb = v_nbPetroleumFuelCars;
 	local_HydrogenV_nb = v_nbHydrogenCars;
 	
 	min_amount_EV = v_minEVCarSlider;
@@ -1221,10 +1221,10 @@ int f_setHydrogenVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 	case HYDROGEN_VAN:
 	
 	vehicleType_electric = OL_EnergyAssetType.ELECTRIC_VAN;
-	vehicleType_diesel = OL_EnergyAssetType.DIESEL_VAN;
+	vehicleType_petroleumFuel = OL_EnergyAssetType.PETROLEUM_FUEL_VAN;
 	
 	local_EV_nb = v_nbEVVans;
-	local_DieselV_nb = v_nbDieselVans;
+	local_PetroleumFuelV_nb = v_nbPetroleumFuelVans;
 	local_HydrogenV_nb = v_nbHydrogenVans;
 	
 	min_amount_EV = v_minEVVanSlider;
@@ -1235,10 +1235,10 @@ int f_setHydrogenVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 	case HYDROGEN_TRUCK:
 
 	vehicleType_electric = OL_EnergyAssetType.ELECTRIC_TRUCK;
-	vehicleType_diesel = OL_EnergyAssetType.DIESEL_TRUCK;
+	vehicleType_petroleumFuel = OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK;
 	
 	local_EV_nb = v_nbEVTrucks;
-	local_DieselV_nb = v_nbDieselTrucks;
+	local_PetroleumFuelV_nb = v_nbPetroleumFuelTrucks;
 	local_HydrogenV_nb = v_nbHydrogenTrucks;
 	
 	min_amount_EV = v_minEVTruckSlider;
@@ -1254,27 +1254,27 @@ int f_setHydrogenVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 if (setAmountOfVehicles > local_HydrogenV_nb){ // Slider has increased the amount of selected vehicles
 	
 	//First convert all other existing additional vehicles
-	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_diesel || p.energyAssetType == vehicleType_electric).size();
+	int nbOfOtherAdditionalVehiclesOfThisClass = findAll(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_petroleumFuel || p.energyAssetType == vehicleType_electric).size();
 	while(setAmountOfVehicles > local_HydrogenV_nb && nbOfOtherAdditionalVehiclesOfThisClass > 0 ){
 		
-		// Find an additional Diesel vehicle
-		J_EAVehicle dieselVehicle = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_diesel);
+		// Find an additional PetroleumFuel vehicle
+		J_EAVehicle petroleumFuelVehicle = findFirst(zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid), p -> p.energyAssetType == vehicleType_petroleumFuel);
 		
-		if(dieselVehicle != null){
-			J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
+		if(petroleumFuelVehicle != null){
+			J_ActivityTrackerTrips tripTracker = petroleumFuelVehicle.tripTracker;
 			
-			// Remove Diesel vehicle		
-			boolean available = dieselVehicle.getAvailability();
-			dieselVehicle.removeEnergyAsset();
-			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(dieselVehicle);
-			zero_Interface.c_orderedVehicles.remove(dieselVehicle);
+			// Remove PetroleumFuel vehicle		
+			boolean available = petroleumFuelVehicle.getAvailability();
+			petroleumFuelVehicle.removeEnergyAsset();
+			zero_Interface.c_additionalVehicles.get(p_gridConnection.p_uid).remove(petroleumFuelVehicle);
+			zero_Interface.c_orderedVehicles.remove(petroleumFuelVehicle);
 			
 			//Create new additional Hydrogen vehicle
 			f_createVehicle(GC, vehicleType, tripTracker, available, true);			
 
 			//Update local variables
 			local_HydrogenV_nb++;
-			local_DieselV_nb--;
+			local_PetroleumFuelV_nb--;
 			nbOfOtherAdditionalVehiclesOfThisClass--;
 		}
 		else{
@@ -1297,23 +1297,23 @@ int f_setHydrogenVehicleSliders(GridConnection GC,OL_EnergyAssetType vehicleType
 			nbOfOtherAdditionalVehiclesOfThisClass--;
 		}
 	}
-	while ( setAmountOfVehicles > local_HydrogenV_nb && local_DieselV_nb > 0) {
+	while ( setAmountOfVehicles > local_HydrogenV_nb && local_PetroleumFuelV_nb > 0) {
 
-		// Find a to be removed Diesel vehicle
-		J_EADieselVehicle dieselVehicle = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType_diesel  && ((GridConnection)p.getParentAgent()) == GC);
-		J_ActivityTrackerTrips tripTracker = dieselVehicle.tripTracker;
+		// Find a to be removed PetroleumFuel vehicle
+		J_EAPetroleumFuelVehicle petroleumFuelVehicle = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == vehicleType_petroleumFuel  && ((GridConnection)p.getParentAgent()) == GC);
+		J_ActivityTrackerTrips tripTracker = petroleumFuelVehicle.tripTracker;
 
-		//Remove diesel vehicle
-		boolean available = dieselVehicle.getAvailability();
-		zero_Interface.c_orderedVehicles.remove(dieselVehicle);
-		dieselVehicle.removeEnergyAsset();
+		//Remove petroleumFuel vehicle
+		boolean available = petroleumFuelVehicle.getAvailability();
+		zero_Interface.c_orderedVehicles.remove(petroleumFuelVehicle);
+		petroleumFuelVehicle.removeEnergyAsset();
 		
 		//Create new Hydrogen vehicle
 		f_createVehicle(GC, vehicleType, tripTracker, available, false);
 			
 		//Update variables
 		local_HydrogenV_nb++;
-		local_DieselV_nb--;
+		local_PetroleumFuelV_nb--;
 		
 	}
 	while (setAmountOfVehicles > local_HydrogenV_nb && local_EV_nb > min_amount_EV){
@@ -1385,7 +1385,7 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 	case HYDROGEN_VEHICLE:
 	
 	v_nbEVCars = local_EV_nb;
-	v_nbDieselCars = local_DieselV_nb;
+	v_nbPetroleumFuelCars = local_PetroleumFuelV_nb;
 	v_nbHydrogenCars = local_HydrogenV_nb;
 	
 	break;
@@ -1393,7 +1393,7 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 	case HYDROGEN_VAN:
 	
 	v_nbEVVans = local_EV_nb;
-	v_nbDieselVans = local_DieselV_nb;
+	v_nbPetroleumFuelVans = local_PetroleumFuelV_nb;
 	v_nbHydrogenVans = local_HydrogenV_nb;
 	
 	break;
@@ -1401,7 +1401,7 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 	case HYDROGEN_TRUCK:
 	
 	v_nbEVTrucks = local_EV_nb;
-	v_nbDieselTrucks = local_DieselV_nb;
+	v_nbPetroleumFuelTrucks = local_PetroleumFuelV_nb;
 	v_nbHydrogenTrucks = local_HydrogenV_nb;
 	
 	break;
@@ -1660,15 +1660,15 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 //Find the current number of vehicles for each type
 int nbEcarsCurrent = count(p_gridConnection.c_electricVehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE);
 int nbHydrogencarsCurrent = count(p_gridConnection.c_hydrogenVehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VEHICLE);
-int nbDieselcarsCurrent = count(p_gridConnection.c_dieselVehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE);
+int nbPetroleumFuelcarsCurrent = count(p_gridConnection.c_petroleumFuelVehicles, p->p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE);
 
 int nbEvansCurrent = count(p_gridConnection.c_electricVehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN);
 int nbHydrogenvansCurrent = count(p_gridConnection.c_hydrogenVehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN);
-int nbDieselvansCurrent = count(p_gridConnection.c_dieselVehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN);
+int nbPetroleumFuelvansCurrent = count(p_gridConnection.c_petroleumFuelVehicles, p->p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN);
 
 int nbEtrucksCurrent = count(p_gridConnection.c_electricVehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK);
 int nbHydrogentrucksCurrent = count(p_gridConnection.c_hydrogenVehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
-int nbDieseltrucksCurrent = count(p_gridConnection.c_dieselVehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
+int nbPetroleumFueltrucksCurrent = count(p_gridConnection.c_petroleumFuelVehicles, p->p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK);
 
 //Check on electric cars, cause for companies that have quarterlyhour electricity data, the initial ea for EV (and other electric appliances) are not made.
 if (p_gridConnection.v_hasQuarterHourlyValues){
@@ -1716,31 +1716,31 @@ else if(setAmountOfVehicles < local_HydrogenV_nb){ // Slider has decreased the a
 //Cars 
 sl_electricCarsCompany.setValue(nbEcarsCurrent, false);
 sl_hydrogenCarsCompany.setValue(nbHydrogencarsCurrent, false);
-sl_dieselCarsCompany.setValue(nbDieselcarsCurrent, false);
+sl_petroleumFuelCarsCompany.setValue(nbPetroleumFuelcarsCurrent, false);
 
 v_nbEVCars = nbEcarsCurrent;
 v_nbHydrogenCars = nbHydrogencarsCurrent;
-v_nbDieselCars = nbDieselcarsCurrent;
+v_nbPetroleumFuelCars = nbPetroleumFuelcarsCurrent;
 
 
 //Vans
 sl_electricVansCompany.setValue(nbEvansCurrent, false);
 sl_hydrogenVansCompany.setValue(nbHydrogenvansCurrent, false);
-sl_dieselVansCompany.setValue(nbDieselvansCurrent, false);
+sl_petroleumFuelVansCompany.setValue(nbPetroleumFuelvansCurrent, false);
 
 v_nbEVVans = nbEvansCurrent;
 v_nbHydrogenVans = nbHydrogenvansCurrent;
-v_nbDieselVans = nbDieselvansCurrent;
+v_nbPetroleumFuelVans = nbPetroleumFuelvansCurrent;
 
 
 //Trucks
 sl_electricTrucksCompany.setValue(nbEtrucksCurrent, false);
 sl_hydrogenTrucksCompany.setValue(nbHydrogentrucksCurrent, false);
-sl_dieselTrucksCompany.setValue(nbDieseltrucksCurrent, false);
+sl_petroleumFuelTrucksCompany.setValue(nbPetroleumFueltrucksCurrent, false);
 
 v_nbEVTrucks = nbEtrucksCurrent;
 v_nbHydrogenTrucks = nbHydrogentrucksCurrent;
-v_nbDieselTrucks = nbDieseltrucksCurrent;
+v_nbPetroleumFuelTrucks = nbPetroleumFueltrucksCurrent;
 
 //Add nfato again
 p_gridConnection.f_nfatoSetConnectionCapacity(false);
@@ -1906,15 +1906,15 @@ else if(v_NFATO_kW_feedin < 0){
 
 sl_electricCarsCompany.setEnabled(enable);
 sl_hydrogenCarsCompany.setEnabled(enable);
-sl_dieselCarsCompany.setEnabled(enable);
+sl_petroleumFuelCarsCompany.setEnabled(enable);
 
 sl_electricVansCompany.setEnabled(enable);
 sl_hydrogenVansCompany.setEnabled(enable);
-sl_dieselVansCompany.setEnabled(enable);
+sl_petroleumFuelVansCompany.setEnabled(enable);
 
 sl_electricTrucksCompany.setEnabled(enable);
 sl_hydrogenTrucksCompany.setEnabled(enable);
-sl_dieselTrucksCompany.setEnabled(enable);
+sl_petroleumFuelTrucksCompany.setEnabled(enable);
 
 // Disabled / Invisible heating based on current scenario settings
 if (enable) {
diff --git a/_alp/Agents/UI_company/Code/Functions.xml b/_alp/Agents/UI_company/Code/Functions.xml
index 1bf98bf..f4d7db6 100644
--- a/_alp/Agents/UI_company/Code/Functions.xml
+++ b/_alp/Agents/UI_company/Code/Functions.xml
@@ -349,7 +349,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>int</ReturnType>
 		<Id>1714471183392</Id>
-		<Name><![CDATA[f_setDieselVehicleSliders]]></Name>
+		<Name><![CDATA[f_setPetroleumFuelVehicleSliders]]></Name>
 		<X>-430</X>
 		<Y>630</Y>
 		<Label>
diff --git a/_alp/Agents/UI_company/Levels/Level.level.xml b/_alp/Agents/UI_company/Levels/Level.level.xml
index 6fde94f..372c8ef 100644
--- a/_alp/Agents/UI_company/Levels/Level.level.xml
+++ b/_alp/Agents/UI_company/Levels/Level.level.xml
@@ -906,7 +906,7 @@ f_setElectricVehicleSliders(p_gridConnection, OL_EnergyAssetType.ELECTRIC_VAN, (
 
 //Update the other two sliders aswell
 sl_hydrogenVansCompany.setValue(v_nbHydrogenVans, false);
-sl_dieselVansCompany.setValue(v_nbDieselVans, false);
+sl_petroleumFuelVansCompany.setValue(v_nbPetroleumFuelVans, false);
 
 //Set scenario to custom
 f_setScenario(2);
@@ -997,7 +997,7 @@ f_setHydrogenVehicleSliders(p_gridConnection, OL_EnergyAssetType.HYDROGEN_VAN, (
 
 //Update the other two sliders aswell
 sl_electricVansCompany.setValue(v_nbEVVans, false);
-sl_dieselVansCompany.setValue(v_nbDieselVans, false);
+sl_petroleumFuelVansCompany.setValue(v_nbPetroleumFuelVans, false);
 
 //Set scenario to custom
 f_setScenario(2);
@@ -1069,7 +1069,7 @@ f_setSimulateYearScreen();</ActionCode>
 					<Control Type="Slider">
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Id>1713446839201</Id>
-						<Name><![CDATA[sl_dieselVansCompany]]></Name>
+						<Name><![CDATA[sl_petroleumFuelVansCompany]]></Name>
 						<X>62</X>
 						<Y>47</Y>
 						<Label>
@@ -1084,7 +1084,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setDieselVehicleSliders(p_gridConnection, OL_EnergyAssetType.DIESEL_VAN, (int)sl_dieselVansCompany.getValue());
+f_setPetroleumFuelVehicleSliders(p_gridConnection, OL_EnergyAssetType.PETROLEUM_FUEL_VAN, (int)sl_petroleumFuelVansCompany.getValue());
 
 //Update the other two sliders aswell
 sl_electricVansCompany.setValue(v_nbEVVans, false);
@@ -1097,13 +1097,13 @@ f_setScenario(2);
 f_setSimulateYearScreen();</ActionCode>
 						</BasicProperties>
 						<ExtendedProperties>
-							<DefaultValueCode>v_nbDieselVans</DefaultValueCode>
+							<DefaultValueCode>v_nbPetroleumFuelVans</DefaultValueCode>
 							<Orientation>HORIZONTAL</Orientation>
-							<MinValue>v_minDieselVanSlider</MinValue>
-							<MaxValue>v_maxDieselVanSlider</MaxValue>
+							<MinValue>v_minPetroleumFuelVanSlider</MinValue>
+							<MaxValue>v_maxPetroleumFuelVanSlider</MaxValue>
 							<Step>1</Step>
 							<LinkTo>false</LinkTo>
-							<Link>v_nbDieselVans</Link>
+							<Link>v_nbPetroleumFuelVans</Link>
 						</ExtendedProperties>
 					</Control>
 					<Text>
@@ -1133,7 +1133,7 @@ f_setSimulateYearScreen();</ActionCode>
 					</Text>
 					<Text>
 						<Id>1713446839205</Id>
-						<Name><![CDATA[t_numberOfDieselVansCompany]]></Name>
+						<Name><![CDATA[t_numberOfPetroleumFuelVansCompany]]></Name>
 						<X>35</X>
 						<Y>50</Y>
 						<Label>
@@ -1149,7 +1149,7 @@ f_setSimulateYearScreen();</ActionCode>
 						<Rotation>0.0</Rotation>
 						<Color>-16777216</Color>
 						<Text><![CDATA[0]]></Text>
-						<TextCode>sl_dieselVansCompany.getIntValue()</TextCode>
+						<TextCode>sl_petroleumFuelVansCompany.getIntValue()</TextCode>
 						<Font>
 							<Name><![CDATA[Dialog]]></Name>
 							<Size>14</Size>
@@ -1184,7 +1184,7 @@ f_setSimulateYearScreen();</ActionCode>
 					</Text>
 					<Text>
 						<Id>1713446857516</Id>
-						<Name><![CDATA[t_numberOfDieselTrucksCompany]]></Name>
+						<Name><![CDATA[t_numberOfPetroleumFuelTrucksCompany]]></Name>
 						<X>35</X>
 						<Y>145</Y>
 						<Label>
@@ -1200,7 +1200,7 @@ f_setSimulateYearScreen();</ActionCode>
 						<Rotation>0.0</Rotation>
 						<Color>-16777216</Color>
 						<Text><![CDATA[0]]></Text>
-						<TextCode>sl_dieselTrucksCompany.getIntValue()</TextCode>
+						<TextCode>sl_petroleumFuelTrucksCompany.getIntValue()</TextCode>
 						<Font>
 							<Name><![CDATA[Dialog]]></Name>
 							<Size>14</Size>
@@ -1356,7 +1356,7 @@ f_setHydrogenVehicleSliders(p_gridConnection, OL_EnergyAssetType.HYDROGEN_TRUCK,
 
 //Update the other two sliders aswell
 sl_electricTrucksCompany.setValue(v_nbEVTrucks, false);
-sl_dieselTrucksCompany.setValue(v_nbDieselTrucks, false);
+sl_petroleumFuelTrucksCompany.setValue(v_nbPetroleumFuelTrucks, false);
 
 //Set scenario to custom
 f_setScenario(2);
@@ -1422,7 +1422,7 @@ f_setElectricVehicleSliders(p_gridConnection, OL_EnergyAssetType.ELECTRIC_TRUCK,
 
 //Update the other two sliders aswell
 sl_hydrogenTrucksCompany.setValue(v_nbHydrogenTrucks, false);
-sl_dieselTrucksCompany.setValue(v_nbDieselTrucks, false);
+sl_petroleumFuelTrucksCompany.setValue(v_nbPetroleumFuelTrucks, false);
 
 //Set scenario to custom
 f_setScenario(2);
@@ -1443,7 +1443,7 @@ f_setSimulateYearScreen();</ActionCode>
 					<Control Type="Slider">
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Id>1713446857526</Id>
-						<Name><![CDATA[sl_dieselTrucksCompany]]></Name>
+						<Name><![CDATA[sl_petroleumFuelTrucksCompany]]></Name>
 						<X>62</X>
 						<Y>142</Y>
 						<Label>
@@ -1458,7 +1458,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setDieselVehicleSliders(p_gridConnection, OL_EnergyAssetType.DIESEL_TRUCK, (int)sl_dieselTrucksCompany.getValue());
+f_setPetroleumFuelVehicleSliders(p_gridConnection, OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK, (int)sl_petroleumFuelTrucksCompany.getValue());
 
 //Update the other two sliders aswell
 sl_electricTrucksCompany.setValue(v_nbEVTrucks, false);
@@ -1471,13 +1471,13 @@ f_setScenario(2);
 f_setSimulateYearScreen();</ActionCode>
 						</BasicProperties>
 						<ExtendedProperties>
-							<DefaultValueCode>v_nbDieselTrucks</DefaultValueCode>
+							<DefaultValueCode>v_nbPetroleumFuelTrucks</DefaultValueCode>
 							<Orientation>HORIZONTAL</Orientation>
-							<MinValue>v_minDieselTruckSlider</MinValue>
-							<MaxValue>v_maxDieselTruckSlider</MaxValue>
+							<MinValue>v_minPetroleumFuelTruckSlider</MinValue>
+							<MaxValue>v_maxPetroleumFuelTruckSlider</MaxValue>
 							<Step>1</Step>
 							<LinkTo>false</LinkTo>
-							<Link>v_nbDieselTrucks</Link>
+							<Link>v_nbPetroleumFuelTrucks</Link>
 						</ExtendedProperties>
 					</Control>
 					<Control Type="Slider">
@@ -1502,7 +1502,7 @@ f_setElectricVehicleSliders(p_gridConnection, OL_EnergyAssetType.ELECTRIC_VEHICL
 
 //Update the other two sliders aswell
 sl_hydrogenCarsCompany.setValue(v_nbHydrogenCars, false);
-sl_dieselCarsCompany.setValue(v_nbDieselCars, false);
+sl_petroleumFuelCarsCompany.setValue(v_nbPetroleumFuelCars, false);
 
 //Set scenario to custom
 f_setScenario(2);
@@ -1678,7 +1678,7 @@ f_setHydrogenVehicleSliders(p_gridConnection, OL_EnergyAssetType.HYDROGEN_VEHICL
 
 //Update the other two sliders aswell
 sl_electricCarsCompany.setValue(v_nbEVCars, false);
-sl_dieselCarsCompany.setValue(v_nbDieselCars, false);
+sl_petroleumFuelCarsCompany.setValue(v_nbPetroleumFuelCars, false);
 
 //Set scenario to custom
 f_setScenario(2);
@@ -1750,7 +1750,7 @@ f_setSimulateYearScreen();</ActionCode>
 					<Control Type="Slider">
 						<EmbeddedIcon>false</EmbeddedIcon>
 						<Id>1713446065933</Id>
-						<Name><![CDATA[sl_dieselCarsCompany]]></Name>
+						<Name><![CDATA[sl_petroleumFuelCarsCompany]]></Name>
 						<X>62</X>
 						<Y>-54</Y>
 						<Label>
@@ -1765,7 +1765,7 @@ f_setSimulateYearScreen();</ActionCode>
 							<EmbeddedIcon>false</EmbeddedIcon>
 							<Enabled>true</Enabled>
 							<ActionCode>//Slider function
-f_setDieselVehicleSliders(p_gridConnection, OL_EnergyAssetType.DIESEL_VEHICLE, (int)sl_dieselCarsCompany.getValue());
+f_setPetroleumFuelVehicleSliders(p_gridConnection, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, (int)sl_petroleumFuelCarsCompany.getValue());
 
 //Update the other two sliders aswell
 sl_electricCarsCompany.setValue(v_nbEVCars, false);
@@ -1778,13 +1778,13 @@ f_setScenario(2);
 f_setSimulateYearScreen();</ActionCode>
 						</BasicProperties>
 						<ExtendedProperties>
-							<DefaultValueCode>v_nbDieselCars</DefaultValueCode>
+							<DefaultValueCode>v_nbPetroleumFuelCars</DefaultValueCode>
 							<Orientation>HORIZONTAL</Orientation>
-							<MinValue>v_minDieselCarSlider</MinValue>
-							<MaxValue>v_maxDieselCarSlider</MaxValue>
+							<MinValue>v_minPetroleumFuelCarSlider</MinValue>
+							<MaxValue>v_maxPetroleumFuelCarSlider</MaxValue>
 							<Step>1</Step>
 							<LinkTo>false</LinkTo>
-							<Link>v_nbDieselCars</Link>
+							<Link>v_nbPetroleumFuelCars</Link>
 						</ExtendedProperties>
 					</Control>
 					<Text>
@@ -1814,7 +1814,7 @@ f_setSimulateYearScreen();</ActionCode>
 					</Text>
 					<Text>
 						<Id>1713446065937</Id>
-						<Name><![CDATA[t_numberOfDieselCarsCompany]]></Name>
+						<Name><![CDATA[t_numberOfPetroleumFuelCarsCompany]]></Name>
 						<X>35</X>
 						<Y>-50</Y>
 						<Label>
@@ -1830,7 +1830,7 @@ f_setSimulateYearScreen();</ActionCode>
 						<Rotation>0.0</Rotation>
 						<Color>-16777216</Color>
 						<Text><![CDATA[0]]></Text>
-						<TextCode>sl_dieselCarsCompany.getIntValue()</TextCode>
+						<TextCode>sl_petroleumFuelCarsCompany.getIntValue()</TextCode>
 						<Font>
 							<Name><![CDATA[Dialog]]></Name>
 							<Size>14</Size>
diff --git a/_alp/Agents/UI_company/Variables.xml b/_alp/Agents/UI_company/Variables.xml
index 6547493..48e572b 100644
--- a/_alp/Agents/UI_company/Variables.xml
+++ b/_alp/Agents/UI_company/Variables.xml
@@ -222,7 +222,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1714139299844</Id>
-		<Name><![CDATA[v_nbDieselCars]]></Name>
+		<Name><![CDATA[v_nbPetroleumFuelCars]]></Name>
 		<X>-1050</X>
 		<Y>750</Y>
 		<Label>
@@ -288,7 +288,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1714139381294</Id>
-		<Name><![CDATA[v_nbDieselVans]]></Name>
+		<Name><![CDATA[v_nbPetroleumFuelVans]]></Name>
 		<X>-1050</X>
 		<Y>950</Y>
 		<Label>
@@ -310,7 +310,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1714139385293</Id>
-		<Name><![CDATA[v_nbDieselTrucks]]></Name>
+		<Name><![CDATA[v_nbPetroleumFuelTrucks]]></Name>
 		<X>-1050</X>
 		<Y>1150</Y>
 		<Label>
@@ -442,7 +442,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1714140007855</Id>
-		<Name><![CDATA[v_minDieselCarSlider]]></Name>
+		<Name><![CDATA[v_minPetroleumFuelCarSlider]]></Name>
 		<X>-1050</X>
 		<Y>630</Y>
 		<Label>
@@ -486,7 +486,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1714140056511</Id>
-		<Name><![CDATA[v_maxDieselCarSlider]]></Name>
+		<Name><![CDATA[v_maxPetroleumFuelCarSlider]]></Name>
 		<X>-1050</X>
 		<Y>690</Y>
 		<Label>
@@ -574,7 +574,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1714141906268</Id>
-		<Name><![CDATA[v_minDieselVanSlider]]></Name>
+		<Name><![CDATA[v_minPetroleumFuelVanSlider]]></Name>
 		<X>-1050</X>
 		<Y>830</Y>
 		<Label>
@@ -618,7 +618,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1714141906272</Id>
-		<Name><![CDATA[v_maxDieselVanSlider]]></Name>
+		<Name><![CDATA[v_maxPetroleumFuelVanSlider]]></Name>
 		<X>-1050</X>
 		<Y>890</Y>
 		<Label>
@@ -706,7 +706,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1714142030267</Id>
-		<Name><![CDATA[v_minDieselTruckSlider]]></Name>
+		<Name><![CDATA[v_minPetroleumFuelTruckSlider]]></Name>
 		<X>-1050</X>
 		<Y>1030</Y>
 		<Label>
@@ -728,7 +728,7 @@
 	</Variable>
 	<Variable Class="PlainVariable">
 		<Id>1714142030269</Id>
-		<Name><![CDATA[v_maxDieselTruckSlider]]></Name>
+		<Name><![CDATA[v_maxPetroleumFuelTruckSlider]]></Name>
 		<X>-1050</X>
 		<Y>1090</Y>
 		<Label>
diff --git a/_alp/Agents/Zero_Interface/Code/Functions.java b/_alp/Agents/Zero_Interface/Code/Functions.java
index 32bf3ef..7d4e2e3 100644
--- a/_alp/Agents/Zero_Interface/Code/Functions.java
+++ b/_alp/Agents/Zero_Interface/Code/Functions.java
@@ -2848,13 +2848,13 @@ ArrayList<GridConnection> f_updateJ_EAlistAfterDeserialisation(ArrayList<J_EA> E
 {/*ALCODESTART::1753882411689*/
 //Get all public and private parked cars
 c_orderedVehiclesPrivateParking = new ArrayList<J_EAVehicle>();
-List<J_EADieselVehicle> allPublicParkedCars = new ArrayList<J_EADieselVehicle>();
+List<J_EAPetroleumFuelVehicle> allPublicParkedCars = new ArrayList<J_EAPetroleumFuelVehicle>();
 for (GCHouse house : energyModel.Houses) {
 	if (house.p_eigenOprit) {
 		c_orderedVehiclesPrivateParking.addAll(house.c_vehicleAssets);
 	}
 	else{
-		allPublicParkedCars.addAll(house.c_dieselVehicles);	
+		allPublicParkedCars.addAll(house.c_petroleumFuelVehicles);	
 	}
 }
 
@@ -2876,12 +2876,12 @@ ArrayList<GridConnection> f_updateJ_EAlistAfterDeserialisation(ArrayList<J_EA> E
 	    GCPublicCharger charger = c_orderedPublicChargers.get(i);
 	    int numberOfCars = numberOfCarsPerCharger.get(i);
 	
-	    List<J_EADieselVehicle> assignedCars = new ArrayList<>(allPublicParkedCars.subList(index, index + numberOfCars));
+	    List<J_EAPetroleumFuelVehicle> assignedCars = new ArrayList<>(allPublicParkedCars.subList(index, index + numberOfCars));
 	    c_mappingOfVehiclesPerCharger.put(charger.p_uid, assignedCars);
 	
 	    // Place vehicles depending on whether the charger is active
 	    if (charger.v_isActive) {
-	        for (J_EADieselVehicle car : assignedCars) {
+	        for (J_EAPetroleumFuelVehicle car : assignedCars) {
 	           	J_ActivityTrackerTrips tripTracker = car.getTripTracker(); //Needed, as triptracker is removed when removeEnergyAsset is called.
 				car.removeEnergyAsset();
 				car.setTripTracker(tripTracker);//Re-set the triptracker again, for storing.
diff --git a/_alp/Agents/Zero_Interface/Variables.xml b/_alp/Agents/Zero_Interface/Variables.xml
index eef922f..ac2021d 100644
--- a/_alp/Agents/Zero_Interface/Variables.xml
+++ b/_alp/Agents/Zero_Interface/Variables.xml
@@ -3501,7 +3501,7 @@ OL_FilterOptionsGC.MANUAL_SELECTION, "Handmatige selectie"
 		<Properties SaveInSnapshot="true" AccessType="public" StaticVariable="false">
 			<CollectionClass>LinkedHashMap</CollectionClass>
 			<ElementClass>String</ElementClass>
-			<ValueElementClass>List&lt;J_EADieselVehicle&gt;</ValueElementClass>
+			<ValueElementClass>List&lt;J_EAPetroleumFuelVehicle&gt;</ValueElementClass>
 		</Properties>
 	</Variable>
 	<Variable Class="CollectionVariable">
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index 779d268..1ce7369 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -1352,39 +1352,39 @@ else if (vehicle_type == OL_EnergyAssetType.ELECTRIC_VAN){
 return electricVehicle;
 /*ALCODEEND*/}
 
-J_EADieselVehicle f_addDieselVehicle(GridConnection parentGC,OL_EnergyAssetType vehicle_type,Boolean isDefaultVehicle,double annualTravelDistance_km)
+J_EAPetroleumFuelVehicle f_addPetroleumFuelVehicle(GridConnection parentGC,OL_EnergyAssetType vehicle_type,Boolean isDefaultVehicle,double annualTravelDistance_km)
 {/*ALCODESTART::1726584205829*/
 double energyConsumption_kWhpkm = 0;
 double vehicleScaling = 1.0;
 
-//Diesel car
+//PetroleumFuel car
 switch (vehicle_type){
 	
-	case DIESEL_VEHICLE:
-		energyConsumption_kWhpkm = roundToDecimal(uniform(0.7, 1.3),2) * avgc_data.p_avgDieselConsumptionCar_kWhpkm;
+	case PETROLEUM_FUEL_VEHICLE:
+		energyConsumption_kWhpkm = roundToDecimal(uniform(0.7, 1.3),2) * avgc_data.p_avgPetroleumFuelConsumptionCar_kWhpkm;
 	break;
 	
-	case DIESEL_VAN:
-		energyConsumption_kWhpkm = avgc_data.p_avgDieselConsumptionVan_kWhpkm;
+	case PETROLEUM_FUEL_VAN:
+		energyConsumption_kWhpkm = avgc_data.p_avgPetroleumFuelConsumptionVan_kWhpkm;
 	break;
 	
-	case DIESEL_TRUCK:
-		energyConsumption_kWhpkm = avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
+	case PETROLEUM_FUEL_TRUCK:
+		energyConsumption_kWhpkm = avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
 	break;
 }
 
 //Create EA
-J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(parentGC, energyConsumption_kWhpkm, energyModel.p_timeStep_h, vehicleScaling, vehicle_type, null);
+J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(parentGC, energyConsumption_kWhpkm, energyModel.p_timeStep_h, vehicleScaling, vehicle_type, null);
 
 //Set annual travel distance
 if (!isDefaultVehicle && annualTravelDistance_km > 1000){
-		dieselVehicle.tripTracker.setAnnualDistance_km(annualTravelDistance_km);
+		petroleumFuelVehicle.tripTracker.setAnnualDistance_km(annualTravelDistance_km);
 }
-else if (vehicle_type == OL_EnergyAssetType.DIESEL_VAN){
-		dieselVehicle.tripTracker.setAnnualDistance_km(avgc_data.p_avgAnnualTravelDistanceVan_km);
+else if (vehicle_type == OL_EnergyAssetType.PETROLEUM_FUEL_VAN){
+		petroleumFuelVehicle.tripTracker.setAnnualDistance_km(avgc_data.p_avgAnnualTravelDistanceVan_km);
 }
 
-return dieselVehicle;
+return petroleumFuelVehicle;
 
 
 
@@ -1500,7 +1500,7 @@ else if (vehicle_type == OL_EnergyAssetType.DIESEL_VAN){
 	int nbCars = 0;
 	int ceiledRemainingNumberOfCarsPerCompany = p_remainingTotals.getCeiledRemainingNumberOfVehiclesPerCompany(companyGC, OL_VehicleType.CAR);
 	for (int k = 0; k < ceiledRemainingNumberOfCarsPerCompany; k++){
-		f_addDieselVehicle(companyGC, OL_EnergyAssetType.DIESEL_VEHICLE, true, 0);
+		f_addPetroleumFuelVehicle(companyGC, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, true, 0);
 		p_remainingTotals.adjustRemainingNumberOfVehiclesCompanies(companyGC, OL_VehicleType.CAR, - 1);
 		nbCars++;
 	}
@@ -1509,7 +1509,7 @@ else if (vehicle_type == OL_EnergyAssetType.DIESEL_VAN){
 	p_remainingTotals.adjustRemainingNumberOfAnonymousCompaniesForVehicleType(companyGC, OL_VehicleType.CAR, - 1);
 	
 	//Set current scenario cars
-	current_scenario_list.setCurrentDieselCars(nbCars);
+	current_scenario_list.setCurrentPetroleumFuelCars(nbCars);
 	//Set planned scenario cars
 	future_scenario_list.setPlannedEVCars(0);
 }
@@ -1519,7 +1519,7 @@ else if (vehicle_type == OL_EnergyAssetType.DIESEL_VAN){
 	int nbVans = 0;
 	int ceiledRemainingNumberOfVansPerCompany = p_remainingTotals.getCeiledRemainingNumberOfVehiclesPerCompany(companyGC, OL_VehicleType.VAN);
 	for (int k = 0; k< ceiledRemainingNumberOfVansPerCompany; k++){
-		f_addDieselVehicle(companyGC, OL_EnergyAssetType.DIESEL_VAN, true, 0);
+		f_addPetroleumFuelVehicle(companyGC, OL_EnergyAssetType.PETROLEUM_FUEL_VAN, true, 0);
 		p_remainingTotals.adjustRemainingNumberOfVehiclesCompanies(companyGC, OL_VehicleType.VAN, - 1);
 		nbVans++;
 	}
@@ -1528,7 +1528,7 @@ else if (vehicle_type == OL_EnergyAssetType.DIESEL_VAN){
 	p_remainingTotals.adjustRemainingNumberOfAnonymousCompaniesForVehicleType(companyGC, OL_VehicleType.VAN, - 1);
 	
 	//Set current scenario vans
-	current_scenario_list.setCurrentDieselVans(nbVans);
+	current_scenario_list.setCurrentPetroleumFuelVans(nbVans);
 	//Set planned scenario vans
 	future_scenario_list.setPlannedEVVans(0);
 }
@@ -1538,7 +1538,7 @@ else if (vehicle_type == OL_EnergyAssetType.DIESEL_VAN){
 	int nbTrucks= 0;
 	int ceiledRemainingNumberOfTrucksPerCompany = p_remainingTotals.getCeiledRemainingNumberOfVehiclesPerCompany(companyGC, OL_VehicleType.TRUCK);
 	for (int k = 0; k< ceiledRemainingNumberOfTrucksPerCompany; k++){
-		f_addDieselVehicle(companyGC, OL_EnergyAssetType.DIESEL_TRUCK, true, 0);
+		f_addPetroleumFuelVehicle(companyGC, OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK, true, 0);
 		p_remainingTotals.adjustRemainingNumberOfVehiclesCompanies(companyGC, OL_VehicleType.TRUCK, - 1);
 		nbTrucks++;
 	}
@@ -1547,7 +1547,7 @@ else if (vehicle_type == OL_EnergyAssetType.DIESEL_VAN){
 	p_remainingTotals.adjustRemainingNumberOfAnonymousCompaniesForVehicleType(companyGC, OL_VehicleType.TRUCK, - 1);
 		
 	//Set current scenario trucks
-	current_scenario_list.setCurrentDieselTrucks(nbTrucks);
+	current_scenario_list.setCurrentPetroleumFuelTrucks(nbTrucks);
 	//Set planned scenario trucks
 	future_scenario_list.setPlannedEVTrucks(0);
 }
@@ -2177,7 +2177,7 @@ else if(pvPower_kW != null && pvPower_kW > 0){
 companyGC.v_liveConnectionMetaData.contractedFeedinCapacity_kW = 0.0;
 companyGC.v_liveConnectionMetaData.physicalCapacity_kW = 0.0;
 
-f_createDieselTractors(companyGC, gridConnection.getTransport().getAgriculture());
+f_createPetroleumFuelTractors(companyGC, gridConnection.getTransport().getAgriculture());
 
 //Check for electricity connection and data
 if (gridConnection.getElectricity().getHasConnection()){
@@ -2439,13 +2439,13 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 if (nbDailyCarCommuters_notNull + nbDailyCarVisitors_notNull > 0){	
 	
 	int nbEVCarsComute = (gridConnection.getTransport().getNumCommuterAndVisitorChargePoints() != null) ? gridConnection.getTransport().getNumCommuterAndVisitorChargePoints() : 0; // Wat doen we hier mee????
-	int nbDieselCarsComute = gridConnection.getTransport().getNumDailyCarAndVanCommuters() + nbDailyCarVisitors_notNull - nbEVCarsComute;
+	int nbPetroleumFuelCarsComute = gridConnection.getTransport().getNumDailyCarAndVanCommuters() + nbDailyCarVisitors_notNull - nbEVCarsComute;
 
 	boolean isDefaultVehicle = true;
 	double maxChargingPower_kW 		= avgc_data.p_avgEVMaxChargePowerCar_kW;	
 	
-	for (int i = 0; i< nbDieselCarsComute; i++){
-		f_addDieselVehicle(companyGC, OL_EnergyAssetType.DIESEL_VEHICLE, isDefaultVehicle, 0);
+	for (int i = 0; i< nbPetroleumFuelCarsComute; i++){
+		f_addPetroleumFuelVehicle(companyGC, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, isDefaultVehicle, 0);
 	}
 	
 	
@@ -2468,7 +2468,7 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 	
 	//add to scenario: current
 	current_scenario_list.setCurrentEVCars(nbEVCarsComute);
-	current_scenario_list.setCurrentDieselCars(nbDieselCarsComute);
+	current_scenario_list.setCurrentPetroleumFuelCars(nbPetroleumFuelCarsComute);
 	
 	//Initialize future cars
 	future_scenario_list.setPlannedEVCars(current_scenario_list.getCurrentEVCars());
@@ -2486,12 +2486,12 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 		//Update remaning amount of cars (company owned only)
 		p_remainingTotals.adjustRemainingNumberOfVehiclesCompanies(companyGC, OL_VehicleType.VAN, - gridConnection.getTransport().getCars().getNumCars());
 		
-		//Get amount of EV and diesel cars
+		//Get amount of EV and petroleumFuel cars
 		Integer nbEVCars = gridConnection.getTransport().getCars().getNumElectricCars();
 		if (nbEVCars == null) {
 		    nbEVCars = 0;
 		}
-		int nbDieselCars = gridConnection.getTransport().getCars().getNumCars() - nbEVCars;
+		int nbPetroleumFuelCars = gridConnection.getTransport().getCars().getNumCars() - nbEVCars;
 		
 		//Initialize parameters
 		boolean isDefaultVehicle		= true;
@@ -2504,9 +2504,9 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 			isDefaultVehicle			= false;
 		}
 		
-		//create diesel vehicle
-		for (int i = 0; i< nbDieselCars; i++){
-			f_addDieselVehicle(companyGC, OL_EnergyAssetType.DIESEL_VEHICLE, isDefaultVehicle, annualTravelDistance_km);
+		//create petroleumFuel vehicle
+		for (int i = 0; i< nbPetroleumFuelCars; i++){
+			f_addPetroleumFuelVehicle(companyGC, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, isDefaultVehicle, annualTravelDistance_km);
 		}
 		
 		//Get number of chargepoints if filled in
@@ -2532,7 +2532,7 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 		
 		//add to scenario: current
 		current_scenario_list.setCurrentEVCars(((current_scenario_list.getCurrentEVCars() != null) ? current_scenario_list.getCurrentEVCars() : 0) + nbEVCars);
-		current_scenario_list.setCurrentDieselCars(((current_scenario_list.getCurrentDieselCars() != null) ? current_scenario_list.getCurrentDieselCars() : 0) + nbDieselCars);
+		current_scenario_list.setCurrentPetroleumFuelCars(((current_scenario_list.getCurrentPetroleumFuelCars() != null) ? current_scenario_list.getCurrentPetroleumFuelCars() : 0) + nbPetroleumFuelCars);
 		current_scenario_list.setCurrentEVCarChargePower_kW(maxChargingPower_kW);
 		
 		//Update Planned cars
@@ -2552,7 +2552,7 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 		if (nbEVVans == null) {
 		    nbEVVans = 0;
 		}	
-		int nbDieselVans = gridConnection.getTransport().getVans().getNumVans() - nbEVVans;
+		int nbPetroleumFuelVans = gridConnection.getTransport().getVans().getNumVans() - nbEVVans;
 
 		boolean isDefaultVehicle		= true;
 		double annualTravelDistance_km 	= 0;
@@ -2564,9 +2564,9 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 			isDefaultVehicle			= false;
 		}
 		
-		//create diesel vehicles
-		for (int i = 0; i< nbDieselVans; i++){
-			f_addDieselVehicle(companyGC, OL_EnergyAssetType.DIESEL_VAN, isDefaultVehicle, annualTravelDistance_km);
+		//create petroleumFuel vehicles
+		for (int i = 0; i< nbPetroleumFuelVans; i++){
+			f_addPetroleumFuelVehicle(companyGC, OL_EnergyAssetType.PETROLEUM_FUEL_VAN, isDefaultVehicle, annualTravelDistance_km);
 		}
 		
 		//Get number of chargepoints if filled in
@@ -2593,7 +2593,7 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 		
 		//add to scenario: current
 		current_scenario_list.setCurrentEVVans(nbEVVans);
-		current_scenario_list.setCurrentDieselVans(nbDieselVans);
+		current_scenario_list.setCurrentPetroleumFuelVans(nbPetroleumFuelVans);
 		current_scenario_list.setCurrentEVVanChargePower_kW(maxChargingPower_kW);
 		
 		//Planned
@@ -2613,7 +2613,7 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 		if (nbEVTrucks == null) {
 		    nbEVTrucks = 0;
 		}
-		int nbDieselTrucks = gridConnection.getTransport().getTrucks().getNumTrucks() - nbEVTrucks;
+		int nbPetroleumFuelTrucks = gridConnection.getTransport().getTrucks().getNumTrucks() - nbEVTrucks;
 	
 		boolean isDefaultVehicle		= true;
 		double annualTravelDistance_km = 0;
@@ -2625,9 +2625,9 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 			isDefaultVehicle			= false;
 		}
 		
-		//create diesel vehicles
-		for (int i = 0; i< nbDieselTrucks; i++){
-			f_addDieselVehicle(companyGC, OL_EnergyAssetType.DIESEL_TRUCK, isDefaultVehicle, annualTravelDistance_km);
+		//create petroleumFuel vehicles
+		for (int i = 0; i< nbPetroleumFuelTrucks; i++){
+			f_addPetroleumFuelVehicle(companyGC, OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK, isDefaultVehicle, annualTravelDistance_km);
 		}
 		
 		//Get number of chargepoints if filled in
@@ -2654,7 +2654,7 @@ else if(!settings.createCurrentElectricityEA()){//input boolean: Dont create cur
 		
 		//add to scenario: current
 		current_scenario_list.setCurrentEVTrucks(nbEVTrucks);
-		current_scenario_list.setCurrentDieselTrucks(nbDieselTrucks);
+		current_scenario_list.setCurrentPetroleumFuelTrucks(nbPetroleumFuelTrucks);
 		current_scenario_list.setCurrentEVTruckChargePower_kW(maxChargingPower_kW);
 		
 		//Planned
@@ -2719,14 +2719,14 @@ Building_data f_createBuildingData_Vallum(GridConnection companyGC,String PandID
 return building_data_record;
 /*ALCODEEND*/}
 
-double f_createDieselTractors(GridConnection companyGridConnection,com.zenmo.zummon.companysurvey.Agriculture agricultureSurveyData)
+double f_createPetroleumFuelTractors(GridConnection companyGridConnection,com.zenmo.zummon.companysurvey.Agriculture agricultureSurveyData)
 {/*ALCODESTART::1737712184349*/
-final double annualDiesel_L = Optional.ofNullable(agricultureSurveyData.getAnnualDieselUsage_L()).orElse(0.0);
-final int numTractors = Optional.ofNullable(agricultureSurveyData.getNumTractors()).orElse(annualDiesel_L > 0.0 ? 1 : 0);
+final double annualPetroleumFuel_L = Optional.ofNullable(agricultureSurveyData.getAnnualPetroleumFuelUsage_L()).orElse(0.0);
+final int numTractors = Optional.ofNullable(agricultureSurveyData.getNumTractors()).orElse(annualPetroleumFuel_L > 0.0 ? 1 : 0);
 
-if (numTractors > 0 && annualDiesel_L <= 0.0) {
+if (numTractors > 0 && annualPetroleumFuel_L <= 0.0) {
     // TODO: this should be in Tractor constructor
-    throw new RuntimeException("Tractor diesel usage missing for " + companyGridConnection.p_gridConnectionID);
+    throw new RuntimeException("Tractor petroleumFuel usage missing for " + companyGridConnection.p_gridConnectionID);
 }
 
 CustomProfile_data tractorProfile = findFirst(c_customProfiles_data, profile -> profile.customProfileID().equals("TractorProfile")); ///????
@@ -2735,7 +2735,7 @@ Building_data f_createBuildingData_Vallum(GridConnection companyGC,String PandID
 	if(tractorProfile == null){
 		throw new RuntimeException("Trying to make a tractor, without having loaded in a tractor profile for GC: " + companyGridConnection.p_gridConnectionID);
 	}
-    new J_EADieselTractor(companyGridConnection, annualDiesel_L / numTractors, tractorProfile.getValuesArray(), energyModel.p_timeStep_h);
+    new J_EAPetroleumFuelTractor(companyGridConnection, annualPetroleumFuel_L / numTractors, tractorProfile.getValuesArray(), energyModel.p_timeStep_h);
 }
 /*ALCODEEND*/}
 
@@ -4363,13 +4363,13 @@ else if (surveyGC.getHeat() != null && surveyGC.getHeat().getAnnualDistrictHeati
 			ev.tripTracker.setAnnualDistance_km(ev.tripTracker.getAnnualDistance_km()*tripTrackerScaling);
 		}
 		else{
-			J_EADieselVehicle dieselVehicle = f_addDieselVehicle(house, OL_EnergyAssetType.DIESEL_VEHICLE, true, 0);
-			dieselVehicle.tripTracker.setAnnualDistance_km(dieselVehicle.tripTracker.getAnnualDistance_km()*tripTrackerScaling);
+			J_EAPetroleumFuelVehicle petroleumFuelVehicle = f_addPetroleumFuelVehicle(house, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, true, 0);
+			petroleumFuelVehicle.tripTracker.setAnnualDistance_km(petroleumFuelVehicle.tripTracker.getAnnualDistance_km()*tripTrackerScaling);
 		}
 	}
 	else {
-		J_EADieselVehicle dieselVehicle = f_addDieselVehicle(house, OL_EnergyAssetType.DIESEL_VEHICLE, true, 0);
-		dieselVehicle.tripTracker.setAnnualDistance_km(dieselVehicle.tripTracker.getAnnualDistance_km()*tripTrackerScaling);
+		J_EAPetroleumFuelVehicle petroleumFuelVehicle = f_addPetroleumFuelVehicle(house, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, true, 0);
+		petroleumFuelVehicle.tripTracker.setAnnualDistance_km(petroleumFuelVehicle.tripTracker.getAnnualDistance_km()*tripTrackerScaling);
 	}
 }
 /*ALCODEEND*/}
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.xml b/_alp/Agents/Zero_Loader/Code/Functions.xml
index 2ac53c7..0d867f3 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.xml
+++ b/_alp/Agents/Zero_Loader/Code/Functions.xml
@@ -495,9 +495,9 @@
 	</Function>
 	<Function AccessType="public" StaticFunction="false">
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
-		<ReturnType>J_EADieselVehicle</ReturnType>
+		<ReturnType>J_EAPetroleumFuelVehicle</ReturnType>
 		<Id>1726584205829</Id>
-		<Name><![CDATA[f_addDieselVehicle]]></Name>
+		<Name><![CDATA[f_addPetroleumFuelVehicle]]></Name>
 		<X>900</X>
 		<Y>760</Y>
 		<Label>
@@ -1016,7 +1016,7 @@ verbruik = levering + productie - teruglevering]]></Description>
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1737712184349</Id>
-		<Name><![CDATA[f_createDieselTractors]]></Name>
+		<Name><![CDATA[f_createPetroleumFuelTractors]]></Name>
 		<X>900</X>
 		<Y>800</Y>
 		<Label>
diff --git a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
index 85945a9..a0d1761 100644
--- a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
@@ -209,10 +209,10 @@
 				<Name><![CDATA[p_hydrogenSpecificEnergy_kWh_kg]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_diesel_kWhpl]]></Name>
+				<Name><![CDATA[p_petroleumFuel_kWhpl]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgDieselConsumptionCar_kmpl]]></Name>
+				<Name><![CDATA[p_avgPetroleumFuelConsumptionCar_kmpl]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_avgGasolineConsumptionCar_kmpl]]></Name>
@@ -221,22 +221,22 @@
 				<Name><![CDATA[p_gasoline_kWhpl]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgDieselConsumptionCar_kWhpkm]]></Name>
+				<Name><![CDATA[p_avgPetroleumFuelConsumptionCar_kWhpkm]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_avgGasolineConsumptionCar_kWhpkm]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgDieselConsumptionVan_kmpl]]></Name>
+				<Name><![CDATA[p_avgPetroleumFuelConsumptionVan_kmpl]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgDieselConsumptionVan_kWhpkm]]></Name>
+				<Name><![CDATA[p_avgPetroleumFuelConsumptionVan_kWhpkm]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgDieselConsumptionTruck_kmpl]]></Name>
+				<Name><![CDATA[p_avgPetroleumFuelConsumptionTruck_kmpl]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgDieselConsumptionTruck_kWhpkm]]></Name>
+				<Name><![CDATA[p_avgPetroleumFuelConsumptionTruck_kWhpkm]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_avgCOPHeatpump]]></Name>
diff --git a/_alp/Agents/tabMobility/Code/Functions.java b/_alp/Agents/tabMobility/Code/Functions.java
index b549ba5..9b8e958 100644
--- a/_alp/Agents/tabMobility/Code/Functions.java
+++ b/_alp/Agents/tabMobility/Code/Functions.java
@@ -98,59 +98,59 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 return Triple.of(numberOfGhostVehicle_Cars, numberOfGhostVehicle_Vans, numberOfGhostVehicle_Trucks);
 /*ALCODEEND*/}
 
-double f_setDieselTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFossilFuelTrucks)
+double f_setPetroleumFuelTrucks(List<GridConnection> gcList,ShapeSlider sliderElectricTrucks,ShapeSlider sliderHydrogenTrucks,ShapeSlider sliderFossilFuelTrucks)
 {/*ALCODESTART::1746008458894*/
-double pctDieselTrucksGoal = sliderFossilFuelTrucks.getValue();
+double pctPetroleumFuelTrucksGoal = sliderFossilFuelTrucks.getValue();
 
 int numberOfGhostVehicle_Trucks = f_calculateNumberOfGhostVehicles(gcList).getRight();
 Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfTrucks( gcList, numberOfGhostVehicle_Trucks );
 
 int nbEtruckCurrent = triple.getLeft();
 int nbHydrogentrucksCurrent = triple.getMiddle();
-int nbDieseltrucksCurrent = triple.getRight();
-int total_vehicles = nbEtruckCurrent + nbHydrogentrucksCurrent + nbDieseltrucksCurrent;
+int nbPetroleumFueltrucksCurrent = triple.getRight();
+int total_vehicles = nbEtruckCurrent + nbHydrogentrucksCurrent + nbPetroleumFueltrucksCurrent;
 
-int nbDieselTrucksGoal = roundToInt(total_vehicles*pctDieselTrucksGoal/100.0);
+int nbPetroleumFuelTrucksGoal = roundToInt(total_vehicles*pctPetroleumFuelTrucksGoal/100.0);
 boolean finishedLookingThroughElectricTrucks = false;
 
-if (nbDieseltrucksCurrent < nbDieselTrucksGoal) {
-	// Add Diesel Trucks
-	while ( nbDieseltrucksCurrent < nbDieselTrucksGoal ) {
+if (nbPetroleumFueltrucksCurrent < nbPetroleumFuelTrucksGoal) {
+	// Add PetroleumFuel Trucks
+	while ( nbPetroleumFueltrucksCurrent < nbPetroleumFuelTrucksGoal ) {
 		if ( nbEtruckCurrent > numberOfGhostVehicle_Trucks && !finishedLookingThroughElectricTrucks ) {
-			// replace electric truck with a diesel truck
-			if (!f_electricToDieselTruck(gcList)) {
+			// replace electric truck with a petroleumFuel truck
+			if (!f_electricToPetroleumFuelTruck(gcList)) {
 				finishedLookingThroughElectricTrucks = true;
 			}
 			else {
-				nbDieseltrucksCurrent++;
+				nbPetroleumFueltrucksCurrent++;
 				nbEtruckCurrent--;
 			}
 		}
 		else{// ( nbHydrogentrucksCurrent > 0 ) {
-			// replace hydrogen truck with diesel truck
-			if (!f_hydrogenToDieselTruck(gcList)) {
+			// replace hydrogen truck with petroleumFuel truck
+			if (!f_hydrogenToPetroleumFuelTruck(gcList)) {
 				f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 				return;
 			}
-			nbDieseltrucksCurrent++;
+			nbPetroleumFueltrucksCurrent++;
 			nbHydrogentrucksCurrent--;
 		}
 		/*
 		else {
-			throw new RuntimeException("Can not add another diesel vehicle as there are no other vehicles to replace.");
+			throw new RuntimeException("Can not add another petroleumFuel vehicle as there are no other vehicles to replace.");
 		}
 		*/
 	}
 }
 else {
-	// Remove Diesel Trucks
-	while ( nbDieseltrucksCurrent > nbDieselTrucksGoal ) {
-		// replace a diesel truck with an electric truck
-		if (!f_dieselToElectricTruck(gcList)) {
+	// Remove PetroleumFuel Trucks
+	while ( nbPetroleumFueltrucksCurrent > nbPetroleumFuelTrucksGoal ) {
+		// replace a petroleumFuel truck with an electric truck
+		if (!f_petroleumFuelToElectricTruck(gcList)) {
 			f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 			return;
 		}
-		nbDieseltrucksCurrent--;
+		nbPetroleumFueltrucksCurrent--;
 		nbEtruckCurrent++;
 	}
 }
@@ -172,23 +172,23 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 
 int nbEtruckCurrent = triple.getLeft();
 int nbHydrogentrucksCurrent = triple.getMiddle();
-int nbDieseltrucksCurrent = triple.getRight();
-int total_vehicles = nbEtruckCurrent + nbHydrogentrucksCurrent + nbDieseltrucksCurrent;
+int nbPetroleumFueltrucksCurrent = triple.getRight();
+int total_vehicles = nbEtruckCurrent + nbHydrogentrucksCurrent + nbPetroleumFueltrucksCurrent;
 
 int nbHydrogenTrucksGoal = roundToInt(total_vehicles*pctHydrogenTrucksGoal/100.0);
-boolean finishedLookingThroughDieselTrucks = false;
+boolean finishedLookingThroughPetroleumFuelTrucks = false;
 
 if (nbHydrogentrucksCurrent < nbHydrogenTrucksGoal) {
 	// Add Hydrogen Trucks
-	while ( nbHydrogentrucksCurrent < nbHydrogenTrucksGoal && !finishedLookingThroughDieselTrucks ) {
-		if ( nbDieseltrucksCurrent > 0 ) {
-			// replace a diesel truck with a hydrogen truck
-			if (!f_dieselToHydrogenTruck(gcList)) {
-				finishedLookingThroughDieselTrucks = true;
+	while ( nbHydrogentrucksCurrent < nbHydrogenTrucksGoal && !finishedLookingThroughPetroleumFuelTrucks ) {
+		if ( nbPetroleumFueltrucksCurrent > 0 ) {
+			// replace a petroleumFuel truck with a hydrogen truck
+			if (!f_petroleumFuelToHydrogenTruck(gcList)) {
+				finishedLookingThroughPetroleumFuelTrucks = true;
 			}
 			else {
 				nbHydrogentrucksCurrent++;
-				nbDieseltrucksCurrent--;
+				nbPetroleumFueltrucksCurrent--;
 			}
 		}
 		else{// ( nbEtruckCurrent > v_totalNumberOfGhostVehicle_Trucks ) {
@@ -208,13 +208,13 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 else {
 	// Remove Hydrogen Trucks
 	while ( nbHydrogentrucksCurrent > nbHydrogenTrucksGoal ) {
-		// replace a hydrogen truck with a diesel truck
-		if (!f_hydrogenToDieselTruck(gcList)) {
+		// replace a hydrogen truck with a petroleumFuel truck
+		if (!f_hydrogenToPetroleumFuelTruck(gcList)) {
 			f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 			return;
 		}
 		nbHydrogentrucksCurrent--;
-		nbDieseltrucksCurrent++;
+		nbPetroleumFueltrucksCurrent++;
 	}
 }
 
@@ -235,23 +235,23 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 
 int nbEtruckCurrent = triple.getLeft();
 int nbHydrogentrucksCurrent = triple.getMiddle();
-int nbDieseltrucksCurrent = triple.getRight();
-int total_vehicles = nbEtruckCurrent + nbHydrogentrucksCurrent + nbDieseltrucksCurrent;
+int nbPetroleumFueltrucksCurrent = triple.getRight();
+int total_vehicles = nbEtruckCurrent + nbHydrogentrucksCurrent + nbPetroleumFueltrucksCurrent;
 
 int nbElectricTrucksGoal = roundToInt(total_vehicles*pctElectricTrucksGoal/100.0);
-boolean finishedLookingThroughDieselTrucks = false;
+boolean finishedLookingThroughPetroleumFuelTrucks = false;
 
 if (nbEtruckCurrent < nbElectricTrucksGoal) {
 	// Add Electric Trucks
-	while ( nbEtruckCurrent < nbElectricTrucksGoal && !finishedLookingThroughDieselTrucks ) {
-		if ( nbDieseltrucksCurrent > 0 ) {
-			// replace a diesel truck with an electric truck
-			if (!f_dieselToElectricTruck(gcList)) {
-				finishedLookingThroughDieselTrucks = true;
+	while ( nbEtruckCurrent < nbElectricTrucksGoal && !finishedLookingThroughPetroleumFuelTrucks ) {
+		if ( nbPetroleumFueltrucksCurrent > 0 ) {
+			// replace a petroleumFuel truck with an electric truck
+			if (!f_petroleumFuelToElectricTruck(gcList)) {
+				finishedLookingThroughPetroleumFuelTrucks = true;
 			}
 			else {
 				nbEtruckCurrent++;
-				nbDieseltrucksCurrent--;
+				nbPetroleumFueltrucksCurrent--;
 			}
 		}
 		else{// if ( nbHydrogentrucksCurrent > 0 ) {
@@ -272,13 +272,13 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 else {
 	// Remove Electric Trucks
 	while ( nbEtruckCurrent > nbElectricTrucksGoal ) {
-		// replace an electric truck with a diesel truck
-		if (!f_electricToDieselTruck(gcList)) {
+		// replace an electric truck with a petroleumFuel truck
+		if (!f_electricToPetroleumFuelTruck(gcList)) {
 			f_setTruckSlidersToCurrentEngineState(gcList, sliderElectricTrucks, sliderHydrogenTrucks, sliderFossilFuelTrucks);
 			return;
 		}
 		nbEtruckCurrent--;
-		nbDieseltrucksCurrent++;
+		nbPetroleumFueltrucksCurrent++;
 	}
 }
 
@@ -289,16 +289,16 @@ Triple<Integer, Integer, Integer> f_calculateNumberOfGhostVehicles(List<GridConn
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-boolean f_dieselToElectricTruck(List<GridConnection> gcList)
+boolean f_petroleumFuelToElectricTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458938*/
-J_EADieselVehicle dieselTruck = null;
+J_EAPetroleumFuelVehicle petroleumFuelTruck = null;
 boolean foundAdditionalVehicle = false;
 
-// find the diesel truck to remove, search through additional vehicles first
+// find the petroleumFuel truck to remove, search through additional vehicles first
 for (GridConnection gc : gcList ) {
 	if(gc instanceof GCUtility && gc.v_isActive){
-		dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
-		if ( dieselTruck != null ) {
+		petroleumFuelTruck = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK);
+		if ( petroleumFuelTruck != null ) {
 			foundAdditionalVehicle = true;
 			break;
 		}
@@ -307,15 +307,15 @@ boolean f_dieselToElectricTruck(List<GridConnection> gcList)
 
 // if no additional vehicle was found, search through the regular ordering of vehicles
 if (!foundAdditionalVehicle) {	
-	dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
+	petroleumFuelTruck = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
-if (dieselTruck!=null) {
-	GridConnection gc = (GridConnection)dieselTruck.getParentAgent();
+if (petroleumFuelTruck!=null) {
+	GridConnection gc = (GridConnection)petroleumFuelTruck.getParentAgent();
 		
-	J_ActivityTrackerTrips tripTracker = dieselTruck.tripTracker;
-	boolean available = dieselTruck.getAvailability();
-	zero_Interface.c_orderedVehicles.remove(dieselTruck);
-	dieselTruck.removeEnergyAsset();
+	J_ActivityTrackerTrips tripTracker = petroleumFuelTruck.tripTracker;
+	boolean available = petroleumFuelTruck.getAvailability();
+	zero_Interface.c_orderedVehicles.remove(petroleumFuelTruck);
+	petroleumFuelTruck.removeEnergyAsset();
 
 	// Re-add Electric vehicle
 	double capacityElectric_kW = zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerTruck_kW;
@@ -336,7 +336,7 @@ boolean f_dieselToElectricTruck(List<GridConnection> gcList)
 
 else {
 	return false;
-	//throw new RuntimeException("Numbers suggest there is a diesel truck left, but could not find it.");
+	//throw new RuntimeException("Numbers suggest there is a petroleumFuel truck left, but could not find it.");
 }
 
 return true;
@@ -446,16 +446,16 @@ boolean f_electricToHydrogenTruck(List<GridConnection> gcList)
 return true;
 /*ALCODEEND*/}
 
-boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
+boolean f_petroleumFuelToHydrogenTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458968*/
-J_EADieselVehicle dieselTruck = null;
+J_EAPetroleumFuelVehicle petroleumFuelTruck = null;
 boolean foundAdditionalVehicle = false;
 
-// find the diesel truck to remove, search through additional vehicles first
+// find the petroleumFuel truck to remove, search through additional vehicles first
 for (GridConnection gc : gcList ) {
 	if(gc instanceof GCUtility && gc.v_isActive){
-		dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
-		if ( dieselTruck != null ) {
+		petroleumFuelTruck = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK);
+		if ( petroleumFuelTruck != null ) {
 			foundAdditionalVehicle = true;
 			break;
 		}
@@ -464,16 +464,16 @@ boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
 
 // if no additional vehicle was found, search through the regular ordering of vehicles
 if (!foundAdditionalVehicle) {
-	dieselTruck = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
+	petroleumFuelTruck = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
-if (dieselTruck!=null) {
-	GridConnection gc = (GridConnection)dieselTruck.getParentAgent();
+if (petroleumFuelTruck!=null) {
+	GridConnection gc = (GridConnection)petroleumFuelTruck.getParentAgent();
 	
-	J_ActivityTrackerTrips tripTracker = dieselTruck.tripTracker;
+	J_ActivityTrackerTrips tripTracker = petroleumFuelTruck.tripTracker;
 	boolean available = true;
-	available = dieselTruck.getAvailability();
-	zero_Interface.c_orderedVehicles.remove(dieselTruck);
-	dieselTruck.removeEnergyAsset();
+	available = petroleumFuelTruck.getAvailability();
+	zero_Interface.c_orderedVehicles.remove(petroleumFuelTruck);
+	petroleumFuelTruck.removeEnergyAsset();
 
 	// Re-add hydrogen vehicle
 	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgHydrogenConsumptionTruck_kWhpkm;			
@@ -490,13 +490,13 @@ boolean f_dieselToHydrogenTruck(List<GridConnection> gcList)
 }
 else {
 	return false;
-	//throw new RuntimeException("Numbers suggest there is a diesel truck left, but could not find it.");
+	//throw new RuntimeException("Numbers suggest there is a petroleumFuel truck left, but could not find it.");
 }
 
 return true;
 /*ALCODEEND*/}
 
-boolean f_electricToDieselTruck(List<GridConnection> gcList)
+boolean f_electricToPetroleumFuelTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458977*/
 J_EAEV electricTruck = null;
 boolean foundAdditionalVehicle = false;
@@ -525,17 +525,17 @@ boolean f_electricToDieselTruck(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.remove(electricTruck);
 	electricTruck.removeEnergyAsset();
 
-	// Re-add diesel vehicle
-	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
+	// Re-add petroleumFuel vehicle
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
 	double vehicleScaling = 1.0;
-	J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_TRUCK, tripTracker);
-	dieselVehicle.available = available;
+	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK, tripTracker);
+	petroleumFuelVehicle.available = available;
 	
-	zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
+	zero_Interface.c_orderedVehicles.add(0, petroleumFuelVehicle);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
 	if(foundAdditionalVehicle){
-		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(petroleumFuelVehicle);
 	}
 }
 else {
@@ -546,7 +546,7 @@ boolean f_electricToDieselTruck(List<GridConnection> gcList)
 return true;
 /*ALCODEEND*/}
 
-boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
+boolean f_hydrogenToPetroleumFuelTruck(List<GridConnection> gcList)
 {/*ALCODESTART::1746008458987*/
 J_EAHydrogenVehicle hydrogenTruck = null;
 boolean foundAdditionalVehicle = false;
@@ -575,17 +575,17 @@ boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.remove(hydrogenTruck);
 	hydrogenTruck.removeEnergyAsset();
 
-	// Re-add diesel vehicle
-	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
+	// Re-add petroleumFuel vehicle
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
 	double vehicleScaling = 1.0;
-	J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_TRUCK, tripTracker);
-	dieselVehicle.available = available;
+	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK, tripTracker);
+	petroleumFuelVehicle.available = available;
 	
-	zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
+	zero_Interface.c_orderedVehicles.add(0, petroleumFuelVehicle);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
 	if(foundAdditionalVehicle){
-		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(petroleumFuelVehicle);
 	}
 }
 else {
@@ -608,16 +608,16 @@ boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 int numberOfGhostVehicle_Trucks = f_calculateNumberOfGhostVehicles(gcList).getRight();
 
 int nbElectricTrucksCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(p.getParentAgent() instanceof GCPublicCharger)) + numberOfGhostVehicle_Trucks;
-int nbDieseltrucksCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK);
+int nbPetroleumFueltrucksCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK);
 int nbHydrogentrucksCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK);
 
-int totalVehicles = nbElectricTrucksCurrent + nbDieseltrucksCurrent + nbHydrogentrucksCurrent;
+int totalVehicles = nbElectricTrucksCurrent + nbPetroleumFueltrucksCurrent + nbHydrogentrucksCurrent;
 
 
 
 int pct_electricTruckSlider = roundToInt(100.0*nbElectricTrucksCurrent/totalVehicles);
 int pct_hydrogenTruckSlider = roundToInt(100.0*nbHydrogentrucksCurrent/totalVehicles);
-int pct_dieselTruckSlider = roundToInt(100.0*nbDieseltrucksCurrent/totalVehicles);
+int pct_petroleumFuelTruckSlider = roundToInt(100.0*nbPetroleumFueltrucksCurrent/totalVehicles);
 
 sliderElectricTrucks.setValue(pct_electricTruckSlider, false);
 if ( sliderHydrogenTrucks != null ) {
@@ -625,7 +625,7 @@ boolean f_hydrogenToDieselTruck(List<GridConnection> gcList)
 }
 else if ( sliderHydrogenTrucks == null && pct_hydrogenTruckSlider != 0 ) {
 	throw new RuntimeException("Hydrogen trucks found but no hydrogen slider passed to f_setTruckSlidersToCurrentEngineState");
-}sliderFossilFuelTrucks.setValue(pct_dieselTruckSlider, false);
+}sliderFossilFuelTrucks.setValue(pct_petroleumFuelTruckSlider, false);
 
 
 //Update variable to change to custom scenario
@@ -643,26 +643,26 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfTrucks(List<GridConn
 
 int nbEtruckCurrent = numberOfGhostVehicle_Trucks;
 int nbHydrogenTrucksCurrent = 0;
-int nbDieselTrucksCurrent = 0;
+int nbPetroleumFuelTrucksCurrent = 0;
 for ( GridConnection gc : gcList ) {
 	nbEtruckCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_TRUCK && !(gc instanceof GCPublicCharger) && gc.v_isActive);
 	nbHydrogenTrucksCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_TRUCK && gc.v_isActive);
-	nbDieselTrucksCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_TRUCK && gc.v_isActive);
+	nbPetroleumFuelTrucksCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK && gc.v_isActive);
 }
 
-return Triple.of(nbEtruckCurrent, nbHydrogenTrucksCurrent, nbDieselTrucksCurrent);
+return Triple.of(nbEtruckCurrent, nbHydrogenTrucksCurrent, nbPetroleumFuelTrucksCurrent);
 /*ALCODEEND*/}
 
-boolean f_dieselToElectricVan(List<GridConnection> gcList)
+boolean f_petroleumFuelToElectricVan(List<GridConnection> gcList)
 {/*ALCODESTART::1749645625091*/
-J_EADieselVehicle dieselVan = null;
+J_EAPetroleumFuelVehicle petroleumFuelVan = null;
 boolean foundAdditionalVehicle = false;
 
-// find the diesel van to remove, search through additional vehicles first
+// find the petroleumFuel van to remove, search through additional vehicles first
 for (GridConnection gc : gcList ) {
 	if(gc instanceof GCUtility && gc.v_isActive){
-		dieselVan = (J_EADieselVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN);
-		if ( dieselVan != null ) {
+		petroleumFuelVan = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN);
+		if ( petroleumFuelVan != null ) {
 			foundAdditionalVehicle = true;
 			break;
 		}
@@ -671,15 +671,15 @@ boolean f_dieselToElectricVan(List<GridConnection> gcList)
 
 // if no additional vehicle was found, search through the regular ordering of vehicles
 if (!foundAdditionalVehicle) {	
-	dieselVan = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
+	petroleumFuelVan = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
-if (dieselVan!=null) {
-	GridConnection gc = (GridConnection)dieselVan.getParentAgent();
+if (petroleumFuelVan!=null) {
+	GridConnection gc = (GridConnection)petroleumFuelVan.getParentAgent();
 		
-	J_ActivityTrackerTrips tripTracker = dieselVan.tripTracker;
-	boolean available = dieselVan.getAvailability();
-	zero_Interface.c_orderedVehicles.remove(dieselVan);
-	dieselVan.removeEnergyAsset();
+	J_ActivityTrackerTrips tripTracker = petroleumFuelVan.tripTracker;
+	boolean available = petroleumFuelVan.getAvailability();
+	zero_Interface.c_orderedVehicles.remove(petroleumFuelVan);
+	petroleumFuelVan.removeEnergyAsset();
 
 	// Re-add Electric vehicle
 	double capacityElectric_kW = zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerVan_kW;
@@ -700,13 +700,13 @@ boolean f_dieselToElectricVan(List<GridConnection> gcList)
 
 else {
 	return false;
-	//throw new RuntimeException("Numbers suggest there is a diesel van left, but could not find it.");
+	//throw new RuntimeException("Numbers suggest there is a petroleumFuel van left, but could not find it.");
 }
 
 return true;
 /*ALCODEEND*/}
 
-boolean f_electricToDieselVan(List<GridConnection> gcList)
+boolean f_electricToPetroleumFuelVan(List<GridConnection> gcList)
 {/*ALCODESTART::1749645629101*/
 J_EAEV electricVan = null;
 boolean foundAdditionalVehicle = false;
@@ -735,17 +735,17 @@ boolean f_electricToDieselVan(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.remove(electricVan);
 	electricVan.removeEnergyAsset();
 
-	// Re-add diesel vehicle
-	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
+	// Re-add petroleumFuel vehicle
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
 	double vehicleScaling = 1.0;
-	J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_VAN, tripTracker);
-	dieselVehicle.available = available;
+	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.PETROLEUM_FUEL_VAN, tripTracker);
+	petroleumFuelVehicle.available = available;
 	
-	zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
+	zero_Interface.c_orderedVehicles.add(0, petroleumFuelVehicle);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
 	if(foundAdditionalVehicle){
-		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(petroleumFuelVehicle);
 	}
 }
 else {
@@ -756,16 +756,16 @@ boolean f_electricToDieselVan(List<GridConnection> gcList)
 return true;
 /*ALCODEEND*/}
 
-boolean f_dieselToElectricCar(List<GridConnection> gcList)
+boolean f_petroleumFuelToElectricCar(List<GridConnection> gcList)
 {/*ALCODESTART::1749646233660*/
-J_EADieselVehicle dieselCar = null;
+J_EAPetroleumFuelVehicle petroleumFuelCar = null;
 boolean foundAdditionalVehicle = false;
 
-// find the diesel car to remove, search through additional vehicles first
+// find the petroleumFuel car to remove, search through additional vehicles first
 for (GridConnection gc : gcList ) {
 	if(gc instanceof GCUtility && gc.v_isActive){
-		dieselCar = (J_EADieselVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE);
-		if ( dieselCar != null ) {
+		petroleumFuelCar = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_additionalVehicles.get(gc.p_uid), p -> p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE);
+		if ( petroleumFuelCar != null ) {
 			foundAdditionalVehicle = true;
 			break;
 		}
@@ -774,15 +774,15 @@ boolean f_dieselToElectricCar(List<GridConnection> gcList)
 
 // if no additional vehicle was found, search through the regular ordering of vehicles
 if (!foundAdditionalVehicle) {	
-	dieselCar = (J_EADieselVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
+	petroleumFuelCar = (J_EAPetroleumFuelVehicle)findFirst(zero_Interface.c_orderedVehicles, p -> p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE && ((GridConnection)p.getParentAgent()).v_isActive && gcList.contains((GridConnection)p.getParentAgent()));
 }
-if (dieselCar!=null) {
-	GridConnection gc = (GridConnection)dieselCar.getParentAgent();
+if (petroleumFuelCar!=null) {
+	GridConnection gc = (GridConnection)petroleumFuelCar.getParentAgent();
 		
-	J_ActivityTrackerTrips tripTracker = dieselCar.tripTracker;
-	boolean available = dieselCar.getAvailability();
-	zero_Interface.c_orderedVehicles.remove(dieselCar);
-	dieselCar.removeEnergyAsset();
+	J_ActivityTrackerTrips tripTracker = petroleumFuelCar.tripTracker;
+	boolean available = petroleumFuelCar.getAvailability();
+	zero_Interface.c_orderedVehicles.remove(petroleumFuelCar);
+	petroleumFuelCar.removeEnergyAsset();
 
 	// Re-add Electric vehicle
 	double capacityElectric_kW = zero_Interface.energyModel.avgc_data.p_avgEVMaxChargePowerCar_kW;
@@ -803,13 +803,13 @@ boolean f_dieselToElectricCar(List<GridConnection> gcList)
 
 else {
 	return false;
-	//throw new RuntimeException("Numbers suggest there is a diesel car left, but could not find it.");
+	//throw new RuntimeException("Numbers suggest there is a petroleumFuel car left, but could not find it.");
 }
 
 return true;
 /*ALCODEEND*/}
 
-boolean f_electricToDieselCar(List<GridConnection> gcList)
+boolean f_electricToPetroleumFuelCar(List<GridConnection> gcList)
 {/*ALCODESTART::1749646235580*/
 J_EAEV electricCar = null;
 boolean foundAdditionalVehicle = false;
@@ -838,17 +838,17 @@ boolean f_electricToDieselCar(List<GridConnection> gcList)
 	zero_Interface.c_orderedVehicles.remove(electricCar);
 	electricCar.removeEnergyAsset();
 
-	// Re-add diesel vehicle
-	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
+	// Re-add petroleumFuel vehicle
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
 	double vehicleScaling = 1.0;
-	J_EADieselVehicle dieselVehicle = new J_EADieselVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_VEHICLE, tripTracker);
-	dieselVehicle.available = available;
+	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, tripTracker);
+	petroleumFuelVehicle.available = available;
 	
-	zero_Interface.c_orderedVehicles.add(0, dieselVehicle);
+	zero_Interface.c_orderedVehicles.add(0, petroleumFuelVehicle);
 	
 	//check if was additional vehicle in companyUI, if so: add to collection
 	if(foundAdditionalVehicle){
-		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(dieselVehicle);
+		zero_Interface.c_additionalVehicles.get(gc.p_uid).add(petroleumFuelVehicle);
 	}
 }
 else {
@@ -867,14 +867,14 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfVans(List<GridConnec
 
 int nbEVansCurrent = numberOfGhostVehicle_Vans;
 int nbHydrogenVansCurrent = 0;
-int nbDieselVansCurrent = 0;
+int nbPetroleumFuelVansCurrent = 0;
 for ( GridConnection gc : gcList ) {
 	nbEVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(gc instanceof GCPublicCharger) && gc.v_isActive);
 	nbHydrogenVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN && gc.v_isActive);
-	nbDieselVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN && gc.v_isActive);
+	nbPetroleumFuelVansCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN && gc.v_isActive);
 }
 
-return Triple.of(nbEVansCurrent, nbHydrogenVansCurrent, nbDieselVansCurrent);
+return Triple.of(nbEVansCurrent, nbHydrogenVansCurrent, nbPetroleumFuelVansCurrent);
 /*ALCODEEND*/}
 
 Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnection> gcList,Integer numberOfGhostVehicle_Cars)
@@ -885,55 +885,55 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnec
 
 int nbEVsCurrent = numberOfGhostVehicle_Cars;
 int nbHydrogenCarsCurrent = 0;
-int nbDieselCarsCurrent = 0;
+int nbPetroleumFuelCarsCurrent = 0;
 for ( GridConnection gc : gcList ) {
 	nbEVsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(gc instanceof GCPublicCharger) && gc.v_isActive);
 	nbHydrogenCarsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VEHICLE && gc.v_isActive);
-	nbDieselCarsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE && gc.v_isActive);
+	nbPetroleumFuelCarsCurrent += count(gc.c_vehicleAssets, p->p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE && gc.v_isActive);
 }
 
-return Triple.of(nbEVsCurrent, nbHydrogenCarsCurrent, nbDieselCarsCurrent);
+return Triple.of(nbEVsCurrent, nbHydrogenCarsCurrent, nbPetroleumFuelCarsCurrent);
 /*ALCODEEND*/}
 
-double f_setDieselVans(List<GridConnection> gcList,ShapeSlider sliderElectricVans,ShapeSlider sliderFossilFuelVans)
+double f_setPetroleumFuelVans(List<GridConnection> gcList,ShapeSlider sliderElectricVans,ShapeSlider sliderFossilFuelVans)
 {/*ALCODESTART::1749655752858*/
-double pctDieselVansGoal = sliderFossilFuelVans.getValue();
+double pctPetroleumFuelVansGoal = sliderFossilFuelVans.getValue();
 
 int numberOfGhostVehicle_Vans = f_calculateNumberOfGhostVehicles(gcList).getMiddle();
 Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfVans( gcList, numberOfGhostVehicle_Vans );
 
 int nbEvanCurrent = triple.getLeft();
-int nbDieselvansCurrent = triple.getRight();
+int nbPetroleumFuelvansCurrent = triple.getRight();
 
-int total_vehicles = nbEvanCurrent + nbDieselvansCurrent;
+int total_vehicles = nbEvanCurrent + nbPetroleumFuelvansCurrent;
 
-int nbDieselVansGoal = roundToInt(total_vehicles*pctDieselVansGoal/100.0);
+int nbPetroleumFuelVansGoal = roundToInt(total_vehicles*pctPetroleumFuelVansGoal/100.0);
 
-if (nbDieselvansCurrent < nbDieselVansGoal) {
-	// Add Diesel Vans
-	while ( nbDieselvansCurrent < nbDieselVansGoal ) {
+if (nbPetroleumFuelvansCurrent < nbPetroleumFuelVansGoal) {
+	// Add PetroleumFuel Vans
+	while ( nbPetroleumFuelvansCurrent < nbPetroleumFuelVansGoal ) {
 		if ( nbEvanCurrent > numberOfGhostVehicle_Vans ) {
-			// replace electric van with a diesel van
-			if (!f_electricToDieselVan(gcList)) {
+			// replace electric van with a petroleumFuel van
+			if (!f_electricToPetroleumFuelVan(gcList)) {
 				f_setVanSlidersToCurrentEngineState(gcList, sliderElectricVans, null, sliderFossilFuelVans);
 				return;
 			}
 			else {
-				nbDieselvansCurrent++;
+				nbPetroleumFuelvansCurrent++;
 				nbEvanCurrent--;
 			}
 		}
 	}
 }
 else {
-	// Remove Diesel Vans
-	while ( nbDieselvansCurrent > nbDieselVansGoal ) {
-		// replace a diesel van with an electric van
-		if (!f_dieselToElectricVan(gcList)) {
+	// Remove PetroleumFuel Vans
+	while ( nbPetroleumFuelvansCurrent > nbPetroleumFuelVansGoal ) {
+		// replace a petroleumFuel van with an electric van
+		if (!f_petroleumFuelToElectricVan(gcList)) {
 			f_setVanSlidersToCurrentEngineState(gcList, sliderElectricVans, null, sliderFossilFuelVans);
 			return;
 		}
-		nbDieselvansCurrent--;
+		nbPetroleumFuelvansCurrent--;
 		nbEvanCurrent++;
 	}
 }
@@ -954,24 +954,24 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnec
 Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfVans( gcList, numberOfGhostVehicle_Vans );
 
 int nbEvanCurrent = triple.getLeft();
-int nbDieselvansCurrent = triple.getRight();
+int nbPetroleumFuelvansCurrent = triple.getRight();
 
-int total_vehicles = nbEvanCurrent + nbDieselvansCurrent;
+int total_vehicles = nbEvanCurrent + nbPetroleumFuelvansCurrent;
 
 int nbElectricVansGoal = roundToInt(total_vehicles*pctElectricVansGoal/100.0);
 
 if (nbEvanCurrent < nbElectricVansGoal) {
 	// Add Electric Vans
 	while ( nbEvanCurrent < nbElectricVansGoal ) {
-		if ( nbDieselvansCurrent > 0 ) {
-			// replace a diesel van with an electric van
-			if (!f_dieselToElectricVan(gcList)) {
+		if ( nbPetroleumFuelvansCurrent > 0 ) {
+			// replace a petroleumFuel van with an electric van
+			if (!f_petroleumFuelToElectricVan(gcList)) {
 				f_setVanSlidersToCurrentEngineState(gcList, sliderElectricVans, null, sliderFossilFuelVans);
 				return;
 			}
 			else {
 				nbEvanCurrent++;
-				nbDieselvansCurrent--;
+				nbPetroleumFuelvansCurrent--;
 			}
 		}
 	}
@@ -979,13 +979,13 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnec
 else {
 	// Remove Electric Vans
 	while ( nbEvanCurrent > nbElectricVansGoal ) {
-		// replace an electric van with a diesel van
-		if (!f_electricToDieselVan(gcList)) {
+		// replace an electric van with a petroleumFuel van
+		if (!f_electricToPetroleumFuelVan(gcList)) {
 			f_setVanSlidersToCurrentEngineState(gcList, sliderElectricVans, null, sliderFossilFuelVans);
 			return;
 		}
 		nbEvanCurrent--;
-		nbDieselvansCurrent++;
+		nbPetroleumFuelvansCurrent++;
 	}
 }
 
@@ -996,45 +996,45 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnec
 zero_Interface.f_resetSettings();
 /*ALCODEEND*/}
 
-double f_setDieselCars(List<GridConnection> gcList,ShapeSlider sliderElectricCars,ShapeSlider sliderFossilFuelCars)
+double f_setPetroleumFuelCars(List<GridConnection> gcList,ShapeSlider sliderElectricCars,ShapeSlider sliderFossilFuelCars)
 {/*ALCODESTART::1749717776391*/
-double pctDieselCarsGoal = sliderFossilFuelCars.getValue();
+double pctPetroleumFuelCarsGoal = sliderFossilFuelCars.getValue();
 
 int numberOfGhostVehicle_Cars = f_calculateNumberOfGhostVehicles(gcList).getMiddle();
 Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfCars( gcList, numberOfGhostVehicle_Cars );
 
 int nbEcarCurrent = triple.getLeft();
-int nbDieselcarsCurrent = triple.getRight();
+int nbPetroleumFuelcarsCurrent = triple.getRight();
 
-int total_vehicles = nbEcarCurrent + nbDieselcarsCurrent;
+int total_vehicles = nbEcarCurrent + nbPetroleumFuelcarsCurrent;
 
-int nbDieselCarsGoal = roundToInt(total_vehicles*pctDieselCarsGoal/100.0);
+int nbPetroleumFuelCarsGoal = roundToInt(total_vehicles*pctPetroleumFuelCarsGoal/100.0);
 
-if (nbDieselcarsCurrent < nbDieselCarsGoal) {
-	// Add Diesel Cars
-	while ( nbDieselcarsCurrent < nbDieselCarsGoal ) {
+if (nbPetroleumFuelcarsCurrent < nbPetroleumFuelCarsGoal) {
+	// Add PetroleumFuel Cars
+	while ( nbPetroleumFuelcarsCurrent < nbPetroleumFuelCarsGoal ) {
 		if ( nbEcarCurrent > numberOfGhostVehicle_Cars ) {
-			// replace electric car with a diesel car
-			if (!f_electricToDieselCar(gcList)) {
+			// replace electric car with a petroleumFuel car
+			if (!f_electricToPetroleumFuelCar(gcList)) {
 				f_setCarSlidersToCurrentEngineState(gcList, sliderElectricCars, null, sliderFossilFuelCars);
 				return;
 			}
 			else {
-				nbDieselcarsCurrent++;
+				nbPetroleumFuelcarsCurrent++;
 				nbEcarCurrent--;
 			}
 		}
 	}
 }
 else {
-	// Remove Diesel Cars
-	while ( nbDieselcarsCurrent > nbDieselCarsGoal ) {
-		// replace a diesel car with an electric car
-		if (!f_dieselToElectricCar(gcList)) {
+	// Remove PetroleumFuel Cars
+	while ( nbPetroleumFuelcarsCurrent > nbPetroleumFuelCarsGoal ) {
+		// replace a petroleumFuel car with an electric car
+		if (!f_petroleumFuelToElectricCar(gcList)) {
 			f_setCarSlidersToCurrentEngineState(gcList, sliderElectricCars, null, sliderFossilFuelCars);
 			return;
 		}
-		nbDieselcarsCurrent--;
+		nbPetroleumFuelcarsCurrent--;
 		nbEcarCurrent++;
 	}
 }
@@ -1055,24 +1055,24 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnec
 Triple<Integer, Integer, Integer> triple = f_calculateCurrentNumberOfCars( gcList, numberOfGhostVehicle_Cars );
 
 int nbEcarCurrent = triple.getLeft();
-int nbDieselcarsCurrent = triple.getRight();
+int nbPetroleumFuelcarsCurrent = triple.getRight();
 
-int total_vehicles = nbEcarCurrent + nbDieselcarsCurrent;
+int total_vehicles = nbEcarCurrent + nbPetroleumFuelcarsCurrent;
 
 int nbElectricCarsGoal = roundToInt(total_vehicles*pctElectricCarsGoal/100.0);
 
 if (nbEcarCurrent < nbElectricCarsGoal) {
 	// Add Electric Cars
 	while ( nbEcarCurrent < nbElectricCarsGoal ) {
-		if ( nbDieselcarsCurrent > 0 ) {
-			// replace a diesel car with an electric car
-			if (!f_dieselToElectricCar(gcList)) {
+		if ( nbPetroleumFuelcarsCurrent > 0 ) {
+			// replace a petroleumFuel car with an electric car
+			if (!f_petroleumFuelToElectricCar(gcList)) {
 				f_setCarSlidersToCurrentEngineState(gcList, sliderElectricCars, null, sliderFossilFuelCars);
 				return;
 			}
 			else {
 				nbEcarCurrent++;
-				nbDieselcarsCurrent--;
+				nbPetroleumFuelcarsCurrent--;
 			}
 		}
 	}
@@ -1080,13 +1080,13 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnec
 else {
 	// Remove Electric Cars
 	while ( nbEcarCurrent > nbElectricCarsGoal ) {
-		// replace an electric car with a diesel car
-		if (!f_electricToDieselCar(gcList)) {
+		// replace an electric car with a petroleumFuel car
+		if (!f_electricToPetroleumFuelCar(gcList)) {
 			f_setCarSlidersToCurrentEngineState(gcList, sliderElectricCars, null, sliderFossilFuelCars);
 			return;
 		}
 		nbEcarCurrent--;
-		nbDieselcarsCurrent++;
+		nbPetroleumFuelcarsCurrent++;
 	}
 }
 
@@ -1109,16 +1109,16 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnec
 int numberOfGhostVehicle_Vans = f_calculateNumberOfGhostVehicles(gcList).getRight();
 
 int nbElectricVansCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VAN && !(p.getParentAgent() instanceof GCPublicCharger)) + numberOfGhostVehicle_Vans;
-int nbDieselvansCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VAN);
+int nbPetroleumFuelvansCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VAN);
 int nbHydrogenvansCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VAN);
 
-int totalVehicles = nbElectricVansCurrent + nbDieselvansCurrent + nbHydrogenvansCurrent;
+int totalVehicles = nbElectricVansCurrent + nbPetroleumFuelvansCurrent + nbHydrogenvansCurrent;
 
 
 
 int pct_electricVanSlider = roundToInt(100.0*nbElectricVansCurrent/totalVehicles);
 int pct_hydrogenVanSlider = roundToInt(100.0*nbHydrogenvansCurrent/totalVehicles);
-int pct_dieselVanSlider = roundToInt(100.0*nbDieselvansCurrent/totalVehicles);
+int pct_petroleumFuelVanSlider = roundToInt(100.0*nbPetroleumFuelvansCurrent/totalVehicles);
 
 sliderElectricVans.setValue(pct_electricVanSlider, false);
 if ( sliderHydrogenVans != null ) {
@@ -1127,7 +1127,7 @@ Triple<Integer, Integer, Integer> f_calculateCurrentNumberOfCars(List<GridConnec
 else if ( sliderHydrogenVans == null && pct_hydrogenVanSlider != 0 ) {
 	throw new RuntimeException("Hydrogen vans found but no hydrogen slider passed to f_setVanSlidersToCurrentEngineState");
 }
-sliderFossilFuelVans.setValue(pct_dieselVanSlider, false);
+sliderFossilFuelVans.setValue(pct_petroleumFuelVanSlider, false);
 
 
 //Update variable to change to custom scenario
@@ -1149,16 +1149,16 @@ else if ( sliderHydrogenVans == null && pct_hydrogenVanSlider != 0 ) {
 int numberOfGhostVehicle_Cars = f_calculateNumberOfGhostVehicles(gcList).getRight();
 
 int nbElectricCarsCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.ELECTRIC_VEHICLE && !(p.getParentAgent() instanceof GCPublicCharger)) + numberOfGhostVehicle_Cars;
-int nbDieselcarsCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.DIESEL_VEHICLE);
+int nbPetroleumFuelcarsCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE);
 int nbHydrogencarsCurrent = count(vehicles, p->p.energyAssetType == OL_EnergyAssetType.HYDROGEN_VEHICLE);
 
-int totalVehicles = nbElectricCarsCurrent + nbDieselcarsCurrent + nbHydrogencarsCurrent;
+int totalVehicles = nbElectricCarsCurrent + nbPetroleumFuelcarsCurrent + nbHydrogencarsCurrent;
 
 
 
 int pct_electricCarSlider = roundToInt(100.0*nbElectricCarsCurrent/totalVehicles);
 int pct_hydrogenCarSlider = roundToInt(100.0*nbHydrogencarsCurrent/totalVehicles);
-int pct_dieselCarSlider = roundToInt(100.0*nbDieselcarsCurrent/totalVehicles);
+int pct_petroleumFuelCarSlider = roundToInt(100.0*nbPetroleumFuelcarsCurrent/totalVehicles);
 
 sliderElectricCars.setValue(pct_electricCarSlider, false);
 if ( sliderHydrogenCars != null ) {
@@ -1167,7 +1167,7 @@ else if ( sliderHydrogenVans == null && pct_hydrogenVanSlider != 0 ) {
 else if ( sliderHydrogenCars == null && pct_hydrogenCarSlider != 0 ) {
 	throw new RuntimeException("Hydrogen cars found but no hydrogen slider passed to f_setCarSlidersToCurrentEngineState");
 }
-sliderFossilFuelCars.setValue(pct_dieselCarSlider, false);
+sliderFossilFuelCars.setValue(pct_petroleumFuelCarSlider, false);
 
 
 //Update variable to change to custom scenario
@@ -1229,15 +1229,15 @@ else if(gr_mobilitySliders_residential.isVisible()){
 
 ////Vehicles
 // Initialize the vehicle counters
-int DieselCars = 0;
+int PetroleumFuelCars = 0;
 int ElectricCars = v_totalNumberOfGhostVehicle_Cars;
 int HydrogenCars = 0;
 
-int DieselVans = 0;
+int PetroleumFuelVans = 0;
 int ElectricVans = v_totalNumberOfGhostVehicle_Vans;
 int HydrogenVans = 0;
 
-int DieselTrucks = 0;
+int PetroleumFuelTrucks = 0;
 int ElectricTrucks = v_totalNumberOfGhostVehicle_Trucks;
 int HydrogenTrucks = 0;
 
@@ -1245,16 +1245,16 @@ else if(gr_mobilitySliders_residential.isVisible()){
 for (GridConnection gc : allConsumerGridConnections) {
 	if(gc.v_isActive){
 		for (J_EAVehicle vehicle : gc.c_vehicleAssets) {
-			if (vehicle instanceof J_EADieselVehicle){
+			if (vehicle instanceof J_EAPetroleumFuelVehicle){
 			 	switch(vehicle.getEAType()){
-			 		case DIESEL_VEHICLE:
-						DieselCars += 1;
+			 		case PETROLEUM_FUEL_VEHICLE:
+						PetroleumFuelCars += 1;
 					break;
-					case DIESEL_VAN:
-						DieselVans += 1;
+					case PETROLEUM_FUEL_VAN:
+						PetroleumFuelVans += 1;
 					break;
-					case DIESEL_TRUCK:
-						DieselTrucks += 1;
+					case PETROLEUM_FUEL_TRUCK:
+						PetroleumFuelTrucks += 1;
 					break;
 				}
 			}
@@ -1290,12 +1290,12 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 
 
 //Set CAR sliders
-int totalCars = DieselCars + ElectricCars + HydrogenCars;
-int DieselCars_pct = 0;
+int totalCars = PetroleumFuelCars + ElectricCars + HydrogenCars;
+int PetroleumFuelCars_pct = 0;
 int ElectricCars_pct = 0;
 int HydrogenCars_pct = 0;
 if (totalCars != 0) {
-	DieselCars_pct = roundToInt((100.0 * DieselCars) / totalCars);
+	PetroleumFuelCars_pct = roundToInt((100.0 * PetroleumFuelCars) / totalCars);
 	ElectricCars_pct = roundToInt((100.0 * ElectricCars) / totalCars);
 	HydrogenCars_pct = roundToInt((100.0 * HydrogenCars) / totalCars);
 }
@@ -1303,17 +1303,17 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 	sl_fossilFuelCars_pct.setEnabled(false);
 	sl_electricCars_pct.setEnabled(false);
 }
-sl_fossilFuelCars_pct.setValue(DieselCars_pct, false);
+sl_fossilFuelCars_pct.setValue(PetroleumFuelCars_pct, false);
 sl_electricCars_pct.setValue(ElectricCars_pct, false);
 
 
 //Set VAN sliders
-int totalVans = DieselVans + ElectricVans + HydrogenVans;
-int DieselVans_pct = 0;
+int totalVans = PetroleumFuelVans + ElectricVans + HydrogenVans;
+int PetroleumFuelVans_pct = 0;
 int ElectricVans_pct = 0;
 int HydrogenVans_pct = 0;
 if (totalVans != 0) {
-	DieselVans_pct = roundToInt(100.0 * DieselVans / totalVans);
+	PetroleumFuelVans_pct = roundToInt(100.0 * PetroleumFuelVans / totalVans);
 	ElectricVans_pct = roundToInt(100.0 * ElectricVans / totalVans);
 	HydrogenVans_pct = roundToInt(100.0 * HydrogenVans / totalVans);
 }
@@ -1321,17 +1321,17 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 	sl_fossilFuelVans_pct.setEnabled(false);
 	sl_electricVans_pct.setEnabled(false);
 }
-sl_fossilFuelVans_pct.setValue(DieselVans_pct, false);
+sl_fossilFuelVans_pct.setValue(PetroleumFuelVans_pct, false);
 sl_electricVans_pct.setValue(ElectricVans_pct, false);
 
 
 //Set TRUCK sliders
-int totalTrucks = DieselTrucks + ElectricTrucks + HydrogenTrucks;
-int DieselTrucks_pct = 0;
+int totalTrucks = PetroleumFuelTrucks + ElectricTrucks + HydrogenTrucks;
+int PetroleumFuelTrucks_pct = 0;
 int ElectricTrucks_pct = 0;
 int HydrogenTrucks_pct = 0;
 if (totalTrucks != 0) {
-	DieselTrucks_pct = roundToInt(100.0 * DieselTrucks / totalTrucks);
+	PetroleumFuelTrucks_pct = roundToInt(100.0 * PetroleumFuelTrucks / totalTrucks);
 	ElectricTrucks_pct = roundToInt(100.0 * ElectricTrucks / totalTrucks);
 	HydrogenTrucks_pct = roundToInt(100.0 * HydrogenTrucks / totalTrucks);
 }
@@ -1340,7 +1340,7 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 	sl_electricTrucks_pct.setEnabled(false);
 	sl_hydrogenTrucks_pct.setEnabled(false);
 }
-sl_fossilFuelTrucks_pct.setValue(DieselTrucks_pct, false);
+sl_fossilFuelTrucks_pct.setValue(PetroleumFuelTrucks_pct, false);
 sl_electricTrucks_pct.setValue(ElectricTrucks_pct, false);
 sl_hydrogenTrucks_pct.setValue(HydrogenTrucks_pct, false);
 /*ALCODEEND*/}
@@ -1524,7 +1524,7 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 		zero_Interface.c_orderedPublicChargers.add(0, gc);
 		currentNbChargers--;
 		
-		for (J_EADieselVehicle car : zero_Interface.c_mappingOfVehiclesPerCharger.get(gc.p_uid)) {
+		for (J_EAPetroleumFuelVehicle car : zero_Interface.c_mappingOfVehiclesPerCharger.get(gc.p_uid)) {
 			car.reRegisterEnergyAsset();
 		}
 	}
@@ -1540,7 +1540,7 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 		zero_Interface.c_orderedPublicChargers.add(0, gc);
 		currentNbChargers++;
 		
-		for (J_EADieselVehicle car : zero_Interface.c_mappingOfVehiclesPerCharger.get(gc.p_uid)) {
+		for (J_EAPetroleumFuelVehicle car : zero_Interface.c_mappingOfVehiclesPerCharger.get(gc.p_uid)) {
 			J_ActivityTrackerTrips tripTracker = car.getTripTracker(); //Needed, as triptracker is removed when removeEnergyAsset is called.
 			car.removeEnergyAsset();
 			car.setTripTracker(tripTracker);//Re-set the triptracker again, for storing.
@@ -1658,8 +1658,8 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 int desiredNbOfPrivateParkedEV = roundToInt(privateParkingEV_pct / 100 * gcListOrderedVehiclesPrivateParking.size());
 
 
-// we scale the consumption instead of getting the diesel/EV parameter from avgc data to represent the 'size' of the car
-double ratioEVToDieselConsumption = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionCar_kWhpkm / zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionCar_kWhpkm;
+// we scale the consumption instead of getting the petroleumFuel/EV parameter from avgc data to represent the 'size' of the car
+double ratioEVToPetroleumFuelConsumption = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionCar_kWhpkm / zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionCar_kWhpkm;
 
 while ( nbOfPrivateParkedEV > desiredNbOfPrivateParkedEV){
 	J_EAVehicle j_ea = findFirst( gcListOrderedVehiclesPrivateParking, h -> h instanceof J_EAEV);
@@ -1667,22 +1667,22 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 		throw new RuntimeException("f_setVehiclesPrivateParking does not work with vehicles that have a vehicleScaling other than 1");
 	}
 	J_ActivityTrackerTrips triptracker = j_ea.tripTracker;
-	double energyConsumption_kWhpkm = j_ea.getEnergyConsumption_kWhpkm() / ratioEVToDieselConsumption; 
+	double energyConsumption_kWhpkm = j_ea.getEnergyConsumption_kWhpkm() / ratioEVToPetroleumFuelConsumption; 
 	j_ea.removeEnergyAsset();
 	gcListOrderedVehiclesPrivateParking.remove(j_ea);
 	zero_Interface.c_orderedVehiclesPrivateParking.remove(j_ea);
-	J_EADieselVehicle dieselCar = new J_EADieselVehicle(j_ea.getParentAgent(), energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, 1, OL_EnergyAssetType.DIESEL_VEHICLE, triptracker);
-	gcListOrderedVehiclesPrivateParking.add(dieselCar);
-	zero_Interface.c_orderedVehiclesPrivateParking.add(dieselCar);
+	J_EAPetroleumFuelVehicle petroleumFuelCar = new J_EAPetroleumFuelVehicle(j_ea.getParentAgent(), energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, 1, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, triptracker);
+	gcListOrderedVehiclesPrivateParking.add(petroleumFuelCar);
+	zero_Interface.c_orderedVehiclesPrivateParking.add(petroleumFuelCar);
 	nbOfPrivateParkedEV --;
 }
 while ( nbOfPrivateParkedEV < desiredNbOfPrivateParkedEV){
-	J_EAVehicle j_ea = findFirst( gcListOrderedVehiclesPrivateParking, h -> h instanceof J_EADieselVehicle);
+	J_EAVehicle j_ea = findFirst( gcListOrderedVehiclesPrivateParking, h -> h instanceof J_EAPetroleumFuelVehicle);
 	if (j_ea.vehicleScaling != 1) {
 		throw new RuntimeException("f_setVehiclesPrivateParking does not work with vehicles that have a vehicleScaling other than 1");
 	}
 	J_ActivityTrackerTrips triptracker = j_ea.tripTracker;
-	double energyConsumption_kWhpkm = j_ea.getEnergyConsumption_kWhpkm() * ratioEVToDieselConsumption;
+	double energyConsumption_kWhpkm = j_ea.getEnergyConsumption_kWhpkm() * ratioEVToPetroleumFuelConsumption;
 	j_ea.removeEnergyAsset();
 	gcListOrderedVehiclesPrivateParking.remove(j_ea);
 	zero_Interface.c_orderedVehiclesPrivateParking.remove(j_ea);
diff --git a/_alp/Agents/tabMobility/Code/Functions.xml b/_alp/Agents/tabMobility/Code/Functions.xml
index 172bb9c..7fe51a7 100644
--- a/_alp/Agents/tabMobility/Code/Functions.xml
+++ b/_alp/Agents/tabMobility/Code/Functions.xml
@@ -82,7 +82,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1746008458894</Id>
-		<Name><![CDATA[f_setDieselTrucks]]></Name>
+		<Name><![CDATA[f_setPetroleumFuelTrucks]]></Name>
 		<X>70</X>
 		<Y>770</Y>
 		<Label>
@@ -178,7 +178,7 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>boolean</ReturnType>
 		<Id>1746008458938</Id>
-		<Name><![CDATA[f_dieselToElectricTruck]]></Name>
+		<Name><![CDATA[f_petroleumFuelToElectricTruck]]></Name>
 		<X>360</X>
 		<Y>720</Y>
 		<Label>
@@ -238,7 +238,7 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>boolean</ReturnType>
 		<Id>1746008458968</Id>
-		<Name><![CDATA[f_dieselToHydrogenTruck]]></Name>
+		<Name><![CDATA[f_petroleumFuelToHydrogenTruck]]></Name>
 		<X>360</X>
 		<Y>800</Y>
 		<Label>
@@ -258,7 +258,7 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>boolean</ReturnType>
 		<Id>1746008458977</Id>
-		<Name><![CDATA[f_electricToDieselTruck]]></Name>
+		<Name><![CDATA[f_electricToPetroleumFuelTruck]]></Name>
 		<X>360</X>
 		<Y>840</Y>
 		<Label>
@@ -278,7 +278,7 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>boolean</ReturnType>
 		<Id>1746008458987</Id>
-		<Name><![CDATA[f_hydrogenToDieselTruck]]></Name>
+		<Name><![CDATA[f_hydrogenToPetroleumFuelTruck]]></Name>
 		<X>360</X>
 		<Y>860</Y>
 		<Label>
@@ -354,7 +354,7 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>boolean</ReturnType>
 		<Id>1749645625091</Id>
-		<Name><![CDATA[f_dieselToElectricVan]]></Name>
+		<Name><![CDATA[f_petroleumFuelToElectricVan]]></Name>
 		<X>590</X>
 		<Y>720</Y>
 		<Label>
@@ -374,7 +374,7 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>boolean</ReturnType>
 		<Id>1749645629101</Id>
-		<Name><![CDATA[f_electricToDieselVan]]></Name>
+		<Name><![CDATA[f_electricToPetroleumFuelVan]]></Name>
 		<X>590</X>
 		<Y>740</Y>
 		<Label>
@@ -394,7 +394,7 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>boolean</ReturnType>
 		<Id>1749646233660</Id>
-		<Name><![CDATA[f_dieselToElectricCar]]></Name>
+		<Name><![CDATA[f_petroleumFuelToElectricCar]]></Name>
 		<X>590</X>
 		<Y>780</Y>
 		<Label>
@@ -414,7 +414,7 @@
 		<ReturnModificator>RETURNS_VALUE</ReturnModificator>
 		<ReturnType>boolean</ReturnType>
 		<Id>1749646235580</Id>
-		<Name><![CDATA[f_electricToDieselCar]]></Name>
+		<Name><![CDATA[f_electricToPetroleumFuelCar]]></Name>
 		<X>590</X>
 		<Y>800</Y>
 		<Label>
@@ -482,7 +482,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1749655752858</Id>
-		<Name><![CDATA[f_setDieselVans]]></Name>
+		<Name><![CDATA[f_setPetroleumFuelVans]]></Name>
 		<X>70</X>
 		<Y>840</Y>
 		<Label>
@@ -538,7 +538,7 @@
 		<ReturnModificator>VOID</ReturnModificator>
 		<ReturnType>double</ReturnType>
 		<Id>1749717776391</Id>
-		<Name><![CDATA[f_setDieselCars]]></Name>
+		<Name><![CDATA[f_setPetroleumFuelCars]]></Name>
 		<X>70</X>
 		<Y>890</Y>
 		<Label>
diff --git a/_alp/Agents/tabMobility/Levels/Level.level.xml b/_alp/Agents/tabMobility/Levels/Level.level.xml
index 00184ff..8ad5339 100644
--- a/_alp/Agents/tabMobility/Levels/Level.level.xml
+++ b/_alp/Agents/tabMobility/Levels/Level.level.xml
@@ -112,7 +112,7 @@
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_electricCars_pct.setValue(100 - sl_fossilFuelCars_pct.getIntValue(), false);
-f_setDieselCars( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
+f_setPetroleumFuelCars( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricCars_pct, sl_fossilFuelCars_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -432,7 +432,7 @@ f_setHydrogenTrucks( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>f_setVehicleSliders( 2, sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );
-f_setDieselTrucks( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
+f_setPetroleumFuelTrucks( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricTrucks_pct, sl_hydrogenTrucks_pct, sl_fossilFuelTrucks_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
@@ -642,7 +642,7 @@ f_setElectricCars( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_el
 					<EmbeddedIcon>false</EmbeddedIcon>
 					<Enabled>true</Enabled>
 					<ActionCode>sl_electricVans_pct.setValue(100 - sl_fossilFuelVans_pct.getIntValue(), false);
-f_setDieselVans( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
+f_setPetroleumFuelVans( uI_Tabs.f_getActiveSliderGridConnections_consumption(), sl_electricVans_pct, sl_fossilFuelVans_pct );</ActionCode>
 				</BasicProperties>
 				<ExtendedProperties>
 					<DefaultValueCode>0</DefaultValueCode>
diff --git a/_alp/Classes/Class.J_ModelSave.java b/_alp/Classes/Class.J_ModelSave.java
index 6cd8687..5040abf 100644
--- a/_alp/Classes/Class.J_ModelSave.java
+++ b/_alp/Classes/Class.J_ModelSave.java
@@ -12,8 +12,8 @@ public class J_ModelSave implements Serializable {
 	public ArrayList<J_EA> c_orderedVehicles;
 	public ArrayList<GCUtility> c_orderedHeatingSystemsCompanies;
 	public ArrayList<GCHouse> c_orderedHeatingSystemsHouses;
-	public ArrayList<J_EADieselVehicle> c_orderedActiveVehiclesPublicParking;
-	public ArrayList<J_EADieselVehicle> c_orderedNonActiveVehiclesPublicParking;
+	public ArrayList<J_EAPetroleumFuelVehicle> c_orderedActiveVehiclesPublicParking;
+	public ArrayList<J_EAPetroleumFuelVehicle> c_orderedNonActiveVehiclesPublicParking;
 	public ArrayList<J_EAVehicle> c_orderedVehiclesPrivateParking;
 	public ArrayList<GIS_Object> c_orderedParkingSpaces;
 	
@@ -21,7 +21,7 @@ public class J_ModelSave implements Serializable {
 	public ArrayList<J_EAChargePoint> c_orderedV2GChargers;
 	public ArrayList<GCPublicCharger> c_orderedPublicChargers;
 
-	public LinkedHashMap<String, List<J_EADieselVehicle>> c_mappingOfVehiclesPerCharger;
+	public LinkedHashMap<String, List<J_EAPetroleumFuelVehicle>> c_mappingOfVehiclesPerCharger;
 	public LinkedHashMap<String, J_scenario_Current> c_scenarioMap_Current;
 	public LinkedHashMap<String, J_scenario_Future> c_scenarioMap_Future;
 	
diff --git a/_alp/Classes/Class.J_scenario_Current.java b/_alp/Classes/Class.J_scenario_Current.java
index d35b4da..c6549a5 100644
--- a/_alp/Classes/Class.J_scenario_Current.java
+++ b/_alp/Classes/Class.J_scenario_Current.java
@@ -39,9 +39,9 @@ public class J_scenario_Current implements Serializable {
 	private Float currentBatteryPower_kW = 0f;
 	private Float currentBatteryCapacity_kWh = 0f;
 	private OL_GridConnectionHeatingType currentHeatingType = OL_GridConnectionHeatingType.NONE;
-	private Integer currentDieselCars = 0;
-	private Integer currentDieselVans = 0;
-	private Integer currentDieselTrucks = 0;
+	private Integer currentPetroleumFuelCars = 0;
+	private Integer currentPetroleumFuelVans = 0;
+	private Integer currentPetroleumFuelTrucks = 0;
 	private Integer currentHydrogenCars = 0; 
 	private Integer currentHydrogenVans = 0;
 	private Integer currentHydrogenTrucks = 0;
@@ -113,16 +113,16 @@ public void setCurrentHeatingType(OL_GridConnectionHeatingType currentHeatingTyp
         this.currentHeatingType = currentHeatingType;
     }
 
-    public void setCurrentDieselCars(Integer currentDieselCars) {
-        this.currentDieselCars = currentDieselCars;
+    public void setCurrentPetroleumFuelCars(Integer currentPetroleumFuelCars) {
+        this.currentPetroleumFuelCars = currentPetroleumFuelCars;
     }
 
-    public void setCurrentDieselVans(Integer currentDieselVans) {
-        this.currentDieselVans = currentDieselVans;
+    public void setCurrentPetroleumFuelVans(Integer currentPetroleumFuelVans) {
+        this.currentPetroleumFuelVans = currentPetroleumFuelVans;
     }
 
-    public void setCurrentDieselTrucks(Integer currentDieselTrucks) {
-        this.currentDieselTrucks = currentDieselTrucks;
+    public void setCurrentPetroleumFuelTrucks(Integer currentPetroleumFuelTrucks) {
+        this.currentPetroleumFuelTrucks = currentPetroleumFuelTrucks;
     }
   
     public void setCurrentHydrogenCars(Integer currentHydrogenCars) {
@@ -212,16 +212,16 @@ public OL_GridConnectionHeatingType getCurrentHeatingType() {
         return currentHeatingType;
     }
 	
-    public Integer getCurrentDieselCars() {
-        return currentDieselCars;
+    public Integer getCurrentPetroleumFuelCars() {
+        return currentPetroleumFuelCars;
     }
 
-    public Integer getCurrentDieselVans() {
-        return currentDieselVans;
+    public Integer getCurrentPetroleumFuelVans() {
+        return currentPetroleumFuelVans;
     }
 
-    public Integer getCurrentDieselTrucks() {
-        return currentDieselTrucks;
+    public Integer getCurrentPetroleumFuelTrucks() {
+        return currentPetroleumFuelTrucks;
     }
 
     public Integer getCurrentHydrogenCars() {

From b4854e1c04d44b33bbcf8296a2f088a8d2f78341 Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Wed, 17 Dec 2025 09:55:09 +0100
Subject: [PATCH 2/5] Bugfix

In the zummon company survey the getter should still be Diesel usage
---
 _alp/Agents/Zero_Loader/Code/Functions.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index 1ce7369..10de091 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -2721,7 +2721,7 @@ Building_data f_createBuildingData_Vallum(GridConnection companyGC,String PandID
 
 double f_createPetroleumFuelTractors(GridConnection companyGridConnection,com.zenmo.zummon.companysurvey.Agriculture agricultureSurveyData)
 {/*ALCODESTART::1737712184349*/
-final double annualPetroleumFuel_L = Optional.ofNullable(agricultureSurveyData.getAnnualPetroleumFuelUsage_L()).orElse(0.0);
+final double annualPetroleumFuel_L = Optional.ofNullable(agricultureSurveyData.getAnnualDieselUsage_L()).orElse(0.0);
 final int numTractors = Optional.ofNullable(agricultureSurveyData.getNumTractors()).orElse(annualPetroleumFuel_L > 0.0 ? 1 : 0);
 
 if (numTractors > 0 && annualPetroleumFuel_L <= 0.0) {

From 0adf6b44d60bb6ee160abf865d41fa9602d1077b Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Wed, 17 Dec 2025 10:18:38 +0100
Subject: [PATCH 3/5] rollback refactor in avgc

---
 _alp/Agents/AVGC_data/Code/Functions.java   | 12 +++++------
 _alp/Agents/AVGC_data/Variables.xml         | 22 ++++++++++-----------
 _alp/Agents/Zero_Loader/Code/Functions.java |  6 +++---
 _alp/Agents/Zero_Loader/EmbeddedObjects.xml | 12 +++++------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/_alp/Agents/AVGC_data/Code/Functions.java b/_alp/Agents/AVGC_data/Code/Functions.java
index 1df466e..5616cf0 100644
--- a/_alp/Agents/AVGC_data/Code/Functions.java
+++ b/_alp/Agents/AVGC_data/Code/Functions.java
@@ -31,20 +31,20 @@
 dataAVGC.p_avgEVEnergyConsumptionVan_kWhpkm = p_avgEVEnergyConsumptionVan_kWhpkm;
 dataAVGC.p_avgEVEnergyConsumptionTruck_kWhpkm = p_avgEVEnergyConsumptionTruck_kWhpkm;
 dataAVGC.p_hydrogenEnergyDensity_kWh_Nm3 = p_hydrogenEnergyDensity_kWh_Nm3;
-dataAVGC.p_avgPetroleumFuelConsumptionCar_kmpl = p_avgPetroleumFuelConsumptionCar_kmpl;
+dataAVGC.p_avgDieselConsumptionCar_kmpl = p_avgDieselConsumptionCar_kmpl;
 dataAVGC.p_avgGasolineConsumptionCar_kmpl = p_avgGasolineConsumptionCar_kmpl;
 dataAVGC.p_hydrogenSpecificEnergy_kWh_kg = p_hydrogenSpecificEnergy_kWh_kg;
 dataAVGC.p_hydrogenDensity_kg_Nm3 = p_hydrogenDensity_kg_Nm3;
 dataAVGC.p_oxygenDensity_kg_Nm3 = p_oxygenDensity_kg_Nm3;
 dataAVGC.p_avgCOPHeatpump = p_avgCOPHeatpump;
 dataAVGC.p_avgEfficiencyHeatpump_fr = p_avgEfficiencyHeatpump_fr;
-dataAVGC.p_avgPetroleumFuelConsumptionCar_kWhpkm = p_avgPetroleumFuelConsumptionCar_kWhpkm;
+dataAVGC.p_avgPetroleumFuelConsumptionCar_kWhpkm = p_avgDieselConsumptionCar_kWhpkm;
 dataAVGC.p_oxygenProduction_kgO2pkgH2 = p_oxygenProduction_kgO2pkgH2;
 dataAVGC.p_avgGasolineConsumptionCar_kWhpkm = p_avgGasolineConsumptionCar_kWhpkm;
-dataAVGC.p_avgPetroleumFuelConsumptionVan_kmpl = p_avgPetroleumFuelConsumptionVan_kmpl;
-dataAVGC.p_avgPetroleumFuelConsumptionVan_kWhpkm = p_avgPetroleumFuelConsumptionVan_kWhpkm;
-dataAVGC.p_avgPetroleumFuelConsumptionTruck_kmpl = p_avgPetroleumFuelConsumptionTruck_kmpl;
-dataAVGC.p_avgPetroleumFuelConsumptionTruck_kWhpkm = p_avgPetroleumFuelConsumptionTruck_kWhpkm;
+dataAVGC.p_avgPetroleumFuelConsumptionVan_kmpl = p_avgDieselConsumptionVan_kmpl;
+dataAVGC.p_avgPetroleumFuelConsumptionVan_kWhpkm = p_avgDieselConsumptionVan_kWhpkm;
+dataAVGC.p_avgPetroleumFuelConsumptionTruck_kmpl = p_avgDieselConsumptionTruck_kmpl;
+dataAVGC.p_avgPetroleumFuelConsumptionTruck_kWhpkm = p_avgDieselConsumptionTruck_kWhpkm;
 dataAVGC.p_avgOutputTemperatureElectricHeatpump_degC = p_avgOutputTemperatureElectricHeatpump_degC;
 dataAVGC.p_avgOutputTemperatureHybridHeatpump_degC = p_avgOutputTemperatureHybridHeatpump_degC;
 dataAVGC.p_avgHydrogenConsumptionCar_kWhpkm = p_avgHydrogenConsumptionCar_kWhpkm;
diff --git a/_alp/Agents/AVGC_data/Variables.xml b/_alp/Agents/AVGC_data/Variables.xml
index 2072b25..b0669a1 100644
--- a/_alp/Agents/AVGC_data/Variables.xml
+++ b/_alp/Agents/AVGC_data/Variables.xml
@@ -795,7 +795,7 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205654</Id>
-		<Name><![CDATA[p_avgPetroleumFuelConsumptionCar_kmpl]]></Name>
+		<Name><![CDATA[p_avgDieselConsumptionCar_kmpl]]></Name>
 		<Description><![CDATA[https://www.unitedconsumers.com/blog/auto/zuinig-rijden.jsp]]></Description>
 		<X>570</X>
 		<Y>400</Y>
@@ -882,7 +882,7 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205663</Id>
-		<Name><![CDATA[p_avgPetroleumFuelConsumptionCar_kWhpkm]]></Name>
+		<Name><![CDATA[p_avgDieselConsumptionCar_kWhpkm]]></Name>
 		<X>570</X>
 		<Y>450</Y>
 		<Label>
@@ -897,7 +897,7 @@ MM O = 16 g/mol
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgPetroleumFuelConsumptionCar_kmpl]]></Code>
+				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgDieselConsumptionCar_kmpl]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205661</Id>
@@ -938,8 +938,8 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205669</Id>
-		<Name><![CDATA[p_avgPetroleumFuelConsumptionVan_kmpl]]></Name>
-		<Description><![CDATA[https://www.webfleet.com/nl_nl/webfleet/blog/hoeveel-petroleumFuel-verbruikt-een-vrachtwagen-per-kilometer/
+		<Name><![CDATA[p_avgDieselConsumptionVan_kmpl]]></Name>
+		<Description><![CDATA[https://www.webfleet.com/nl_nl/webfleet/blog/hoeveel-diesel-verbruikt-een-vrachtwagen-per-kilometer/
 
 11 liter per 100 km = 9.1 km per liter.
 ]]></Description>
@@ -970,7 +970,7 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205672</Id>
-		<Name><![CDATA[p_avgPetroleumFuelConsumptionVan_kWhpkm]]></Name>
+		<Name><![CDATA[p_avgDieselConsumptionVan_kWhpkm]]></Name>
 		<X>570</X>
 		<Y>530</Y>
 		<Label>
@@ -985,7 +985,7 @@ MM O = 16 g/mol
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgPetroleumFuelConsumptionVan_kmpl]]></Code>
+				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgDieselConsumptionVan_kmpl]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205670</Id>
@@ -998,8 +998,8 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205675</Id>
-		<Name><![CDATA[p_avgPetroleumFuelConsumptionTruck_kmpl]]></Name>
-		<Description><![CDATA[https://www.webfleet.com/nl_nl/webfleet/blog/hoeveel-petroleumFuel-verbruikt-een-vrachtwagen-per-kilometer/
+		<Name><![CDATA[p_avgDieselConsumptionTruck_kmpl]]></Name>
+		<Description><![CDATA[https://www.webfleet.com/nl_nl/webfleet/blog/hoeveel-diesel-verbruikt-een-vrachtwagen-per-kilometer/
 
 --> 25 - 30 - 40 liter per 100 km. = 4 - 3.33 - 2.5 km per l
 Heavely dependend on load, city/highway, etc.
@@ -1031,7 +1031,7 @@ For now: Picking 3.33 km per l]]></Description>
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205678</Id>
-		<Name><![CDATA[p_avgPetroleumFuelConsumptionTruck_kWhpkm]]></Name>
+		<Name><![CDATA[p_avgDieselConsumptionTruck_kWhpkm]]></Name>
 		<X>570</X>
 		<Y>580</Y>
 		<Label>
@@ -1046,7 +1046,7 @@ For now: Picking 3.33 km per l]]></Description>
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgPetroleumFuelConsumptionTruck_kmpl]]></Code>
+				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgDieselConsumptionTruck_kmpl]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205676</Id>
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index 10de091..3fdaf8d 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -1361,15 +1361,15 @@ J_EAPetroleumFuelVehicle f_addPetroleumFuelVehicle(GridConnection parentGC,OL_En
 switch (vehicle_type){
 	
 	case PETROLEUM_FUEL_VEHICLE:
-		energyConsumption_kWhpkm = roundToDecimal(uniform(0.7, 1.3),2) * avgc_data.p_avgPetroleumFuelConsumptionCar_kWhpkm;
+		energyConsumption_kWhpkm = roundToDecimal(uniform(0.7, 1.3),2) * avgc_data.p_avgDieselConsumptionCar_kWhpkm;
 	break;
 	
 	case PETROLEUM_FUEL_VAN:
-		energyConsumption_kWhpkm = avgc_data.p_avgPetroleumFuelConsumptionVan_kWhpkm;
+		energyConsumption_kWhpkm = avgc_data.p_avgDieselConsumptionVan_kWhpkm;
 	break;
 	
 	case PETROLEUM_FUEL_TRUCK:
-		energyConsumption_kWhpkm = avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
+		energyConsumption_kWhpkm = avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
 	break;
 }
 
diff --git a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
index a0d1761..8688de4 100644
--- a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
@@ -212,7 +212,7 @@
 				<Name><![CDATA[p_petroleumFuel_kWhpl]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgPetroleumFuelConsumptionCar_kmpl]]></Name>
+				<Name><![CDATA[p_avgDieselConsumptionCar_kmpl]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_avgGasolineConsumptionCar_kmpl]]></Name>
@@ -221,22 +221,22 @@
 				<Name><![CDATA[p_gasoline_kWhpl]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgPetroleumFuelConsumptionCar_kWhpkm]]></Name>
+				<Name><![CDATA[p_avgDieselConsumptionCar_kWhpkm]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_avgGasolineConsumptionCar_kWhpkm]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgPetroleumFuelConsumptionVan_kmpl]]></Name>
+				<Name><![CDATA[p_avgDieselConsumptionVan_kmpl]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgPetroleumFuelConsumptionVan_kWhpkm]]></Name>
+				<Name><![CDATA[p_avgDieselConsumptionVan_kWhpkm]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgPetroleumFuelConsumptionTruck_kmpl]]></Name>
+				<Name><![CDATA[p_avgDieselConsumptionTruck_kmpl]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_avgPetroleumFuelConsumptionTruck_kWhpkm]]></Name>
+				<Name><![CDATA[p_avgDieselConsumptionTruck_kWhpkm]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_avgCOPHeatpump]]></Name>

From c1dcef80d714b4e07bd5c1cb32de9a316f5b15da Mon Sep 17 00:00:00 2001
From: Luc-Sol <luc@solidegroep.nl>
Date: Wed, 17 Dec 2025 10:23:16 +0100
Subject: [PATCH 4/5] more rollback refactor in avgc

---
 _alp/Agents/AVGC_data/Code/Functions.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/_alp/Agents/AVGC_data/Code/Functions.java b/_alp/Agents/AVGC_data/Code/Functions.java
index 5616cf0..6f777c1 100644
--- a/_alp/Agents/AVGC_data/Code/Functions.java
+++ b/_alp/Agents/AVGC_data/Code/Functions.java
@@ -18,7 +18,7 @@
 dataAVGC.p_avgEVStorageTruck_kWh = p_avgEVStorageTruck_kWh;
 dataAVGC.p_ratioHouseInstalledPV = p_ratioHouseInstalledPV;
 dataAVGC.p_gas_kWhpm3 = p_gas_kWhpm3;
-dataAVGC.p_petroleumFuel_kWhpl = p_petroleumFuel_kWhpl;
+dataAVGC.p_diesel_kWhpl = p_diesel_kWhpl;
 dataAVGC.p_gasoline_kWhpl = p_gasoline_kWhpl;
 dataAVGC.p_waterHeatCapacity_JpkgK = p_waterHeatCapacity_JpkgK;
 dataAVGC.p_waterDensity_kgpm3 = p_waterDensity_kgpm3;
@@ -38,13 +38,13 @@
 dataAVGC.p_oxygenDensity_kg_Nm3 = p_oxygenDensity_kg_Nm3;
 dataAVGC.p_avgCOPHeatpump = p_avgCOPHeatpump;
 dataAVGC.p_avgEfficiencyHeatpump_fr = p_avgEfficiencyHeatpump_fr;
-dataAVGC.p_avgPetroleumFuelConsumptionCar_kWhpkm = p_avgDieselConsumptionCar_kWhpkm;
+dataAVGC.p_avgDieselConsumptionCar_kWhpkm = p_avgDieselConsumptionCar_kWhpkm;
 dataAVGC.p_oxygenProduction_kgO2pkgH2 = p_oxygenProduction_kgO2pkgH2;
 dataAVGC.p_avgGasolineConsumptionCar_kWhpkm = p_avgGasolineConsumptionCar_kWhpkm;
-dataAVGC.p_avgPetroleumFuelConsumptionVan_kmpl = p_avgDieselConsumptionVan_kmpl;
-dataAVGC.p_avgPetroleumFuelConsumptionVan_kWhpkm = p_avgDieselConsumptionVan_kWhpkm;
-dataAVGC.p_avgPetroleumFuelConsumptionTruck_kmpl = p_avgDieselConsumptionTruck_kmpl;
-dataAVGC.p_avgPetroleumFuelConsumptionTruck_kWhpkm = p_avgDieselConsumptionTruck_kWhpkm;
+dataAVGC.p_avgDieselConsumptionVan_kmpl = p_avgDieselConsumptionVan_kmpl;
+dataAVGC.p_avgDieselConsumptionVan_kWhpkm = p_avgDieselConsumptionVan_kWhpkm;
+dataAVGC.p_avgDieselConsumptionTruck_kmpl = p_avgDieselConsumptionTruck_kmpl;
+dataAVGC.p_avgDieselConsumptionTruck_kWhpkm = p_avgDieselConsumptionTruck_kWhpkm;
 dataAVGC.p_avgOutputTemperatureElectricHeatpump_degC = p_avgOutputTemperatureElectricHeatpump_degC;
 dataAVGC.p_avgOutputTemperatureHybridHeatpump_degC = p_avgOutputTemperatureHybridHeatpump_degC;
 dataAVGC.p_avgHydrogenConsumptionCar_kWhpkm = p_avgHydrogenConsumptionCar_kWhpkm;

From cd1bd2b811fbd466629fd4c6ee3290c5f5209782 Mon Sep 17 00:00:00 2001
From: Ate Hempenius <ate@zenmo.com>
Date: Thu, 18 Dec 2025 12:40:18 +0100
Subject: [PATCH 5/5] bugfixes and cars now run by default on gasoline instead
 of Diesel!

---
 _alp/Agents/AVGC_data/Variables.xml            |  8 ++++----
 _alp/Agents/UI_company/Code/Functions.java     |  6 +++---
 _alp/Agents/Zero_Loader/Code/Functions.java    |  2 +-
 _alp/Agents/Zero_Loader/EmbeddedObjects.xml    |  2 +-
 _alp/Agents/tabMobility/Code/Functions.java    | 18 +++++++++---------
 _alp/Agents/tabMobility/Code/Functions.xml     |  8 ++++----
 _alp/Agents/tabMobility/Levels/Level.level.xml |  4 ++--
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/_alp/Agents/AVGC_data/Variables.xml b/_alp/Agents/AVGC_data/Variables.xml
index b0669a1..0c13915 100644
--- a/_alp/Agents/AVGC_data/Variables.xml
+++ b/_alp/Agents/AVGC_data/Variables.xml
@@ -766,7 +766,7 @@ MM O = 16 g/mol
 	</Variable>
 	<Variable Class="Parameter">
 		<Id>1726584205651</Id>
-		<Name><![CDATA[p_petroleumFuel_kWhpl]]></Name>
+		<Name><![CDATA[p_diesel_kWhpl]]></Name>
 		<Description><![CDATA[https://www.joostdevree.nl/shtmls/calorische_waarde.shtml]]></Description>
 		<X>1070</X>
 		<Y>250</Y>
@@ -897,7 +897,7 @@ MM O = 16 g/mol
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgDieselConsumptionCar_kmpl]]></Code>
+				<Code><![CDATA[p_diesel_kWhpl/p_avgDieselConsumptionCar_kmpl]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205661</Id>
@@ -985,7 +985,7 @@ MM O = 16 g/mol
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgDieselConsumptionVan_kmpl]]></Code>
+				<Code><![CDATA[p_diesel_kWhpl/p_avgDieselConsumptionVan_kmpl]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205670</Id>
@@ -1046,7 +1046,7 @@ For now: Picking 3.33 km per l]]></Description>
 			<UnitType>NONE</UnitType>
 			<SdArray>false</SdArray>
 			<DefaultValue Class="CodeValue">
-				<Code><![CDATA[p_petroleumFuel_kWhpl/p_avgDieselConsumptionTruck_kmpl]]></Code>
+				<Code><![CDATA[p_diesel_kWhpl/p_avgDieselConsumptionTruck_kmpl]]></Code>
 			</DefaultValue>
 			<ParameterEditor>
 				<Id>1726584205676</Id>
diff --git a/_alp/Agents/UI_company/Code/Functions.java b/_alp/Agents/UI_company/Code/Functions.java
index d7a4a61..3ce49c4 100644
--- a/_alp/Agents/UI_company/Code/Functions.java
+++ b/_alp/Agents/UI_company/Code/Functions.java
@@ -702,15 +702,15 @@ else if (vehicleType == OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE || vehicleType
 	switch (vehicleType){
 		
 		case PETROLEUM_FUEL_VEHICLE:
-			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionCar_kWhpkm;
+			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgGasolineConsumptionCar_kWhpkm;
 		break;
 		
 		case PETROLEUM_FUEL_VAN:
-			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionVan_kWhpkm;
+			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionVan_kWhpkm;
 		break;
 		
 		case PETROLEUM_FUEL_TRUCK:
-			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
+			energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
 		break;
 	}
 	
diff --git a/_alp/Agents/Zero_Loader/Code/Functions.java b/_alp/Agents/Zero_Loader/Code/Functions.java
index 356a152..48294de 100644
--- a/_alp/Agents/Zero_Loader/Code/Functions.java
+++ b/_alp/Agents/Zero_Loader/Code/Functions.java
@@ -1361,7 +1361,7 @@ J_EAPetroleumFuelVehicle f_addPetroleumFuelVehicle(GridConnection parentGC,OL_En
 switch (vehicle_type){
 	
 	case PETROLEUM_FUEL_VEHICLE:
-		energyConsumption_kWhpkm = roundToDecimal(uniform(0.7, 1.3),2) * avgc_data.p_avgDieselConsumptionCar_kWhpkm;
+		energyConsumption_kWhpkm = roundToDecimal(uniform(0.7, 1.3),2) * avgc_data.p_avgGasolineConsumptionCar_kWhpkm;
 	break;
 	
 	case PETROLEUM_FUEL_VAN:
diff --git a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
index 78d2ed6..e58d26f 100644
--- a/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
+++ b/_alp/Agents/Zero_Loader/EmbeddedObjects.xml
@@ -215,7 +215,7 @@
 				<Name><![CDATA[p_hydrogenSpecificEnergy_kWh_kg]]></Name>
 			</Parameter>
 			<Parameter>
-				<Name><![CDATA[p_petroleumFuel_kWhpl]]></Name>
+				<Name><![CDATA[p_diesel_kWhpl]]></Name>
 			</Parameter>
 			<Parameter>
 				<Name><![CDATA[p_avgDieselConsumptionCar_kmpl]]></Name>
diff --git a/_alp/Agents/tabMobility/Code/Functions.java b/_alp/Agents/tabMobility/Code/Functions.java
index 93e0b48..9b8d9c8 100644
--- a/_alp/Agents/tabMobility/Code/Functions.java
+++ b/_alp/Agents/tabMobility/Code/Functions.java
@@ -522,7 +522,7 @@ boolean f_electricToPetroleumFuelTruck(List<GridConnection> gcList)
 	electricTruck.removeEnergyAsset();
 
 	// Re-add petroleumFuel vehicle
-	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
 	double vehicleScaling = 1.0;
 	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK, tripTracker, available);
 	
@@ -571,9 +571,9 @@ boolean f_hydrogenToPetroleumFuelTruck(List<GridConnection> gcList)
 	hydrogenTruck.removeEnergyAsset();
 
 	// Re-add petroleumFuel vehicle
-	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionTruck_kWhpkm;
 	double vehicleScaling = 1.0;
-	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_TRUCK, tripTracker, available);
+	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.PETROLEUM_FUEL_TRUCK, tripTracker, available);
 	
 	zero_Interface.c_orderedVehicles.add(0, petroleumFuelVehicle);
 	
@@ -729,9 +729,9 @@ boolean f_electricToPetroleumFuelVan(List<GridConnection> gcList)
 	electricVan.removeEnergyAsset();
 
 	// Re-add petroleumFuel vehicle
-	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgDieselConsumptionVan_kWhpkm;
 	double vehicleScaling = 1.0;
-	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_VAN, tripTracker, available);
+	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.PETROLEUM_FUEL_VAN, tripTracker, available);
 	
 	zero_Interface.c_orderedVehicles.add(0, petroleumFuelVehicle);
 	
@@ -830,9 +830,9 @@ boolean f_electricToPetroleumFuelCar(List<GridConnection> gcList)
 	electricCar.removeEnergyAsset();
 
 	// Re-add petroleumFuel vehicle
-	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionTruck_kWhpkm;
+	double energyConsumption_kWhpkm = zero_Interface.energyModel.avgc_data.p_avgGasolineConsumptionCar_kWhpkm;
 	double vehicleScaling = 1.0;
-	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.DIESEL_VEHICLE, tripTracker, available);
+	J_EAPetroleumFuelVehicle petroleumFuelVehicle = new J_EAPetroleumFuelVehicle(gc, energyConsumption_kWhpkm, zero_Interface.energyModel.p_timeStep_h, vehicleScaling, OL_EnergyAssetType.PETROLEUM_FUEL_VEHICLE, tripTracker, available);
 	
 	zero_Interface.c_orderedVehicles.add(0, petroleumFuelVehicle);
 	
@@ -1638,7 +1638,7 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 
 
 // we scale the consumption instead of getting the petroleumFuel/EV parameter from avgc data to represent the 'size' of the car
-double ratioEVToPetroleumFuelConsumption = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionCar_kWhpkm / zero_Interface.energyModel.avgc_data.p_avgPetroleumFuelConsumptionCar_kWhpkm;
+double ratioEVToPetroleumFuelConsumption = zero_Interface.energyModel.avgc_data.p_avgEVEnergyConsumptionCar_kWhpkm / zero_Interface.energyModel.avgc_data.p_avgGasolineConsumptionCar_kWhpkm;
 
 while ( nbOfPrivateParkedEV > desiredNbOfPrivateParkedEV){
 	J_EAVehicle j_ea = findFirst( gcListOrderedVehiclesPrivateParking, h -> h instanceof J_EAEV);
@@ -1658,7 +1658,7 @@ else if (vehicle instanceof J_EAHydrogenVehicle){
 }
 while ( nbOfPrivateParkedEV < desiredNbOfPrivateParkedEV){
 	J_EAVehicle j_ea = findFirst( gcListOrderedVehiclesPrivateParking, h -> h instanceof J_EAPetroleumFuelVehicle);
-	if (j_ea.vehicleScaling != 1) {
+	if (j_ea.getVehicleScaling_fr() != 1) {
 		throw new RuntimeException("f_setVehiclesPrivateParking does not work with vehicles that have a vehicleScaling other than 1");
 	}
 	J_ActivityTrackerTrips triptracker = j_ea.tripTracker;
diff --git a/_alp/Agents/tabMobility/Code/Functions.xml b/_alp/Agents/tabMobility/Code/Functions.xml
index 7fe51a7..8936ffd 100644
--- a/_alp/Agents/tabMobility/Code/Functions.xml
+++ b/_alp/Agents/tabMobility/Code/Functions.xml
@@ -355,7 +355,7 @@
 		<ReturnType>boolean</ReturnType>
 		<Id>1749645625091</Id>
 		<Name><![CDATA[f_petroleumFuelToElectricVan]]></Name>
-		<X>590</X>
+		<X>680</X>
 		<Y>720</Y>
 		<Label>
 			<X>10</X>
@@ -375,7 +375,7 @@
 		<ReturnType>boolean</ReturnType>
 		<Id>1749645629101</Id>
 		<Name><![CDATA[f_electricToPetroleumFuelVan]]></Name>
-		<X>590</X>
+		<X>680</X>
 		<Y>740</Y>
 		<Label>
 			<X>10</X>
@@ -395,7 +395,7 @@
 		<ReturnType>boolean</ReturnType>
 		<Id>1749646233660</Id>
 		<Name><![CDATA[f_petroleumFuelToElectricCar]]></Name>
-		<X>590</X>
+		<X>680</X>
 		<Y>780</Y>
 		<Label>
 			<X>10</X>
@@ -415,7 +415,7 @@
 		<ReturnType>boolean</ReturnType>
 		<Id>1749646235580</Id>
 		<Name><![CDATA[f_electricToPetroleumFuelCar]]></Name>
-		<X>590</X>
+		<X>680</X>
 		<Y>800</Y>
 		<Label>
 			<X>10</X>
diff --git a/_alp/Agents/tabMobility/Levels/Level.level.xml b/_alp/Agents/tabMobility/Levels/Level.level.xml
index 8ad5339..8fd3a6f 100644
--- a/_alp/Agents/tabMobility/Levels/Level.level.xml
+++ b/_alp/Agents/tabMobility/Levels/Level.level.xml
@@ -20,7 +20,7 @@
 		<LineColor>-4144960</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>800</Width>
+		<Width>960</Width>
 		<Height>470</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>
@@ -1154,7 +1154,7 @@ f_setChargingAttitude(selectedChargingAttitude, uI_Tabs.f_getAllSliderGridConnec
 		<LineColor>-5952982</LineColor>
 		<LineMaterial>null</LineMaterial>
 		<LineStyle>SOLID</LineStyle>
-		<Width>720</Width>
+		<Width>900</Width>
 		<Height>230</Height>
 		<Rotation>0.0</Rotation>
 		<FillColor>-1</FillColor>