diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml
index d32afa20be8615134eb73b9df1925aa1d7a02bfd..817ea41674993a347bd2951ba169d5c09608b753 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/completed_heavyBus_31b.VIF_Report_2.xml	
@@ -571,7 +571,7 @@
       </di:Reference>
     </Signature>
   </PrimaryVehicle>
-  <ManufacturingStage stepCount="2">
+  <ManufacturingStep stepCount="2">
     <Data xsi:type="BusManufacturingStageDataType" id="MST-aec22451f48f47c484ac">
       <HashPreviousStage>
         <di:Reference URI="#VEH-88dcf76d37a64b5eaf70">
@@ -673,5 +673,5 @@
         <di:DigestValue>aVAzUfhrvuQA2Q7Yb8IBOuVuRp0QVgDRI2NX5BiZZgI=</di:DigestValue>
       </di:Reference>
     </Signature>
-  </ManufacturingStage>
+  </ManufacturingStep>
 </VectoOutputMultistage>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml
index e93e83b2f10f5e2cd04c72853bbc882150092a07..93af0856993c8c3b2c987a867c914a519a137d67 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/completed_heavyBus_34f.VIF_Report_2.xml	
@@ -602,7 +602,7 @@
       </di:Reference>
     </vif0.1:Signature>
   </vif0.1:PrimaryVehicle>
-  <vif0.1:ManufacturingStage stepCount="2">
+  <vif0.1:ManufacturingStep stepCount="2">
     <vif0.1:Data xsi:type="BusManufacturingStageDataType" id="MST-607e449d2b0e45228b69">
       <vif0.1:HashPreviousStage>
         <di:Reference URI="#PIF-7f30aafa027a41a1864b">
@@ -682,5 +682,5 @@
         <di:DigestValue>D1pKqglxP9ST/vCUSHkr8y4L7miQhPPPywLTCCOIPZk=</di:DigestValue>
       </di:Reference>
     </vif0.1:Signature>
-  </vif0.1:ManufacturingStage>
+  </vif0.1:ManufacturingStep>
 </vif0.1:VectoOutputMultistage>
\ No newline at end of file
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml
index a9f69d7ddd8c8f04e3e16f466230ba7c0b988c02..0eb4cdbc759a3c8aca9714f87991e650b79c7957 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/completed_heavyBus_39a.VIF_Report_2.xml	
@@ -576,7 +576,7 @@
       </di:Reference>
     </vif0.1:Signature>
   </vif0.1:PrimaryVehicle>
-  <vif0.1:ManufacturingStage stepCount="2">
+  <vif0.1:ManufacturingStep stepCount="2">
     <vif0.1:Data xsi:type="BusManufacturingStageDataType" id="MST-9d0c3a409fce4a89a6ce">
       <vif0.1:HashPreviousStage>
         <di:Reference URI="#PIF-10652bf49ae0499f8689">
@@ -674,5 +674,5 @@
         <di:DigestValue>3YDwmAXmbJO9ExDXLz+Q4lNnQXHFBRThT6JdzG5uW3k=</di:DigestValue>
       </di:Reference>
     </vif0.1:Signature>
-  </vif0.1:ManufacturingStage>
+  </vif0.1:ManufacturingStep>
 </vif0.1:VectoOutputMultistage>
\ No newline at end of file
diff --git a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index b5bf856819fa28f97096c6ac6124105b926a303f..89f11bf27e892c1b989c6a7e12c4c0c67151320b 100644
--- a/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/Vecto3GUI2020Test/TestData/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -574,7 +574,7 @@
       </di:Reference>
     </Signature>
   </PrimaryVehicle>
-  <ManufacturingStage stepCount="2">
+  <ManufacturingStep stepCount="2">
     <Data xsi:type="BusManufacturingStageDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
       <HashPreviousStage>
         <di:Reference URI="#VEH-622a60d3b3cf4340a362">
@@ -686,5 +686,5 @@
         <di:DigestValue>ExKEVzerQlHGdqCo8XsbBC5PWQ0dKFC0nsiPkW31ZBs=</di:DigestValue>
       </di:Reference>
     </Signature>
