Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r3434 -r3435
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3434)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3435)
@@ -127,7 +127,8 @@
             macroStabilityOutput.CalculationResult = CalculationResult.Succeeded;
             var macroStabilityOutputItem = new MacroStabilityOutputItem
             {
-                StabilityModelType = MStabModelType.UpliftVan, CalculationResult = CalculationResult.Succeeded
+                StabilityModelType = MStabModelType.UpliftVan, 
+                CalculationResult = CalculationResult.Succeeded
             };
             macroStabilityOutput.UpliftSituation = new UpliftSituation { IsUplift = true };
             macroStabilityOutputItem.SafetyFactor = 2.34;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperOutputFromEngine.cs
===================================================================
diff -u -r3409 -r3435
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperOutputFromEngine.cs	(.../FillMacroStabilityWrapperOutputFromEngine.cs)	(revision 3409)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperOutputFromEngine.cs	(.../FillMacroStabilityWrapperOutputFromEngine.cs)	(revision 3435)
@@ -147,7 +147,7 @@
 
         private static void FillUpliftVan(MacroStabilityOutputItem outputItem, MacroStability.CSharpWrapper.Output.MacroStabilityOutput kernelOutput)
         {
-            var msc = new DualSlidingCircleMinimumSafetyCurve
+            var dualSlidingCircleMinimumSafetyCurve = new DualSlidingCircleMinimumSafetyCurve
             {
                 ActiveCircleCenter =
                     new Point2D(outputItem.ActiveCenterPoint.X, outputItem.ActiveCenterPoint.Z),
@@ -156,17 +156,17 @@
                     new Point2D(outputItem.PassiveCenterPoint.X, outputItem.PassiveCenterPoint.Z),
                 PassiveCircleRadius = outputItem.PassiveCenterPointRadius
             };
-            kernelOutput.StabilityOutput.MinimumSafetyCurve = msc;
+            kernelOutput.StabilityOutput.MinimumSafetyCurve = dualSlidingCircleMinimumSafetyCurve;
         }
 
         private static void FillBishop(MacroStabilityOutputItem outputItem, MacroStability.CSharpWrapper.Output.MacroStabilityOutput kernelOutput)
         {
-            var msc = new SlidingCircleMinimumSafetyCurve
+            var slidingCircleMinimumSafetyCurve = new SlidingCircleMinimumSafetyCurve
             {
                 Center = new Point2D(outputItem.ActiveCenterPoint.X, outputItem.ActiveCenterPoint.Z),
                 Radius = outputItem.ActiveCenterPointRadius
             };
-            kernelOutput.StabilityOutput.MinimumSafetyCurve = msc;
+            kernelOutput.StabilityOutput.MinimumSafetyCurve = slidingCircleMinimumSafetyCurve;
         }
     }
 }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs
===================================================================
diff -u -r3409 -r3435
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs	(.../FillEngineFromMacroStabilityWrapperOutput.cs)	(revision 3409)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillEngineFromMacroStabilityWrapperOutput.cs	(.../FillEngineFromMacroStabilityWrapperOutput.cs)	(revision 3435)
@@ -64,21 +64,21 @@
                 
                 if (outputItem.StabilityModelType == MStabModelType.Bishop)
                 {
-                    var msc = (SlidingCircleMinimumSafetyCurve)kernelOutput.StabilityOutput.MinimumSafetyCurve;
-                    FillBishopSlipCircle(msc, outputItem);
+                    var slidingCircleMinimumSafetyCurve = (SlidingCircleMinimumSafetyCurve)kernelOutput.StabilityOutput.MinimumSafetyCurve;
+                    FillBishopSlipCircle(slidingCircleMinimumSafetyCurve, outputItem);
                 }
 
                 if (outputItem.StabilityModelType == MStabModelType.UpliftVan)
                 {
-                    var msc = (DualSlidingCircleMinimumSafetyCurve)kernelOutput.StabilityOutput.MinimumSafetyCurve;
-                    FillUpliftVanDualSlipCircle(msc, outputItem);
+                    var dualSlidingCircleMinimumSafetyCurve = (DualSlidingCircleMinimumSafetyCurve)kernelOutput.StabilityOutput.MinimumSafetyCurve;
+                    FillUpliftVanDualSlipCircle(dualSlidingCircleMinimumSafetyCurve, outputItem);
                 }
 
                 if (outputItem.StabilityModelType == MStabModelType.Bishop ||
                     outputItem.StabilityModelType == MStabModelType.UpliftVan)
                 {
-                    var msc = kernelOutput.StabilityOutput.MinimumSafetyCurve;
-                    FillSlices(msc, outputItem);
+                    var minimumSafetyCurveBase = kernelOutput.StabilityOutput.MinimumSafetyCurve;
+                    FillSlices(minimumSafetyCurveBase, outputItem);
                 }
 
                 macroStabilityOutput.StabilityOutputItems.Add(outputItem);
