diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
index 6b91ea62812809430c94fc095215ced25373a2fa..7e3165853fdf31e0fb1f435c4e8ec2cc1377a615 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml
@@ -4,15 +4,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- OCV HEV (and OCV FCV in future) Bus -->
-		<Result status="success" xsi:type="ResultSuccessOCVHEVType">
+		<!-- OVC HEV (and OVC FCV in future) Bus -->
+		<Result status="success" xsi:type="ResultSuccessOVCHEVType">
 			<Mission>Long Haul</Mission>
 			<SimulationParameters>
 				<TotalVehicleMass unit="kg">17200</TotalVehicleMass>
 				<MassPassengers unit="kg">2600</MassPassengers>
 				<PassengerCount>13.75</PassengerCount>
 			</SimulationParameters>
-			<OCVMode type="charge depleting">
+			<OVCMode type="charge depleting">
 				<AverageSpeed unit="km/h">1.0</AverageSpeed>
 				<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
 					<FuelConsumption unit="g/km">3.1</FuelConsumption>
@@ -30,8 +30,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
 				</ElectricEnergy>
 				<CO2 unit="g/km">5.1</CO2>
 				<CO2 unit="g/p-km">5.2</CO2>
-			</OCVMode>
-			<OCVMode type="charge sustaining">
+			</OVCMode>
+			<OVCMode type="charge sustaining">
 				<AverageSpeed unit="km/h">1.2</AverageSpeed>
 				<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
 					<FuelConsumption unit="g/km">6.1</FuelConsumption>
@@ -43,7 +43,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
 				</Fuel>
 				<CO2 unit="g/km">8.1</CO2>
 				<CO2 unit="g/p-km">8.2</CO2>
-			</OCVMode>
+			</OVCMode>
 			<Total>
 				<AverageSpeed unit="km/h">1.2</AverageSpeed>					
 				<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
@@ -68,8 +68,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
 				<UtilityFactor>0.345</UtilityFactor>
 			</Total>
 		</Result>
-		<!-- END OCV HEV (and OCV FCV in future) Bus -->
-		<Summary xsi:type="ResultSummaryOCVHEVType">
+		<!-- END OVC HEV (and OVC FCV in future) Bus -->
+		<Summary xsi:type="ResultSummaryOVCHEVType">
 			<AveragePassengerCount>3.141</AveragePassengerCount>
 			<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
 				<FuelConsumption unit="g/km">6.1</FuelConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
index db265ed79273d2cee5d05e5105c94799edce0264..cbb5153cbbe644b638a10dbedd0f76926961b119 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml
@@ -4,14 +4,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- OCV HEV (and OCV FCV in future) Lorry  -->
-		<Result status="success" xsi:type="ResultSuccessOCVHEVType">
+		<!-- OVC HEV (and OVC FCV in future) Lorry  -->
+		<Result status="success" xsi:type="ResultSuccessOVCHEVType">
 			<Mission>Long Haul</Mission>
 			<SimulationParameters>
 				<TotalVehicleMass unit="kg">17200</TotalVehicleMass>
 				<Payload unit="kg">2600</Payload>
 			</SimulationParameters>
-			<OCVMode type="charge depleting">
+			<OVCMode type="charge depleting">
 				<AverageSpeed unit="km/h">1.0</AverageSpeed>
 				<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
 					<FuelConsumption unit="g/km">3.1</FuelConsumption>
@@ -35,8 +35,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
 				<CO2 unit="g/km">5.1</CO2>
 				<CO2 unit="g/t-km">5.3</CO2>
 				<CO2 unit="g/m³-km">5.4</CO2>
-			</OCVMode>
-			<OCVMode type="charge sustaining">
+			</OVCMode>
+			<OVCMode type="charge sustaining">
 				<AverageSpeed unit="km/h">1.2</AverageSpeed>
 				<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
 					<FuelConsumption unit="g/km">6.1</FuelConsumption>
@@ -52,7 +52,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
 				<CO2 unit="g/km">8.1</CO2>
 				<CO2 unit="g/t-km">8.3</CO2>
 				<CO2 unit="g/m³-km">8.4</CO2>
-			</OCVMode>
+			</OVCMode>
 			<Total>
 				<AverageSpeed unit="km/h">1.2</AverageSpeed>	
 				<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
