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 2abcc0a6799026518aea6383501a518c7a206a5a..8d93aad851c7d29011bf895d226cc7d029f47800 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 dbdda181ffeb2f7b0cecb5b5bbd23ae5c7cd8288..6a587688490a2f7a3b6d136bf63e19de42075882 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 65e0097fe1b5ddf4cc66a9dba38794c2838219c9..6705787dfde9bb453036f6c3410b59645f40bc9c 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 7b67c6a129caa3df120c394dc5ac61f15802c808..885a68d120869ff7139f0beb4ce399def5396f12 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 5a8bd1363abb59bbf5579a8efcb16eef1d33cbd3..5611315b7bd2bcf95759b92719429c86ece3f0e2 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 680b0a9729964208a2d248788de94df695442a7c..6dd0f94b26b578f1388efbd2f54def5cbf8300d2 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 b4c901b589602097ec50a5580e206adce51a674b..4a5db54cda61e307cbb1f885350414c5766ef0b3 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 c05751b10f15f84dea6532b141d717b2ff5ff9cf..7a72a1a03e182c6fcd8a0ef38e95c743f939fbae 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 8c6780476508c0f76b89a2e62393c83ef4de4dd5..d3212ae3ceaf478ddfd95f3e82175e545a8d362c 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 558a14bba8d743e37f34a892a94fdda477847069..f505ceb37ba46bb28a233f6435708bc2cf24357f 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 d2173a5bc555e4de2827baa3faf7846cb2124cdc..5043f42e58b6b3defa9c91310cfaf60291429d37 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 3cd8d425981460fc1397bc5ecb452f45ba95ce34..b3394584fe60757bcfc79acac456b4f451248030 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 cc86208f242838f8e4feb89f6cb8528cd9f2a2f1..2ba8f57a749a5a7715e1ae74d11a24bf3442c14f 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 bc03e50212bc45a042ed350c8635eca6d5660368..3df6a06be5991a872196beccdf6e4ef0a3ca445b 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 a0f342417a135fab931debfea70a34f36f004f4b..cbc4aed54e46c48e10e12cf6d36f976d9f872c45 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 841720ef6ac519c3a045f5b27c454b876cf682a4..bb9b3da3a9db22e93dd4bbd2d8bfc03466d3d508 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 7aa3d38fbe6ce4acce962eb218d79a371baa8214..02f8cea034d3f303981c9c1edfe878d458d17b33 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 22f99e3cd63fed7b699ae186af47573cc3bca2cf..6d9d45a69c24fcee9cdda5f95ae46da439a7226b 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 53e56e8b8f3823973131160dd4869fb092641255..1c107e6352069c520194dbe5dfeb619d0172ff94 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 586c608eb4d46140fe6ad025fb6556f327cc33fb..059e53b2bc710e18e7043e3164a4b0fb6055f07a 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 092cda1172d7539b1006774b00db7c48380b08d5..8de5353110b14b9792122fa12aebb6dc90498ba3 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>