diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml
index a889b353db6d04d3242cac588b524a40159101a7..0103dbb159b879db3c956b602010f243095fd952 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/input_aux.xml	
@@ -5,7 +5,7 @@
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
 		<VIN>VIN-1234</VIN>
 		<Date>2021-06-06T22:00:00Z</Date>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 		<VehicleDeclarationType>interim</VehicleDeclarationType>
 		<Components xsi:type="Components_Conventional_CompletedBusType">
 			<Auxiliaries>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml
index 34e44bda753b03be6d4bdf1cba96b7b20a931452..ce0d24aebf122c29657ad17331cf806787993c35 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2/vecto_vehicle-completed_heavyBus_31b.xml	
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>10680</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>86</NumberPassengerSeatsLowerDeck>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_aux.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_aux.xml
index a889b353db6d04d3242cac588b524a40159101a7..0103dbb159b879db3c956b602010f243095fd952 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_aux.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/input_aux.xml	
@@ -5,7 +5,7 @@
 		<ManufacturerAddress>Inffeldgasse 19</ManufacturerAddress>
 		<VIN>VIN-1234</VIN>
 		<Date>2021-06-06T22:00:00Z</Date>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 		<VehicleDeclarationType>interim</VehicleDeclarationType>
 		<Components xsi:type="Components_Conventional_CompletedBusType">
 			<Auxiliaries>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/vecto_vehicle-completed_heavyBus_31b.xml
index aafea2d02d7baa1c1eb9aea55eebdabc6b9299d0..ed6fbe549d75d1af3c0d6c3664d9f5fa765ee070 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/vecto_vehicle-completed_heavyBus_31b.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 31b2_NG-PI/vecto_vehicle-completed_heavyBus_31b.xml	
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>10680</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>86</NumberPassengerSeatsLowerDeck>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml
index 0edd2a3e40ffc7bf592301fa05eb503e63da3fea..ffb8f6f0ecfa258019df580c81a35d131ca38378 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml	
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>19400</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>16</NumberPassengerSeatsLowerDeck>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
index 709891bb30d6f94dc57e1000b3fc890ea2aee8df..ac6c5d341053fc329d9dfa419971af77d48fb891 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml	
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>19000</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>37000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<ClassBus>II</ClassBus>
 		<NumberPassengerSeatsLowerDeck>181</NumberPassengerSeatsLowerDeck>
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml b/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml
index acf86d58e021279c45eea6c8e624f411189b8699..0148ec1611b1dde556d0655c77f2996d635e5b8b 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_31b/vecto_vehicle-completed_heavyBus_31b.xml	
@@ -16,7 +16,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:/VectoCore/VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>10680</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 			<NumberPassengerSeatsLowerDeck>86</NumberPassengerSeatsLowerDeck>
diff --git a/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml b/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml
index a2abe53dfc68d57f1a4ec0fbafa44e3b6767156e..491e55a44f2b2ee4dda18092fd363e67feb6c01c 100644
--- a/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml	
+++ b/Generic Vehicles/Declaration Mode/SingleBus_34f/vecto_vehicle-completed_heavyBus_34f.xml	
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>19400</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>16</NumberPassengerSeatsLowerDeck>
diff --git a/VECTO/Input Files/Engine.vb b/VECTO/Input Files/Engine.vb
index 2e3593452e13e09d39b940e9975f0514b3842b04..16bc56d12bde70086253fa17b5dba98728b5d047 100644
--- a/VECTO/Input Files/Engine.vb	
+++ b/VECTO/Input Files/Engine.vb	
@@ -633,7 +633,7 @@ Public Class DummyVehicle
 	Public Property EngineIdleSpeed As PerSecond Implements IVehicleDeclarationInputData.EngineIdleSpeed
 	Public Property VocationalVehicle As Boolean Implements IVehicleDeclarationInputData.VocationalVehicle
 	Public Property SleeperCab As Boolean Implements IVehicleDeclarationInputData.SleeperCab
-	Public ReadOnly Property AirdragModifiedMultistage As Boolean? Implements IVehicleDeclarationInputData.AirdragModifiedMultistage
+	Public ReadOnly Property AirdragModifiedMultistep As Boolean? Implements IVehicleDeclarationInputData.AirdragModifiedMultistep
 	Public Property TankSystem As TankSystem? Implements IVehicleDeclarationInputData.TankSystem
 	Public Property IVehicleEngineeringInputData_ADAS As IAdvancedDriverAssistantSystemsEngineering Implements IVehicleEngineeringInputData.ADAS
 	Public ReadOnly Property IVehicleEngineeringInputData_Components As IVehicleComponentsEngineering Implements IVehicleEngineeringInputData.Components
diff --git a/VECTO/Input Files/Gearbox.vb b/VECTO/Input Files/Gearbox.vb
index 3a4cb79259122d72d14334482853e8223fb420c9..c4a743d6f3dd8bdaea623e6b9bc3ef0820fdf2d9 100644
--- a/VECTO/Input Files/Gearbox.vb	
+++ b/VECTO/Input Files/Gearbox.vb	
@@ -829,7 +829,7 @@ Public Class MockEngineeringVehicle
     Public Property EngineIdleSpeed As PerSecond Implements IVehicleDeclarationInputData.EngineIdleSpeed
     Public Property VocationalVehicle As Boolean Implements IVehicleDeclarationInputData.VocationalVehicle
     Public Property SleeperCab As Boolean Implements IVehicleDeclarationInputData.SleeperCab
-    Public ReadOnly Property AirdragModifiedMultistage As Boolean? Implements IVehicleDeclarationInputData.AirdragModifiedMultistage
+    Public ReadOnly Property AirdragModifiedMultistep As Boolean? Implements IVehicleDeclarationInputData.AirdragModifiedMultistep
     Public Property TankSystem As TankSystem? Implements IVehicleDeclarationInputData.TankSystem
 
     Public Property IVehicleEngineeringInputData_ADAS As IAdvancedDriverAssistantSystemsEngineering _
diff --git a/VECTO/Input Files/MockVehicleInputData.vb b/VECTO/Input Files/MockVehicleInputData.vb
index 2c757f820b2a4908b01765dd83824f36ded8e71f..274d6518f22e20f0763a4b3020727b667f5887b2 100644
--- a/VECTO/Input Files/MockVehicleInputData.vb	
+++ b/VECTO/Input Files/MockVehicleInputData.vb	
@@ -29,7 +29,7 @@ Public Class MockVehicleInputData
     Public Property EngineIdleSpeed As PerSecond Implements IVehicleDeclarationInputData.EngineIdleSpeed
     Public Property VocationalVehicle As Boolean Implements IVehicleDeclarationInputData.VocationalVehicle
     Public Property SleeperCab As Boolean Implements IVehicleDeclarationInputData.SleeperCab
-    Public ReadOnly Property AirdragModifiedMultistage As Boolean? Implements IVehicleDeclarationInputData.AirdragModifiedMultistage
+    Public ReadOnly Property AirdragModifiedMultistep As Boolean? Implements IVehicleDeclarationInputData.AirdragModifiedMultistep
     Public Property TankSystem As TankSystem? Implements IVehicleDeclarationInputData.TankSystem
 
     Public Property ADAS As IAdvancedDriverAssistantSystemDeclarationInputData _
diff --git a/VECTO/Input Files/Vehicle.vb b/VECTO/Input Files/Vehicle.vb
index 1d7a8c0c6b31f5f142e012bfbd6636e4651a5c7d..d91ee12c9d7ecb09317e8a220cd30269063a933c 100644
--- a/VECTO/Input Files/Vehicle.vb	
+++ b/VECTO/Input Files/Vehicle.vb	
@@ -794,7 +794,7 @@ Public Class Vehicle
 		End Get
 	End Property
 
-	Public ReadOnly Property AirdragModifiedMultistage As Boolean? Implements IVehicleDeclarationInputData.AirdragModifiedMultistage
+	Public ReadOnly Property AirdragModifiedMultistep As Boolean? Implements IVehicleDeclarationInputData.AirdragModifiedMultistep
 
 	Public ReadOnly Property TankSystem As TankSystem? Implements IVehicleDeclarationInputData.TankSystem
 		Get
diff --git a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
index a0ac53b8e01598299113ecdd0b57130d2775ba57..cd19257c4a3a6213e45a43d76e756f8a47d782ac 100644
--- a/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
+++ b/VECTO3GUI2020/Util/XML/Implementation/ComponentWriter/XMLVehicleWriter.cs
@@ -262,7 +262,7 @@ namespace VECTO3GUI2020.Util.XML.Implementation.ComponentWriter
 			_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_TPMLM,
 				_inputData.GrossVehicleMassRating?.ToXMLFormat(0)));
 