@@ -83,8 +83,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
 				<UtilityFactor>0.345</UtilityFactor>
 			</Total>
 		</Result>
-		<!-- END OCV HEV (and OCV FCV in future) Lorry -->
-		<Summary xsi:type="ResultSummaryOCVHEVType">
+		<!-- END OVC HEV (and OVC FCV in future) Lorry -->
+		<Summary xsi:type="ResultSummaryOVCHEVType">
 			<AveragePayload unit="t">3.141</AveragePayload>
 			<!-- repeat for every fuel used -->
 			<Fuel type="Diesel CI">
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
index 337f5ef774c228c0217b3821988fb325e11c14cd..d38849abfa598b61067936a0678491fc1be87ad6 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml
@@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- non-OCV HEV Bus  -->
-		<Result status="success" xsi:type="ResultSuccessNonOCVHEVType">
+		<!-- non-OVC HEV Bus  -->
+		<Result status="success" xsi:type="ResultSuccessNonOVCHEVType">
 			<Mission>Long Haul</Mission>
 			<SimulationParameters>
 				<TotalVehicleMass unit="kg">17200</TotalVehicleMass>
@@ -26,8 +26,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
 				<CO2 unit="g/p-km">8.2</CO2>
 			</Total>
 		</Result>
-		<!-- END non-OCV HEV Bus -->
-		<Summary xsi:type="ResultSummaryNonOCVHEVType">
+		<!-- END non-OVC HEV Bus -->
+		<Summary xsi:type="ResultSummaryNonOVCHEVType">
 			<AveragePassengerCount>3.141</AveragePassengerCount>
 			<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
 				<FuelConsumption unit="g/km">6.1</FuelConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
index 6b6c0a8ffbb92c40a9ef28fc3db700f07c587123..5c8ba64ac92294dd2b2d75fa3b0aa9de1ab720fc 100644
--- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml
@@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- non-OCV HEV Lorry  -->
-		<Result status="success" xsi:type="ResultSuccessNonOCVHEVType">
+		<!-- non-OVC HEV Lorry  -->
+		<Result status="success" xsi:type="ResultSuccessNonOVCHEVType">
 			<Mission>Long Haul</Mission>
 			<SimulationParameters>
 				<TotalVehicleMass unit="kg">17200</TotalVehicleMass>
@@ -29,8 +29,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec
 				<CO2 unit="g/m³-km">8.4</CO2>
 			</Total>
 		</Result>
-		<!-- END non-OCV HEV Lorry -->
-		<Summary xsi:type="ResultSummaryNonOCVHEVType">
+		<!-- END non-OVC HEV Lorry -->
+		<Summary xsi:type="ResultSummaryNonOVCHEVType">
 			<AveragePayload unit="t">3.141</AveragePayload>
 			<Fuel type="Diesel CI"><!-- repeat for every fuel used -->
 				<FuelConsumption unit="g/km">6.1</FuelConsumption>
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
index 89a9d9c2b623e46eef334767474337013e9a7095..761358d65f89f5d73881cc28bfd40b50cb58ca40 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- ICE only, non-OCV HEV (and H2 only ICE in future) Bus  -->
+		<!-- ICE only, non-OVC HEV (and H2 only ICE in future) Bus  -->
 		<Result status="success" xsi:type="ResultSuccessConventionalType">
 			<Mission>Long Haul</Mission>
 			<Distance unit="km">100.185</Distance>
@@ -44,6 +44,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
 				<CO2 unit="g/p-km">8.2</CO2>
 			</Total>
 		</Result>
-		<!-- END ICE only, non-OCV HEV (and H2 only ICE in future) Bus -->
+		<!-- END ICE only, non-OVC HEV (and H2 only ICE in future) Bus -->
 	</Results>
 </VectoMockResults>
\ No newline at end of file
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
index 8cbd3114a6e2e1a75b6013804bdcfc7b0823e289..7cc3c1534b5125d7f312d56ff4d69a9c18d5b939 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- ICE only, non-OCV HEV (and H2 only ICE in future) Lorry -->
+		<!-- ICE only, non-OVC HEV (and H2 only ICE in future) Lorry -->
 		<Result status="success" xsi:type="ResultSuccessConventionalType">
 			<Mission>Long Haul</Mission>
 			<Distance unit="km">100.185</Distance>
