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 ffa58346ad48980f8d5a7262ab90a74bd5a3e70d..d32afa20be8615134eb73b9df1925aa1d7a02bfd 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 stageCount="2">
+  <ManufacturingStage stepCount="2">
     <Data xsi:type="BusManufacturingStageDataType" id="MST-aec22451f48f47c484ac">
       <HashPreviousStage>
         <di:Reference URI="#VEH-88dcf76d37a64b5eaf70">
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 93d2db1c469fe5c4c57ec74dda368bf5d246e25b..e93e83b2f10f5e2cd04c72853bbc882150092a07 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 stageCount="2">
+  <vif0.1:ManufacturingStage stepCount="2">
     <vif0.1:Data xsi:type="BusManufacturingStageDataType" id="MST-607e449d2b0e45228b69">
       <vif0.1:HashPreviousStage>
         <di:Reference URI="#PIF-7f30aafa027a41a1864b">
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 b9fbad0730b636deda824d49ba8b646c9837b5cd..a9f69d7ddd8c8f04e3e16f466230ba7c0b988c02 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 stageCount="2">
+  <vif0.1:ManufacturingStage stepCount="2">
     <vif0.1:Data xsi:type="BusManufacturingStageDataType" id="MST-9d0c3a409fce4a89a6ce">
       <vif0.1:HashPreviousStage>
         <di:Reference URI="#PIF-10652bf49ae0499f8689">
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
index 573b344afab3f9dc5da11024a6c8745a7d75a416..a281537272544197e3f1dd565d8c16097e8d5183 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/ManufacturingStageViewModel_v0_1.cs
@@ -26,10 +26,10 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			set => SetProperty(ref _hashPreviousStage, value);
 		}
 
-		public int StageCount
+		public int StepCount
 		{
-			get => _stageCount;
-			set => SetProperty(ref _stageCount, value);
+			get => _stepCount;
+			set => SetProperty(ref _stepCount, value);
 		}
 
 		public IVehicleDeclarationInputData Vehicle => _vehicleViewModel;
@@ -60,7 +60,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			Title = "Edit Manufacturing Stage";
 			
 			
-			_stageCount = consolidatedManufacturingStageInputData?.StageCount + 1 ?? 2;
+			_stepCount = consolidatedManufacturingStageInputData?.StepCount + 1 ?? 2;
 
 			_consolidatedManufacturingStageInputData = consolidatedManufacturingStageInputData;
 
@@ -76,7 +76,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 
 
 		
-		private int _stageCount;
+		private int _stepCount;
 		private DigestData _hashPreviousStage;
 		private IManufacturingStageInputData _consolidatedManufacturingStageInputData;
 
diff --git a/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml b/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml
index 32721a7d21c9a94e70563fd7dc760484f60fb575..21a1ba5b48ebed8ed7a3f59915a23f32853c604e 100644
--- a/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml
+++ b/VECTO3GUI2020/Views/Multistage/ManufacturingStageView.xaml
@@ -25,7 +25,7 @@
                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" Margin="0 10 20 10" >
                     <StackPanel.Visibility>
                         <PriorityBinding>
-                            <Binding Path="StageCount" Converter="{StaticResource AlwaysVisibleConverter}"/>
+                            <Binding Path="StepCount" Converter="{StaticResource AlwaysVisibleConverter}"/>
                             <Binding>
                                 <Binding.Source>
                                     <Visibility>Collapsed</Visibility>
@@ -36,7 +36,7 @@
                     <Label Content="{x:Static properties:GUILabels.ManufacturingSteps}"></Label>
                     <Label>
                         <PriorityBinding>
-                            <Binding Path="StageCount"></Binding>
+                            <Binding Path="StepCount"></Binding>
                             <Binding >
                             </Binding>
                         </PriorityBinding>
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 fbc939defb3e02f2f2940e0caec7272d2cd75ca3..b5bf856819fa28f97096c6ac6124105b926a303f 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 stageCount="2">
+  <ManufacturingStage stepCount="2">
     <Data xsi:type="BusManufacturingStageDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
       <HashPreviousStage>
         <di:Reference URI="#VEH-622a60d3b3cf4340a362">