-			_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_AirdragModifiedMultistage, _inputData.AirdragModifiedMultistage));
+			_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Bus_AirdragModifiedMultistep, _inputData.AirdragModifiedMultistep));
 			_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_NgTankSystem, _inputData.TankSystem));
 			_Xelement.Add(new XElement(_defaultNamespace + XMLNames.Vehicle_RegisteredClass, _inputData.RegisteredClass.ToXMLFormat()));
 
diff --git a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
index 08f08b6651ca607caf082b8db41a20bd87eb2665..fbc193c1bc278ae72ff7b5e8064fc7ce784af3a1 100644
--- a/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
+++ b/VECTO3GUI2020/ViewModel/Implementation/JobEdit/Vehicle/VehicleViewModel.cs
@@ -238,7 +238,7 @@ namespace VECTO3GUI2020.ViewModel.Implementation.JobEdit.Vehicle
 			set => throw new NotImplementedException();
 		}
 
-		public bool? AirdragModifiedMultistage => throw new NotImplementedException();
+		public bool? AirdragModifiedMultistep => throw new NotImplementedException();
 
 		public virtual TankSystem? TankSystem
 		{
diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
index 3f796f04b9e585a837ff3221a4ba4ef1c6d8367c..100e136eef2bd79a252b47b316d0186efd31b49a 100644
--- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
+++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs
@@ -202,11 +202,11 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 				MultistageAirdragViewModel.AirdragViewModelChanged += ((sender, args) => {
 					if (sender is IMultistageAirdragViewModel vm)
 					{
-						if (AirdragModifiedMultistageMandatory)
+						if (AirdragModifiedMultistepMandatory)
 						{
 							if (vm.AirDragViewModel != null)
 							{
-								AirdragModifiedMultistage = true;
+								AirdragModifiedMultistep = true;
 							}
 						}
 					}
@@ -221,16 +221,16 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			CreateParameterViewModels();
 
 
-			if (consolidatedVehicleData?.AirdragModifiedMultistage != null)
+			if (consolidatedVehicleData?.AirdragModifiedMultistep != null)
 			{
-				AirdragModifiedMultistageMandatory = true;
-				AirdragModifiedMultistageEditingEnabled = true;
+				AirdragModifiedMultistepMandatory = true;
+				AirdragModifiedMultistepEditingEnabled = true;
 			}
 
 			if (consolidatedVehicleData?.Components?.AirdragInputData != null)
 			{
-				AirdragModifiedMultistageMandatory = true;
-				AirdragModifiedMultistageEditingEnabled = true;
+				AirdragModifiedMultistepMandatory = true;
+				AirdragModifiedMultistepEditingEnabled = true;
 			}
 		}
 
@@ -334,7 +334,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 				PassengerGroupEditingCallback;
 
 			_parameterViewModels[nameof(AirdragModifiedEnum)].EditingChangedCallback = model => {
-				AirdragModifiedMultistageEditingEnabled = model.EditingEnabled;
+				AirdragModifiedMultistepEditingEnabled = model.EditingEnabled;
 			};
 
 			//Setup allowed values
@@ -413,7 +413,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			LegislativeClass = vehicleInputData.LegislativeClass;
 			CurbMassChassis = vehicleInputData.CurbMassChassis;
 			GrossVehicleMassRating = vehicleInputData.GrossVehicleMassRating;
-			AirdragModifiedMultistage = vehicleInputData.AirdragModifiedMultistage;
+			AirdragModifiedMultistep = vehicleInputData.AirdragModifiedMultistep;
 			TankSystem = vehicleInputData.TankSystem;
 			RegisteredClass = vehicleInputData.RegisteredClass;
 			NumberPassengerSeatsUpperDeck = vehicleInputData.NumberPassengerSeatsUpperDeck;
@@ -439,7 +439,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			EcoRollTypeNullable = vehicleInputData.ADAS?.EcoRoll;
 			PredictiveCruiseControlNullable = vehicleInputData.ADAS?.PredictiveCruiseControl;
 			ATEcoRollReleaseLockupClutch = vehicleInputData.ADAS?.ATEcoRollReleaseLockupClutch;
-			AirdragModifiedMultistage = vehicleInputData.AirdragModifiedMultistage;
+			AirdragModifiedMultistep = vehicleInputData.AirdragModifiedMultistep;
 			foreach (var multistageParameterViewModel in _parameterViewModels.Values)
 			{
 				multistageParameterViewModel.UpdateEditingEnabled();
@@ -485,7 +485,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		private bool? _lowEntry;
 		private VehicleCode? _vehicleCode;
 		private RegistrationClass? _registeredClass;
-		private bool? _airdragModifiedMultistage;
+		private bool? _airdragModifiedMultistep;
 		private bool _airdragModifiedEditingEnabled = false;
 		private LegislativeClass? _legislativeClass;
 		private ConsumerTechnology? _doorDriveTechnology;
@@ -700,14 +700,14 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		{
 			get
 			{
-				return _airdragModifiedMultistage.toAirdragModifiedEnum();
+				return _airdragModifiedMultistep.toAirdragModifiedEnum();
 			}
 			set
 			{
-				var prevVal = AirdragModifiedMultistage;
+				var prevVal = AirdragModifiedMultistep;
 				var newVal = value?.toNullableBool();
 				if (prevVal != newVal) {
-					AirdragModifiedMultistage = value?.toNullableBool();
+					AirdragModifiedMultistep = value?.toNullableBool();
 				}
 				if (_parameterViewModels.ContainsKey(nameof(AirdragModifiedEnum)))
 				{
@@ -720,8 +720,8 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		{
 			get
 			{
-				if (_consolidatedVehicleData?.AirdragModifiedMultistage != null) {
-					return _consolidatedVehicleData.AirdragModifiedMultistage.toAirdragModifiedEnum();
+				if (_consolidatedVehicleData?.AirdragModifiedMultistep != null) {
+					return _consolidatedVehicleData.AirdragModifiedMultistep.toAirdragModifiedEnum();
 				} else {
 					return null;
 				}
@@ -730,15 +730,15 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		}
 
 
-		public bool? AirdragModifiedMultistage
+		public bool? AirdragModifiedMultistep
 		{
 			get
 			{
-				return _airdragModifiedMultistage;
+				return _airdragModifiedMultistep;
 			}
 			set
 			{
-				if (SetProperty(ref _airdragModifiedMultistage, value)) {
+				if (SetProperty(ref _airdragModifiedMultistep, value)) {
 					if(value == false){
 						MultistageAirdragViewModel.AirDragViewModel = null;
 					} else {
@@ -749,13 +749,13 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			}
 		}
 
-		public bool AirdragModifiedMultistageMandatory
+		public bool AirdragModifiedMultistepMandatory
 		{
-			get => _airdragModifiedMultistageMandatory;
-			set => SetProperty(ref _airdragModifiedMultistageMandatory, value);
+			get => _airdragModifiedMultistepMandatory;
+			set => SetProperty(ref _airdragModifiedMultistepMandatory, value);
 		}
 
-		public bool AirdragModifiedMultistageEditingEnabled
+		public bool AirdragModifiedMultistepEditingEnabled
 		{
 			get
 			{
@@ -764,7 +764,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 			set
 			{
 				var val = value;
-				if (AirdragModifiedMultistageMandatory) {
+				if (AirdragModifiedMultistepMandatory) {
 					val = true;
 				} else {
 					val = false;
@@ -1177,7 +1177,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 						}
 						break;
 					case nameof(AirdragModifiedEnum):
-						if (AirdragModifiedMultistageEditingEnabled && (AirdragModifiedEnum == AIRDRAGMODIFIED.UNKNOWN)) {
+						if (AirdragModifiedMultistepEditingEnabled && (AirdragModifiedEnum == AIRDRAGMODIFIED.UNKNOWN)) {
 							result = "Air drag modified has to be set";
 						}
 						break;
@@ -1234,7 +1234,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation
 		}
 		#endregion
 
-		private bool _airdragModifiedMultistageMandatory;
+		private bool _airdragModifiedMultistepMandatory;
 		private int? _numberPassengersStandingLowerDeck;
 		private int? _numberPassengersStandingUpperDeck;
 		private bool _exemptedVehicle;
diff --git a/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml b/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml
index 5ab3c287ff37bc763317d7311cf26db0d70c688b..5fb13f8d3cbcdce2ba840f84557e1eec004af5b4 100644
--- a/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml
+++ b/VECTO3GUI2020/Views/Multistage/VehicleView_v2_8.xaml
@@ -44,7 +44,7 @@
                     ParameterViewModels[GrossVehicleMassRating]}"></ContentControl>
 
 
-                <ContentControl Visibility="{Binding AirdragModifiedMultistageMandatory, Converter={StaticResource BooleanToVisibilityConverter}}"
+                <ContentControl Visibility="{Binding AirdragModifiedMultistepMandatory, Converter={StaticResource BooleanToVisibilityConverter}}"
                     Content="{Binding ParameterViewModels[AirdragModifiedEnum]}"/>
 
                 <ContentControl 
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 12e3a4e2cea019db6aea8071b715b8502103e001..ad423c74f43d8fcb9946c51402ad5c2b1cbb75b8 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
@@ -595,7 +595,7 @@
         <LegislativeCategory>M3</LegislativeCategory>
         <CorrectedActualMass>500</CorrectedActualMass>
         <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-        <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+        <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
         <ClassBus>II+III</ClassBus>
         <NgTankSystem>Compressed</NgTankSystem>
         <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/Vecto3GUI2020Test/ViewModelTests/AirdragTests.cs b/Vecto3GUI2020Test/ViewModelTests/AirdragTests.cs
index 20841fe44531e4b6d3379b1d95e95c94209d02c7..8fc8052b196f610f50a6893005b01cd6f8fd7f77 100644
--- a/Vecto3GUI2020Test/ViewModelTests/AirdragTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/AirdragTests.cs
@@ -24,12 +24,12 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			var vehicleVm = vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
 				InterimStageBusVehicleViewModel_v2_8;
 
-			Assert.IsTrue(vehicleVm.AirdragModifiedMultistageEditingEnabled);
+			Assert.IsTrue(vehicleVm.AirdragModifiedMultistepEditingEnabled);
 
 			//try to change to false
 
-			vehicleVm.AirdragModifiedMultistage = false; //should not change the value
-			Assert.IsTrue(vehicleVm.AirdragModifiedMultistageEditingEnabled);
+			vehicleVm.AirdragModifiedMultistep = false; //should not change the value
+			Assert.IsTrue(vehicleVm.AirdragModifiedMultistepEditingEnabled);
 		}
 
 		[Test]
@@ -41,7 +41,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
 				vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
 					InterimStageBusVehicleViewModel_v2_8;
 
-			Assert.IsFalse(vehicleVm.AirdragModifiedMultistageEditingEnabled);
+			Assert.IsFalse(vehicleVm.AirdragModifiedMultistepEditingEnabled);
 		}
 
 		/// <summary>
@@ -59,18 +59,18 @@ namespace Vecto3GUI2020Test.ViewModelTests
 				vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
 					InterimStageBusVehicleViewModel_v2_8;
 
-			Assert.IsNull(vehicleVm.AirdragModifiedMultistage);
+			Assert.IsNull(vehicleVm.AirdragModifiedMultistep);
 
 			var airdragViewModel = vehicleVm.MultistageAirdragViewModel as MultistageAirdragViewModel;
 			Assert.IsTrue(airdragViewModel.LoadAirdragFile(GetTestDataPath(airdragLoadTestFile)));
 
-			Assert.IsNull(vehicleVm.AirdragModifiedMultistage);
-			Assert.IsFalse(vehicleVm.AirdragModifiedMultistageMandatory);
+			Assert.IsNull(vehicleVm.AirdragModifiedMultistep);
+			Assert.IsFalse(vehicleVm.AirdragModifiedMultistepMandatory);
 
-			vehicleVm.AirdragModifiedMultistageEditingEnabled = true;
-			Assert.IsFalse(vehicleVm.AirdragModifiedMultistageEditingEnabled);
+			vehicleVm.AirdragModifiedMultistepEditingEnabled = true;
+			Assert.IsFalse(vehicleVm.AirdragModifiedMultistepEditingEnabled);
 
-			Assert.IsNull(vehicleVm.AirdragModifiedMultistage);
+			Assert.IsNull(vehicleVm.AirdragModifiedMultistep);
 
 			//Set Mandatory Fields
 			vehicleVm.Manufacturer = "testManufacturer";
@@ -89,13 +89,13 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			var secondStageVehicleVm =
 				(secondstageVm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel) as
 				InterimStageBusVehicleViewModel_v2_8;
-			Assert.IsTrue(secondStageVehicleVm.AirdragModifiedMultistageEditingEnabled);
-			Assert.IsTrue(secondStageVehicleVm.AirdragModifiedMultistageMandatory);
-			Assert.IsNull(secondStageVehicleVm.ConsolidatedVehicleData.AirdragModifiedMultistage);
+			Assert.IsTrue(secondStageVehicleVm.AirdragModifiedMultistepEditingEnabled);
+			Assert.IsTrue(secondStageVehicleVm.AirdragModifiedMultistepMandatory);
+			Assert.IsNull(secondStageVehicleVm.ConsolidatedVehicleData.AirdragModifiedMultistep);
 
 			//try to disable AirdragModified
-			secondStageVehicleVm.AirdragModifiedMultistageEditingEnabled = false;
-			Assert.IsTrue(secondStageVehicleVm.AirdragModifiedMultistageEditingEnabled);
+			secondStageVehicleVm.AirdragModifiedMultistepEditingEnabled = false;
+			Assert.IsTrue(secondStageVehicleVm.AirdragModifiedMultistepEditingEnabled);
 		}
 		/// <summary>
 		///  no airdrag component set in VIF => AirdragModifiedMultistage is disabled
@@ -108,17 +108,17 @@ namespace Vecto3GUI2020Test.ViewModelTests
 				vm.MultiStageJobViewModel.ManufacturingStageViewModel.Vehicle as
 					InterimStageBusVehicleViewModel_v2_8;
 
-			Assert.IsNull(vehicleVm.AirdragModifiedMultistage);
+			Assert.IsNull(vehicleVm.AirdragModifiedMultistep);
 
-			Assert.IsNull(vehicleVm.AirdragModifiedMultistage);
-			Assert.IsFalse(vehicleVm.AirdragModifiedMultistageMandatory);
+			Assert.IsNull(vehicleVm.AirdragModifiedMultistep);
+			Assert.IsFalse(vehicleVm.AirdragModifiedMultistepMandatory);
 
 			var airdragViewModel = vehicleVm.MultistageAirdragViewModel;
 			Assert.IsTrue(airdragViewModel.LoadAirdragFile(GetTestDataPath(airdragLoadTestFile)), "Airdrag file not loaded");
-			Assert.IsFalse(vehicleVm.AirdragModifiedMultistageMandatory);
+			Assert.IsFalse(vehicleVm.AirdragModifiedMultistepMandatory);
 
-			vehicleVm.AirdragModifiedMultistageEditingEnabled = true;
-			Assert.IsFalse(vehicleVm.AirdragModifiedMultistageEditingEnabled);
+			vehicleVm.AirdragModifiedMultistepEditingEnabled = true;
+			Assert.IsFalse(vehicleVm.AirdragModifiedMultistepEditingEnabled);
 
 		}
 		/// <summary>
@@ -150,7 +150,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
 
 			var vehicleViewModel = vm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as InterimStageBusVehicleViewModel_v2_8;
 
-			Assert.IsNull(vehicleViewModel.AirdragModifiedMultistage);
+			Assert.IsNull(vehicleViewModel.AirdragModifiedMultistep);
 
 
 			//Load airdrag file
@@ -159,18 +159,18 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			Assert.IsTrue(airdragLoaded, "Airdrag file was not loaded");
 
 			//Airdrag modified set to true if a component is loaded and the field is mandatory
-			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistage);
-			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistageMandatory);
+			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistep);
+			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistepMandatory);
 			Assert.AreEqual(
 				AIRDRAGMODIFIED.TRUE,
 				vehicleViewModel.ParameterViewModels[nameof(vehicleViewModel.AirdragModifiedEnum)].CurrentContent);
 
-			vehicleViewModel.AirdragModifiedMultistage = false;
+			vehicleViewModel.AirdragModifiedMultistep = false;
 			Assert.AreEqual(AIRDRAGMODIFIED.FALSE,vehicleViewModel.ParameterViewModels[nameof(vehicleViewModel.AirdragModifiedEnum)].CurrentContent);
 			Assert.IsNull(vehicleViewModel.Components?.AirdragInputData);
 			Assert.IsNull(vehicleViewModel.MultistageAirdragViewModel.AirDragViewModel);
 
-			vehicleViewModel.AirdragModifiedMultistage = true;
+			vehicleViewModel.AirdragModifiedMultistep = true;
 			Assert.AreEqual(loadedAirdragComponent, vehicleViewModel.MultistageAirdragViewModel.AirDragViewModel);
 
 		}
@@ -182,7 +182,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
 
 			var vehicleViewModel = vm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as InterimStageBusVehicleViewModel_v2_8;
 
-			Assert.IsNull(vehicleViewModel.AirdragModifiedMultistage);
+			Assert.IsNull(vehicleViewModel.AirdragModifiedMultistep);
 
 
 			//Load input file
@@ -196,18 +196,18 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			Assert.NotNull(loadedAirdragComponent);
 
 			//Airdrag modified set to true if a component is loaded and the field is mandatory
-			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistage);
-			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistageMandatory);
+			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistep);
+			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistepMandatory);
 			Assert.AreEqual(
 				AIRDRAGMODIFIED.TRUE,
 				vehicleViewModel.ParameterViewModels[nameof(vehicleViewModel.AirdragModifiedEnum)].CurrentContent);
 
-			vehicleViewModel.AirdragModifiedMultistage = false;
+			vehicleViewModel.AirdragModifiedMultistep = false;
 			Assert.AreEqual(AIRDRAGMODIFIED.FALSE, vehicleViewModel.ParameterViewModels[nameof(vehicleViewModel.AirdragModifiedEnum)].CurrentContent);
 			Assert.IsNull(vehicleViewModel.Components?.AirdragInputData);
 			Assert.IsNull(vehicleViewModel.MultistageAirdragViewModel.AirDragViewModel);
 
-			vehicleViewModel.AirdragModifiedMultistage = true;
+			vehicleViewModel.AirdragModifiedMultistep = true;
 			Assert.AreEqual(loadedAirdragComponent, vehicleViewModel.MultistageAirdragViewModel.AirDragViewModel);
 
 		}
@@ -219,7 +219,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
 
 			var vehicleViewModel = vm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as InterimStageBusVehicleViewModel_v2_8;
 
-			Assert.IsNull(vehicleViewModel.AirdragModifiedMultistage);
+			Assert.IsNull(vehicleViewModel.AirdragModifiedMultistep);
 
 
 			//Load input file
@@ -228,9 +228,9 @@ namespace Vecto3GUI2020Test.ViewModelTests
 				GetTestDataPath(stageInputFullSample));
 
 
-			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistage);
+			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistep);
 			vehicleViewModel.MultistageAirdragViewModel.RemoveAirdragComponent(); //remove airdrag viewmodel;
-			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistage);
+			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistep);
 
 
 
@@ -246,7 +246,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
 
 			var vehicleViewModel = vm.MultiStageJobViewModel.ManufacturingStageViewModel.VehicleViewModel as InterimStageBusVehicleViewModel_v2_8;
 
-			Assert.IsNull(vehicleViewModel.AirdragModifiedMultistage);
+			Assert.IsNull(vehicleViewModel.AirdragModifiedMultistep);
 
 
 			//Load airdrag file
@@ -254,8 +254,8 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			Assert.IsTrue(airdragLoaded, "Airdrag file was not loaded");
 
 			//Airdrag modified set to true if a component is loaded and the field is mandatory
-			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistage);
-			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistageMandatory);
+			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistep);
+			Assert.IsTrue(vehicleViewModel.AirdragModifiedMultistepMandatory);
 			Assert.AreEqual(
 				AIRDRAGMODIFIED.TRUE,
 				vehicleViewModel.ParameterViewModels[nameof(vehicleViewModel.AirdragModifiedEnum)].CurrentContent);
@@ -266,7 +266,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			airdragLoaded = vehicleViewModel.MultistageAirdragViewModel.LoadAirdragFile(GetTestDataPath(airdragLoadTestFile));
 			Assert.IsTrue(airdragLoaded, "Airdrag file was not loaded");
 
-			vehicleViewModel.AirdragModifiedMultistage = false;
+			vehicleViewModel.AirdragModifiedMultistep = false;
 			Assert.IsNull(vehicleViewModel.MultistageAirdragViewModel.AirDragViewModel);
 
 
diff --git a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
index 8731ec9b6c817bc48fe97bcb44024e0b5d526c17..4fc8221fbe147f600fff74aefa9b60ce0449c689 100644
--- a/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/LoadAndSaveVehicleData.cs
@@ -86,12 +86,12 @@ namespace Vecto3GUI2020Test
 			Assert.NotNull(vehicle);
 
 
-			Assert.True(vehicle.AirdragModifiedMultistageEditingEnabled);
+			Assert.True(vehicle.AirdragModifiedMultistepEditingEnabled);
 
 			newMultistageJobViewModel.AddVifFile(GetTestDataPath(consolidated_multiple_stages_hev));
 			Assert.AreEqual(GetTestDataPath(consolidated_multiple_stages_hev), newMultistageJobViewModel.VifPath);
 			vehicle = newMultistageJobViewModel.MultiStageJobViewModel.VehicleInputData as InterimStageBusVehicleViewModel_v2_8;
-			Assert.IsFalse(vehicle.AirdragModifiedMultistageEditingEnabled);
+			Assert.IsFalse(vehicle.AirdragModifiedMultistepEditingEnabled);
 
 		}
 
@@ -179,15 +179,15 @@ namespace Vecto3GUI2020Test
 			Assert.Null(vehicleViewModelV28.ConsolidatedEntranceHeightInMm);
 
 
-			Assert.IsFalse(vehicleViewModelV28.AirdragModifiedMultistageEditingEnabled);
+			Assert.IsFalse(vehicleViewModelV28.AirdragModifiedMultistepEditingEnabled);
 
-			Assert.IsNull(vehicleViewModelV28.AirdragModifiedMultistage);
+			Assert.IsNull(vehicleViewModelV28.AirdragModifiedMultistep);
 			Assert.IsNull(vehicleViewModelV28.ConsolidatedAirdragModifiedEnum);
 			Assert.IsTrue(vehicleViewModelV28.AirdragModifiedEnum == AIRDRAGMODIFIED.UNKNOWN || vehicleViewModelV28.AirdragModifiedEnum == null);
 			
 
 
-			Assert.AreEqual(vehicleViewModelV28.AirdragModifiedMultistageEditingEnabled, false);
+			Assert.AreEqual(vehicleViewModelV28.AirdragModifiedMultistepEditingEnabled, false);
 
 			Assert.Null(vehicleViewModelV28.BusAuxiliaries);
 
@@ -245,7 +245,7 @@ namespace Vecto3GUI2020Test
 			Assert.NotNull(inputData.JobInputData.Vehicle.Components.AirdragInputData, "No Airdrag Component loaded");
 			var airdragData = inputData.JobInputData.Vehicle.Components.AirdragInputData;
 			
-			Assert.AreEqual(expectedAirdragModifiedValue, vehicleVm.AirdragModifiedMultistage);
+			Assert.AreEqual(expectedAirdragModifiedValue, vehicleVm.AirdragModifiedMultistep);
 
 			TestContext.WriteLine("Done!");
 
@@ -292,7 +292,7 @@ namespace Vecto3GUI2020Test
 			Assert.AreEqual(LegislativeClass.M3, vehicleViewModel.LegislativeClass);
 			Assert.AreEqual(500, vehicleViewModel.CurbMassChassis.Value());//CorrectedActualMass
 			Assert.AreEqual(3500, vehicleViewModel.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass
-			Assert.AreEqual(true, vehicleViewModel.AirdragModifiedMultistage);
+			Assert.AreEqual(true, vehicleViewModel.AirdragModifiedMultistep);
 			Assert.AreEqual(AIRDRAGMODIFIED.TRUE, vehicleViewModel.AirdragModifiedEnum);
 			Assert.AreEqual(AIRDRAGMODIFIED.TRUE, vehicleViewModel.ParameterViewModels[nameof(vehicleViewModel.AirdragModifiedEnum)].CurrentContent);
 			Assert.AreEqual(TankSystem.Compressed, vehicleViewModel.TankSystem);//NgTankSystem
diff --git a/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs b/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs
index 5152c1998054eb67955f8b1539654fc8b1e4db4b..71a6d3a181add868ae35b776823b3e540f875a6b 100644
--- a/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs
+++ b/Vecto3GUI2020Test/ViewModelTests/VIFTests.cs
@@ -270,7 +270,7 @@ namespace Vecto3GUI2020Test.ViewModelTests
 			vehicle.ManufacturerAddress = "Address";
 			vehicle.Manufacturer = "Manufacturer";
 			vehicle.VIN = "VIN12345678";
-			vehicle.AirdragModifiedMultistage = true;
+			vehicle.AirdragModifiedMultistep = true;
 			vehicle.VehicleDeclarationType = VehicleDeclarationType.interim;
 			
 			var writer = GetFileOutputVIFWriter(multiStageViewModel);
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index eddf2a1b27a1df9079453372c7aa78c87c002fa0..c10c72b27ecb616dfa43f6e3d5e027738a214ad3 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -146,7 +146,7 @@ namespace TUGraz.VectoCommon.InputData
 
 		bool SleeperCab { get; }
 
-		bool? AirdragModifiedMultistage { get; }
+		bool? AirdragModifiedMultistep { get; }
 
 		TankSystem? TankSystem { get; }
 
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
index f2e9732861d686c60154bcf2eac41469cad8a443..e9994c822d2f7129bd088b4172ac94d8e5ffa0e7 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.Designer.cs
@@ -529,11 +529,11 @@ namespace TUGraz.VectoCommon.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to AirdragModifiedMultistage.
+        ///   Looks up a localized string similar to AirdragModifiedMultistep.
         /// </summary>
-        public static string Bus_AirdragModifiedMultistage {
+        public static string Bus_AirdragModifiedMultistep {
             get {
-                return ResourceManager.GetString("Bus_AirdragModifiedMultistage", resourceCulture);
+                return ResourceManager.GetString("Bus_AirdragModifiedMultistep", resourceCulture);
             }
         }
         
diff --git a/VectoCommon/VectoCommon/Resources/XMLNames.resx b/VectoCommon/VectoCommon/Resources/XMLNames.resx
index 37cbf6c026a759cd1a4088fc72e286f7ad3678c0..24f3fec5bb649c4dd155fff58bf7dba0e841203a 100644
--- a/VectoCommon/VectoCommon/Resources/XMLNames.resx
+++ b/VectoCommon/VectoCommon/Resources/XMLNames.resx
@@ -1383,8 +1383,8 @@
   <data name="Bus_ADAS_APTEcoRollReleaseLockupClutch" xml:space="preserve">
     <value>APTEcoRollReleaseLockupClutch</value>
   </data>
-  <data name="Bus_AirdragModifiedMultistage" xml:space="preserve">
-    <value>AirdragModifiedMultistage</value>
+  <data name="Bus_AirdragModifiedMultistep" xml:space="preserve">
+    <value>AirdragModifiedMultistep</value>
   </data>
   <data name="CorrectedActualMass" xml:space="preserve">
     <value>CorrectedActualMass</value>
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
index a5309cc60e7190133319615cb37de0872e726f42..94c4a92c57d7593e6bc5fb2be54b3e3a0c5a7511 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONComponentInputData.cs
@@ -318,7 +318,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		public bool SleeperCab => DeclarationData.Vehicle.SleeperCabDefault;
 
-		public bool? AirdragModifiedMultistage { get; }
+		public bool? AirdragModifiedMultistep { get; }
 
 		public TankSystem? TankSystem => DeclarationData.Vehicle.TankSystemDefault;
 
diff --git a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
index 8d19b73b0f0fb1e73f4e6f204215b1ddabfbd4b4..6a46712e9f08ee942cf68f9120951d09d883d55a 100644
--- a/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/JSON/JSONVehicleData.cs
@@ -422,7 +422,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
 
 		public virtual bool SleeperCab => DeclarationData.Vehicle.SleeperCabDefault;
 
-		public virtual bool? AirdragModifiedMultistage { get; }
+		public virtual bool? AirdragModifiedMultistep { get; }
 
 		public virtual TankSystem? TankSystem => DeclarationData.Vehicle.TankSystemDefault;
 
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
index 550347750f599a96cec607d4356e4115e736e5aa..06d994e64d27ca725c6ae17c17d8faf2336a4b7d 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
@@ -167,7 +167,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 
 		public virtual bool SleeperCab => XmlConvert.ToBoolean(GetString(XMLNames.Vehicle_SleeperCab));
 
-		public virtual bool? AirdragModifiedMultistage { get; }
+		public virtual bool? AirdragModifiedMultistep { get; }
 
 		public virtual TankSystem? TankSystem =>
 			ElementExists(XMLNames.Vehicle_NgTankSystem)
@@ -705,7 +705,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 		public Kilogram CurbMassChassis { get; }
 		public bool VocationalVehicle { get; }
 		public bool SleeperCab { get; }
-		public bool? AirdragModifiedMultistage { get; }
+		public bool? AirdragModifiedMultistep { get; }
 		public TankSystem? TankSystem { get; }
 
 		public bool HybridElectricHDV { get; }
@@ -829,9 +829,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider
 				? GetDouble(XMLNames.Vehicle_TPMLM).SI<Kilogram>()
 				: null;
 
-		public override bool? AirdragModifiedMultistage =>
-			ElementExists(XMLNames.Bus_AirdragModifiedMultistage)
-				? GetBool(XMLNames.Bus_AirdragModifiedMultistage)
+		public override bool? AirdragModifiedMultistep =>
+			ElementExists(XMLNames.Bus_AirdragModifiedMultistep)
+				? GetBool(XMLNames.Bus_AirdragModifiedMultistep)
 				: (bool?)null;
 
 		public override RegistrationClass? RegisteredClass =>
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 aa93bd2e36b5b402880ef0676ffabefc55d84c41..b120086bf22582eecd4e9dfa2d26c7edca2225df 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs
@@ -517,7 +517,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
 
 		public Kilogram GrossVehicleMassRating => GetVehiclePropertyValue<Kilogram>(nameof(GrossVehicleMassRating)) ?? _primaryVehicle.Vehicle.GrossVehicleMassRating;
 
-		public bool? AirdragModifiedMultistage => GetVehiclePropertyValue<bool?>(nameof(AirdragModifiedMultistage));
+		public bool? AirdragModifiedMultistep => GetVehiclePropertyValue<bool?>(nameof(AirdragModifiedMultistep));
 
 		public TankSystem? TankSystem => GetVehiclePropertyValue<TankSystem?>(nameof(TankSystem));
 
@@ -667,7 +667,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl
 					continue;
 				}
 
-				if (checkAirdragModified && manufacturingStage.Vehicle?.AirdragModifiedMultistage == null) {
+				if (checkAirdragModified && manufacturingStage.Vehicle?.AirdragModifiedMultistep == null) {
 					validAirdragEntries = false;
 					break;
 				}
diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
index b7e5d3a86821c35144eb9f413cb0fc7ba99881de..30131906cb97f2cbfea828b90278563e3f60407c 100644
--- a/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
+++ b/VectoCore/VectoCore/InputData/FileIO/XML/Engineering/DataProvider/XMLEngineeringVehicleDataProvider.cs
@@ -112,7 +112,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Engineering.DataProvider
 
 		public bool SleeperCab => false;
 
-		public virtual bool? AirdragModifiedMultistage => null;
+		public virtual bool? AirdragModifiedMultistep => null;
 
 		public TankSystem? TankSystem =>
 			ElementExists(XMLNames.Vehicle_NgTankSystem)
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
index e987c2936501f43fa327cd5182d4956481f95c29..fe5feb406651e6caaafadf3a968a4e0b6c830174 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs
@@ -291,11 +291,11 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 			if (_consolidatedInputData?.Vehicle?.Components?.AirdragInputData == null)
 				return null;
 
-			switch (_vehicleInputData.AirdragModifiedMultistage) {
+			switch (_vehicleInputData.AirdragModifiedMultistep) {
 				case null:
 					throw new VectoException("AirdragModifiedMultistage must be set if an airdrag component has been set in previous stages.");
 				default:
-					return new XElement(v210 + XMLNames.Bus_AirdragModifiedMultistage, _vehicleInputData.AirdragModifiedMultistage);
+					return new XElement(v210 + XMLNames.Bus_AirdragModifiedMultistep, _vehicleInputData.AirdragModifiedMultistep);
 			}
 		}
 
@@ -334,10 +334,10 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
 
 		private XElement GetBusAirdrag(IAirdragDeclarationInputData airdrag)
 		{
-			if (airdrag != null && _vehicleInputData.AirdragModifiedMultistage != false) 
+			if (airdrag != null && _vehicleInputData.AirdragModifiedMultistep != false) 
 				return GetAirdragElement(airdrag);
 
-			return _vehicleInputData.AirdragModifiedMultistage == true
+			return _vehicleInputData.AirdragModifiedMultistep == true
 				? GetBusAirdragUseStandardValues()
 				: null;
 		}
diff --git a/VectoCore/VectoCore/OutputData/XML/GroupWriter/Declaration/Vehicle/CompletedBus/CompletedBusParametersWriter.cs b/VectoCore/VectoCore/OutputData/XML/GroupWriter/Declaration/Vehicle/CompletedBus/CompletedBusParametersWriter.cs
index 3007e2023d85180073e96ba84241413d3c1d1f64..88c063c9141421612de13ed525f46b22e335cda0 100644
--- a/VectoCore/VectoCore/OutputData/XML/GroupWriter/Declaration/Vehicle/CompletedBus/CompletedBusParametersWriter.cs
+++ b/VectoCore/VectoCore/OutputData/XML/GroupWriter/Declaration/Vehicle/CompletedBus/CompletedBusParametersWriter.cs
@@ -40,9 +40,9 @@ namespace TUGraz.VectoCore.OutputData.XML.GroupWriter.Declaration.Vehicle.Comple
 					vehicle.GrossVehicleMassRating.ToXMLFormat(0)));
 			}
 
-			if (vehicle.AirdragModifiedMultistage != null) {
-				elements.Add(new XElement(writerNamespace + XMLNames.Bus_AirdragModifiedMultistage,
-					vehicle.AirdragModifiedMultistage));
+			if (vehicle.AirdragModifiedMultistep != null) {
+				elements.Add(new XElement(writerNamespace + XMLNames.Bus_AirdragModifiedMultistep,
+					vehicle.AirdragModifiedMultistep));
 			}
 
 			if (vehicle.RegisteredClass != null) {
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
index f2866aee0d2fe8112ed56a36f4dc7a2a2835d67b..c59d5156ce4623186fc4ce472b4772375d51a490 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.10.2_JobInputData.xsd
@@ -2980,7 +2980,7 @@
 					<xs:documentation>P041 - [kg]</xs:documentation>
 				</xs:annotation>
 			</xs:element>
-			<xs:element name="AirdragModifiedMultistage" type="xs:boolean" minOccurs="0">
+			<xs:element name="AirdragModifiedMultistep" type="xs:boolean" minOccurs="0">
 				<xs:annotation>
 					<xs:documentation>P334 - bool</xs:documentation>
 				</xs:annotation>
diff --git a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
index bc690a7de656abc596b6ff31b352a976bfe5a4bd..1c76db780194fd1718bce26c378ed443822bb2f6 100644
--- a/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/Multistage/MultistageVehicleTest.cs
@@ -246,7 +246,7 @@ namespace TUGraz.VectoCore.Tests.Integration.Multistage
 			Assert.AreEqual(LegislativeClass.M3, data.Vehicle.LegislativeClass);
 			Assert.AreEqual(500, data.Vehicle.CurbMassChassis.Value());
 			Assert.AreEqual(3500, data.Vehicle.GrossVehicleMassRating.Value());
-			Assert.AreEqual(true, data.Vehicle.AirdragModifiedMultistage);
+			Assert.AreEqual(true, data.Vehicle.AirdragModifiedMultistep);
 			Assert.AreEqual(TankSystem.Compressed, data.Vehicle.TankSystem);
 			Assert.AreEqual(RegistrationClass.II_III, data.Vehicle.RegisteredClass);
 			Assert.AreEqual(1, data.Vehicle.NumberPassengerSeatsLowerDeck);
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 f8a7ecfb0897ea318bbe4f2cc984ee391e898f11..6d861f87fd72ceadda4ef02b54bfdaadf409d7a7 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
@@ -595,7 +595,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>I+II</ClassBus>
 		<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
index 9e78863358126b7f4bf414095decf0c2fed06ca1..06d1359f84542744d7f09326d985a6ff9b35a04a 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41.xml
@@ -17,7 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
index 92eac018358bc848e6d6298232b37af2830eec1a..b8230a98c444fbbe613ed761726b06d4a0502397 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_41_mixed.xml
@@ -17,7 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
index 6422345a377266bf8042973f7e2af7a2b0835b46..15c67467d3271b0398624242379521828aff2e21 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-completed_heavyBus_42.xml
@@ -17,7 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>		
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>		
 		<ClassBus>I+II</ClassBus>		
 		<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
index ee0bce9b6ec425823a0d84ae3232a33eaeff3387..205250d4db8df061ac299304028e2f62ad3d2e5b 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/vecto_vehicle-completed_heavyBus.xml
@@ -17,7 +17,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>15400</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NumberPassengerSeatsLowerDeck>50</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
index fc99200f3ca2bfdbeec0358194e2a3b2c55ac5d2..1bf3bdb347330da29deb7690c485ec7760382fe5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/VTPMode/HeavyBus/vecto_vehicle-completed_heavyBus_34f.xml
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>19400</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<ClassBus>II+III</ClassBus>
 		<NumberPassengerSeatsLowerDeck>16</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml
index 1be600645f0edd61c07b84b8d65b3b54bdc6818a..4c480bafd8e59345517481b22e158d92c2ce7d06 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/Conventional_completedBus_1.xml
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem><!-- optional -->
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml
index 505683bbe54c9d8ff64e4ff439e209f82404fe4f..5f8da960e6069a452e1742adb1c9c368c443cc68 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/HEV_completedBus_1.xml
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem><!-- optional -->
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml
index 547e2944e40ff17b2c8d528e483e80cae7694f44..c9f31d28a2b2fe8eac907854550697800a58a47c 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/IEPC_completedBus_1.xml
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml
index cb50b2e0a35f88e3b4c1a6846c3ebfd14bb6764d..c9eeae9c8ff5b774e13eba01329dbe3ea6511f85 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/Distributed/CompletedBus/PEV_completedBus_1.xml
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample-final-noADAS.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample-final-noADAS.xml
index c14f5c030c748a4eeaafe451c67ad3b4e1290758..ec506488f57fd923dc853f845906105f02752bbd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample-final-noADAS.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample-final-noADAS.xml
@@ -8,7 +8,7 @@
     <Model>Sample Bus Model</Model>
     <LegislativeCategory>M3</LegislativeCategory>
     <CorrectedActualMass>500</CorrectedActualMass>
-    <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+    <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
     <ClassBus>II+III</ClassBus>
     <NgTankSystem>Compressed</NgTankSystem>
     <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample-final.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample-final.xml
index 7f0506dca6c9dc1980e9974820ed202f7523fd26..b4fd8da31e848d10169ec77dfb298152f4125058 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample-final.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample-final.xml
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample.xml
index 556811a99b7259000a7684efd7eccf262ac9aecd..c23e2da3087536dc7a30cda3b04bb05e567bb0ad 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample.xml
@@ -9,7 +9,7 @@
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>500</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample_group41.xml
index 61f700afa86fccba775c247cc39ca40b968a8399..41322fc7660f6ccf89c34db68180baa64b9b1992 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_full-sample_group41.xml
@@ -15,7 +15,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCor
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 		<ClassBus>II+III</ClassBus>
 		<NgTankSystem>Compressed</NgTankSystem>
 		<NumberPassengerSeatsLowerDeck>2</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index a836349fadf2c128e91e9a5dc6aebcad77e939b1..186c68b1c6b10c5a64b2bec7887b722a81d987b7 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.10/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
@@ -1 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<NgTankSystem>Compressed</NgTankSystem>
		<ClassBus>A</ClassBus>
		<BodyworkCode>CG</BodyworkCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>AirdragModifiedMultistepAirdragModifiedMultistep
+<tns:VectoInputDeclaration schemaVersion="2.0" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
+		<Manufacturer>Some Manufacturer 1</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
+		<VIN>VEH-1234567891</VIN>
+		<Date>2021-01-09T11:00:00Z</Date>
+		<Model>Sample Bus Model 2</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>5000</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
+		<NgTankSystem>Compressed</NgTankSystem>
+		<ClassBus>A</ClassBus>
+		<BodyworkCode>CG</BodyworkCode>
+		<LowEntry>true</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>10000</VehicleLength>
+		<VehicleWidth>2600</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<VehicleDeclarationType>interim</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_Conventional_Type">
+			<EngineStopStart>true</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+		</ADAS>
+		<Components xsi:type="Components_Conventional_CompletedBusType">
+			<Auxiliaries>
+				<Data xsi:type="AUX_Conventional_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Headlights>false</Headlights>
+						</LEDLights>		
+					</ElectricSystem>
+					<HVAC>
+						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
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 93327319dab227661589b4773805d48369c6fdc6..c8f907f11d844110b9df735825774f33daf26012 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
@@ -749,7 +749,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<VIN>VEH-2234567890</VIN>
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
 				<CorrectedActualMass>15000</CorrectedActualMass>	
-				<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+				<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 				<BodyworkCode>CB</BodyworkCode>
 				<DoorDriveTechnology>mixed</DoorDriveTechnology>				
 				<VehicleDeclarationType>interim</VehicleDeclarationType>				
@@ -822,7 +822,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 				<Date>2021-02-13T07:20:08.0187663Z</Date>
 				<LegislativeCategory>M3</LegislativeCategory>				
 				<TechnicalPermissibleMaximumLadenMass>20000</TechnicalPermissibleMaximumLadenMass>
-				<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
+				<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
 				<NgTankSystem>Liquefied</NgTankSystem>						
 				<VehicleDeclarationType>interim</VehicleDeclarationType>
 				<ADAS xsi:type="ADAS_Conventional_Type">
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 047d51c36c5c207971be80b9b50ccdc878ade07d..b73b3f86fd0e1a7289dd50d816a00de023eebffa 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
@@ -595,7 +595,7 @@
         <LegislativeCategory>M3</LegislativeCategory>
         <CorrectedActualMass>500</CorrectedActualMass>
         <TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
-        <AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+        <AirdragModifiedMultistep>true</AirdragModifiedMultistep>
         <ClassBus>II+III</ClassBus>
         <NgTankSystem>Compressed</NgTankSystem>
         <NumberPassengerSeatsLowerDeck>1</NumberPassengerSeatsLowerDeck>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
index ddd990790fef94c5307914789b4d62c6a7dc7add..1cb6960191b4deaacdc7209df8f0a5df14444928 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_full-sample.xml
@@ -1 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
		<Manufacturer>Some Manufacturer</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
		<VIN>VEH-1234567890</VIN>
		<Date>2020-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>500</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<ClassBus>II+III</ClassBus>
		<NgTankSystem>Compressed</NgTankSystem>
		<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
		<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
		<NumberPassengersStandingUpperDeck>10</NumberPassengersStandingUpperDeck>
		<BodyworkCode>CB</BodyworkCode>
		<LowEntry>false</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>9500</VehicleLength>
		<VehicleWidth>2500</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>electric</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<AirDrag>
				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
					<v2.0:Model>Generic Model</v2.0:Model>
					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
				</v2.0:Data>
				<v2.0:Signature>
					<di:Reference URI="#CabinX23h">
						<di:Transforms>
							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
						</di:Transforms>
						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
					</di:Reference>
				</v2.0:Signature>
			</AirDrag>
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Positionlights>true</Positionlights>
							<Brakelights>true</Brakelights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<SystemConfiguration>0</SystemConfiguration>
						<HeatPumpTypeDriverCompartment>
							<Cooling>none</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypeDriverCompartment>
						<HeatPumpTypePassengerCompartment>
							<Cooling>non R-744 2-stage</Cooling>
							<Heating>none</Heating>
						</HeatPumpTypePassengerCompartment>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>AirdragModifiedMultistepAirdragModifiedMultistep
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#" 
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType">
+		<Manufacturer>Some Manufacturer</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address</ManufacturerAddress>
+		<VIN>VEH-1234567890</VIN>
+		<Date>2020-01-09T11:00:00Z</Date>
+		<Model>Sample Bus Model</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>500</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>3500</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
+		<ClassBus>II+III</ClassBus>
+		<NgTankSystem>Compressed</NgTankSystem>
+		<NumberPassengerSeatsLowerDeck>0</NumberPassengerSeatsLowerDeck>
+		<NumberPassengersStandingLowerDeck>10</NumberPassengersStandingLowerDeck>
+		<NumberPassengerSeatsUpperDeck>10</NumberPassengerSeatsUpperDeck>
+		<NumberPassengersStandingUpperDeck>10</NumberPassengersStandingUpperDeck>
+		<BodyworkCode>CB</BodyworkCode>
+		<LowEntry>false</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>9500</VehicleLength>
+		<VehicleWidth>2500</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>electric</DoorDriveTechnology>
+		<VehicleDeclarationType>interim</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_Conventional_Type">
+			<EngineStopStart>true</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+		</ADAS>
+		<Components xsi:type="Components_Conventional_CompletedBusType">
+			<AirDrag>
+				<v2.0:Data xsi:type="v2.0:AirDragDataDeclarationType" id="CabinX23h">
+					<v2.0:Manufacturer>Generic Manufacturer</v2.0:Manufacturer>
+					<v2.0:Model>Generic Model</v2.0:Model>
+					<v2.0:CertificationNumber>e12*0815/8051*2017/05E0000*00</v2.0:CertificationNumber>
+					<v2.0:Date>2017-03-24T15:00:00Z</v2.0:Date>
+					<v2.0:AppVersion>Vecto AirDrag x.y</v2.0:AppVersion>
+					<v2.0:CdxA_0>6.31</v2.0:CdxA_0>
+					<v2.0:TransferredCdxA>6.32</v2.0:TransferredCdxA>
+					<v2.0:DeclaredCdxA>6.34</v2.0:DeclaredCdxA>
+				</v2.0:Data>
+				<v2.0:Signature>
+					<di:Reference URI="#CabinX23h">
+						<di:Transforms>
+							<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
+							<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+						</di:Transforms>
+						<di:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+						<di:DigestValue>b9SHCfOoVrBxFQ8wwDK32OO+9bd85DuaUdgs6j/29N8=</di:DigestValue>
+					</di:Reference>
+				</v2.0:Signature>
+			</AirDrag>
+			<Auxiliaries>
+				<Data xsi:type="AUX_Conventional_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Positionlights>true</Positionlights>
+							<Brakelights>true</Brakelights>
+							<Headlights>false</Headlights>
+						</LEDLights>		
+					</ElectricSystem>
+					<HVAC>
+						<SystemConfiguration>0</SystemConfiguration>
+						<HeatPumpTypeDriverCompartment>
+							<Cooling>none</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypeDriverCompartment>
+						<HeatPumpTypePassengerCompartment>
+							<Cooling>non R-744 2-stage</Cooling>
+							<Heating>none</Heating>
+						</HeatPumpTypePassengerCompartment>
+						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
+						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
index 33ab2883f270c489b857155ca03bdaced030b5c1..533b7b72dd018c8e864e43025aac405c4380134d 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/vecto_vehicle-stage_input_only_certain_entries01-sample.xml
@@ -1 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
		<Manufacturer>Some Manufacturer 1</Manufacturer>
		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
		<VIN>VEH-1234567891</VIN>
		<Date>2021-01-09T11:00:00Z</Date>
		<Model>Sample Bus Model 2</Model>
		<LegislativeCategory>M3</LegislativeCategory>
		<CorrectedActualMass>5000</CorrectedActualMass>
		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
		<AirdragModifiedMultistage>false</AirdragModifiedMultistage>
		<ClassBus>A</ClassBus>
		<NgTankSystem>Compressed</NgTankSystem>
		<BodyworkCode>CG</BodyworkCode>
		<LowEntry>true</LowEntry>
		<HeightIntegratedBody>2500</HeightIntegratedBody>
		<VehicleLength>10000</VehicleLength>
		<VehicleWidth>2600</VehicleWidth>
		<EntranceHeight>2000</EntranceHeight>
		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
		<VehicleDeclarationType>interim</VehicleDeclarationType>
		<ADAS xsi:type="ADAS_Conventional_Type">
			<EngineStopStart>true</EngineStopStart>
			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
			<PredictiveCruiseControl>none</PredictiveCruiseControl>
			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
		</ADAS>
		<Components xsi:type="Components_Conventional_CompletedBusType">
			<Auxiliaries>
				<Data xsi:type="AUX_Conventional_CompletedBusType">
					<ElectricSystem>
						<LEDLights>
							<Interiorlights>false</Interiorlights>
							<Dayrunninglights>true</Dayrunninglights>
							<Headlights>false</Headlights>
						</LEDLights>		
					</ElectricSystem>
					<HVAC>
						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
						<DoubleGlazing>false</DoubleGlazing>
						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
					</HVAC>
				</Data>
			</Auxiliaries>
		</Components>
	</v2.0:Vehicle>
</tns:VectoInputDeclaration>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>AirdragModifiedMultistepAirdragModifiedMultistep
+<tns:VectoInputDeclaration schemaVersion="2.8" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.10.2"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationInput:v2.0" 
+xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.3" 
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" 
+xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob v:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+	<v2.0:Vehicle id="VEH-1234567890" xsi:type="Vehicle_Conventional_CompletedBusDeclarationType" >
+		<Manufacturer>Some Manufacturer 1</Manufacturer>
+		<ManufacturerAddress>Some Manufacturer Address 1</ManufacturerAddress>
+		<VIN>VEH-1234567891</VIN>
+		<Date>2021-01-09T11:00:00Z</Date>
+		<Model>Sample Bus Model 2</Model>
+		<LegislativeCategory>M3</LegislativeCategory>
+		<CorrectedActualMass>5000</CorrectedActualMass>
+		<TechnicalPermissibleMaximumLadenMass>10000</TechnicalPermissibleMaximumLadenMass>
+		<AirdragModifiedMultistep>false</AirdragModifiedMultistep>
+		<ClassBus>A</ClassBus>
+		<NgTankSystem>Compressed</NgTankSystem>
+		<BodyworkCode>CG</BodyworkCode>
+		<LowEntry>true</LowEntry>
+		<HeightIntegratedBody>2500</HeightIntegratedBody>
+		<VehicleLength>10000</VehicleLength>
+		<VehicleWidth>2600</VehicleWidth>
+		<EntranceHeight>2000</EntranceHeight>
+		<DoorDriveTechnology>pneumatic</DoorDriveTechnology>
+		<VehicleDeclarationType>interim</VehicleDeclarationType>
+		<ADAS xsi:type="ADAS_Conventional_Type">
+			<EngineStopStart>true</EngineStopStart>
+			<EcoRollWithoutEngineStop>false</EcoRollWithoutEngineStop>
+			<EcoRollWithEngineStop>false</EcoRollWithEngineStop>
+			<PredictiveCruiseControl>none</PredictiveCruiseControl>
+			<APTEcoRollReleaseLockupClutch>true</APTEcoRollReleaseLockupClutch>
+		</ADAS>
+		<Components xsi:type="Components_Conventional_CompletedBusType">
+			<Auxiliaries>
+				<Data xsi:type="AUX_Conventional_CompletedBusType">
+					<ElectricSystem>
+						<LEDLights>
+							<Interiorlights>false</Interiorlights>
+							<Dayrunninglights>true</Dayrunninglights>
+							<Headlights>false</Headlights>
+						</LEDLights>		
+					</ElectricSystem>
+					<HVAC>
+						<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
+						<DoubleGlazing>false</DoubleGlazing>
+						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+					</HVAC>
+				</Data>
+			</Auxiliaries>
+		</Components>
+	</v2.0:Vehicle>
+</tns:VectoInputDeclaration>
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
index 7a38428e28025f3508b9bad3968c5767f06115dc..326a3281d9554d1369a76ecfed3c34e0581e4b5f 100644
--- a/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
@@ -39,7 +39,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
 		public PerSecond EngineIdleSpeed { get; }
 		public bool VocationalVehicle { get; }
 		public bool SleeperCab { get; }
-		public bool? AirdragModifiedMultistage { get; }
+		public bool? AirdragModifiedMultistep { get; }
 		public TankSystem? TankSystem { get; }
 		public IAdvancedDriverAssistantSystemDeclarationInputData ADAS { get; }
 		public bool ZeroEmissionVehicle { get; }
@@ -155,7 +155,7 @@ namespace TUGraz.VectoCore.Tests.Utils {
 		public PerSecond EngineIdleSpeed { get; }
 		public bool VocationalVehicle { get; }
 		public bool SleeperCab { get; }
-		public bool? AirdragModifiedMultistage { get; }
+		public bool? AirdragModifiedMultistep { get; }
 		public TankSystem? TankSystem { get; }
 
 		IAdvancedDriverAssistantSystemDeclarationInputData IVehicleDeclarationInputData.ADAS => _adas;
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
index 5ebf4b2e5de693bed95b584e1d5db50fc5d8a31a..01a5135bc5d30856a041c0e0b530ba3bd3df49a8 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusConsolidatedInputDataTest.cs
@@ -58,7 +58,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(LegislativeClass.M3, vehicle.LegislativeClass);
 			Assert.AreEqual(15000, vehicle.CurbMassChassis.Value());//CorrectedActualMass
 			Assert.AreEqual(20000, vehicle.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass
-			Assert.AreEqual(null, vehicle.AirdragModifiedMultistage);
+			Assert.AreEqual(null, vehicle.AirdragModifiedMultistep);
 			Assert.AreEqual(TankSystem.Liquefied, vehicle.TankSystem);//NgTankSystem
 			Assert.AreEqual(RegistrationClass.B, vehicle.RegisteredClass);//ClassBus
 			Assert.AreEqual(11, vehicle.NumberPassengerSeatsLowerDeck);
@@ -133,7 +133,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(null, vehicle.LegislativeClass);
 			Assert.AreEqual(null, vehicle.CurbMassChassis);//CorrectedActualMass
 			Assert.AreEqual(null, vehicle.GrossVehicleMassRating);//TechnicalPermissibleMaximumLadenMass
-			Assert.AreEqual(null, vehicle.AirdragModifiedMultistage);
+			Assert.AreEqual(null, vehicle.AirdragModifiedMultistep);
 			Assert.AreEqual(null, vehicle.TankSystem);//NgTankSystem
 			Assert.AreEqual(null, vehicle.RegisteredClass);//ClassBus
 			Assert.AreEqual(null, vehicle.NumberPassengerSeatsLowerDeck);
@@ -171,7 +171,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(null, vehicle.LegislativeClass);
 			Assert.AreEqual(15000, vehicle.CurbMassChassis.Value());//CorrectedActualMass
 			Assert.AreEqual(null, vehicle.GrossVehicleMassRating);//TechnicalPermissibleMaximumLadenMass
-			Assert.AreEqual(null, vehicle.AirdragModifiedMultistage);
+			Assert.AreEqual(null, vehicle.AirdragModifiedMultistep);
 			Assert.AreEqual(TankSystem.Compressed, vehicle.TankSystem);//NgTankSystem
 			Assert.AreEqual(null, vehicle.RegisteredClass);//ClassBus
 			Assert.AreEqual(12, vehicle.NumberPassengerSeatsLowerDeck);
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
index c93fd2f60445d372e321a380afe36fdc9d7616a1..f1630e490de607e5b3ab639c2acdce5bcf0005e8 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusDataTest.cs
@@ -575,7 +575,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(null, vehicleData.LegislativeClass);			
 			Assert.AreEqual(null, vehicleData.CurbMassChassis);
 			Assert.AreEqual(null, vehicleData.GrossVehicleMassRating);
-			Assert.AreEqual(null, vehicleData.AirdragModifiedMultistage);
+			Assert.AreEqual(null, vehicleData.AirdragModifiedMultistep);
 			Assert.AreEqual(null, vehicleData.TankSystem);
 			Assert.AreEqual(null, vehicleData.RegisteredClass);
 			Assert.AreEqual(null, vehicleData.NumberPassengerSeatsLowerDeck);
@@ -614,7 +614,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual("Intermediate Manufacturer Address 2", vehicleData.ManufacturerAddress);
 			Assert.AreEqual("VEH-2234567890", vehicleData.VIN);
 			Assert.AreEqual(DateTime.Parse("2021-02-13T07:20:08.0187663Z").ToUniversalTime(), vehicleData.Date);
-			Assert.AreEqual(null, vehicleData.AirdragModifiedMultistage);
+			Assert.AreEqual(null, vehicleData.AirdragModifiedMultistep);
 			Assert.AreEqual(VehicleDeclarationType.final, vehicleData.VehicleDeclarationType);
 
 			Assert.AreEqual(true, vehicleData.ADAS.EngineStopStart);
@@ -705,7 +705,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(LegislativeClass.M3, vehicleData.LegislativeClass);
 			Assert.AreEqual(25000.SI<Kilogram>(), vehicleData.CurbMassChassis);
 			Assert.AreEqual(30000.SI<Kilogram>(), vehicleData.GrossVehicleMassRating);
-			Assert.AreEqual(null, vehicleData.AirdragModifiedMultistage);
+			Assert.AreEqual(null, vehicleData.AirdragModifiedMultistep);
 			Assert.AreEqual(TankSystem.Liquefied, vehicleData.TankSystem);
 			Assert.AreEqual(RegistrationClass.B, vehicleData.RegisteredClass);
 			Assert.AreEqual(24, vehicleData.NumberPassengerSeatsLowerDeck);
diff --git a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
index 4869984126453e5eedd52a26bfcb816f85156856..d9660aa85dd6e32621904c43b2a5c0236d91fd46 100644
--- a/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLMultistageBusInputDataTest.cs
@@ -59,7 +59,7 @@ namespace TUGraz.VectoCore.Tests.XML
 			Assert.AreEqual(LegislativeClass.M3, vehicle.LegislativeClass);
 			Assert.AreEqual(500, vehicle.CurbMassChassis.Value());//CorrectedActualMass
 			Assert.AreEqual(3500, vehicle.GrossVehicleMassRating.Value());//TechnicalPermissibleMaximumLadenMass
-			Assert.AreEqual(true, vehicle.AirdragModifiedMultistage);
+			Assert.AreEqual(true, vehicle.AirdragModifiedMultistep);
 			Assert.AreEqual(TankSystem.Compressed, vehicle.TankSystem);//NgTankSystem
 			Assert.AreEqual(RegistrationClass.II_III, vehicle.RegisteredClass);//ClassBus
 			Assert.AreEqual(1, vehicle.NumberPassengerSeatsLowerDeck);
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 f8a7ecfb0897ea318bbe4f2cc984ee391e898f11..6d861f87fd72ceadda4ef02b54bfdaadf409d7a7 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
@@ -595,7 +595,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
 		<LegislativeCategory>M3</LegislativeCategory>
 		<CorrectedActualMass>8300</CorrectedActualMass>
 		<TechnicalPermissibleMaximumLadenMass>18000</TechnicalPermissibleMaximumLadenMass>
-		<AirdragModifiedMultistage>true</AirdragModifiedMultistage>
+		<AirdragModifiedMultistep>true</AirdragModifiedMultistep>
 		<ClassBus>I+II</ClassBus>
 		<NumberPassengerSeatsLowerDeck>30</NumberPassengerSeatsLowerDeck>
 		<NumberPassengersStandingLowerDeck>0</NumberPassengersStandingLowerDeck>