diff --git a/VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs b/VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs
index d6f7eea2509c38c74b3da39105a556433672b36e..2e911edc3f81b64e206fa28e4f9f2327081b2ba7 100644
--- a/VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs
+++ b/VectoCore/ModelbasedTests/DriverStrategy/CoastingTests.cs
@@ -52,7 +52,7 @@ namespace TUGraz.VectoCore.ModelbasedTests.DriverStrategy
 #if TRACE
 			graphWriter.Enable();
 #else
-			GraphWriter.Disable();
+			graphWriter.Disable();
 #endif
 
 			graphWriter.Xfields = new[] { ModalResultField.dist };
@@ -61,7 +61,7 @@ namespace TUGraz.VectoCore.ModelbasedTests.DriverStrategy
 				ModalResultField.v_act, ModalResultField.acc, ModalResultField.n_eng_avg, ModalResultField.Gear,
 				ModalResultField.P_eng_out, /*ModalResultField.T_eng_fcmap, */ ModalResultField.FCMap,
 			};
-			GraphWriter.PlotDrivingMode = true;
+			graphWriter.PlotDrivingMode = true;
 			graphWriter.Series1Label = "Vecto 3";
 			return graphWriter;
 		}
diff --git a/VectoCore/ModelbasedTests/DriverStrategy/SimpleCycles.cs b/VectoCore/ModelbasedTests/DriverStrategy/SimpleCycles.cs
index 89dc31b8f08693bfc839609188e7999eaba4af5a..8cfe02516a68cfa18a0e7aed223936441ccee907 100644
--- a/VectoCore/ModelbasedTests/DriverStrategy/SimpleCycles.cs
+++ b/VectoCore/ModelbasedTests/DriverStrategy/SimpleCycles.cs
@@ -54,7 +54,7 @@ namespace TUGraz.VectoCore.ModelbasedTests.DriverStrategy
 #if TRACE
 			graphWriter.Enable();
 #else
-			GraphWriter.Disable();
+			graphWriter.Disable();
 #endif
 			graphWriter.Xfields = new[] { ModalResultField.time, ModalResultField.dist };
 
diff --git a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
index 9358a17a5a9187135db597308ccb6154c131db90..191d30d59a97545fe142ee8e3817412d0f3de2a5 100644
--- a/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
+++ b/VectoCore/VectoCoreTest/Integration/BatteryElectric/BatteryElectricTest.cs
@@ -71,7 +71,7 @@ namespace TUGraz.VectoCore.Tests.Integration.BatteryElectric
 			graphWriter.Enable();
 
 			//#else
-			//GraphWriter.Disable();
+			//graphWriter.Disable();
 			//#endif