Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsInputTest.cs
===================================================================
diff -u -r155f90720529de4c163cb3498ef10901e084c2f7 -r94cebe24f89d131cf1803922c58335f200e43484
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsInputTest.cs	(.../DerivedMacroStabilityInwardsInputTest.cs)	(revision 155f90720529de4c163cb3498ef10901e084c2f7)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsInputTest.cs	(.../DerivedMacroStabilityInwardsInputTest.cs)	(revision 94cebe24f89d131cf1803922c58335f200e43484)
@@ -50,7 +50,7 @@
         public void Constructor_WithInput_DoesNotThrow()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer(1.0, 1.1);
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer(1.0, 1.1);
 
             // Call
             TestDelegate call = () => new DerivedMacroStabilityInwardsInput(input);
@@ -90,7 +90,7 @@
         public void PiezometricHeadExit_InputWithAssessmentLevelMissing_PiezometricHeadSetToNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer(1.0, 1.0);
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer(1.0, 1.0);
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -104,7 +104,7 @@
         public void EffectiveThicknessCoverageLayer_SoilProfileSingleAquiferAndCoverageUnderSurfaceLine_ReturnsThicknessCoverageLayer()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -118,7 +118,7 @@
         public void EffectiveThicknessCoverageLayer_InputWithoutSurfaceLine_MeansSetToNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.SurfaceLine = null;
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -137,7 +137,7 @@
         public void EffectiveThicknessCoverageLayer_SoilProfileSingleAquiferAboveSurfaceLine_ThicknessCoverageLayerNaN(double deltaAboveSurfaceLine)
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithSingleAquiferLayerAboveSurfaceLine(deltaAboveSurfaceLine);
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithSingleAquiferLayerAboveSurfaceLine(deltaAboveSurfaceLine);
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -151,7 +151,7 @@
         public void EffectiveThicknessCoverageLayer_MeanSetSoilProfileSetToNull_ThicknessCoverageLayerNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.ThicknessCoverageLayer.Mean = new RoundedDouble(2, new Random(21).NextDouble() + 1);
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -170,7 +170,7 @@
         public void EffectiveThicknessCoverageLayer_ProfileWithoutAquiferLayer_ThicknessCoverageLayerNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
             {
@@ -194,7 +194,7 @@
         public void EffectiveThicknessCoverageLayer_InputResultsInZeroCoverageThickness_ThicknessCoverageLayerNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
             {
@@ -222,7 +222,7 @@
         public void EffectiveThicknessCoverageLayer_InputWithoutSoilProfile_MeansSetToNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.StochasticSoilProfile = null;
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -237,7 +237,7 @@
         public void ThicknessCoverageLayer_SoilProfileSingleAquiferAndCoverageUnderSurfaceLine_ReturnsThicknessCoverageLayer()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -251,7 +251,7 @@
         public void ThicknessCoverageLayer_InputWithoutSurfaceLine_MeansSetToNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.SurfaceLine = null;
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -270,7 +270,7 @@
         public void ThicknessCoverageLayer_SoilProfileSingleAquiferAboveSurfaceLine_ThicknessCoverageLayerNaN(double deltaAboveSurfaceLine)
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithSingleAquiferLayerAboveSurfaceLine(deltaAboveSurfaceLine);
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithSingleAquiferLayerAboveSurfaceLine(deltaAboveSurfaceLine);
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -284,7 +284,7 @@
         public void ThicknessCoverageLayer_MeanSetSoilProfileSetToNull_ThicknessCoverageLayerNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.ThicknessCoverageLayer.Mean = new RoundedDouble(2, new Random(21).NextDouble() + 1);
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -303,7 +303,7 @@
         public void ThicknessCoverageLayer_ProfileWithoutAquiferLayer_ThicknessCoverageLayerNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
             {
@@ -327,7 +327,7 @@
         public void ThicknessCoverageLayer_InputResultsInZeroCoverageThickness_ThicknessCoverageLayerNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
             {
@@ -355,7 +355,7 @@
         public void ThicknessCoverageLayer_InputWithoutSoilProfile_MeansSetToNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.StochasticSoilProfile = null;
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -370,7 +370,7 @@
         public void ThicknessAquiferLayer_SoilProfileSingleAquiferAndCoverageUnderSurfaceLine_ReturnsMeanExpectedThicknessAquiferLayer()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -384,7 +384,7 @@
         public void ThicknessAquiferLayer_InputWithoutSoilProfile_ReturnMeanNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.StochasticSoilProfile = null;
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -399,7 +399,7 @@
         public void ThicknessAquiferLayer_InputWithoutSurfaceLine_ReturnMeanNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.SurfaceLine = null;
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -418,7 +418,7 @@
         public void ThicknessAquiferLayer_SoilProfileSingleAquiferAboveSurfaceLine_ReturnMeanNaN(double deltaAboveSurfaceLine)
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithSingleAquiferLayerAboveSurfaceLine(deltaAboveSurfaceLine);
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithSingleAquiferLayerAboveSurfaceLine(deltaAboveSurfaceLine);
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -433,7 +433,7 @@
         {
             // Setup
             double expectedThickness;
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithMultipleAquiferLayersUnderSurfaceLine(out expectedThickness);
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithMultipleAquiferLayersUnderSurfaceLine(out expectedThickness);
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -447,7 +447,7 @@
         public void ThicknessAquiferLayer_MeanSetExitPointSetToNaN_ReturnMeanNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.ExitPointL = RoundedDouble.NaN;
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -464,7 +464,7 @@
         public void ThicknessAquiferLayer_ProfileWithoutAquiferLayer_ReturnMeanNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
             {
@@ -488,7 +488,7 @@
         public void ThicknessAquiferLayer_SoilProfileSingleAquiferUnderSurfaceLine_ReturnMeanExpectedThicknessAquiferLayer()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquifer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquifer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -502,7 +502,7 @@
         public void ThicknessAquiferLayer_MeanSetSoilProfileSetToNull_ReturnMeanNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             input.StochasticSoilProfile = null;
@@ -518,7 +518,7 @@
         public void ThicknessAquiferLayer_InputResultsInZeroAquiferThickness_ReturnMeanNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
             {
@@ -546,7 +546,7 @@
         public void ThicknessAquiferLayer_SurfaceLineHalfWayProfileLayer_ConsecutiveThicknessSetToLayerHeightUnderSurfaceLine()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0)
             {
@@ -574,7 +574,7 @@
         public void SeepageLength_ValidData_ReturnsSeepageLength()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             // Call
@@ -589,7 +589,7 @@
         public void SeepageLength_EntryPointNaN_SeepageLengthNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.EntryPointL = RoundedDouble.NaN;
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -605,7 +605,7 @@
         public void SeepageLength_ExitPointNaN_SeepageLengthNaN()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             input.ExitPointL = RoundedDouble.NaN;
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
@@ -621,7 +621,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_NoSoilProfile_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = null;
 
@@ -638,7 +638,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_NoStochasticSoilProfile_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = null;
 
@@ -655,7 +655,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_NoSurfaceLine_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.SurfaceLine = null;
 
@@ -672,7 +672,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_NoExitPointL_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.ExitPointL = RoundedDouble.NaN;
 
@@ -689,7 +689,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_NoAquitardLayers_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[]
             {
@@ -712,7 +712,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_NoAquiferLayers_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[]
             {
@@ -735,7 +735,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_NoCoverageLayersAboveTopAquiferLayer_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[]
             {
@@ -762,7 +762,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_SingleLayer_ReturnsWithParametersFromLayer()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             var random = new Random(21);
             double belowPhreaticLevelMean = 0.1 + random.NextDouble();
@@ -795,7 +795,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_MultipleLayersEqualStandardDeviationAndShift_ReturnsWithWeightedMean()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             var random = new Random(21);
             double belowPhreaticLevelMeanA = 0.1 + random.NextDouble();
@@ -843,7 +843,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_MultipleLayersInequalStandardDeviationOrShift_ReturnsNaNValues(double deviationDelta, double shiftDelta)
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             var random = new Random(21);
             double belowPhreaticLevelMeanA = 0.1 + random.NextDouble();
@@ -883,7 +883,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_MultipleLayersInequalStandardDeviationOrShiftButEqualWhenRounded_ReturnsWithWeightedMean()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             const double belowPhreaticLevelMeanA = 2.5;
             const double belowPhreaticLevelMeanB = 3.4;
@@ -920,7 +920,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_OneLayerWithIncorrectShiftMeanCombination_ReturnsNaNValues()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[]
             {
@@ -949,7 +949,7 @@
         public void SaturatedVolumicWeightOfCoverageLayer_MultipleLayersOneLayerWithIncorrectShiftMeanCombination_ReturnsNaNValues()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[]
             {
@@ -984,7 +984,7 @@
         public void DarcyPermeability_NoSoilProfile_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = null;
 
@@ -1000,7 +1000,7 @@
         public void DarcyPermeability_NoStochasticSoilProfile_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = null;
 
@@ -1016,7 +1016,7 @@
         public void DarcyPermeability_NoSurfaceLine_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.SurfaceLine = null;
 
@@ -1032,7 +1032,7 @@
         public void DarcyPermeability_NoExitPointL_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.ExitPointL = RoundedDouble.NaN;
 
@@ -1048,7 +1048,7 @@
         public void DarcyPermeability_NoAquiferLayers_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[]
             {
@@ -1067,7 +1067,7 @@
         public void DarcyPermeability_SingleLayerWithIncorrectMean_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", 0.0, new[]
             {
@@ -1091,7 +1091,7 @@
         public void DarcyPermeability_MultiplelayersWithOneIncorrectLayerMean_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", 0.0, new[]
             {
@@ -1121,7 +1121,7 @@
         public void DarcyPermeability_MultipleAquiferLayersWithSameVariation_ReturnsWithWeightedMean()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
 
             var random = new Random(21);
@@ -1158,7 +1158,7 @@
         public void DarcyPermeability_SingleAquiferLayerWithRandomMeanAndDeviation_ReturnsWithWeightedMean()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             var random = new Random(21);
             double permeabilityMean = 0.1 + random.NextDouble();
@@ -1187,7 +1187,7 @@
         public void DarcyPermeability_MultipleAquiferLayersWithDifferentMeanAndDeviation_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[]
             {
@@ -1217,7 +1217,7 @@
         public void DiameterD70_NoSoilProfile_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = null;
 
@@ -1233,7 +1233,7 @@
         public void DiameterD70_NoStochasticSoilProfile_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile = null;
 
@@ -1249,7 +1249,7 @@
         public void DiameterD70_NoSurfaceLine_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.SurfaceLine = null;
 
@@ -1265,7 +1265,7 @@
         public void DiameterD70_NoExitPointL_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.ExitPointL = RoundedDouble.NaN;
 
@@ -1281,7 +1281,7 @@
         public void DiameterD70_NoAquiferLayers_ReturnsNaNForParameters()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             input.StochasticSoilProfile.SoilProfile = new PipingSoilProfile("", -2.0, new[]
             {
@@ -1300,7 +1300,7 @@
         public void DiameterD70_SingleAquiferLayers_ReturnsWithParametersFromLayer()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             var random = new Random(21);
             double diameterD70Mean = 0.1 + random.NextDouble();
@@ -1327,7 +1327,7 @@
         public void DiameterD70_MultipleAquiferLayers_ReturnsWithParametersFromTopmostLayer()
         {
             // Setup
-            MacroStabilityInwardsInput input = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
+            MacroStabilityInwardsInput input = MacroStabilityInwardsInputFactory.CreateInputWithAquiferAndCoverageLayer();
             var derivedInput = new DerivedMacroStabilityInwardsInput(input);
             const double diameterD70Mean = 0.5;
             const double diameterD70CoefficientOfVariation = 0.2;