From df6cd358b7271106f311f49bb9c4224f0dc5c065 Mon Sep 17 00:00:00 2001
From: Harald Martini <harald.martini@student.tugraz.at>
Date: Wed, 1 Jun 2022 17:12:00 +0200
Subject: [PATCH] updated testfiles

---
 .../Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml      | 2 +-
 .../Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml    | 2 +-
 .../FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml     | 2 +-
 .../FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml  | 2 +-
 ...cto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml | 2 +-
 .../XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml | 2 +-
 .../conventional_completed_bus.VIF_Report_3.xml                 | 2 +-
 .../vecto_multistage_consolidated_multiple_stages.xml           | 2 +-
 ...cto_multistage_consolidated_multiple_stages_NGTankSystem.xml | 2 +-
 .../vecto_multistage_consolidated_multiple_stages_airdrag.xml   | 2 +-
 .../vecto_multistage_consolidated_multiple_stages_heatPump.xml  | 2 +-
 .../vecto_multistage_consolidated_multiple_stages_hev.xml       | 2 +-
 .../vecto_multistage_consolidated_multiple_stages_vif.xml       | 2 +-
 .../vecto_multistage_consolidated_one_stage.xml                 | 2 +-
 .../vecto_multistage_consolidated_two_stages.xml                | 2 +-
 .../vecto_multistage_conventional_final_vif.VIF_Report_1.xml    | 2 +-
 .../vecto_multistage_primary_vehicle_only.xml                   | 2 +-
 .../vecto_multistage_primary_vehicle_stage_2_3.xml              | 2 +-
 .../vecto_multistage_primary_vehicle_stage_2_3_group41.xml      | 2 +-
 .../vecto_multistage_primary_vehicle_stage_2_full.xml           | 2 +-
 .../vecto_multistage_primary_vehicle_stage_2_mandatory.xml      | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 2abcc0a679..8d93aad851 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -33,7 +33,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
index dbdda181ff..6a58768849 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml	
@@ -34,7 +34,7 @@ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
 					<tcl:Entry gear="6" maxTorque="1800"/>
 					<tcl:Entry gear="1" maxTorque="2500"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
index 65e0097fe1..6705787dfd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml	
@@ -28,7 +28,7 @@
 					<tcl:Entry gear="6" maxTorque="1800"/>
 					<tcl:Entry gear="1" maxTorque="2500"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index 7b67c6a129..885a68d120 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml	
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml	
@@ -29,7 +29,7 @@
           <Entry gear="1" maxTorque="2500" />
           <Entry gear="12" maxTorque="1900" />
         </vif0.1:TorqueLimits>
-        <Components xsi:type="VehicleComponentsPIFType">
+        <Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
           <Engine>
             <Data xsi:type="EngineDataPIFType">
               <Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
index 5a8bd1363a..5611315b7b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
@@ -29,7 +29,7 @@
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
index 680b0a9729..6dd0f94b26 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion1.0/test.VIF_Report_2.xml
@@ -37,7 +37,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
           <tcl:Entry gear="6" maxTorque="1800" />
           <tcl:Entry gear="1" maxTorque="2500" />
         </vif0.1:TorqueLimits>
-        <vif0.1:Components xsi:type="VehicleComponentsPIFType">
+        <vif0.1:Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
           <vif0.1:Engine>
             <vif0.1:Data xsi:type="EngineDataPIFType">
               <vif0.1:Manufacturer>Generic Engine Manufacturer</vif0.1:Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml
index b4c901b589..4a5db54cda 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/conventional_completed_bus.VIF_Report_3.xml
@@ -29,7 +29,7 @@
           <v2.0:Entry gear="1" maxTorque="2500" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" />
           <v2.0:Entry gear="12" maxTorque="1900" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" />
         </tns:TorqueLimits>
-        <Components xsi:type="VehicleComponentsPIFType">
+        <Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
           <Engine>
             <Data xsi:type="EngineDataPIFType">
               <Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index c05751b10f..7a72a1a03e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index 8c67804765..d3212ae3ce 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index 558a14bba8..f505ceb37b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index d2173a5bc5..5043f42e58 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index 3cd8d42598..b3394584fe 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index cc86208f24..2ba8f57a74 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index bc03e50212..3df6a06be5 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index a0f342417a..cbc4aed54e 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index 841720ef6a..bb9b3da3a9 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -35,7 +35,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
           <v2.0:Entry gear="1" maxTorque="2500" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" />
           <v2.0:Entry gear="12" maxTorque="1900" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" />
         </vif0.1:TorqueLimits>
-        <Components xsi:type="VehicleComponentsPIFType">
+        <Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
           <Engine>
             <Data xsi:type="EngineDataPIFType">
               <Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
index 7aa3d38fbe..02f8cea034 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index 22f99e3cd6..6d9d45a69c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -38,7 +38,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index 53e56e8b8f..1c107e6352 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -38,7 +38,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="6" maxTorque="1800"/>
 					<tcl:Entry gear="1" maxTorque="2500"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index 586c608eb4..059e53b2bc 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index 092cda1172..8de5353110 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -39,7 +39,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 					<tcl:Entry gear="1" maxTorque="2500"/>
 					<tcl:Entry gear="12" maxTorque="1900"/>
 				</TorqueLimits>
-				<Components xsi:type="VehicleComponentsPIFType">
+				<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
 					<Engine>
 						<Data xsi:type="EngineDataPIFType">
 							<Manufacturer>Generic Engine Manufacturer</Manufacturer>
-- 
GitLab