Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/FixedSoilStressCreator.cs
===================================================================
diff -u -rfe0f11c19023237d7f3629c2206b4fe5eb5e121f -ra13385e3a8ecbf7d50b039d632b38ec5865fb495
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/FixedSoilStressCreator.cs	(.../FixedSoilStressCreator.cs)	(revision fe0f11c19023237d7f3629c2206b4fe5eb5e121f)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/FixedSoilStressCreator.cs	(.../FixedSoilStressCreator.cs)	(revision a13385e3a8ecbf7d50b039d632b38ec5865fb495)
@@ -23,21 +23,21 @@
 using System.Collections.Generic;
 using System.Linq;
 using Deltares.MacroStability.CSharpWrapper.Input;
+using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
-using SoilLayer = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
 
 namespace Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
     /// <summary>
-    /// Creates <see cref="Deltares.MacroStability.Geometry.FixedSoilStress"/> instances which are required by <see cref="IUpliftVanKernel"/>.
+    /// Creates <see cref="FixedSoilStress"/> instances which are required by <see cref="IUpliftVanKernel"/>.
     /// </summary>
     internal static class FixedSoilStressCreator
     {
         /// <summary>
-        /// Creates <see cref="Deltares.MacroStability.Geometry.FixedSoilStress"/> objects based on the given layers.
+        /// Creates <see cref="FixedSoilStress"/> objects based on the given layers.
         /// </summary>
-        /// <param name="layerLookup">The layers to create <see cref="Deltares.MacroStability.Geometry.FixedSoilStress"/> for.</param>
-        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="Deltares.MacroStability.Geometry.FixedSoilStress"/>.</returns>
+        /// <param name="layerLookup">The layers to create <see cref="FixedSoilStress"/> for.</param>
+        /// <returns>An <see cref="IEnumerable{T}"/> of <see cref="FixedSoilStress"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="layerLookup"/>
         /// is <c>null</c>.</exception>
         public static IEnumerable<FixedSoilStress> Create(IDictionary<SoilLayer, LayerWithSoil> layerLookup)
@@ -48,8 +48,11 @@
             }
 
             return layerLookup.Where(ll => ll.Key.UsePop)
-                              .Select(keyValuePair => new FixedSoilStress(keyValuePair.Value.Soil, StressValueType.POP, keyValuePair.Key.Pop))
-                              .ToArray();
+                              .Select(keyValuePair => new FixedSoilStress
+                              {
+                                  Soil = keyValuePair.Value.Soil,
+                                  POP = keyValuePair.Key.Pop
+                              }).ToArray();
         }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/FixedSoilStressCreatorTest.cs
===================================================================
diff -u -r1dd8f5d0ec52eb9570be02d8193524d70dee7d9f -ra13385e3a8ecbf7d50b039d632b38ec5865fb495
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/FixedSoilStressCreatorTest.cs	(.../FixedSoilStressCreatorTest.cs)	(revision 1dd8f5d0ec52eb9570be02d8193524d70dee7d9f)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/FixedSoilStressCreatorTest.cs	(.../FixedSoilStressCreatorTest.cs)	(revision a13385e3a8ecbf7d50b039d632b38ec5865fb495)
@@ -22,11 +22,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Deltares.MacroStability.Geometry;
+using Core.Common.Base.Geometry;
+using Deltares.MacroStability.CSharpWrapper.Input;
 using NUnit.Framework;
+using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input;
-using Point2D = Core.Common.Base.Geometry.Point2D;
-using SoilLayer = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer;
+using WaterPressureInterpolationModel = Deltares.MacroStability.CSharpWrapper.Input.WaterPressureInterpolationModel;
 
 namespace Riskeer.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
 {
@@ -51,20 +52,16 @@
             var lookup = new Dictionary<SoilLayer, LayerWithSoil>
             {
                 {
-                    CreateSoilLayer(new Point2D[0], true, 22),
-                    CreateLayerWithSoil(new Point2D[0], "Material 1")
+                    CreateSoilLayer(new Point2D[0], true, 22), CreateLayerWithSoil(new Point2D[0], "Material 1")
                 },
                 {
-                    CreateSoilLayer(new Point2D[0], false),
-                    CreateLayerWithSoil(new Point2D[0], "Material 2")
+                    CreateSoilLayer(new Point2D[0], false), CreateLayerWithSoil(new Point2D[0], "Material 2")
                 },
                 {
-                    CreateSoilLayer(new Point2D[0], true, 23),
-                    CreateLayerWithSoil(new Point2D[0], "Material 3")
+                    CreateSoilLayer(new Point2D[0], true, 23), CreateLayerWithSoil(new Point2D[0], "Material 3")
                 },
                 {
-                    CreateSoilLayer(new Point2D[0], true, 24),
-                    CreateLayerWithSoil(new Point2D[0], "Material 4")
+                    CreateSoilLayer(new Point2D[0], true, 24), CreateLayerWithSoil(new Point2D[0], "Material 4")
                 }
             };
 
@@ -79,17 +76,9 @@
             {
                 KeyValuePair<SoilLayer, LayerWithSoil> keyValuePair = lookUpWithPop.ElementAt(i);
                 FixedSoilStress fixedSoilStress = fixedSoilStresses.ElementAt(i);
-                
+
                 Assert.AreEqual(keyValuePair.Value.Soil, fixedSoilStress.Soil);
-                Assert.AreEqual(keyValuePair.Key.Pop, fixedSoilStress.CenterStressValue.POP);
-                
-                Assert.AreEqual(FixedStressPosition.Center, fixedSoilStress.CenterStressValue.FixedStressPosition); // Automatically synced
-                Assert.AreEqual(FixedStressPosition.Center, fixedSoilStress.BottomStressValue.FixedStressPosition); // Automatically synced
-                Assert.AreEqual(FixedStressPosition.Center, fixedSoilStress.TopStressValue.FixedStressPosition); // Automatically synced
-                Assert.IsNull(fixedSoilStress.CenterStressValue.FixedSoilStress); // Irrelevant
-                Assert.IsNull(fixedSoilStress.BottomStressValue.FixedSoilStress); // Irrelevant
-                Assert.IsNull(fixedSoilStress.TopStressValue.FixedSoilStress); // Irrelevant
-                Assert.IsFalse(fixedSoilStress.TopBottom); // Irrelevant
+                Assert.AreEqual(keyValuePair.Key.Pop, fixedSoilStress.POP);
             }
         }
 
@@ -104,7 +93,10 @@
 
         private static LayerWithSoil CreateLayerWithSoil(IEnumerable<Point2D> outerRing1, string materialName)
         {
-            return new LayerWithSoil(outerRing1, Enumerable.Empty<IEnumerable<Point2D>>(), new Soil(materialName), false, WaterpressureInterpolationModel.Automatic);
+            return new LayerWithSoil(outerRing1, Enumerable.Empty<IEnumerable<Point2D>>(), new Soil
+            {
+                Name = materialName
+            }, false, WaterPressureInterpolationModel.Automatic);
         }
     }
 }
\ No newline at end of file