diff --git a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
index 6c40cd3b09b38a9bd6e96d16e16ac09df710b6ee..8731ec9b6c817bc48fe97bcb44024e0b5d526c17 100644
--- a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
@@ -150,7 +150,7 @@ namespace Vecto3GUI2020Test
 		public void loadInputFilePrimaryOnly()
 		{
 			var vm = LoadFileFromTestDirectory(primary_vehicle_only);
-			Assert.AreEqual(2, vm.MultiStageJobViewModel.ManufacturingStageViewModel.StageCount);
+			Assert.AreEqual(2, vm.MultiStageJobViewModel.ManufacturingStageViewModel.StepCount);
 
 			var primaryVehicle = vm.MultiStageJobViewModel.PrimaryVehicle;
 			Assert.NotNull(primaryVehicle);
diff --git a/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs b/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs
index a8602dd564cd01a96054ad61c4922e46176d90b4..d0a74550e072236a0fdc4200683ba6cbeffe3d03 100644
--- a/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs
@@ -31,7 +31,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
 		public void loadPrimaryVehicleOnlyAndCreateNewVIF()
 		{
 			var multistagevm = LoadFileFromTestDirectory(primary_vehicle_only).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
-			var stage = multistagevm.ManufacturingStageViewModel.StageCount;
+			var stage = multistagevm.ManufacturingStageViewModel.StepCount;
 
 			Assert.AreEqual(2, stage);
 
@@ -62,7 +62,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			[Values(LegislativeClass.M3)] LegislativeClass legCategory)
 		{
 			var multistagevm = LoadFileFromTestDirectory(primary_vehicle_only).MultiStageJobViewModel as MultiStageJobViewModel_v0_1;
-			var stage = multistagevm.ManufacturingStageViewModel.StageCount;
+			var stage = multistagevm.ManufacturingStageViewModel.StepCount;
 
 			Assert.AreEqual(2, stage);
 
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index 32ca994977e16c68c25209357b1cf8708c56eae3..325f5bf26047b8c09e3685d9c4b089547f8e1856 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -981,7 +981,7 @@ namespace TUGraz.VectoCommon.InputData
 	public interface IManufacturingStageInputData
 	{
 		DigestData HashPreviousStage { get; }
-		int StageCount { get; }
+		int StepCount { get; }
 
 		IVehicleDeclarationInputData Vehicle { get; }
 
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index c6fcdf5e48e16127c60c10b7845fbc4050fe479a..2be02c30bf5172cad0bee6304a86dd8d24801516 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -2671,11 +2671,11 @@ namespace TUGraz.VectoCommon.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to stageCount.
+        ///   Looks up a localized string similar to stepCount.
         /// </summary>
-        public static string ManufacturingStage_StageCount {
+        public static string ManufacturingStage_StepCount {
             get {
-                return ResourceManager.GetString("ManufacturingStage_StageCount", resourceCulture);
+                return ResourceManager.GetString("ManufacturingStage_StepCount", resourceCulture);
             }
         }
         
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 80d1724a7d4cfbdef3bb6da37249538e0263654f..5dc4045f9a705ec4364cf7a6bce7f931e625c217 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1425,8 +1425,8 @@
   <data name="ManufacturingStage" xml:space="preserve">
     <value>ManufacturingStage</value>
   </data>
-  <data name="ManufacturingStage_StageCount" xml:space="preserve">
-    <value>stageCount</value>
+  <data name="ManufacturingStage_StepCount" xml:space="preserve">
+    <value>stepCount</value>
   </data>
   <data name="Bus_DeclarationType" xml:space="preserve">
     <value>DeclarationType</value>
@@ -1572,12 +1572,12 @@
   <data name="BusAux_Technology" xml:space="preserve">
     <value>Technology</value>
   </data>
-<data name="BusHVACHeatPumpCooling" xml:space="preserve">
-	<value>Cooling</value>
-</data>
-<data name="BusHVACHeatPumpHeating" xml:space="preserve">
-	<value>Heating</value>
-</data>
+  <data name="BusHVACHeatPumpCooling" xml:space="preserve">
+    <value>Cooling</value>
+  </data>
+  <data name="BusHVACHeatPumpHeating" xml:space="preserve">
+    <value>Heating</value>
+  </data>
   <data name="Exempted_SumNetPower" xml:space="preserve">
     <value>SumNetPower</value>
   </data>
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
index e65ddef508ad1f130fa9d3a3b00ecb82d12257c0..eb5ab1ae88d65e19178eb5b4567b11db3fe3e604 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationMultistageInputData.cs
@@ -201,7 +201,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 			_hashPreviousStage ??
 			(_hashPreviousStage = Reader.GetDigestData(GetNode("HashPreviousStage")));
 
-		public int StageCount => Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStage_StageCount));
+		public int StepCount => Convert.ToInt32(GetAttribute(BaseNode, XMLNames.ManufacturingStage_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 c733bfb432f6a7d03918672eb41a2bd03e38f3dd..bc812f5d3ed2eca181f29df883a89b2d2c95d4c0 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -441,7 +441,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
 
 		public DigestData HashPreviousStage => _manufacturingStages.First().HashPreviousStage;
 
-		public int StageCount => _manufacturingStages.First().StageCount;
+		public int StepCount => _manufacturingStages.First().StepCount;
 
 		public IVehicleDeclarationInputData Vehicle => GetConsolidatedVehicleData();
 
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index e0cdacc59dc5cee5478d20718a823168ea8f3dd0..386a697ec62f436ee2e89e948bdeac1e80e5ca8b 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -210,7 +210,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 			var vehicleId = $"{VectoComponents.Vehicle.HashIdPrefix()}{GetGUID()}";
 
 			var stage = new XElement(tns + XMLNames.ManufacturingStage,
-				new XAttribute("stageCount", GetStageNumber()),
+				new XAttribute(XMLNames.ManufacturingStage_StepCount, GetStageNumber()),
 				new XElement(tns + XMLNames.Report_DataWrap,
 					new XAttribute(xsi + XMLNames.Attr_Type, "BusManufacturingStageDataType"),
 					new XAttribute(XMLNames.Component_ID_Attr, multistageId),
@@ -230,7 +230,7 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 			if (_manufacturingStageInputData == null || _manufacturingStageInputData.Count == 0)
 				return 2;
 
-			return _manufacturingStageInputData.Last().StageCount + 1;
+			return _manufacturingStageInputData.Last().StepCount + 1;
 		}
 
 		private XElement GetHashPreviousStageElement()
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
index 0af141c2e7e605b874ffdc4476c836980289f902..417fb75e962cd100570e18d0bb4658e6e3260c76 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistage.0.1.xsd
@@ -476,7 +476,7 @@
 			<xs:element name="Data" type="vif:AbstractManufacturingStageDataType"/>
 			<xs:element name="Signature" type="v1.0:SignatureType"/>
 		</xs:sequence>
-		<xs:attribute name="stageCount" use="required">
+		<xs:attribute name="stepCount" use="required">
 			<xs:simpleType>
 				<xs:restriction base="xs:int">
 					<xs:minInclusive value="2"/>
diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
index 6d49eef407a7f62a1a03df175d53a8f52e71f677..b54e72d3c29a95ffb5728ae7170184c8dd831cf4 100644
--- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
@@ -167,7 +167,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
 		
 		private void TestVifStage2Data(IManufacturingStageInputData data)
 		{
-			Assert.AreEqual(2, data.StageCount);
+			Assert.AreEqual(2, data.StepCount);
 			TestSignatureData(data.HashPreviousStage, "nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
 				"#PIF-d10aff76c5d149948046");
 
@@ -188,7 +188,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
 
 		private void TestVifStage3Data(IManufacturingStageInputData data)
 		{
-			Assert.AreEqual(3, data.StageCount);
+			Assert.AreEqual(3, data.StepCount);
 			TestSignatureData(data.HashPreviousStage, "BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
 				"#RESULT-6f30c7fe665a47938f6b");
 
@@ -234,7 +234,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
 
 		private void TestVifStage4Data(IManufacturingStageInputData data)
 		{
-			Assert.AreEqual(4, data.StageCount);
+			Assert.AreEqual(4, data.StepCount);
 			TestSignatureData(data.HashPreviousStage, "GHpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
 				"#RESULT-8f30c7fe665a47938f6b");
 			
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 4bbd3da184097a875552d5c8a3e2ceb4280d1dd5..1c06609a7f9f2f5b7bfb163d9d2705ab067b9e33 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="vif0.1:BusManufacturingStageDataType" id="asdf">
 			<HashPreviousStage>
 				<di:Reference>
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 ca1871926d184b45a0d5defde9ba2570339e59a9..6f7e0d61e3072059eaab366b8aef4612f8110c55 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 stageCount="2">
+  <vif0.1:ManufacturingStage stepCount="2">
     <vif0.1:Data xsi:type="BusManufacturingStageDataType" id="MST-ab066054c1bc431db1e3">
       <vif0.1:HashPreviousStage>
         <di:Reference URI="#PIF-4121ae4751874cefa376">
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 8d9070572809ff47f66a49ac33ca030b0170e134..e7e1dfc3ee731fa9b20d492d3a327d599a3e7529 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 stageCount="2">
+  <vif0.1:ManufacturingStage stepCount="2">
     <Data xsi:type="BusManufacturingStageDataType" id="MST-b0420da682c648adac83" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
       <HashPreviousStage>
         <di:Reference URI="#VEH-4cb168560c0d4b3d886d">
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 a325b76a0a4f9fda653473c9d39ac500f6557f13..472b5df9fed98b57411ffe03b8ed5cd838517b2e 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -687,7 +687,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">
+	<ManufacturingStage stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -758,7 +758,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="4">
+	<ManufacturingStage stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
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 d16619dab4bf384ab3be4da2c7a7e7a22927a1d1..2c3ed5a7299a201c096622024c542b1ec767371d 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -690,7 +690,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">
+	<ManufacturingStage stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -761,7 +761,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="4">
+	<ManufacturingStage stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
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 0d851eb8384b543cefd12d2dca688d42e92c1270..362d754a294e3121ab6c15305973d77dc25d3e74 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -731,7 +731,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">
+	<ManufacturingStage stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -803,7 +803,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="4">
+	<ManufacturingStage stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
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 379d96b39e4f3630f43420483e40e6deff027fe7..7f895953e9a51a07777aa20d11d07cd86910958a 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -687,7 +687,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">
+	<ManufacturingStage stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -758,7 +758,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="4">
+	<ManufacturingStage stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
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 6c2f9bbd4081b8c1efc3358e39c3ef5178dc931c..673b3b60984f80def7ea633be390c6210764753c 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -687,7 +687,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">
+	<ManufacturingStage stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
@@ -758,7 +758,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="4">
+	<ManufacturingStage stepCount="4">
 		<Data xsi:type="BusManufacturingStageDataType" id="MST-3">
 			<HashPreviousStage>
 				<di:Reference URI="#RESULT-8f30c7fe665a47938f6b">
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 02fc55554ce9506fca4478c9e633d6b156dfeccf..445eb2422d6d9ac2cb7dac60d89315798351032b 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -685,7 +685,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">
+	<ManufacturingStage stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
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 2566c5713dfa9c84758dffe1b197ada3480ed5f2..c485496e64dbe626be19b7c8329480c34456f862 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
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 38f9eea853ac0a54c8d2a4563ab274eda2af2a79..e586b03cf272ee1f8e6bef47b57631fd97e1a68e 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -685,7 +685,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">
+	<ManufacturingStage stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
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 be9026ca3e75386bda936ce67578115804ec56c8..c8761c264dc3be275d7a6514baef260a1877ab68 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 stageCount="2">
+  <ManufacturingStage stepCount="2">
     <Data xsi:type="BusManufacturingStageDataType" id="MST-0adf9390bde54a23a113" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
       <HashPreviousStage>
         <di:Reference URI="#VEH-622a60d3b3cf4340a362">
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 5c9f0960a006e5eb7ce855e2c77fd55f2cbfdea7..9251b948b90c153b1c64f810d64d24d8c59d17ed 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -674,7 +674,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">
+	<ManufacturingStage stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
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 d5df6890b211e8dbd8695d19b536bf6f4959ffe1..26dbc0da6e69f0bfd73c08a02c25812e11ee7087 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
@@ -607,7 +607,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 			</di:Reference>
 		</Signature>
 	</ManufacturingStage>
-	<ManufacturingStage stageCount="3">
+	<ManufacturingStage stepCount="3">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-2">
 			<HashPreviousStage>
 			<di:Reference URI="#RESULT-6f30c7fe665a47938f6b">
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 300c02d16d0f0e0cad1e1fa98aaad28a0f78a618..0b7933d245c290b0269899aa9248b4021da7faf5 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d11aff76c5d149948046">
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 9ff878fa3eda3ade66d240c726940ad1a6216edd..32fa85e13f171474d49bc7d3512483e9d383ebe7 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="BusManufacturingStageDataType" id="MSTG-1">
 			<HashPreviousStage>
 			<di:Reference URI="#PIF-d10aff76c5d149948046">
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index 05f0e3318a62bbff550a1da64829f96cc13e6b27..d5cdc47b1400df2da891da807b2911d698667be7 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -544,7 +544,7 @@ namespace TUGraz.VectoCore.Tests.XML
 		
 		private void TestManufacturingStag01(IManufacturingStageInputData manufacturingStage)
 		{
-			Assert.AreEqual(2, manufacturingStage.StageCount);
+			Assert.AreEqual(2, manufacturingStage.StepCount);
 
 			TestDigestData("#PIF-d10aff76c5d149948046", "nI+57QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
 				manufacturingStage.HashPreviousStage);
@@ -599,7 +599,7 @@ namespace TUGraz.VectoCore.Tests.XML
 
 		private void TestManufacturingStag02(IManufacturingStageInputData manufacturingStage)
 		{
-			Assert.AreEqual(3, manufacturingStage.StageCount);
+			Assert.AreEqual(3, manufacturingStage.StepCount);
 
 			TestDigestData("#RESULT-6f30c7fe665a47938f6b", "BMpFCKh1bu/YPwYj37kJK1uCrv++BTLf2OUZcOt43Os=",
 				manufacturingStage.HashPreviousStage);
@@ -681,7 +681,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(1, manufacturingStages.Count);
 			
 			var stageData = manufacturingStages[0];
-			Assert.AreEqual(2, stageData.StageCount);
+			Assert.AreEqual(2, stageData.StepCount);
 
 			TestDigestData("#PIF-d11aff76c5d149948046", "nI+67QQtWA2rFqJTZ41t0XrXcJbcGmc7j4E66iGJyT0=",
 				stageData.HashPreviousStage);
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 4bbd3da184097a875552d5c8a3e2ceb4280d1dd5..1c06609a7f9f2f5b7bfb163d9d2705ab067b9e33 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 stageCount="2">
+	<ManufacturingStage stepCount="2">
 		<Data xsi:type="vif0.1:BusManufacturingStageDataType" id="asdf">
 			<HashPreviousStage>
 				<di:Reference>