diff --git a/_alp/Agents/ChartGespreksLeidraad/Code/Functions.java b/_alp/Agents/ChartGespreksLeidraad/Code/Functions.java
index 46ccdc7..4d1fa86 100644
--- a/_alp/Agents/ChartGespreksLeidraad/Code/Functions.java
+++ b/_alp/Agents/ChartGespreksLeidraad/Code/Functions.java
@@ -56,7 +56,7 @@
 double selfConsumedEnergy_MWh = data.getRapidRunData().getTotalEnergySelfConsumed_MWh();
 double importE_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.ELECTRICITY) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.ELECTRICITY) : 0; 
 double importG_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.METHANE) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.METHANE) : 0;
-double importF_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.DIESEL) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.DIESEL) : 0; 
+double importF_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.PETROLEUM_FUEL) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.PETROLEUM_FUEL) : 0; 
 double importH_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.HYDROGEN) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.HYDROGEN) : 0; 
 double exportE_MWh = data.getRapidRunData().getTotalEnergyExport_MWh();
 double districtHeating_consumption_MWh ;
diff --git a/_alp/Agents/ChartKPISummary/Code/Functions.java b/_alp/Agents/ChartKPISummary/Code/Functions.java
index e600198..eb67f2f 100644
--- a/_alp/Agents/ChartKPISummary/Code/Functions.java
+++ b/_alp/Agents/ChartKPISummary/Code/Functions.java
@@ -35,7 +35,7 @@
 	
 double elecConsumption_pct = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.ELECTRICITY) ? data.getRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getIntegral_MWh() / totalEnergyConsumption_MWh * 100 : 0;
 double gasConsumption_pct = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.METHANE) ? data.getRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.METHANE).getIntegral_MWh() / totalEnergyConsumption_MWh * 100 : 0;
-double FFconsumption_pct = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.DIESEL) ? data.getRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.DIESEL).getIntegral_MWh() / totalEnergyConsumption_MWh * 100 : 0;
+double FFconsumption_pct = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.PETROLEUM_FUEL) ? data.getRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.PETROLEUM_FUEL).getIntegral_MWh() / totalEnergyConsumption_MWh * 100 : 0;
 double h2consumption_pct = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.HYDROGEN) ? data.getRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.HYDROGEN).getIntegral_MWh() / totalEnergyConsumption_MWh * 100 : 0;
 double production_MWh = data.getRapidRunData().getTotalEnergyProduced_MWh();
 
@@ -89,7 +89,7 @@
 	
 	double previousElectricityConsumption_pct = data.getPreviousRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.ELECTRICITY) ? data.getPreviousRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.ELECTRICITY).getIntegral_MWh() / previousTotalEnergyConsumption_MWh * 100 : 0;
 	double previousGasConsumption_pct = data.getPreviousRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.METHANE) ? data.getPreviousRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.METHANE).getIntegral_MWh() / previousTotalEnergyConsumption_MWh * 100 : 0;
-	double previousFFConsumption_pct = data.getPreviousRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.DIESEL) ? data.getPreviousRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.DIESEL).getIntegral_MWh() / previousTotalEnergyConsumption_MWh * 100 : 0;
+	double previousFFConsumption_pct = data.getPreviousRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.PETROLEUM_FUEL) ? data.getPreviousRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.PETROLEUM_FUEL).getIntegral_MWh() / previousTotalEnergyConsumption_MWh * 100 : 0;
 	double previousH2Consumption_pct = data.getPreviousRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.HYDROGEN) ? data.getPreviousRapidRunData().am_dailyAverageConsumptionAccumulators_kW.get(OL_EnergyCarriers.HYDROGEN).getIntegral_MWh() / previousTotalEnergyConsumption_MWh * 100 : 0; 
 	double previousProduction_MWh = data.getPreviousRapidRunData().getTotalEnergyProduced_MWh();  
 	
