Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r2165 -r2172
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 2165)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs	(.../MacroStabilityInwardsTests.cs)	(revision 2172)
@@ -31,6 +31,7 @@
 using Deltares.DamEngine.Io.XmlOutput;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
+using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper;
 
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs
===================================================================
diff -u -r2111 -r2172
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingSellmeijerVnkTests.cs	(.../PipingSellmeijerVnkTests.cs)	(revision 2172)
@@ -26,6 +26,7 @@
 using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using NUnit.Framework;
+using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper;
 
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r2111 -r2172
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 2172)
@@ -29,6 +29,7 @@
 using KellermanSoftware.CompareNetObjects;
 using NUnit.Framework;
 using CharacteristicPointType = Deltares.DamEngine.Data.Geotechnics.CharacteristicPointType;
+using ConversionHelper = Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.ConversionHelper;
 using LogMessageType = Deltares.DamEngine.Data.Standard.Logging.LogMessageType;
 using ShearStrengthModel = Deltares.DamEngine.Data.Geotechnics.ShearStrengthModel;
 using Soil = Deltares.DamEngine.Data.Geotechnics.Soil;
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs
===================================================================
diff -u -r2111 -r2172
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs	(.../PipingBlighTests.cs)	(revision 2172)
@@ -27,6 +27,7 @@
 using Deltares.DamEngine.Interface;
 using Deltares.DamEngine.Io;
 using NUnit.Framework;
+using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper;
 
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs
===================================================================
diff -u -r2111 -r2172
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs	(.../MacroStabilityOutwardsTests.cs)	(revision 2111)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityOutwardsTests.cs	(.../MacroStabilityOutwardsTests.cs)	(revision 2172)
@@ -27,6 +27,7 @@
 using Deltares.DamEngine.Io.XmlOutput;
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
+using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper;
 
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs
===================================================================
diff -u -r2157 -r2172
--- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 2157)
+++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/Factories/FactoryForDamProjectData.cs	(.../FactoryForDamProjectData.cs)	(revision 2172)
@@ -29,6 +29,7 @@
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Interface;
+using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper;
 
 namespace Deltares.DamEngine.TestHelpers.Factories
 {
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs
===================================================================
diff -u -r2136 -r2172
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 2136)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs	(.../WtiPipingSellmeijerRevisedTests.cs)	(revision 2172)
@@ -9,6 +9,7 @@
 using Deltares.DamEngine.TestHelpers;
 using NUnit.Framework;
 using Deltares.DamEngine.Data.Standard.Calculation;
+using ConversionHelper = Deltares.DamEngine.Interface.ConversionHelper;
 
 namespace Deltares.DamEngine.IntegrationTests.IntegrationTests
 {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r2050 -r2172
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 2050)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 2172)
@@ -35,8 +35,8 @@
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Standard.Calculation;
-using Deltares.MacroStability.Kernel;
 using Deltares.WTIStability.Calculation.Wrapper;
+using ConversionHelper = Deltares.DamEngine.Calculators.KernelWrappers.MacroStabilityCommon.MacroStabilityIo.ConversionHelper;
 using GeometryPoint = Deltares.DamEngine.Data.Geometry.GeometryPoint;
 using LogMessage = Deltares.DamEngine.Data.Standard.Logging.LogMessage;
 using LogMessageType = Deltares.DamEngine.Data.Standard.Logging.LogMessageType;