@@ -101,35 +101,35 @@
             }
         }
 
-        private static void FillUpliftVanDualSlipCircle(DualSlidingCircleMinimumSafetyCurve msc,
+        private static void FillUpliftVanDualSlipCircle(DualSlidingCircleMinimumSafetyCurve dualSlidingCircleMinimumSafetyCurve,
             MacroStabilityOutputItem outputItem)
         {
-            if (msc != null && msc.ActiveCircleCenter != null && msc.PassiveCircleCenter != null)
+            if (dualSlidingCircleMinimumSafetyCurve != null && dualSlidingCircleMinimumSafetyCurve.ActiveCircleCenter != null && dualSlidingCircleMinimumSafetyCurve.PassiveCircleCenter != null)
             {
                 outputItem.ActiveCenterPoint =
-                    new Data.Geometry.Point2D(msc.ActiveCircleCenter.X, msc.ActiveCircleCenter.Z);
-                outputItem.ActiveCenterPointRadius = msc.ActiveCircleRadius;
+                    new Data.Geometry.Point2D(dualSlidingCircleMinimumSafetyCurve.ActiveCircleCenter.X, dualSlidingCircleMinimumSafetyCurve.ActiveCircleCenter.Z);
+                outputItem.ActiveCenterPointRadius = dualSlidingCircleMinimumSafetyCurve.ActiveCircleRadius;
                 outputItem.PassiveCenterPoint =
-                    new Data.Geometry.Point2D(msc.PassiveCircleCenter.X, msc.PassiveCircleCenter.Z);
-                outputItem.PassiveCenterPointRadius = msc.PassiveCircleRadius;
+                    new Data.Geometry.Point2D(dualSlidingCircleMinimumSafetyCurve.PassiveCircleCenter.X, dualSlidingCircleMinimumSafetyCurve.PassiveCircleCenter.Z);
+                outputItem.PassiveCenterPointRadius = dualSlidingCircleMinimumSafetyCurve.PassiveCircleRadius;
             }
         }
 
-        private static void FillBishopSlipCircle(SlidingCircleMinimumSafetyCurve msc, MacroStabilityOutputItem outputItem)
+        private static void FillBishopSlipCircle(SlidingCircleMinimumSafetyCurve slidingCircleMinimumSafetyCurve, MacroStabilityOutputItem outputItem)
         {
-            if (msc != null && msc.Center != null)
+            if (slidingCircleMinimumSafetyCurve != null && slidingCircleMinimumSafetyCurve.Center != null)
             {
-                outputItem.ActiveCenterPoint = new Data.Geometry.Point2D(msc.Center.X, msc.Center.Z);
-                outputItem.ActiveCenterPointRadius = msc.Radius;
+                outputItem.ActiveCenterPoint = new Data.Geometry.Point2D(slidingCircleMinimumSafetyCurve.Center.X, slidingCircleMinimumSafetyCurve.Center.Z);
+                outputItem.ActiveCenterPointRadius = slidingCircleMinimumSafetyCurve.Radius;
             }
         }
 
-        private static void FillSlices(MinimumSafetyCurveBase msc, MacroStabilityOutputItem outputItem)
+        private static void FillSlices(MinimumSafetyCurveBase minimumSafetyCurveBase, MacroStabilityOutputItem outputItem)
         {
-            if (msc != null && msc.Slices != null)
+            if (minimumSafetyCurveBase != null && minimumSafetyCurveBase.Slices != null)
             {
                 outputItem.ResultSlices = new List<StabilityResultSlice>();
-                foreach (var slice in msc.Slices)
+                foreach (var slice in minimumSafetyCurveBase.Slices)
                 {
                     var resultSlice = new StabilityResultSlice();
                     resultSlice.TopLeftPoint = new Data.Geometry.Point2D(slice.TopLeftPoint.X, slice.TopLeftPoint.Z);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs
===================================================================
diff -u -r3407 -r3435
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 3407)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs	(.../MacroStabilityIoTests.cs)	(revision 3435)
@@ -370,14 +370,14 @@
                     SafetyFactor = 3.856,
                     ModelOptionType = StabilityModelOptionType.UpliftVan
                 };
-                var msc = new DualSlidingCircleMinimumSafetyCurve
+                var dualSlidingCircleMinimumSafetyCurve = new DualSlidingCircleMinimumSafetyCurve
                 {
                     ActiveCircleCenter = new MacroStability.CSharpWrapper.Point2D(10, 10),
                     ActiveCircleRadius = 8,
                     PassiveCircleCenter = new MacroStability.CSharpWrapper.Point2D(22, 11),
                     PassiveCircleRadius = 7
                 };
-                output.StabilityOutput.MinimumSafetyCurve = msc;
+                output.StabilityOutput.MinimumSafetyCurve = dualSlidingCircleMinimumSafetyCurve;
             }
             else if (choice == 2)
             {