@@ -46,6 +46,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
 				<CO2 unit="g/m³-km">8.4</CO2>
 			</Total>
 		</Result>
-		<!-- ICE only, non-OCV HEV (and H2 only ICE in future) Lorry -->
+		<!-- ICE only, non-OVC HEV (and H2 only ICE in future) Lorry -->
 	</Results>
 </VectoMockResults>
\ No newline at end of file
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
index 0b8151ad2b9eaf1341b8dd3db5d14a4130d7ef40..c68905f44d2ee30b318f0f9918063b29d0bc6d66 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- OCV HEV (and OCV FCV in future) Bus -->
+		<!-- OVC HEV (and OVC FCV in future) Bus -->
 		<Result status="success" xsi:type="ResultSuccessOVCHEVType">
 			<Mission>Long Haul</Mission>
 			<Distance unit="km">100.185</Distance>
@@ -105,7 +105,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
 				<UtilityFactor>0.345</UtilityFactor>
 			</Total>
 		</Result>
-		<!-- END OCV HEV (and OCV FCV in future) Bus -->
+		<!-- END OVC HEV (and OVC FCV in future) Bus -->
 	</Results>
 </VectoMockResults>
-
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
index e3f1c79e9d37a53ab0faebdf701badf5f6a5ef9a..eb56bfb26b690400aaae58ef4a7f2a61f9a12e00 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- OCV HEV (and OCV FCV in future) Lorry -->
+		<!-- OVC HEV (and OVC FCV in future) Lorry -->
 		<Result status="success" xsi:type="ResultSuccessOVCHEVType">
 			<Mission>Long Haul</Mission>
 			<Distance unit="km">100.185</Distance>
@@ -119,6 +119,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
 				<UtilityFactor>0.345</UtilityFactor>
 			</Total>
 		</Result>
-		<!-- END OCV HEV (and OCV FCV in future) Lorry -->
+		<!-- END OVC HEV (and OVC FCV in future) Lorry -->
 	</Results>
 </VectoMockResults>
\ No newline at end of file
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
index 44dba2fad0d19dc8ee45e70b1fe4a80fce89c58c..4c30b196ee8000c15353afa831d105d485450041 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml
@@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- ICE only, non-OCV HEV (and H2 only ICE in future) Bus  -->
-		<Result status="success" xsi:type="ResultSuccessNonOCVHEVType">
+		<!-- ICE only, non-OVC HEV (and H2 only ICE in future) Bus  -->
+		<Result status="success" xsi:type="ResultSuccessNonOVCHEVType">
 			<Mission>Long Haul</Mission>
 			<Distance unit="km">100.185</Distance>
 			<SimulationParameters>
@@ -44,6 +44,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
 				<CO2 unit="g/p-km">8.2</CO2>
 			</Total>
 		</Result>
-		<!-- END ICE only, non-OCV HEV (and H2 only ICE in future) Bus -->
+		<!-- END ICE only, non-OVC HEV (and H2 only ICE in future) Bus -->
 	</Results>
 </VectoMockResults>
\ No newline at end of file
diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml
index 3294c2ec5e8ca2ab2a55a1e3bad65f81cf57c669..23ea0409ba5e8edb616429b87d211bfbd49af7d8 100644
--- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml
+++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml
@@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd">
 	<Results>
 		<Status>success</Status>
-		<!-- ICE only, non-OCV HEV (and H2 only ICE in future) Lorry -->
-		<Result status="success" xsi:type="ResultSuccessNonOCVHEVType">
+		<!-- ICE only, non-OVC HEV (and H2 only ICE in future) Lorry -->
+		<Result status="success" xsi:type="ResultSuccessNonOVCHEVType">
 			<Mission>Long Haul</Mission>
 			<Distance unit="km">100.185</Distance>
 			<SimulationParameters>
@@ -46,6 +46,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\
 				<CO2 unit="g/m³-km">8.4</CO2>
 			</Total>
 		</Result>
-		<!-- ICE only, non-OCV HEV (and H2 only ICE in future) Lorry -->
+		<!-- ICE only, non-OVC HEV (and H2 only ICE in future) Lorry -->
 	</Results>
 </VectoMockResults>
\ No newline at end of file