diff --git a/_alp/Agents/ChartSankey/Code/Functions.java b/_alp/Agents/ChartSankey/Code/Functions.java
index d382221..49fa22a 100644
--- a/_alp/Agents/ChartSankey/Code/Functions.java
+++ b/_alp/Agents/ChartSankey/Code/Functions.java
@@ -8,7 +8,7 @@
 double selfConsumedEnergy_MWh = data.getRapidRunData().getTotalEnergySelfConsumed_MWh();
 double importE_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.ELECTRICITY) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.ELECTRICITY) : 0;
 double importG_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.METHANE) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.METHANE) : 0;
-double importF_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.DIESEL) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.DIESEL) : 0;
+double importF_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.PETROLEUM_FUEL) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.PETROLEUM_FUEL) : 0;
 double importHeat_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.HEAT) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.HEAT) : 0;
 double importH_MWh = data.getRapidRunData().activeConsumptionEnergyCarriers.contains(OL_EnergyCarriers.HYDROGEN) ? data.getRapidRunData().getTotalImport_MWh(OL_EnergyCarriers.HYDROGEN) : 0;
 double exportH_MWh = data.getRapidRunData().activeProductionEnergyCarriers.contains(OL_EnergyCarriers.HYDROGEN) ? data.getRapidRunData().getTotalExport_MWh(OL_EnergyCarriers.HYDROGEN) : 0;
diff --git a/_alp/Agents/UI_Results/AOC.UI_Results.xml b/_alp/Agents/UI_Results/AOC.UI_Results.xml
index b8cfb3b..f32a173 100644
--- a/_alp/Agents/UI_Results/AOC.UI_Results.xml
+++ b/_alp/Agents/UI_Results/AOC.UI_Results.xml
@@ -10,14 +10,14 @@ cm_productionColors = new J_ColorMap<>(OL_EnergyCarriers.class);
 cm_productionColors.put(OL_EnergyCarriers.ELECTRICITY, v_electricitySupplyColor);
 cm_productionColors.put(OL_EnergyCarriers.HEAT, v_districtHeatHeatSupplyColor);
 cm_productionColors.put(OL_EnergyCarriers.METHANE, v_naturalGasSupplyColor);
-cm_productionColors.put(OL_EnergyCarriers.DIESEL, v_petroleumProductsSupplyColor);
+cm_productionColors.put(OL_EnergyCarriers.PETROLEUM_FUEL, v_petroleumProductsSupplyColor);
 cm_productionColors.put(OL_EnergyCarriers.HYDROGEN, v_hydrogenSupplyColor);
 
 cm_consumptionColors = new J_ColorMap<>(OL_EnergyCarriers.class);
 cm_consumptionColors.put(OL_EnergyCarriers.ELECTRICITY, v_electricityDemandColor);
 cm_consumptionColors.put(OL_EnergyCarriers.HEAT, v_districtHeatDemandColor);
 cm_consumptionColors.put(OL_EnergyCarriers.METHANE, v_naturalGasDemandColor);
-cm_consumptionColors.put(OL_EnergyCarriers.DIESEL, v_petroleumProductsDemandColor);
+cm_consumptionColors.put(OL_EnergyCarriers.PETROLEUM_FUEL, v_petroleumProductsDemandColor);
 cm_consumptionColors.put(OL_EnergyCarriers.HYDROGEN, v_hydrogenDemandColor);
 
 
diff --git a/_alp/Agents/UI_Results/Code/Functions.java b/_alp/Agents/UI_Results/Code/Functions.java
index 4b79e5c..ad03c04 100644
--- a/_alp/Agents/UI_Results/Code/Functions.java
+++ b/_alp/Agents/UI_Results/Code/Functions.java
@@ -319,8 +319,8 @@ String f_getName(OL_EnergyCarriers energyCarrier)
 		return "Warmte";
 	case METHANE:
 		return "Gas";
-	case DIESEL:
-		return "Diesel";
+	case PETROLEUM_FUEL:
+		return "Voertuig Brandstof";
 	case HYDROGEN:
 		return "Waterstof";
 	default: