diff --git a/HashingTool/ViewModel/HashComponentDataViewModel.cs b/HashingTool/ViewModel/HashComponentDataViewModel.cs
index bc23aa2a9831b3b029943db37e349e6f9a9fd64b..fe6ab69fce98ec8b63993b42e7d9e85e062db4c8 100644
--- a/HashingTool/ViewModel/HashComponentDataViewModel.cs
+++ b/HashingTool/ViewModel/HashComponentDataViewModel.cs
@@ -164,7 +164,7 @@ namespace HashingTool.ViewModel
 										: e.ValidationEventArgs.Message,
 									e.ValidationEventArgs == null ? 0 : e.ValidationEventArgs.Exception.LineNumber)));
 						});
-					await validator.ValidateXML(TUGraz.VectoCore.Utils.XmlDocumentType.DeclarationComponentData);
+					await validator.ValidateXML(XmlDocumentType.DeclarationComponentData);
 				}
 				if (ComponentDataValid != null && ComponentDataValid.Value) {
 					//var c14N = XMLHashProvider.DefaultCanonicalizationMethod.ToArray();
diff --git a/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
index ec23fbdfbde32334ce94b3e2091c375f60fec1ac..f910671d7f185611ba557de40a23dc012fb82553 100644
--- a/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/DoubleExtensionMethods.cs
@@ -77,7 +77,7 @@ namespace TUGraz.VectoCommon.Utils
 		[DebuggerStepThrough]
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		public static bool IsRelativeEqual(this double expected, double actual,
-			double toleranceFactor = DoubleExtensionMethods.ToleranceFactor)
+			double toleranceFactor = ToleranceFactor)
 		{
 			if (double.IsNaN(expected)) {
 				return double.IsNaN(actual);
diff --git a/VectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs b/VectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs
index 017b45e323fa91d95b05b698bd4d84a8fde9f644..32bc88d9b6c3784687fa872f2cc2240f463ef41c 100644
--- a/VectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs
+++ b/VectoCommon/VectoCommon/Utils/SIConvertExtensionMethods.cs
@@ -63,7 +63,7 @@ namespace TUGraz.VectoCommon.Utils
 				return false;
 			if (ReferenceEquals(this, obj))
 				return true;
-			if (obj.GetType() != this.GetType())
+			if (obj.GetType() != GetType())
 				return false;
 			return Equals((ConvertedSI)obj);
 		}
diff --git a/VectoCommon/VectoCommon/Utils/VectoMath.cs b/VectoCommon/VectoCommon/Utils/VectoMath.cs
index 39e2cc008d16256bb949a31610d96e92890cb4fd..0932091c61b32ddc024de62493dd84db31879234 100644
--- a/VectoCommon/VectoCommon/Utils/VectoMath.cs
+++ b/VectoCommon/VectoCommon/Utils/VectoMath.cs
@@ -494,7 +494,7 @@ namespace TUGraz.VectoCommon.Utils
 			var q = 1.0 / 8.0 * a * a * a - a * b / 2.0 + c;
 			var r = -3.0 / 256.0 * a * a * a * a + a * a * b / 16.0 - a * c / 4.0 + d;
 			if (q.IsEqual(0, 1e-12)) {
-				var solY = VectoMath.QuadraticEquationSolver(1, b, d);
+				var solY = QuadraticEquationSolver(1, b, d);
 				var retVal = new List<double>();
 				foreach (var s in solY) {
 					if (s < 0) {
@@ -508,7 +508,7 @@ namespace TUGraz.VectoCommon.Utils
 				return retVal.ToArray();
 			}
 
-			var solZ = VectoMath.Polynom3Solver(8.0, 20.0 * p, 16.0 * p * p - 8.0 * r, 4.0 * p * p * p - 4.0 * p * r - q * q);
+			var solZ = Polynom3Solver(8.0, 20.0 * p, 16.0 * p * p - 8.0 * r, 4.0 * p * p * p - 4.0 * p * r - q * q);
 			if (solZ.Length == 0) {
 				return new double[0];
 
@@ -521,8 +521,8 @@ namespace TUGraz.VectoCommon.Utils
 				// no real-valued solution
 				return new double[0];
 			}
-			var solY1 = VectoMath.QuadraticEquationSolver(1, -Math.Sqrt(u), q / (2.0 * Math.Sqrt(u)) + p + z);
-			var solY2 = VectoMath.QuadraticEquationSolver(1, Math.Sqrt(u), -q / (2.0 * Math.Sqrt(u)) + p + z);
+			var solY1 = QuadraticEquationSolver(1, -Math.Sqrt(u), q / (2.0 * Math.Sqrt(u)) + p + z);
+			var solY2 = QuadraticEquationSolver(1, Math.Sqrt(u), -q / (2.0 * Math.Sqrt(u)) + p + z);
 			return solY1.Select(s => s - a / 4.0).Concat(solY2.Select(s => s - a / 4.0)).ToArray();
 		}
 	}
diff --git a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/CombinedAlternator.cs b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/CombinedAlternator.cs
index fba3ba300ea77d5ade1f31fceb6d40cfb709e19f..36edab2cc03c0fa010f0f981284a6c713c9ecad7 100644
--- a/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/CombinedAlternator.cs
+++ b/VectoCore/VectoCore/Models/BusAuxiliaries/DownstreamModules/Impl/Electrics/CombinedAlternator.cs
@@ -196,10 +196,10 @@ namespace TUGraz.VectoCore.Models.BusAuxiliaries.DownstreamModules.Impl.Electric
 		{
 
 			// Count Check.
-			if (this.Alternators.Count != other.Alternators.Count)
+			if (Alternators.Count != other.Alternators.Count)
 				return false;
 
-			foreach (var alt in this.Alternators) {
+			foreach (var alt in Alternators) {
 
 				// Can we find the same alternatorName in other
 				if (other.Alternators.Count(f => f.AlternatorName == alt.AlternatorName) != 1)
diff --git a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
index 53aaf138ca6477fb77f5b90de751a85e91712768..8ae43c859128612d34340b785f47be98ade37292 100644
--- a/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/DeclarationData.cs
@@ -197,7 +197,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 				}
 
 				return CompressorMapReader.ReadStream(
-					RessourceHelper.ReadStream(DeclarationData.DeclarationDataResourcePrefix + ".VAUXBus." + resource), dragCurveFactorClutch, $"{compressorSize} - {clutchType}");
+					RessourceHelper.ReadStream(DeclarationDataResourcePrefix + ".VAUXBus." + resource), dragCurveFactorClutch, $"{compressorSize} - {clutchType}");
 			}
 
 			public static BusAlternatorTechnologies AlternatorTechnologies = new BusAlternatorTechnologies();
diff --git a/VectoCore/VectoCore/Models/Declaration/FuelData.cs b/VectoCore/VectoCore/Models/Declaration/FuelData.cs
index ff8f94808d5eb2645556c87ebb25e65726ff21ef..3c5307edfe9acf7509e4d0a70f2c11d7b1772b26 100644
--- a/VectoCore/VectoCore/Models/Declaration/FuelData.cs
+++ b/VectoCore/VectoCore/Models/Declaration/FuelData.cs
@@ -110,7 +110,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 					return false;
 				if (ReferenceEquals(this, obj))
 					return true;
-				if (obj.GetType() != this.GetType())
+				if (obj.GetType() != GetType())
 					return false;
 
 				return Equals((Entry)obj);
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index a8d2815cb4945d1894e08e22db1f7b07ad3d5ffc..dff5b60c4d54549d159bf25f73463f9525f2e0ed 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -1214,32 +1214,32 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
 
 		public MeterPerSecond VehicleSpeed => 0.SI<MeterPerSecond>();
 
-		public bool VehicleStopped => throw new System.NotImplementedException();
+		public bool VehicleStopped => throw new NotImplementedException();
 
-		public Kilogram VehicleMass => throw new System.NotImplementedException();
+		public Kilogram VehicleMass => throw new NotImplementedException();
 
-		public Kilogram VehicleLoading => throw new System.NotImplementedException();
+		public Kilogram VehicleLoading => throw new NotImplementedException();
 
-		public Kilogram TotalMass => throw new System.NotImplementedException();
+		public Kilogram TotalMass => throw new NotImplementedException();
 
-		public CubicMeter CargoVolume => throw new System.NotImplementedException();
+		public CubicMeter CargoVolume => throw new NotImplementedException();
 
 		public Newton AirDragResistance(MeterPerSecond previousVelocity, MeterPerSecond nextVelocity)
 		{
-			throw new System.NotImplementedException();
+			throw new NotImplementedException();
 		}
 
 		public Newton RollingResistance(Radian gradient)
 		{
-			throw new System.NotImplementedException();
+			throw new NotImplementedException();
 		}
 
 		public Newton SlopeResistance(Radian gradient)
 		{
-			throw new System.NotImplementedException();
+			throw new NotImplementedException();
 		}
 
-		public MeterPerSecond MaxVehicleSpeed => throw new System.NotImplementedException();
+		public MeterPerSecond MaxVehicleSpeed => throw new NotImplementedException();
 
 		#endregion
 	}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
index 20add777492266ccb3a11d60deb7312e9f9e9204..92fb6d5839e5af7bd2f2a32d79eb892750ccfb5f 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricMotor/EfficiencyMap.cs
@@ -55,9 +55,9 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor
 			var response = LookupElectricPower(angularSpeed, torque, true);
 			var delta = response.ElectricalPower - electricPower;
 			torque = SearchAlgorithm.Search(torque, delta, torque * 0.1,
-				getYValue: result => ((EfficiencyMap.EfficiencyResult)result).ElectricalPower - electricPower,
+				getYValue: result => ((EfficiencyResult)result).ElectricalPower - electricPower,
 				evaluateFunction: x => LookupElectricPower(angularSpeed, x, true),
-				criterion: result => (((EfficiencyMap.EfficiencyResult)result).ElectricalPower - electricPower).Value());
+				criterion: result => (((EfficiencyResult)result).ElectricalPower - electricPower).Value());
 
 			return new EfficiencyResult
 			{
@@ -76,16 +76,16 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricMotor
 		}
 
 		[JsonIgnore]
-		public IReadOnlyCollection<EfficiencyMap.Entry> Entries
+		public IReadOnlyCollection<Entry> Entries
 		{
 			get
 			{
 				var entries = _efficiencyMapMech2El.Entries;
-				var retVal = new EfficiencyMap.Entry[entries.Count];
+				var retVal = new Entry[entries.Count];
 				var i = 0;
 				foreach (var entry in entries)
 				{
-					retVal[i++] = new EfficiencyMap.Entry(entry.Y.SI<PerSecond>(), entry.X.SI<NewtonMeter>(), entry.Z.SI<Watt>());
+					retVal[i++] = new Entry(entry.Y.SI<PerSecond>(), entry.X.SI<NewtonMeter>(), entry.Z.SI<Watt>());
 				}
 				return retVal;
 			}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
index cc57aade72277ae810c9e279f3929fffe5a17c80..68535805d4514a2e0f5e5aac93bcdb30bcae3e7c 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/CycleGearbox.cs
@@ -451,14 +451,14 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 		public override Second LastUpshift
 		{
-			get => throw new System.NotImplementedException();
-			protected internal set => throw new System.NotImplementedException();
+			get => throw new NotImplementedException();
+			protected internal set => throw new NotImplementedException();
 		}
 
 		public override Second LastDownshift
 		{
-			get => throw new System.NotImplementedException();
-			protected internal set => throw new System.NotImplementedException();
+			get => throw new NotImplementedException();
+			protected internal set => throw new NotImplementedException();
 		}
 
 		public override GearshiftPosition NextGear
@@ -533,7 +533,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 		public override bool DisengageGearbox
 		{
 			get => false;
-			set => throw new System.NotImplementedException();
+			set => throw new NotImplementedException();
 		}
 
 		public override void TriggerGearshift(Second absTime, Second dt)
@@ -564,20 +564,20 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 			public override GearshiftPosition InitGear(Second absTime, Second dt, NewtonMeter torque, PerSecond outAngularVelocity)
 			{
-				throw new System.NotImplementedException();
+				throw new NotImplementedException();
 			}
 
 			public override GearshiftPosition Engage(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity)
 			{
-				throw new System.NotImplementedException();
+				throw new NotImplementedException();
 			}
 
 			public override void Disengage(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity)
 			{
-				throw new System.NotImplementedException();
+				throw new NotImplementedException();
 			}
 
-			public override GearshiftPosition NextGear => throw new System.NotImplementedException();
+			public override GearshiftPosition NextGear => throw new NotImplementedException();
 
 			public override ShiftPolygon ComputeDeclarationShiftPolygon(
 				GearboxType gearboxType, int i, EngineFullLoadCurve engineDataFullLoadCurve, IList<ITransmissionInputData> gearboxGears,
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
index e80b6ac61927077c6e1508168695a360115aed7b..ad284fb5adbb12b223f18ea514aca7dfeaf2d848 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/DefaultDriverStrategy.cs
@@ -103,7 +103,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 			ATEcoRollReleaseLockupClutch = data?.GearboxData?.ATEcoRollReleaseLockupClutch ?? false;
 
 			EcoRollState = new EcoRoll() {
-				State = Impl.EcoRollStates.EcoRollOff,
+				State = EcoRollStates.EcoRollOff,
 				Gear = new GearshiftPosition(0),
 				StateChangeTstmp = -double.MaxValue.SI<Second>(),
 				PreviousBrakePower = 0.SI<Watt>(),
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
index e99a696cbff567c2829974e070d9c752ca4d7402..c3bb88de4b0cbbb81d645baac221022085f4262b 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/HybridController.cs
@@ -598,7 +598,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl
 
 			public override void Disengage(Second absTime, Second dt, NewtonMeter outTorque, PerSecond outAngularVelocity)
 			{
-				throw new System.NotImplementedException("AT Shift Strategy does not support disengaging.");
+				throw new NotImplementedException("AT Shift Strategy does not support disengaging.");
 			}
 
 			protected override bool SpeedTooLowForEngine(GearshiftPosition gear, PerSecond outAngularSpeed)
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimpleHybridController.cs b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimpleHybridController.cs
index 98ad19713484f87f360100eee558dfd23e8abf70..204cf6ef07b007514c35b8e7d41a294ee835319d 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimpleHybridController.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Impl/SimpleHybridController.cs
@@ -24,7 +24,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
 
 		public SimpleHybridController(VehicleContainer container, ElectricSystem es, SwitchableClutch clutch) : base(container)
 		{
-			this.ElectricSystem = es;
+			ElectricSystem = es;
 			//this.clutch = clutch;
 		}
 
@@ -64,7 +64,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent.Impl {
 
 		public IShiftStrategy ShiftStrategy => null;
 
-		public SimpleComponentState PreviousState => throw new System.NotImplementedException();
+		public SimpleComponentState PreviousState => throw new NotImplementedException();
 
 		public IElectricMotorControl ElectricMotorControl(PowertrainPosition pos)
 		{
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/SwitchableClutch.cs b/VectoCore/VectoCore/Models/SimulationComponent/SwitchableClutch.cs
index 8ae93ba2f338d2a2db10b5ffd5ad95ee9fa4a65d..c8ccebbc00944357222cf2cc9e46db3de100bdce 100644
--- a/VectoCore/VectoCore/Models/SimulationComponent/SwitchableClutch.cs
+++ b/VectoCore/VectoCore/Models/SimulationComponent/SwitchableClutch.cs
@@ -81,7 +81,7 @@ namespace TUGraz.VectoCore.Models.SimulationComponent
 				if (DataBus.DriverInfo.DriverBehavior == DrivingBehavior.Halted && !ClutchOpen)
 				{
 					//return HandleClutchClosed(absTime, dt, outTorque, outAngularVelocity, dryRun);
-					return base.HandleClutchOpen(absTime, dt, outTorque, outAngularVelocity, dryRun);
+					return HandleClutchOpen(absTime, dt, outTorque, outAngularVelocity, dryRun);
 				}
 				return base.Request(absTime, dt, outTorque, outAngularVelocity, dryRun);
 
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs
index b26cbb222e3baf40aac3ad94d5c32aad7dd04f69..09aff714f79cb82f3aeba8dd5481805f0428572a 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLDeclarationReportMultistageBusVehicle.cs
@@ -33,11 +33,11 @@ namespace TUGraz.VectoCore.OutputData.XML
 			Writer.WriteReport(ReportType.DeclarationReportMultistageVehicleXML, _multistageBusReport.Report);
 		}
 		
-		protected override void DoStoreResult(XMLDeclarationReport.ResultEntry entry, VectoRunData runData, IModalDataContainer modData)
+		protected override void DoStoreResult(ResultEntry entry, VectoRunData runData, IModalDataContainer modData)
 		{
 			throw new NotSupportedException();
 		}
-		protected override void WriteResult(XMLDeclarationReport.ResultEntry result)
+		protected override void WriteResult(ResultEntry result)
 		{
 			throw new NotSupportedException();
 		}
diff --git a/VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs b/VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
index fee1b8a01c79260c085be20696ce3b4a61710c4b..73e03d54bde62c25920a290ba7c3f3d458a46333 100644
--- a/VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
+++ b/VectoCore/VectoCore/OutputData/XML/XMLMonitoringReport.cs
@@ -79,7 +79,7 @@ namespace TUGraz.VectoCore.OutputData.XML
 					errors.Add(e.Message);
 				}, true);
 				if (mrfErrors) {
-					LogManager.GetLogger(typeof(XMLMonitoringReport).FullName).Warn("XML Validation of manufacturer record failed! errors: {0}", string.Join(System.Environment.NewLine, errors));
+					LogManager.GetLogger(typeof(XMLMonitoringReport).FullName).Warn("XML Validation of manufacturer record failed! errors: {0}", string.Join(Environment.NewLine, errors));
 				}
 
 				var mrfType = mrf.Root?.GetSchemaInfo()?.SchemaType?.QualifiedName ?? new XmlQualifiedName("urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:AbstractVectoOutputManufacturerType");
diff --git a/VectoCore/VectoCore/Utils/XMLHelper.cs b/VectoCore/VectoCore/Utils/XMLHelper.cs
index 1dcd5aa945f565b31ad9cef4eb1ef1e86f7ddebf..4793725a250eb9d37507e1bf0a197c699666d7b9 100644
--- a/VectoCore/VectoCore/Utils/XMLHelper.cs
+++ b/VectoCore/VectoCore/Utils/XMLHelper.cs
@@ -228,7 +228,7 @@ namespace TUGraz.VectoCore.Utils
 		public static TableData ReadCSVResource(XmlNode baseNode, string xmlElement, string basePath)
 		{
 			var resourceNode = baseNode.SelectSingleNode(
-				XMLHelper.QueryLocalName(xmlElement) + ExtCSVResourceQuery);
+				QueryLocalName(xmlElement) + ExtCSVResourceQuery);
 			var filename = string.Empty;
 			if (resourceNode != null) {
 				filename = resourceNode.Attributes?.GetNamedItem(XMLNames.ExtResource_File_Attr).InnerText;
diff --git a/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs b/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
index e3a50bb7821ca2255d3fdb5c3000155c7e226121..3d024f5dd3c4fb2e898a85c09c28e73ea450400b 100644
--- a/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/ShiftStrategy/ShiftStrategyTest.cs
@@ -96,7 +96,7 @@ namespace TUGraz.VectoCore.Tests.Integration.ShiftStrategy
 				string.Format(CultureInfo.InvariantCulture, "1000, {1}, {2},  0", v1, v2, slope),
 				string.Format(CultureInfo.InvariantCulture, "1100, {1},   0,  0", v1, v2, slope)
 			};
-			System.IO.Directory.CreateDirectory(string.Format(@"Shiftt_{0}_{1}", v1, v2, slope));
+			Directory.CreateDirectory(string.Format(@"Shiftt_{0}_{1}", v1, v2, slope));
 			var slopePrefix = "";
 			if (!slope.IsEqual(0)) {
 				slopePrefix = slope > 0 ? "uh_" : "dh_";
diff --git a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
index 5d2f6c1de1d9bd079dadf926f314ee62837b78ce..9aeb9e2e7d05cbc1ea475b47f7a8101952a3c4be 100644
--- a/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockModalDataContainer.cs
@@ -188,7 +188,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		public void SetDataValue(string fieldName, object value)
 		{
-			throw new System.NotImplementedException();
+			throw new NotImplementedException();
 		}
 
 		public void AddAuxiliary(string id, string columnName = null)
diff --git a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
index d9e2dda5348e2a790f6400e9288e6a1f5e429425..1669dfc081a6cd0254da78ec3540d5ae88d62f70 100644
--- a/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
+++ b/VectoCore/VectoCoreTest/Utils/MockVehicleContainer.cs
@@ -126,7 +126,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		public Watt GearboxLoss()
 		{
-			throw new System.NotImplementedException();
+			throw new NotImplementedException();
 		}
 
 		public Second LastShift { get;  set; }
@@ -136,7 +136,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		public GearData GetGearData(uint gear)
 		{
-			throw new System.NotImplementedException();
+			throw new NotImplementedException();
 		}
 
 		public PerSecond EngineSpeed { get; set; }
@@ -217,12 +217,12 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		public IReadOnlyList<DrivingCycleData.DrivingCycleEntry> LookAhead(Meter lookaheadDistance)
 		{
-			throw new System.NotImplementedException();
+			throw new NotImplementedException();
 		}
 
 		public IReadOnlyList<DrivingCycleData.DrivingCycleEntry> LookAhead(Second time)
 		{
-			throw new System.NotImplementedException();
+			throw new NotImplementedException();
 		}
 
 		public SpeedChangeEntry LastTargetspeedChange { get; set; }
@@ -252,7 +252,7 @@ namespace TUGraz.VectoCore.Tests.Utils
 
 		public ISimulationOutPort GetCycleOutPort()
 		{
-			throw new System.NotImplementedException();
+			throw new NotImplementedException();
 		}
 
 		public VectoRun.Status RunStatus { get; set; }