-  </ManufacturingStage>
+  </ManufacturingStep>
 </VectoOutputMultistage>
\ No newline at end of file
diff --git a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
index c9e480966fd5307e3873dd36de3b0b7f1a5c6eb4..6917a314af37c6698c6ac917efcb7305c8f44482 100644
--- a/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
+++ b/VectoCommon/VectoCommon/Hashing/VectoComponents.cs
@@ -81,7 +81,7 @@ namespace TUGraz.VectoCommon.Hashing
 				case VectoComponents.VectoPrimaryVehicleInformation:
 					return "PrimaryVehicle";
 				case VectoComponents.VectoManufacturingStage:
-					return "ManufacturingStage";
+					return XMLNames.ManufacturingStep;
 				default:
 					throw new ArgumentOutOfRangeException("VectoComponents", component, null);
 			}
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index 2be02c30bf5172cad0bee6304a86dd8d24801516..fb5f279780f1e5ff17dbcf343b04320ff53086dd 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -2662,20 +2662,20 @@ namespace TUGraz.VectoCommon.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ManufacturingStage.
+        ///   Looks up a localized string similar to ManufacturingStep.
         /// </summary>
-        public static string ManufacturingStage {
+        public static string ManufacturingStep {
             get {
-                return ResourceManager.GetString("ManufacturingStage", resourceCulture);
+                return ResourceManager.GetString("ManufacturingStep", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to stepCount.
         /// </summary>
-        public static string ManufacturingStage_StepCount {
+        public static string ManufacturingStep_StepCount {
             get {
-                return ResourceManager.GetString("ManufacturingStage_StepCount", resourceCulture);
+                return ResourceManager.GetString("ManufacturingStep_StepCount", resourceCulture);
             }
         }
         
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 5dc4045f9a705ec4364cf7a6bce7f931e625c217..787de9a3f0d19420d0a16ac6e98547d36f2b0f8e 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1422,10 +1422,10 @@
   <data name="Bus_PrimaryVehicle" xml:space="preserve">
     <value>PrimaryVehicle</value>
   </data>
-  <data name="ManufacturingStage" xml:space="preserve">
-    <value>ManufacturingStage</value>
+  <data name="ManufacturingStep" xml:space="preserve">
+    <value>ManufacturingStep</value>
   </data>
-  <data name="ManufacturingStage_StepCount" xml:space="preserve">
+  <data name="ManufacturingStep_StepCount" xml:space="preserve">
     <value>stepCount</value>
   </data>
   <data name="Bus_DeclarationType" xml:space="preserve">
diff --git a/VectoCommon/VectoHashing/VectoHash.cs b/VectoCommon/VectoHashing/VectoHash.cs
index f7e9cbaf24a0c5bf918d264651141ec90e61e144..e70472c195a4ef6f1d44da097532500ae2e7b16d 100644
--- a/VectoCommon/VectoHashing/VectoHash.cs
+++ b/VectoCommon/VectoHashing/VectoHash.cs
@@ -292,7 +292,7 @@ namespace TUGraz.VectoHashing
 			if (Document.DocumentElement.LocalName.Equals("VectoOutputPrimaryVehicle")) {
 				return VectoComponents.VectoPrimaryVehicleInformation;
 			}
-			if (Document.DocumentElement.LocalName.Equals(XMLNames.ManufacturingStage)) {
+			if (Document.DocumentElement.LocalName.Equals(XMLNames.ManufacturingStep)) {
 				return VectoComponents.VectoManufacturingStage;
 			}
 			throw new Exception("unknown document structure! neither input data nor output data format");
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index eb5ab1ae88d65e19178eb5b4567b11db3fe3e604..8508ad1f6acdfcf401bc03f0379f9c0f2499079e 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -176,7 +176,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 	{
 		public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
 
-		public const string XSD_TYPE = "ManufacturingStageType";
+		public const string XSD_TYPE = "ManufacturingStepType";
 
 		public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
 
@@ -201,7 +201,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 			_hashPreviousStage ??
 			(_hashPreviousStage = Reader.GetDigestData(GetNode("HashPreviousStage")));
 
-		public int StepCount => Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStage_StepCount));
+		public int StepCount => Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStep_StepCount));
 
 		public IVehicleDeclarationInputData Vehicle => _vehicle ?? (_vehicle = Reader.Vehicle);
 
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
index bc812f5d3ed2eca181f29df883a89b2d2c95d4c0..90df3d6e7874fffaebd78164f46210c5f3c4e4bb 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -177,7 +177,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
 
 		private void SetManufacturingStageNodes()
 		{
-			_manufacturingNodeStages = BaseNode.SelectNodes(XMLHelper.QueryLocalName(XMLNames.ManufacturingStage));
+			_manufacturingNodeStages = BaseNode.SelectNodes(XMLHelper.QueryLocalName(XMLNames.ManufacturingStep));
 		}
 	}
 
@@ -187,7 +187,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
 	{
 		public static readonly XNamespace NAMESPACE_URI = XMLDefinitions.DECLARATION_MULTISTAGE_BUS_VEHICLE_NAMESPACE_VO1;
 
-		public const string XSD_TYPE = "ManufacturingStageType";
+		public const string XSD_TYPE = "ManufacturingStepType";
 
 		public static readonly string QUALIFIED_XSD_TYPE = XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE);
 
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index 386a697ec62f436ee2e89e948bdeac1e80e5ca8b..b95fe27086f8b9d0a3b26c2bdd8c32949be5d6e6 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -105,7 +105,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 			{
 				if(xElement.Name.LocalName == XMLNames.Bus_PrimaryVehicle)
 					_primaryVehicle = xElement;
-				else if (xElement.Name.LocalName == XMLNames.ManufacturingStage)
+				else if (xElement.Name.LocalName == XMLNames.ManufacturingStep)
 					_manufacturingStages.Add(xElement);
 			}
 
@@ -209,8 +209,8 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 			var multistageId = $"{VectoComponents.VectoManufacturingStage.HashIdPrefix()}{GetGUID()}";
 			var vehicleId = $"{VectoComponents.Vehicle.HashIdPrefix()}{GetGUID()}";
 
-			var stage = new XElement(tns + XMLNames.ManufacturingStage,
-				new XAttribute(XMLNames.ManufacturingStage_StepCount, GetStageNumber()),
+			var stage = new XElement(tns + XMLNames.ManufacturingStep,
+				new XAttribute(XMLNames.ManufacturingStep_StepCount, GetStageNumber()),
 				new XElement(tns + XMLNames.Report_DataWrap,
 					new XAttribute(xsi + XMLNames.Attr_Type, "BusManufacturingStageDataType"),
 					new XAttribute(XMLNames.Component_ID_Attr, multistageId),
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
index 417fb75e962cd100570e18d0bb4658e6e3260c76..00f5051698d7e7a7c7c607586314ad9434430f8c 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
@@ -19,7 +19,7 @@
 	<xs:complexType name="AbstractAxleWheelsComponentPIFType" abstract="true"/>
 	<xs:complexType name="AbstractAxleWheelsDataPIFType" abstract="true"/>
 	<xs:complexType name="AbstractEngineDataPIFType" abstract="true"/>
-	<xs:complexType name="AbstractManufacturingStageDataType" abstract="true">
+	<xs:complexType name="AbstractManufacturingStepDataType" abstract="true">
 		<xs:attribute name="id" type="xs:NCName" use="required"/>
 	</xs:complexType>
 	<xs:complexType name="AbstractPrimaryVehicleType" abstract="true"/>
@@ -368,7 +368,7 @@
 	</xs:complexType>
 	<xs:complexType name="BusManufacturingStageDataType">
 		<xs:complexContent>
-			<xs:extension base="vif:AbstractManufacturingStageDataType">
+			<xs:extension base="vif:AbstractManufacturingStepDataType">
 				<xs:sequence>
 					<xs:element name="HashPreviousStage" type="v1.0:SignatureType"/>
 					<xs:element name="Vehicle" type="v2.10.2:AbstractCompletedBusVehicleType"/>
@@ -471,9 +471,9 @@
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-	<xs:complexType name="ManufacturingStageType">
+	<xs:complexType name="ManufacturingStepType">
 		<xs:sequence>
-			<xs:element name="Data" type="vif:AbstractManufacturingStageDataType"/>
+			<xs:element name="Data" type="vif:AbstractManufacturingStepDataType"/>
 			<xs:element name="Signature" type="v1.0:SignatureType"/>
 		</xs:sequence>
 		<xs:attribute name="stepCount" use="required">
@@ -724,7 +724,7 @@
 	<xs:complexType name="VectoOutputMultistageType">
 		<xs:sequence>
 			<xs:element name="PrimaryVehicle" type="vif:PrimaryVehicleType"/>
-			<xs:element name="ManufacturingStage" type="vif:ManufacturingStageType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="ManufacturingStep" type="vif:ManufacturingStepType" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="VehicleComponentsPIFType">
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 1c06609a7f9f2f5b7bfb163d9d2705ab067b9e33..270185d989f00df1f9c3f3b673a1132a46e72971 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
@@ -578,7 +578,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
     </di:Reference>
   </Signature>
   </PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="vif0.1:BusManufacturingStageDataType" id="asdf">
 			<HashPreviousStage>
 				<di:Reference>
@@ -669,5 +669,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue></di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
\ No newline at end of file
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 6f7e0d61e3072059eaab366b8aef4612f8110c55..1d412027c8adf0a77f73237dad41bb6098cac114 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
@@ -562,7 +562,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
       </di:Reference>
     </vif0.1:Signature>
   </vif0.1:PrimaryVehicle>
-  <vif0.1:ManufacturingStage stepCount="2">
+  <vif0.1:ManufacturingStep stepCount="2">
     <vif0.1:Data xsi:type="BusManufacturingStageDataType" id="MST-ab066054c1bc431db1e3">
       <vif0.1:HashPreviousStage>
         <di:Reference URI="#PIF-4121ae4751874cefa376">
@@ -665,5 +665,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
         <di:DigestValue>nOfZudPCG54oOYKKanFSCDOEQpivinYCPj2CqOTwqvE=</di:DigestValue>
       </di:Reference>
     </vif0.1:Signature>
-  </vif0.1:ManufacturingStage>
+  </vif0.1:ManufacturingStep>
 </vif0.1:VectoOutputMultistage>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
index e7e1dfc3ee731fa9b20d492d3a327d599a3e7529..7f7b036d7d5bfc81e1a475b277d0bad53ab7967f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/exempted_completed.VIF_Report_2.xml
@@ -57,7 +57,7 @@
       </di:Reference>
     </Signature>
   </PrimaryVehicle>
-  <vif0.1:ManufacturingStage stepCount="2">
+  <vif0.1:ManufacturingStep stepCount="2">
     <Data xsi:type="BusManufacturingStageDataType" id="MST-b0420da682c648adac83" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
       <HashPreviousStage>
         <di:Reference URI="#VEH-4cb168560c0d4b3d886d">
@@ -102,5 +102,5 @@
         <di:DigestValue>khdPY14l0WRVUuF9LOyO8XNRJQSYmL1PtvmCNSQcVSc=</di:DigestValue>
       </di:Reference>
     </vif0.1:Signature>
-  </vif0.1:ManufacturingStage>
+  </vif0.1:ManufacturingStep>
 </vif0.1:VectoOutputMultistage>
\ No newline at end of file
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 472b5df9fed98b57411ffe03b8ed5cd838517b2e..32090a802c4de85e3482498955286c551de06178 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -686,8 +686,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="3">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -757,8 +757,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="4">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
@@ -817,5 +817,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 2c3ed5a7299a201c096622024c542b1ec767371d..858325f396e8e43618e50a58bae19990b229a202 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
@@ -640,7 +640,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -689,8 +689,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="3">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -760,8 +760,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="4">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
@@ -822,5 +822,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 362d754a294e3121ab6c15305973d77dc25d3e74..49987d56aa04c64bcccb1f8b0863074b70c5cac3 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -730,8 +730,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="3">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -802,8 +802,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="4">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
@@ -863,5 +863,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 7f895953e9a51a07777aa20d11d07cd86910958a..1aaf43fa0e58d67dc98478764d5c7b608bca48a0 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -686,8 +686,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="3">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -757,8 +757,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="4">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
@@ -817,5 +817,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 673b3b60984f80def7ea633be390c6210764753c..5ea6673015e896131dbf8973bb58a382428392a1 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -686,8 +686,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="3">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -757,8 +757,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="4">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
@@ -816,5 +816,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj38kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 445eb2422d6d9ac2cb7dac60d89315798351032b..65391e324b293e181fef47c3d8fd2127b4e2c4d0 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -684,8 +684,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="3">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -755,5 +755,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 c485496e64dbe626be19b7c8329480c34456f862..631dfe2dd5e054bb4e1e01f7f55d167b27612704 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -678,5 +678,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 e586b03cf272ee1f8e6bef47b57631fd97e1a68e..c046b728cd41f74c21b9cbdb9afd58b876b7f9f1 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -684,8 +684,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="3">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -740,5 +740,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 c8761c264dc3be275d7a6514baef260a1877ab68..ce036210b2d02057006869f260a91f00f2c9778c 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
@@ -574,7 +574,7 @@
       </di:Reference>
     </Signature>
   </PrimaryVehicle>
-  <ManufacturingStage stepCount="2">
+  <ManufacturingStep stepCount="2">
     <Data xsi:type="BusManufacturingStageDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
       <HashPreviousStage>
         <di:Reference URI="#VEH-622a60d3b3cf4340a362">
@@ -686,5 +686,5 @@
         <di:DigestValue>ExKEVzerQlHGdqCo8XsbBC5PWQ0dKFC0nsiPkW31ZBs=</di:DigestValue>
       </di:Reference>
     </Signature>
-  </ManufacturingStage>
+  </ManufacturingStep>
 </VectoOutputMultistage>
\ No newline at end of file
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 9251b948b90c153b1c64f810d64d24d8c59d17ed..c0042c347eb8abe7ada134596dd7992651486342 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -673,8 +673,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="3">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -744,5 +744,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 26dbc0da6e69f0bfd73c08a02c25812e11ee7087..699f62be975d981b407231266e3d4eb86e63c735 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
@@ -572,7 +572,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -606,8 +606,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
-	<ManufacturingStage stepCount="3">
+	</ManufacturingStep>
+	<ManufacturingStep stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -641,5 +641,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 0b7933d245c290b0269899aa9248b4021da7faf5..ca42bbe39ada42dd8695630a5b555a8904b88dfa 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d11aff76c5d149948046">
@@ -749,5 +749,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
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 32fa85e13f171474d49bc7d3512483e9d383ebe7..0827a21d15f8fda1b73a6d11879d73ae28637797 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
@@ -639,7 +639,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -673,5 +673,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue>BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=</di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
diff --git a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
index 1c06609a7f9f2f5b7bfb163d9d2705ab067b9e33..270185d989f00df1f9c3f3b673a1132a46e72971 100644
--- a/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
@@ -578,7 +578,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
     </di:Reference>
   </Signature>
   </PrimaryVehicle>
-	<ManufacturingStage stepCount="2">
+	<ManufacturingStep stepCount="2">
 		<Data xsi:type="vif0.1:BusManufacturingStageDataType" id="asdf">
 			<HashPreviousStage>
 				<di:Reference>
@@ -669,5 +669,5 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<di:DigestValue></di:DigestValue>
 			</di:Reference>
 		</Signature>
-	</ManufacturingStage>
+	</ManufacturingStep>
 </VectoOutputMultistage>
\ No newline at end of file