Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsInput.cs
===================================================================
diff -u -r155f90720529de4c163cb3498ef10901e084c2f7 -rbc3f3fa34e839d801599d4e0cef89734aa8e0475
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsInput.cs	(.../DerivedMacroStabilityInwardsInput.cs)	(revision 155f90720529de4c163cb3498ef10901e084c2f7)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsInput.cs	(.../DerivedMacroStabilityInwardsInput.cs)	(revision bc3f3fa34e839d801599d4e0cef89734aa8e0475)
@@ -205,7 +205,7 @@
         private void UpdateThicknessAquiferLayerMean(LogNormalDistribution thicknessAquiferLayer)
         {
             StochasticSoilProfile stochasticSoilProfile = input.StochasticSoilProfile;
-            RingtoetsPipingSurfaceLine surfaceLine = input.SurfaceLine;
+            RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine = input.SurfaceLine;
             RoundedDouble exitPointL = input.ExitPointL;
 
             if (stochasticSoilProfile?.SoilProfile != null && surfaceLine != null && !double.IsNaN(exitPointL))
@@ -223,7 +223,7 @@
         private void UpdateThicknessCoverageLayerMean(LogNormalDistribution thicknessCoverageLayerDistribution)
         {
             StochasticSoilProfile stochasticSoilProfile = input.StochasticSoilProfile;
-            RingtoetsPipingSurfaceLine surfaceLine = input.SurfaceLine;
+            RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine = input.SurfaceLine;
             RoundedDouble exitPointL = input.ExitPointL;
 
             if (stochasticSoilProfile?.SoilProfile != null && surfaceLine != null && !double.IsNaN(exitPointL))
@@ -259,7 +259,7 @@
 
         private void UpdateDiameterD70Parameters(VariationCoefficientLogNormalDistribution diameterD70Distribution)
         {
-            PipingSoilLayer topMostAquiferLayer = GetConsecutiveAquiferLayers().FirstOrDefault();
+            MacroStabilityInwardsSoilLayer topMostAquiferLayer = GetConsecutiveAquiferLayers().FirstOrDefault();
             if (topMostAquiferLayer != null)
             {
                 var diameterD70Mean = new RoundedDouble(GetNumberOfDecimals(diameterD70Distribution), topMostAquiferLayer.DiameterD70Mean);
@@ -274,15 +274,15 @@
 
         private void UpdateDarcyPermeabilityParameters(VariationCoefficientLogNormalDistribution darcyPermeabilityDistribution)
         {
-            PipingSoilLayer[] aquiferLayers = GetConsecutiveAquiferLayers();
+            MacroStabilityInwardsSoilLayer[] aquiferLayers = GetConsecutiveAquiferLayers();
 
             int numberOfDecimals = GetNumberOfDecimals(darcyPermeabilityDistribution);
 
             if (HasCorrectDarcyPermeabilityWeightDistributionParameterDefinition(
                 aquiferLayers,
                 numberOfDecimals))
             {
-                PipingSoilLayer topMostAquiferLayer = aquiferLayers.First();
+                MacroStabilityInwardsSoilLayer topMostAquiferLayer = aquiferLayers.First();
 
                 var permeabilityCoefficientOfVariation = new RoundedDouble(numberOfDecimals, topMostAquiferLayer.PermeabilityCoefficientOfVariation);
 
@@ -302,15 +302,15 @@
 
         private void UpdateSaturatedVolumicWeightOfCoverageLayerParameters(LogNormalDistribution volumicWeightDistribution)
         {
-            PipingSoilLayer[] coverageLayers = GetConsecutiveCoverageLayers();
+            MacroStabilityInwardsSoilLayer[] coverageLayers = GetConsecutiveCoverageLayers();
 
             int numberOfDecimals = GetNumberOfDecimals(volumicWeightDistribution);
 
             if (HasCorrectSaturatedWeightDistributionParameterDefinition(
                 coverageLayers,
                 numberOfDecimals))
             {
-                PipingSoilLayer topMostAquitardLayer = coverageLayers.First();
+                MacroStabilityInwardsSoilLayer topMostAquitardLayer = coverageLayers.First();
                 volumicWeightDistribution.Shift = (RoundedDouble) topMostAquitardLayer.BelowPhreaticLevelShift;
                 volumicWeightDistribution.StandardDeviation = (RoundedDouble) topMostAquitardLayer.BelowPhreaticLevelDeviation;
 
@@ -337,7 +337,7 @@
             return distribution.Mean.NumberOfDecimalPlaces;
         }
 
-        private static bool HasCorrectSaturatedWeightDistributionParameterDefinition(IList<PipingSoilLayer> consecutiveAquitardLayers, int numberOfDecimals)
+        private static bool HasCorrectSaturatedWeightDistributionParameterDefinition(IList<MacroStabilityInwardsSoilLayer> consecutiveAquitardLayers, int numberOfDecimals)
         {
             if (!consecutiveAquitardLayers.Any())
             {
@@ -361,7 +361,7 @@
                                          distributions[0]));
         }
 
-        private static bool HasCorrectDarcyPermeabilityWeightDistributionParameterDefinition(IList<PipingSoilLayer> consecutiveAquitardLayers, int numberOfDecimals)
+        private static bool HasCorrectDarcyPermeabilityWeightDistributionParameterDefinition(IList<MacroStabilityInwardsSoilLayer> consecutiveAquitardLayers, int numberOfDecimals)
         {
             if (!consecutiveAquitardLayers.Any())
             {
@@ -385,7 +385,7 @@
                                          distributions[0]));
         }
 
-        private static LogNormalDistribution[] GetLayerSaturatedVolumicWeightDistributionDefinitions(IList<PipingSoilLayer> consecutiveAquitardLayers, int numberOfDecimals)
+        private static LogNormalDistribution[] GetLayerSaturatedVolumicWeightDistributionDefinitions(IList<MacroStabilityInwardsSoilLayer> consecutiveAquitardLayers, int numberOfDecimals)
         {
             try
             {
@@ -402,7 +402,7 @@
             }
         }
 
-        private static VariationCoefficientLogNormalDistribution[] GetLayerPermeabilityDistributionDefinitions(IList<PipingSoilLayer> consecutiveAquitardLayers, int numberOfDecimals)
+        private static VariationCoefficientLogNormalDistribution[] GetLayerPermeabilityDistributionDefinitions(IList<MacroStabilityInwardsSoilLayer> consecutiveAquitardLayers, int numberOfDecimals)
         {
             try
             {
@@ -431,12 +431,12 @@
             return Math.Abs(baseLayerDistribution.CoefficientOfVariation - currentLayerDistribution.CoefficientOfVariation) < 1e-6;
         }
 
-        private static double GetWeightedMeanForVolumicWeightOfCoverageLayer(PipingSoilLayer[] aquitardLayers, PipingSoilProfile profile, double surfaceLevel)
+        private static double GetWeightedMeanForVolumicWeightOfCoverageLayer(MacroStabilityInwardsSoilLayer[] aquitardLayers, MacroStabilityInwardsSoilProfile profile, double surfaceLevel)
         {
             var totalThickness = 0.0;
             var weighedTotal = 0.0;
 
-            foreach (PipingSoilLayer layer in aquitardLayers)
+            foreach (MacroStabilityInwardsSoilLayer layer in aquitardLayers)
             {
                 double layerThickness = profile.GetLayerThickness(layer);
                 double bottom = layer.Top - layerThickness;
@@ -449,12 +449,12 @@
             return weighedTotal / totalThickness;
         }
 
-        private static double GetWeightedMeanForDarcyPermeabilityOfAquiferLayer(PipingSoilLayer[] aquitardLayers, PipingSoilProfile profile, double surfaceLevel)
+        private static double GetWeightedMeanForDarcyPermeabilityOfAquiferLayer(MacroStabilityInwardsSoilLayer[] aquitardLayers, MacroStabilityInwardsSoilProfile profile, double surfaceLevel)
         {
             var totalThickness = 0.0;
             var weighedTotal = 0.0;
 
-            foreach (PipingSoilLayer layer in aquitardLayers)
+            foreach (MacroStabilityInwardsSoilLayer layer in aquitardLayers)
             {
                 double layerThickness = profile.GetLayerThickness(layer);
                 double bottom = layer.Top - layerThickness;
@@ -467,38 +467,38 @@
             return weighedTotal / totalThickness;
         }
 
-        private PipingSoilLayer[] GetConsecutiveAquiferLayers()
+        private MacroStabilityInwardsSoilLayer[] GetConsecutiveAquiferLayers()
         {
-            RingtoetsPipingSurfaceLine surfaceLine = input.SurfaceLine;
-            PipingSoilProfile soilProfile = input.StochasticSoilProfile?.SoilProfile;
+            RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine = input.SurfaceLine;
+            MacroStabilityInwardsSoilProfile soilProfile = input.StochasticSoilProfile?.SoilProfile;
             RoundedDouble exitPointL = input.ExitPointL;
 
             if (surfaceLine != null && soilProfile != null && !double.IsNaN(exitPointL))
             {
                 return soilProfile.GetConsecutiveAquiferLayersBelowLevel(surfaceLine.GetZAtL(exitPointL)).ToArray();
             }
 
-            return new PipingSoilLayer[0];
+            return new MacroStabilityInwardsSoilLayer[0];
         }
 
-        private PipingSoilLayer[] GetConsecutiveCoverageLayers()
+        private MacroStabilityInwardsSoilLayer[] GetConsecutiveCoverageLayers()
         {
-            RingtoetsPipingSurfaceLine surfaceLine = input.SurfaceLine;
-            PipingSoilProfile soilProfile = input.StochasticSoilProfile?.SoilProfile;
+            RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine = input.SurfaceLine;
+            MacroStabilityInwardsSoilProfile soilProfile = input.StochasticSoilProfile?.SoilProfile;
             RoundedDouble exitPointL = input.ExitPointL;
 
             if (surfaceLine != null && soilProfile != null && !double.IsNaN(exitPointL))
             {
-                PipingSoilLayer[] consecutiveAquitardLayersBelowLevel = soilProfile
+                MacroStabilityInwardsSoilLayer[] consecutiveAquitardLayersBelowLevel = soilProfile
                     .GetConsecutiveCoverageLayersBelowLevel(surfaceLine.GetZAtL(exitPointL))
                     .ToArray();
 
                 return consecutiveAquitardLayersBelowLevel;
             }
-            return new PipingSoilLayer[0];
+            return new MacroStabilityInwardsSoilLayer[0];
         }
 
-        private static double GetThicknessTopAquiferLayer(PipingSoilProfile soilProfile, RingtoetsPipingSurfaceLine surfaceLine, RoundedDouble exitPointL)
+        private static double GetThicknessTopAquiferLayer(MacroStabilityInwardsSoilProfile soilProfile, RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine, RoundedDouble exitPointL)
         {
             try
             {
@@ -507,15 +507,15 @@
             }
             catch (Exception e)
             {
-                if (e is RingtoetsPipingSurfaceLineException || e is InvalidOperationException || e is ArgumentException)
+                if (e is RingtoetsMacroStabilityInwardsSurfaceLineException || e is InvalidOperationException || e is ArgumentException)
                 {
                     return double.NaN;
                 }
                 throw;
             }
         }
 
-        private static double GetThicknessCoverageLayers(PipingSoilProfile soilProfile, RingtoetsPipingSurfaceLine surfaceLine, RoundedDouble exitPointL)
+        private static double GetThicknessCoverageLayers(MacroStabilityInwardsSoilProfile soilProfile, RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine, RoundedDouble exitPointL)
         {
             try
             {
@@ -524,7 +524,7 @@
             }
             catch (Exception e)
             {
-                if (e is RingtoetsPipingSurfaceLineException || e is InvalidOperationException || e is ArgumentException)
+                if (e is RingtoetsMacroStabilityInwardsSurfaceLineException || e is InvalidOperationException || e is ArgumentException)
                 {
                     return double.NaN;
                 }