Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs
===================================================================
diff -u -r0adc6562a9cedb81859034ef5d62e9b11db4d9c7 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs	(.../AddNewDemoDikeAssessmentSectionCommand.cs)	(revision 0adc6562a9cedb81859034ef5d62e9b11db4d9c7)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoDikeAssessmentSectionCommand.cs	(.../AddNewDemoDikeAssessmentSectionCommand.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -127,7 +127,10 @@
                 StandardDeviation = originalPhreaticLevelExit.StandardDeviation
             };
             calculation.InputParameters.SurfaceLine = pipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001");
-            calculation.InputParameters.SoilProfile = pipingFailureMechanism.SoilProfiles.First(sp => sp.Name == "W1-6_0_1D1");
+            calculation.InputParameters.SoilProfile = pipingFailureMechanism
+                .StochasticSoilModels
+                .SelectMany(sm => sm.StochasticSoilProfiles.Select(ssp => ssp.SoilProfile))
+                .First(sp => sp.Name == "W1-6_0_1D1");
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
 
             calculation.InputParameters.NotifyObservers();
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs
===================================================================
diff -u -r1e49eb86c81e8446aeb6031cfd7a209bb0c11bac -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs	(.../AddNewDemoDikeAssessmentSectionCommandTest.cs)	(revision 1e49eb86c81e8446aeb6031cfd7a209bb0c11bac)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs	(.../AddNewDemoDikeAssessmentSectionCommandTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -75,8 +75,8 @@
 
             Assert.AreEqual(2380, demoAssessmentSection.ReferenceLine.Points.Count());
 
-            var profiles = demoAssessmentSection.PipingFailureMechanism.SoilProfiles.ToArray();
-            Assert.AreEqual(4, profiles.Length);
+            var soilModels = demoAssessmentSection.PipingFailureMechanism.StochasticSoilModels.ToArray();
+            Assert.AreEqual(4, soilModels.Length);
             var surfaceLines = demoAssessmentSection.PipingFailureMechanism.SurfaceLines.ToArray();
             Assert.AreEqual(4, surfaceLines.Length);
             AssertCharacteristicPointsOnSurfaceLines(surfaceLines);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs
===================================================================
diff -u -rde18e9d8a0324e9345f412eb6c1ffeed4f86f2fb -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs	(.../DikeAssessmentSectionTest.cs)	(revision de18e9d8a0324e9345f412eb6c1ffeed4f86f2fb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs	(.../DikeAssessmentSectionTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -55,7 +55,7 @@
             Assert.IsNull(section.ReferenceLine);
             Assert.IsInstanceOf<FailureMechanismContribution>(section.FailureMechanismContribution);
 
-            CollectionAssert.IsEmpty(section.PipingFailureMechanism.SoilProfiles);
+            CollectionAssert.IsEmpty(section.PipingFailureMechanism.StochasticSoilModels);
             CollectionAssert.IsEmpty(section.PipingFailureMechanism.SurfaceLines);
 
             Assert.IsInstanceOf<PipingFailureMechanism>(section.PipingFailureMechanism);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs
===================================================================
diff -u -r08ab7af115b5bbad87eaffb9bc1b1c4379ec8738 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision 08ab7af115b5bbad87eaffb9bc1b1c4379ec8738)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -77,17 +77,6 @@
         public ICollection<RingtoetsPipingSurfaceLine> SurfaceLines { get; private set; }
 
         /// <summary>
-        /// Gets the available profiles within the scope of the piping failure mechanism.
-        /// </summary>
-        public PipingSoilProfile[] SoilProfiles
-        {
-            get
-            {
-                return StochasticSoilModels.SelectMany(ssm => ssm.StochasticSoilProfiles.Select(ssp => ssp.SoilProfile)).Distinct().ToArray();
-            }
-        }
-
-        /// <summary>
         /// Gets the available stochastic soil models within the scope of the piping failure mechanism.
         /// </summary>
         public ObservableList<StochasticSoilModel> StochasticSoilModels { get; private set; }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs	(.../PipingCalculationContext.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationContext.cs	(.../PipingCalculationContext.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -39,11 +39,11 @@
         /// </summary>
         /// <param name="calculation">The <see cref="PipingCalculation"/> instance wrapped by this context object.</param>
         /// <param name="surfaceLines">The surface lines available within the piping context.</param>
-        /// <param name="soilProfiles">The soil profiles available within the piping context.</param>
+        /// <param name="stochasticSoilModels">The stochastic soil models available within the piping context.</param>
         /// <param name="pipingFailureMechanism">The piping failure mechanism which the piping context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the piping context belongs to.</param>
-        public PipingCalculationContext(PipingCalculation calculation, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<PipingSoilProfile> soilProfiles, PipingFailureMechanism pipingFailureMechanism, AssessmentSectionBase assessmentSection)
-            : base(calculation, surfaceLines, soilProfiles, assessmentSection)
+        public PipingCalculationContext(PipingCalculation calculation, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> stochasticSoilModels, PipingFailureMechanism pipingFailureMechanism, AssessmentSectionBase assessmentSection)
+            : base(calculation, surfaceLines, stochasticSoilModels, assessmentSection)
         {
             if (pipingFailureMechanism == null)
             {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs	(.../PipingCalculationGroupContext.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs	(.../PipingCalculationGroupContext.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -39,15 +39,15 @@
         /// </summary>
         /// <param name="calculationGroup">The <see cref="PipingCalculationGroup"/> instance wrapped by this context object.</param>
         /// <param name="surfaceLines">The surface lines available within the piping context.</param>
-        /// <param name="soilProfiles">The soil profiles available within the piping context.</param>
+        /// <param name="stochasticSoilModels">The stochastic soil models available within the piping context.</param>
         /// <param name="pipingFailureMechanism">The piping failure mechanism which the piping context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the piping context belongs to.</param>
-        public PipingCalculationGroupContext(PipingCalculationGroup calculationGroup, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<PipingSoilProfile> soilProfiles, PipingFailureMechanism pipingFailureMechanism, AssessmentSectionBase assessmentSection)
-            : base(calculationGroup, surfaceLines, soilProfiles, assessmentSection)
+        public PipingCalculationGroupContext(PipingCalculationGroup calculationGroup, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> stochasticSoilModels, PipingFailureMechanism pipingFailureMechanism, AssessmentSectionBase assessmentSection)
+            : base(calculationGroup, surfaceLines, stochasticSoilModels, assessmentSection)
         {
             if (pipingFailureMechanism == null)
             {
-                var message = String.Format(Resources.PipingContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
+                var message = string.Format(Resources.PipingContext_AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
                                             Resources.PipingContext_DataDescription_PipingFailureMechanism);
                 throw new ArgumentNullException("pipingFailureMechanism", message);
             }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs	(.../PipingContext.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs	(.../PipingContext.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -42,20 +42,20 @@
         /// </summary>
         /// <param name="wrappedData">The concrete data instance wrapped by this context object.</param>
         /// <param name="surfaceLines">The surface lines available within the piping context.</param>
-        /// <param name="soilProfiles">The soil profiles available within the piping context.</param>
+        /// <param name="stochasticSoilModels">The stochastic soil models available within the piping context.</param>
         /// <param name="assessmentSection">The assessment section which the piping context belongs to.</param>
         /// <exception cref="System.ArgumentNullException">When any input parameter is null.</exception>
         protected PipingContext(
             T wrappedData,
             IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines,
-            IEnumerable<PipingSoilProfile> soilProfiles, 
+            IEnumerable<StochasticSoilModel> stochasticSoilModels, 
             AssessmentSectionBase assessmentSection)
         {
-            AssertInputsAreNotNull(wrappedData, surfaceLines, soilProfiles, assessmentSection);
+            AssertInputsAreNotNull(wrappedData, surfaceLines, stochasticSoilModels, assessmentSection);
 
             WrappedData = wrappedData;
             AvailablePipingSurfaceLines = surfaceLines;
-            AvailablePipingSoilProfiles = soilProfiles;
+            AvailableStochasticSoilModels = stochasticSoilModels;
             AssessmentSection = assessmentSection;
         }
 
@@ -81,10 +81,10 @@
         public IEnumerable<RingtoetsPipingSurfaceLine> AvailablePipingSurfaceLines { get; private set; }
 
         /// <summary>
-        /// Gets the available piping soil profiles in order for the user to select one to 
-        /// set <see cref="PipingInput.SoilProfile"/>.
+        /// Gets the available stochastic soil models in order for the user to select a <see cref="PipingSoilProfile"/>
+        /// to set <see cref="PipingInput.SoilProfile"/>.
         /// </summary>
-        public IEnumerable<PipingSoilProfile> AvailablePipingSoilProfiles { get; private set; }
+        public IEnumerable<StochasticSoilModel> AvailableStochasticSoilModels { get; private set; }
 
         /// <summary>
         /// Gets the available hydraulic boundary locations in order for the user to select one to 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs
===================================================================
diff -u -r1e49eb86c81e8446aeb6031cfd7a209bb0c11bac -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs	(.../PipingInputContext.cs)	(revision 1e49eb86c81e8446aeb6031cfd7a209bb0c11bac)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs	(.../PipingInputContext.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -33,8 +33,16 @@
     /// </summary>
     public class PipingInputContext : PipingContext<PipingInput>
     {
-        public PipingInputContext(PipingInput pipingInput, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<PipingSoilProfile> soilProfiles, AssessmentSectionBase assessmentSection)
-            : base(pipingInput, surfaceLines, soilProfiles, assessmentSection)
+        /// <summary>
+        /// Creates a new instance of <see cref="PipingInputContext"/>
+        /// </summary>
+        /// <param name="pipingInput">The piping input instance wrapped by this context object.</param>
+        /// <param name="surfaceLines">The surface lines available within the piping context.</param>
+        /// <param name="stochasticSoilModels">The stochastic soil models available within the piping context.</param>
+        /// <param name="assessmentSection">The assessment section which the piping context belongs to.</param>
+        /// <exception cref="System.ArgumentNullException">When any input parameter is null.</exception>
+        public PipingInputContext(PipingInput pipingInput, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> stochasticSoilModels, AssessmentSectionBase assessmentSection)
+            : base(pipingInput, surfaceLines, stochasticSoilModels, assessmentSection)
         {
         }
     }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs
===================================================================
diff -u -rcaa64ef94fa8e30074f269de2fe0aad3c482c690 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision caa64ef94fa8e30074f269de2fe0aad3c482c690)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -73,9 +73,9 @@
         /// <summary>
         /// Gets the available soil profiles on <see cref="PipingCalculationContext"/>.
         /// </summary>
-        public IEnumerable<PipingSoilProfile> GetAvailableSoilProfilesForCalculation()
+        public IEnumerable<PipingSoilProfile> GetAvailableSoilProfiles()
         {
-            return data.AvailablePipingSoilProfiles;
+            return PipingCalculationConfigurationHelper.GetPipingSoilProfilesForSurfaceLine(data.WrappedData.SurfaceLine, data.AvailableStochasticSoilModels);
         }
 
         /// <summary>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/UITypeEditors/PipingInputContextSoilProfileSelectionEditor.cs
===================================================================
diff -u -rcaa64ef94fa8e30074f269de2fe0aad3c482c690 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/UITypeEditors/PipingInputContextSoilProfileSelectionEditor.cs	(.../PipingInputContextSoilProfileSelectionEditor.cs)	(revision caa64ef94fa8e30074f269de2fe0aad3c482c690)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/UITypeEditors/PipingInputContextSoilProfileSelectionEditor.cs	(.../PipingInputContextSoilProfileSelectionEditor.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -42,7 +42,7 @@
 
         protected override IEnumerable<PipingSoilProfile> GetAvailableOptions(ITypeDescriptorContext context)
         {
-            return GetPropertiesObject(context).GetAvailableSoilProfilesForCalculation();
+            return GetPropertiesObject(context).GetAvailableSoilProfiles();
         }
 
         protected override PipingSoilProfile GetCurrentOption(ITypeDescriptorContext context)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -r3c32d100da48791a0e606457fba7910818bd26fa -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 3c32d100da48791a0e606457fba7910818bd26fa)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -307,7 +307,7 @@
             // items.
             using (new SuspendDataGridViewColumnResizes(soilProfileColumn)) 
             {
-                var pipingSoilProfiles = pipingFailureMechanism != null ? pipingFailureMechanism.SoilProfiles : null;
+                var pipingSoilProfiles = GetPipingSoilProfilesFromStochasticSoilModels();
                 SetItemsOnObjectCollection(soilProfileColumn.Items, GetSoilProfilesDataSource(pipingSoilProfiles).ToArray());
             }
             using (new SuspendDataGridViewColumnResizes(hydraulicBoundaryLocationColumn))
@@ -319,6 +319,11 @@
             }
         }
 
+        private PipingSoilProfile[] GetPipingSoilProfilesFromStochasticSoilModels()
+        {
+            return pipingFailureMechanism != null ? pipingFailureMechanism.StochasticSoilModels.SelectMany(ssm => ssm.StochasticSoilProfiles.Select(ssp => ssp.SoilProfile)).Distinct().ToArray() : null;
+        }
+
         private void FillAvailableSoilProfilesList(DataGridViewRow dataGridViewRow)
         {
             var rowData = (PipingCalculationRow)dataGridViewRow.DataBoundItem;
@@ -552,7 +557,7 @@
 
             var pipingCalculationRow = (PipingCalculationRow) dataGridView.Rows[e.RowIndex].DataBoundItem;
 
-            ApplicationSelection.Selection = new PipingInputContext(pipingCalculationRow.PipingCalculation.InputParameters, pipingFailureMechanism.SurfaceLines, pipingFailureMechanism.SoilProfiles, assessmentSection);
+            ApplicationSelection.Selection = new PipingInputContext(pipingCalculationRow.PipingCalculation.InputParameters, pipingFailureMechanism.SurfaceLines, pipingFailureMechanism.StochasticSoilModels, assessmentSection);
         }
 
         private void ListBoxOnSelectedValueChanged(object sender, EventArgs e)
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rbff183a6d323111affe69f3afa19b9ada02c9375 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision bff183a6d323111affe69f3afa19b9ada02c9375)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -461,7 +461,7 @@
             return new object[]
             {
                 new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, pipingFailureMechanismContext.Parent), TreeFolderCategory.Input),
-                new PipingCalculationGroupContext(wrappedData.CalculationsGroup, wrappedData.SurfaceLines, wrappedData.SoilProfiles, wrappedData, pipingFailureMechanismContext.Parent),
+                new PipingCalculationGroupContext(wrappedData.CalculationsGroup, wrappedData.SurfaceLines, wrappedData.StochasticSoilModels, wrappedData, pipingFailureMechanismContext.Parent),
                 new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData), TreeFolderCategory.Output)
             };
         }
@@ -536,7 +536,7 @@
                 pipingCalculationContext.WrappedData.Comments,
                 new PipingInputContext(pipingCalculationContext.WrappedData.InputParameters,
                                        pipingCalculationContext.AvailablePipingSurfaceLines,
-                                       pipingCalculationContext.AvailablePipingSoilProfiles,
+                                       pipingCalculationContext.AvailableStochasticSoilModels,
                                        pipingCalculationContext.AssessmentSection)
             };
 
@@ -607,15 +607,15 @@
                 {
                     childNodeObjects.Add(new PipingCalculationContext(calculation,
                                                                       nodeData.AvailablePipingSurfaceLines,
-                                                                      nodeData.AvailablePipingSoilProfiles,
+                                                                      nodeData.AvailableStochasticSoilModels,
                                                                       nodeData.PipingFailureMechanism,
                                                                       nodeData.AssessmentSection));
                 }
                 else if (group != null)
                 {
                     childNodeObjects.Add(new PipingCalculationGroupContext(group,
                                                                            nodeData.AvailablePipingSurfaceLines,
-                                                                           nodeData.AvailablePipingSoilProfiles,
+                                                                           nodeData.AvailableStochasticSoilModels,
                                                                            nodeData.PipingFailureMechanism,
                                                                            nodeData.AssessmentSection));
                 }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs
===================================================================
diff -u -r08ab7af115b5bbad87eaffb9bc1b1c4379ec8738 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision 08ab7af115b5bbad87eaffb9bc1b1c4379ec8738)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -31,7 +31,7 @@
             CollectionAssert.IsEmpty(piping.Sections);
             CollectionAssert.IsEmpty(piping.SurfaceLines);
             Assert.IsInstanceOf<ObservableList<RingtoetsPipingSurfaceLine>>(piping.SurfaceLines);
-            CollectionAssert.IsEmpty(piping.SoilProfiles);
+            CollectionAssert.IsEmpty(piping.StochasticSoilModels);
             Assert.IsInstanceOf<ObservableList<StochasticSoilModel>>(piping.StochasticSoilModels);
             Assert.AreEqual("Berekeningen", piping.CalculationsGroup.Name);
             Assert.AreEqual(1, piping.CalculationsGroup.Children.Count);
@@ -193,41 +193,5 @@
             // Assert
             CollectionAssert.DoesNotContain(failureMechanism.CalculationsGroup.Children, folder);
         }
-
-        [Test]
-        public void SoilProfiles_StochasticSoilModelsWithDuplicateProfiles_ReturnsDistinctProfiles()
-        {
-            // Setup
-            var failureMechanism = new PipingFailureMechanism();
-            PipingSoilProfile profile = new TestPipingSoilProfile();
-            StochasticSoilProfile stochasticProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0)
-            {
-                SoilProfile = profile
-            };
-            failureMechanism.StochasticSoilModels.AddRange(new[]
-            {
-                new StochasticSoilModel(0, string.Empty, string.Empty)
-                {
-                    StochasticSoilProfiles =
-                    {
-                        stochasticProfile
-                    }
-                }, 
-                new StochasticSoilModel(0, string.Empty, string.Empty)
-                {
-                    StochasticSoilProfiles =
-                    {
-                        stochasticProfile
-                    }
-                }
-            });
-
-            // Call
-            var profiles = failureMechanism.SoilProfiles;
-
-            // Assert
-            Assert.AreEqual(1, profiles.Length);
-            Assert.AreSame(profile, profiles.First());
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj
===================================================================
diff -u -r3721b5bb1ae327907884a90d1a9bd300042e0540 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj	(.../Ringtoets.Piping.Data.TestUtil.csproj)	(revision 3721b5bb1ae327907884a90d1a9bd300042e0540)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj	(.../Ringtoets.Piping.Data.TestUtil.csproj)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -48,6 +48,7 @@
     <Compile Include="PipingCalculationFactory.cs" />
     <Compile Include="Segment2DLoopCollectionHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestStochasticSoilModel.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
@@ -71,6 +72,10 @@
       <Project>{14C6F716-64E2-4BC4-A1EF-05865FCEFA4C}</Project>
       <Name>Ringtoets.Piping.Primitives</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Piping.KernelWrapper.TestUtil\Ringtoets.Piping.KernelWrapper.TestUtil.csproj">
+      <Project>{27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8}</Project>
+      <Name>Ringtoets.Piping.KernelWrapper.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestStochasticSoilModel.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestStochasticSoilModel.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/TestStochasticSoilModel.cs	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -0,0 +1,23 @@
+using System;
+using Ringtoets.Piping.KernelWrapper.TestUtil;
+
+namespace Ringtoets.Piping.Data.TestUtil
+{
+    public class TestStochasticSoilModel : StochasticSoilModel
+    {
+        public TestStochasticSoilModel() : base(0, String.Empty, String.Empty)
+        {
+            StochasticSoilProfiles.AddRange(new []
+            {
+                new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 0)
+                {
+                    SoilProfile = new TestPipingSoilProfile()
+                },
+                new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 0)
+                {
+                    SoilProfile = new TestPipingSoilProfile()
+                }
+            });
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs
===================================================================
diff -u -r5e426c2c9fd73b2bab4be73f9e4b7f9b2feb0a49 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs	(.../PipingCalculationContextTest.cs)	(revision 5e426c2c9fd73b2bab4be73f9e4b7f9b2feb0a49)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationContextTest.cs	(.../PipingCalculationContextTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -6,7 +6,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Piping.Data;
-
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
@@ -24,9 +24,9 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var profiles = new[]
+            var soilModels = new[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
             var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
 
@@ -36,14 +36,14 @@
             mocks.ReplayAll();
 
             // Call
-            var presentationObject = new PipingCalculationContext(calculation, surfacelines, profiles, pipingFailureMechanismMock, assessmentSectionMock);
+            var presentationObject = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock);
 
             // Assert
             Assert.IsInstanceOf<IObservable>(presentationObject);
             Assert.IsInstanceOf<PipingContext<PipingCalculation>>(presentationObject);
             Assert.AreSame(calculation, presentationObject.WrappedData);
             Assert.AreSame(surfacelines, presentationObject.AvailablePipingSurfaceLines);
-            Assert.AreSame(profiles, presentationObject.AvailablePipingSoilProfiles);
+            Assert.AreSame(soilModels, presentationObject.AvailableStochasticSoilModels);
             Assert.AreSame(pipingFailureMechanismMock, presentationObject.PipingFailureMechanism);
             Assert.AreSame(assessmentSectionMock, presentationObject.AssessmentSection);
         }
@@ -56,17 +56,17 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var profiles = new[]
+            var soilModels = new[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
             var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
             var mocks = new MockRepository();
             var assessmentSection = mocks.StrictMock<AssessmentSectionBase>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new PipingCalculationContext(calculation, surfacelines, profiles, null, assessmentSection);
+            TestDelegate call = () => new PipingCalculationContext(calculation, surfacelines, soilModels, null, assessmentSection);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "Het piping faalmechanisme mag niet 'null' zijn.");
@@ -80,17 +80,17 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var profiles = new[]
+            var soilModels = new[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
             var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
             var mocks = new MockRepository();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new PipingCalculationContext(calculation, surfacelines, profiles, pipingFailureMechanismMock, null);
+            TestDelegate call = () => new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, null);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "Het traject mag niet 'null' zijn.");
@@ -111,13 +111,13 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var profiles = new[]
+            var soilModels = new[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
 
             var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
-            var context = new PipingCalculationContext(calculation, surfacelines, profiles, pipingFailureMechanismMock, assessmentSectionBaseMock);
+            var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionBaseMock);
 
             // Call
             context.Attach(observer);
@@ -141,13 +141,13 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var profiles = new[]
+            var soilModels = new[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
 
             var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
-            var context = new PipingCalculationContext(calculation, surfacelines, profiles, pipingFailureMechanismMock, assessmentSectionBaseMock);
+            var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionBaseMock);
 
             context.Attach(observer);
 
@@ -174,13 +174,13 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var profiles = new[]
+            var soilModels = new[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
 
             var calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
-            var context = new PipingCalculationContext(calculation, surfacelines, profiles, pipingFailureMechanismMock, assessmentSectionBaseMock);
+            var context = new PipingCalculationContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionBaseMock);
 
             calculation.Attach(observer); // Attach to wrapped object
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationGroupContextTest.cs
===================================================================
diff -u -r5e426c2c9fd73b2bab4be73f9e4b7f9b2feb0a49 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationGroupContextTest.cs	(.../PipingCalculationGroupContextTest.cs)	(revision 5e426c2c9fd73b2bab4be73f9e4b7f9b2feb0a49)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationGroupContextTest.cs	(.../PipingCalculationGroupContextTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -8,6 +8,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
@@ -26,9 +27,9 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var soilProfiles = new[]
+            var soilModels = new StochasticSoilModel[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
 
             var mocks = new MockRepository();
@@ -37,14 +38,14 @@
             mocks.ReplayAll();
 
             // Call
-            var groupContext = new PipingCalculationGroupContext(group, surfaceLines, soilProfiles, pipingFailureMechanismMock, assessmentSectionBase);
+            var groupContext = new PipingCalculationGroupContext(group, surfaceLines, soilModels, pipingFailureMechanismMock, assessmentSectionBase);
 
             // Assert
             Assert.IsInstanceOf<IObservable>(groupContext);
             Assert.IsInstanceOf<PipingContext<PipingCalculationGroup>>(groupContext);
             Assert.AreSame(group, groupContext.WrappedData);
             Assert.AreSame(surfaceLines, groupContext.AvailablePipingSurfaceLines);
-            Assert.AreSame(soilProfiles, groupContext.AvailablePipingSoilProfiles);
+            Assert.AreSame(soilModels, groupContext.AvailableStochasticSoilModels);
             Assert.AreSame(pipingFailureMechanismMock, groupContext.PipingFailureMechanism);
             Assert.AreSame(assessmentSectionBase, groupContext.AssessmentSection);
         }
@@ -58,17 +59,17 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var soilProfiles = new[]
+            var soilModels = new[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
 
             var mocks = new MockRepository();
             var assessmentSectionBase = mocks.StrictMock<AssessmentSectionBase>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new PipingCalculationGroupContext(group, surfaceLines, soilProfiles, null, assessmentSectionBase);
+            TestDelegate call = () => new PipingCalculationGroupContext(group, surfaceLines, soilModels, null, assessmentSectionBase);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "Het piping faalmechanisme mag niet 'null' zijn.");
@@ -85,17 +86,17 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var soilProfiles = new[]
+            var soilModels = new[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
 
             var mocks = new MockRepository();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new PipingCalculationGroupContext(group, surfaceLines, soilProfiles, pipingFailureMechanismMock, null);
+            TestDelegate call = () => new PipingCalculationGroupContext(group, surfaceLines, soilModels, pipingFailureMechanismMock, null);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "Het traject mag niet 'null' zijn.");
@@ -118,7 +119,7 @@
 
             var context = new PipingCalculationGroupContext(pipingCalculationGroup,
                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                            Enumerable.Empty<PipingSoilProfile>(),
+                                                            Enumerable.Empty<StochasticSoilModel>(),
                                                             pipingFailureMechanismMock, assessmentSectionBase);
 
             // Call
@@ -143,7 +144,7 @@
 
             var context = new PipingCalculationGroupContext(pipingCalculationGroup,
                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                            Enumerable.Empty<PipingSoilProfile>(),
+                                                            Enumerable.Empty<StochasticSoilModel>(),
                                                             pipingFailureMechanismMock, assessmentSectionBase);
 
             context.Attach(observer);
@@ -171,7 +172,7 @@
 
             var context = new PipingCalculationGroupContext(pipingCalculationGroup,
                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                            Enumerable.Empty<PipingSoilProfile>(),
+                                                            Enumerable.Empty<StochasticSoilModel>(),
                                                             pipingFailureMechanismMock, assessmentSectionBase);
 
             pipingCalculationGroup.Attach(observer); // Attach to wrapped object
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs
===================================================================
diff -u -r5b575c7019f5ec9d0db2784fda5cb5c7b4df9a90 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs	(.../PipingContextTest.cs)	(revision 5b575c7019f5ec9d0db2784fda5cb5c7b4df9a90)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs	(.../PipingContextTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using Core.Common.Base;
-
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
+using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
 
 namespace Ringtoets.Piping.Forms.Test.PresentationObjects
@@ -24,27 +23,28 @@
             var assessmentSection = mocks.StrictMock<AssessmentSectionBase>();
             mocks.ReplayAll();
 
-            RingtoetsPipingSurfaceLine[] surfaceLines = {
+            RingtoetsPipingSurfaceLine[] surfaceLines =
+            {
                 new RingtoetsPipingSurfaceLine(),
                 new RingtoetsPipingSurfaceLine(),
             };
 
-            PipingSoilProfile[] soilProfiles = {
-                new TestPipingSoilProfile(),
-                new TestPipingSoilProfile()
+            var soilModels = new[]
+            {
+                new TestStochasticSoilModel()
             };
 
             var target = new ObservableObject();
 
             // Call
-            var context = new SimplePipingContext<ObservableObject>(target, surfaceLines, soilProfiles, assessmentSection);
+            var context = new SimplePipingContext<ObservableObject>(target, surfaceLines, soilModels, assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<IObservable>(context);
             Assert.AreSame(surfaceLines, context.AvailablePipingSurfaceLines,
-                "It is vital that the iterator should be identical to the collection, in order to stay in sync when items are added or removed.");
-            Assert.AreSame(soilProfiles, context.AvailablePipingSoilProfiles,
-                "It is vital that the iterator should be identical to the collection, in order to stay in sync when items are added or removed.");
+                           "It is vital that the iterator should be identical to the collection, in order to stay in sync when items are added or removed.");
+            Assert.AreSame(soilModels, context.AvailableStochasticSoilModels,
+                           "It is vital that the iterator should be identical to the collection, in order to stay in sync when items are added or removed.");
             Assert.AreSame(target, context.WrappedData);
 
             mocks.VerifyAll();
@@ -60,13 +60,16 @@
 
             // Call
             TestDelegate call = () => new SimplePipingContext<ObservableObject>(null,
-                                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                                 Enumerable.Empty<PipingSoilProfile>(),
-                                                                                 assessmentSection);
+                                                                                Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                                Enumerable.Empty<StochasticSoilModel>(),
+                                                                                assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            string customMessage = exception.Message.Split(new [] { Environment.NewLine }, StringSplitOptions.None)[0];
+            string customMessage = exception.Message.Split(new[]
+            {
+                Environment.NewLine
+            }, StringSplitOptions.None)[0];
             Assert.AreEqual("Het piping data object mag niet 'null' zijn.", customMessage);
             mocks.VerifyAll();
         }
@@ -80,14 +83,17 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new SimplePipingContext<ObservableObject>(new ObservableObject(), 
-                                                                                 null,
-                                                                                 Enumerable.Empty<PipingSoilProfile>(),
-                                                                                 assessmentSection);
+            TestDelegate call = () => new SimplePipingContext<ObservableObject>(new ObservableObject(),
+                                                                                null,
+                                                                                Enumerable.Empty<StochasticSoilModel>(),
+                                                                                assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            string customMessage = exception.Message.Split(new[] { Environment.NewLine }, StringSplitOptions.None)[0];
+            string customMessage = exception.Message.Split(new[]
+            {
+                Environment.NewLine
+            }, StringSplitOptions.None)[0];
             Assert.AreEqual("De verzameling van profielschematisaties mag niet 'null' zijn.", customMessage);
             mocks.VerifyAll();
         }
@@ -101,14 +107,17 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new SimplePipingContext<ObservableObject>(new ObservableObject(), 
-                                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                                 null,
-                                                                                 assessmentSection);
+            TestDelegate call = () => new SimplePipingContext<ObservableObject>(new ObservableObject(),
+                                                                                Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                                null,
+                                                                                assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            string customMessage = exception.Message.Split(new[] { Environment.NewLine }, StringSplitOptions.None)[0];
+            string customMessage = exception.Message.Split(new[]
+            {
+                Environment.NewLine
+            }, StringSplitOptions.None)[0];
             Assert.AreEqual("De verzameling van ondergrondschematiseringen mag niet 'null' zijn.", customMessage);
             mocks.VerifyAll();
         }
@@ -127,7 +136,7 @@
 
             var context = new SimplePipingContext<ObservableObject>(observableObject,
                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                    Enumerable.Empty<PipingSoilProfile>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                                     assessmentSection);
 
             // Call
@@ -151,7 +160,7 @@
 
             var context = new SimplePipingContext<ObservableObject>(observableObject,
                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                    Enumerable.Empty<PipingSoilProfile>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                                     assessmentSection);
 
             context.Attach(observer);
@@ -178,7 +187,7 @@
 
             var context = new SimplePipingContext<ObservableObject>(observableObject,
                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                    Enumerable.Empty<PipingSoilProfile>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                                     assessmentSection);
 
             observableObject.Attach(observer); // Attach to wrapped object
@@ -200,9 +209,9 @@
 
             var observableObject = new ObservableObject();
             var context = new SimplePipingContext<ObservableObject>(observableObject,
-                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                     Enumerable.Empty<PipingSoilProfile>(),
-                                                                     assessmentSection);
+                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
+                                                                    assessmentSection);
 
             // Call
             bool isEqual = context.Equals(context);
@@ -222,9 +231,9 @@
 
             var observableObject = new ObservableObject();
             var context = new SimplePipingContext<ObservableObject>(observableObject,
-                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                     Enumerable.Empty<PipingSoilProfile>(),
-                                                                     assessmentSection);
+                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
+                                                                    assessmentSection);
 
             // Call
             bool isEqual = context.Equals(null);
@@ -244,20 +253,20 @@
 
             var observableObject = new ObservableObject();
             var context = new SimplePipingContext<ObservableObject>(observableObject,
-                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                     Enumerable.Empty<PipingSoilProfile>(),
-                                                                     assessmentSection);
+                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
+                                                                    assessmentSection);
 
             var otherContext = new SimplePipingContext<ObservableObject>(observableObject,
-                                                                          new[]
-                                                                          {
-                                                                              new RingtoetsPipingSurfaceLine()
-                                                                          },
-                                                                          new[]
-                                                                          {
-                                                                              new TestPipingSoilProfile()
-                                                                          },
-                                                                          assessmentSection);
+                                                                         new[]
+                                                                         {
+                                                                             new RingtoetsPipingSurfaceLine()
+                                                                         },
+                                                                         new[]
+                                                                         {
+                                                                             new StochasticSoilModel(0, string.Empty, string.Empty)
+                                                                         },
+                                                                         assessmentSection);
 
             // Call
             bool isEqual = context.Equals(otherContext);
@@ -280,20 +289,20 @@
             var observableObject = new ObservableObject();
             var otherObservableObject = new ObservableObject();
             var context = new SimplePipingContext<ObservableObject>(observableObject,
-                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                     Enumerable.Empty<PipingSoilProfile>(),
-                                                                     assessmentSection);
+                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
+                                                                    assessmentSection);
 
             var otherContext = new SimplePipingContext<ObservableObject>(otherObservableObject,
-                                                                          new[]
-                                                                          {
-                                                                              new RingtoetsPipingSurfaceLine()
-                                                                          },
-                                                                          new[]
-                                                                          {
-                                                                              new TestPipingSoilProfile()
-                                                                          },
-                                                                          assessmentSection);
+                                                                         new[]
+                                                                         {
+                                                                             new RingtoetsPipingSurfaceLine()
+                                                                         },
+                                                                         new[]
+                                                                         {
+                                                                             new StochasticSoilModel(0, string.Empty, string.Empty)
+                                                                         },
+                                                                         assessmentSection);
 
             // Call
             bool isEqual = context.Equals(otherContext);
@@ -316,9 +325,9 @@
 
             var observableObject = new ObservableObject();
             var context = new SimplePipingContext<ObservableObject>(observableObject,
-                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                     Enumerable.Empty<PipingSoilProfile>(),
-                                                                     assessmentSection);
+                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
+                                                                    assessmentSection);
 
             var otherContext = new SimplePipingContext<IObservable>(observableStub,
                                                                     new[]
@@ -327,7 +336,7 @@
                                                                     },
                                                                     new[]
                                                                     {
-                                                                        new TestPipingSoilProfile()
+                                                                        new StochasticSoilModel(0, string.Empty, string.Empty)
                                                                     },
                                                                     assessmentSection);
 
@@ -351,20 +360,20 @@
 
             var observableObject = new ObservableObject();
             var context = new SimplePipingContext<ObservableObject>(observableObject,
-                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                     Enumerable.Empty<PipingSoilProfile>(),
-                                                                     assessmentSection);
+                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
+                                                                    assessmentSection);
 
             var otherContext = new SimplePipingContext<ObservableObject>(observableObject,
-                                                                          new[]
-                                                                          {
-                                                                              new RingtoetsPipingSurfaceLine()
-                                                                          },
-                                                                          new[]
-                                                                          {
-                                                                              new TestPipingSoilProfile()
-                                                                          },
-                                                                          assessmentSection);
+                                                                         new[]
+                                                                         {
+                                                                             new RingtoetsPipingSurfaceLine()
+                                                                         },
+                                                                         new[]
+                                                                         {
+                                                                             new StochasticSoilModel(0, string.Empty, string.Empty)
+                                                                         },
+                                                                         assessmentSection);
             // Precondition
             Assert.True(context.Equals(otherContext));
 
@@ -379,16 +388,10 @@
 
         private class SimplePipingContext<T> : PipingContext<T> where T : IObservable
         {
-            public SimplePipingContext(T target, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<PipingSoilProfile> soilProfiles, AssessmentSectionBase assessmentSection)
-                : base(target, surfaceLines, soilProfiles, assessmentSection)
-            {
-                
-            }
+            public SimplePipingContext(T target, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> stochasticSoilModels, AssessmentSectionBase assessmentSection)
+                : base(target, surfaceLines, stochasticSoilModels, assessmentSection) {}
         }
 
-        private class ObservableObject : Observable
-        {
-            
-        }
+        private class ObservableObject : Observable {}
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs
===================================================================
diff -u -r5e426c2c9fd73b2bab4be73f9e4b7f9b2feb0a49 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs	(.../PipingInputContextTest.cs)	(revision 5e426c2c9fd73b2bab4be73f9e4b7f9b2feb0a49)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs	(.../PipingInputContextTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -8,6 +8,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
@@ -23,22 +24,22 @@
             // Setup
             var pipingInput = new PipingInput(new GeneralPipingInput());
             var surfaceLines = new[] { new RingtoetsPipingSurfaceLine() };
-            var profiles = new[] { new TestPipingSoilProfile() };
+            var stochasticSoilModels = new[] { new TestStochasticSoilModel() };
 
             var mocks = new MockRepository();
             var assessmentSection = mocks.StrictMock<AssessmentSectionBase>();
 
             mocks.ReplayAll();
             
             // Call
-            var context = new PipingInputContext(pipingInput, surfaceLines, profiles, assessmentSection);
+            var context = new PipingInputContext(pipingInput, surfaceLines, stochasticSoilModels, assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<PipingContext<PipingInput>>(context);
             Assert.AreSame(pipingInput, context.WrappedData);
             Assert.AreSame(assessmentSection, context.AssessmentSection);
             CollectionAssert.AreEqual(surfaceLines, context.AvailablePipingSurfaceLines);
-            CollectionAssert.AreEqual(profiles, context.AvailablePipingSoilProfiles);
+            CollectionAssert.AreEqual(stochasticSoilModels, context.AvailableStochasticSoilModels);
 
             mocks.VerifyAll();
         }
@@ -52,13 +53,13 @@
             {
                 new RingtoetsPipingSurfaceLine()
             };
-            var soilProfiles = new[]
+            var stochasticSoilModels = new[]
             {
-                new TestPipingSoilProfile()
+                new TestStochasticSoilModel()
             };
 
             // Call
-            TestDelegate call = () => new PipingInputContext(input, surfaceLines, soilProfiles, null);
+            TestDelegate call = () => new PipingInputContext(input, surfaceLines, stochasticSoilModels, null);
 
             // Assert
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "Het traject mag niet 'null' zijn.");
@@ -77,7 +78,7 @@
             var pipingInput = new PipingInput(new GeneralPipingInput());
             var context = new PipingInputContext(pipingInput,
                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                  assessmentSectionMock);
 
             // Call
@@ -100,7 +101,7 @@
             var pipingInput = new PipingInput(new GeneralPipingInput());
             var context = new PipingInputContext(pipingInput,
                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                  assessmentSectionMock);
 
             context.Attach(observer);
@@ -126,7 +127,7 @@
             var pipingInput = new PipingInput(new GeneralPipingInput());
             var context = new PipingInputContext(pipingInput,
                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                  assessmentSectionMock);
 
             pipingInput.Attach(observer); // Attach to wrapped object
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs	(.../PipingCalculationContextPropertiesTest.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationContextPropertiesTest.cs	(.../PipingCalculationContextPropertiesTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -46,7 +46,7 @@
             {
                 Data = new PipingCalculationContext(calculation,
                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                    Enumerable.Empty<PipingSoilProfile>(),
+                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                     pipingFailureMechanismMock,
                                                     assessmentSectionBaseMock)
             };
@@ -73,7 +73,7 @@
             {
                 Data = new PipingCalculationContext(calculation,
                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                    Enumerable.Empty<PipingSoilProfile>(),
+                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                     pipingFailureMechanismMock,
                                                     assessmentSectionBaseMock)
             };
@@ -104,7 +104,7 @@
             {
                 Data = new PipingCalculationContext(calculation,
                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                    Enumerable.Empty<PipingSoilProfile>(),
+                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                     pipingFailureMechanismMock,
                                                     assessmentSectionBaseMock)
             };
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationGroupContextPropertiesTest.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationGroupContextPropertiesTest.cs	(.../PipingCalculationGroupContextPropertiesTest.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingCalculationGroupContextPropertiesTest.cs	(.../PipingCalculationGroupContextPropertiesTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -32,7 +32,7 @@
         public void GetProperties_WithData_ReturnTheSameValueAsData()
         {
             // Setup
-            var group = new PipingCalculationGroup();
+            var calculationGroup = new PipingCalculationGroup();
 
             var mocks = new MockRepository();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
@@ -41,14 +41,14 @@
 
             var properties = new PipingCalculationGroupContextProperties
             {
-                Data = new PipingCalculationGroupContext(@group,
+                Data = new PipingCalculationGroupContext(calculationGroup,
                                                          Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                         Enumerable.Empty<PipingSoilProfile>(),
+                                                         Enumerable.Empty<StochasticSoilModel>(),
                                                          pipingFailureMechanismMock, assessmentSectionBaseMock)
             };
 
             // Call & Assert
-            Assert.AreEqual(group.Name, properties.Name);
+            Assert.AreEqual(calculationGroup.Name, properties.Name);
         }
 
         [Test]
@@ -62,21 +62,21 @@
             var assessmentSectionBaseMock = mocks.StrictMock<AssessmentSectionBase>();
             mocks.ReplayAll();
 
-            var group = new PipingCalculationGroup();
-            group.Attach(projectObserver);
+            var calculationGroup = new PipingCalculationGroup();
+            calculationGroup.Attach(projectObserver);
 
             var properties = new PipingCalculationGroupContextProperties
             {
-                Data = new PipingCalculationGroupContext(@group,
+                Data = new PipingCalculationGroupContext(calculationGroup,
                                                          Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                         Enumerable.Empty<PipingSoilProfile>(),
+                                                         Enumerable.Empty<StochasticSoilModel>(),
                                                          pipingFailureMechanismMock, assessmentSectionBaseMock)
             };
 
             // Call & Assert
             const string name = "cool new name!";
             properties.Name = name;
-            Assert.AreEqual(name, group.Name);
+            Assert.AreEqual(name, calculationGroup.Name);
             mocks.VerifyAll();
         }
 
@@ -86,7 +86,7 @@
         public void Name_GroupHasEditableName_NameShouldNotBeReadonly(bool nameIsEditable)
         {
             // Setup
-            var group = new PipingCalculationGroup("A", nameIsEditable);
+            var calculationGroup = new PipingCalculationGroup("A", nameIsEditable);
 
             var mocks = new MockRepository();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
@@ -95,9 +95,9 @@
 
             var properties = new PipingCalculationGroupContextProperties
             {
-                Data = new PipingCalculationGroupContext(@group,
+                Data = new PipingCalculationGroupContext(calculationGroup,
                                                          Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                         Enumerable.Empty<PipingSoilProfile>(),
+                                                         Enumerable.Empty<StochasticSoilModel>(),
                                                          pipingFailureMechanismMock, assessmentSectionBaseMock)
             };
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -r3721b5bb1ae327907884a90d1a9bd300042e0540 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 3721b5bb1ae327907884a90d1a9bd300042e0540)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -65,7 +65,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock)
             };
 
@@ -112,7 +112,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock)
             };
 
@@ -158,7 +158,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock),
                 DampingFactorExit = new LognormalDistributionDesignVariable(dampingFactorExit),
                 PhreaticLevelExit = new NormalDistributionDesignVariable(phreaticLevelExit),
@@ -233,7 +233,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock),
                 ExitPointL = (RoundedDouble) exitPoint,
                 EntryPointL = (RoundedDouble) entryPoint
@@ -267,7 +267,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock),
                 EntryPointL = (RoundedDouble) 0.5,
                 ExitPointL = (RoundedDouble) 2
@@ -301,7 +301,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock)
             };
 
@@ -337,7 +337,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock)
             };
 
@@ -379,7 +379,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock)
             };
 
@@ -415,7 +415,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock)
             };
 
@@ -449,7 +449,7 @@
             {
                 Data = new PipingInputContext(inputParameters,
                                               Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                              Enumerable.Empty<PipingSoilProfile>(),
+                                              Enumerable.Empty<StochasticSoilModel>(),
                                               assessmentSectionMock)
             };
             inputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0, 0)
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rba840423eb72501cbad89c1a6d88642531efa8d5 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs	(.../PipingCalculationContextTreeNodeInfoTest.cs)	(revision ba840423eb72501cbad89c1a6d88642531efa8d5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs	(.../PipingCalculationContextTreeNodeInfoTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -16,6 +16,7 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
+using Ringtoets.Piping.Forms.Test.PresentationObjects;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Plugin;
 using Ringtoets.Piping.Primitives;
@@ -74,7 +75,7 @@
                                                                         },
                                                                         new[]
                                                                         {
-                                                                            new TestPipingSoilProfile()
+                                                                            new TestStochasticSoilModel(), 
                                                                         },
                                                                         pipingFailureMechanismMock,
                                                                         assessmentSectionBaseMock);
@@ -117,7 +118,7 @@
                                                                         },
                                                                         new[]
                                                                         {
-                                                                            new TestPipingSoilProfile()
+                                                                            new TestStochasticSoilModel()
                                                                         },
                                                                         pipingFailureMechanismMock,
                                                                         assessmentSectionBaseMock);
@@ -153,7 +154,7 @@
                                                                         },
                                                                         new[]
                                                                         {
-                                                                            new TestPipingSoilProfile()
+                                                                            new TestStochasticSoilModel()
                                                                         },
                                                                         pipingFailureMechanismMock,
                                                                         assessmentSectionBaseMock);
@@ -167,7 +168,7 @@
             var pipingInputContext = (PipingInputContext) children[1];
             Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedData);
             CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines);
-            CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSoilProfiles, pipingInputContext.AvailablePipingSoilProfiles);
+            CollectionAssert.AreEqual(pipingCalculationContext.AvailableStochasticSoilModels, pipingInputContext.AvailableStochasticSoilModels);
             Assert.AreSame(pipingCalculationContext.WrappedData.SemiProbabilisticOutput, children[2]);
             Assert.IsInstanceOf<EmptyPipingCalculationReport>(children[3]);
         }
@@ -182,7 +183,7 @@
 
             var pipingCalculationContext = new PipingCalculationContext(new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()),
                                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                         pipingFailureMechanismMock,
                                                                         assessmentSectionBaseMock);
 
@@ -198,7 +199,7 @@
             var pipingInputContext = (PipingInputContext) children[1];
             Assert.AreSame(pipingCalculationContext.WrappedData.InputParameters, pipingInputContext.WrappedData);
             CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSurfaceLines, pipingInputContext.AvailablePipingSurfaceLines);
-            CollectionAssert.AreEqual(pipingCalculationContext.AvailablePipingSoilProfiles, pipingInputContext.AvailablePipingSoilProfiles);
+            CollectionAssert.AreEqual(pipingCalculationContext.AvailableStochasticSoilModels, pipingInputContext.AvailableStochasticSoilModels);
 
             Assert.IsInstanceOf<EmptyPipingOutput>(children[2]);
             Assert.IsInstanceOf<EmptyPipingCalculationReport>(children[3]);
@@ -232,7 +233,7 @@
 
             var pipingCalculationsInputs = new PipingCalculationContext(calculation,
                                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                         pipingFailureMechanismMock,
                                                                         assessmentSectionBaseMock);
             pipingCalculationsInputs.Attach(observerMock);
@@ -267,7 +268,7 @@
             var assessmentSectionBaseMock = mocks.StrictMock<AssessmentSectionBase>();
             var nodeData = new PipingCalculationContext(calculation,
                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                         pipingFailureMechanismMock,
                                                         assessmentSectionBaseMock);
 
@@ -301,7 +302,7 @@
             var assessmentSectionBaseMock = mocks.StrictMock<AssessmentSectionBase>();
             var nodeData = new PipingCalculationContext(calculation,
                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                         pipingFailureMechanismMock,
                                                         assessmentSectionBaseMock);
 
@@ -333,7 +334,7 @@
             var assessmentSectionBaseMock = mocks.StrictMock<AssessmentSectionBase>();
             var nodeData = new PipingCalculationContext(new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()),
                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                         pipingFailureMechanismMock,
                                                         assessmentSectionBaseMock);
 
@@ -382,12 +383,12 @@
 
             var calculationContext = new PipingCalculationContext(calculationToBeRemoved,
                                                                   Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                  Enumerable.Empty<PipingSoilProfile>(),
+                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                   pipingFailureMechanismMock,
                                                                   assessmentSectionMock);
             var groupContext = new PipingCalculationGroupContext(group,
                                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanismMock,
                                                                  assessmentSectionMock);
 
@@ -413,12 +414,12 @@
 
             var calculationContext = new PipingCalculationContext(calculationToBeRemoved,
                                                                   Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                  Enumerable.Empty<PipingSoilProfile>(),
+                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                   pipingFailureMechanismMock,
                                                                   assessmentSectionMock);
             var groupContext = new PipingCalculationGroupContext(group,
                                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanismMock,
                                                                  assessmentSectionMock);
 
@@ -440,7 +441,7 @@
 
             var nodeMock = new PipingCalculationContext(new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput()),
                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                         pipingFailureMechanismMock,
                                                         assessmentSectionBaseMock);
 
@@ -474,12 +475,12 @@
 
             var calculationContext = new PipingCalculationContext(elementToBeRemoved,
                                                                   Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                  Enumerable.Empty<PipingSoilProfile>(),
+                                                                  Enumerable.Empty<StochasticSoilModel>(),
                                                                   pipingFailureMechanismMock,
                                                                   assessmentSectionMock);
             var groupContext = new PipingCalculationGroupContext(group,
                                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanismMock,
                                                                  assessmentSectionMock);
 
@@ -510,7 +511,7 @@
             var assessmentSectionBaseMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingCalculationContext = new PipingCalculationContext(calculation,
                                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                         pipingFailureMechanismMock,
                                                                         assessmentSectionBaseMock);
 
@@ -569,7 +570,7 @@
             var assessmentSectionBaseMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingCalculationContext = new PipingCalculationContext(calculation,
                                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                         pipingFailureMechanismMock,
                                                                         assessmentSectionBaseMock);
 
@@ -613,7 +614,7 @@
             var assessmentSectionBaseMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingCalculationContext = new PipingCalculationContext(calculation,
                                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                         pipingFailureMechanismMock,
                                                                         assessmentSectionBaseMock);
 
@@ -671,7 +672,7 @@
             var assessmentSectionBaseMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingCalculationContext = new PipingCalculationContext(calculation,
                                                                         Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                        Enumerable.Empty<PipingSoilProfile>(),
+                                                                        Enumerable.Empty<StochasticSoilModel>(),
                                                                         pipingFailureMechanismMock,
                                                                         assessmentSectionBaseMock);
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbff183a6d323111affe69f3afa19b9ada02c9375 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision bff183a6d323111affe69f3afa19b9ada02c9375)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -72,7 +72,7 @@
 
             var groupContext = new PipingCalculationGroupContext(group,
                                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanismMock,
                                                                  assessmentSectionMock);
 
@@ -104,7 +104,7 @@
 
             var groupContext = new PipingCalculationGroupContext(group,
                                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanismMock,
                                                                  assessmentSectionMock);
 
@@ -130,7 +130,7 @@
 
             var groupContext = new PipingCalculationGroupContext(group,
                                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanismMock,
                                                                  assessmentSectionMock);
 
@@ -163,7 +163,7 @@
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -203,13 +203,13 @@
 
             var parentData = new PipingCalculationGroupContext(parentGroup,
                                                                Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                               Enumerable.Empty<PipingSoilProfile>(),
+                                                               Enumerable.Empty<StochasticSoilModel>(),
                                                                pipingFailureMechanismMock,
                                                                assessmentSectionMock);
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -322,7 +322,7 @@
             var parentData = new object();
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -429,7 +429,7 @@
             var parentData = new PipingFailureMechanismContext(pipingFailureMechanismMock, assessmentSectionMock);
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -533,7 +533,7 @@
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -568,7 +568,7 @@
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -619,7 +619,7 @@
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -687,7 +687,7 @@
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -746,7 +746,7 @@
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -814,7 +814,7 @@
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -902,7 +902,7 @@
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
             nodeData.Attach(observer);
@@ -927,7 +927,7 @@
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
@@ -955,15 +955,15 @@
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
             var parentGroup = new PipingCalculationGroup();
             parentGroup.Children.Add(group);
             var parentNodeData = new PipingCalculationGroupContext(parentGroup,
                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                   Enumerable.Empty<PipingSoilProfile>(),
+                                                                   Enumerable.Empty<StochasticSoilModel>(),
                                                                    pipingFailureMechanismMock,
                                                                    assessmentSectionMock);
 
@@ -988,14 +988,14 @@
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
             var parentGroup = new PipingCalculationGroup();
             var parentNodeData = new PipingCalculationGroupContext(parentGroup,
                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                   Enumerable.Empty<PipingSoilProfile>(),
+                                                                   Enumerable.Empty<StochasticSoilModel>(),
                                                                    pipingFailureMechanismMock,
                                                                    assessmentSectionMock);
 
@@ -1022,15 +1022,15 @@
 
             var nodeData = new PipingCalculationGroupContext(group,
                                                              Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                             Enumerable.Empty<PipingSoilProfile>(),
+                                                             Enumerable.Empty<StochasticSoilModel>(),
                                                              pipingFailureMechanismMock,
                                                              assessmentSectionMock);
 
             var parentGroup = new PipingCalculationGroup();
             parentGroup.Children.Add(group);
             var parentNodeData = new PipingCalculationGroupContext(parentGroup,
                                                                    Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                   Enumerable.Empty<PipingSoilProfile>(),
+                                                                   Enumerable.Empty<StochasticSoilModel>(),
                                                                    pipingFailureMechanismMock,
                                                                    assessmentSectionMock);
             parentNodeData.Attach(observer);
@@ -1057,7 +1057,7 @@
 
             var groupContext = new PipingCalculationGroupContext(group,
                                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanismMock,
                                                                  assessmentSectionMock);
 
@@ -1081,7 +1081,7 @@
 
             var groupContext = new PipingCalculationGroupContext(group,
                                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                 Enumerable.Empty<PipingSoilProfile>(),
+                                                                 Enumerable.Empty<StochasticSoilModel>(),
                                                                  pipingFailureMechanismMock,
                                                                  assessmentSectionMock);
 
@@ -1371,7 +1371,7 @@
 
             dataContext = new PipingCalculationGroupContext(data,
                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                            Enumerable.Empty<PipingSoilProfile>(),
+                                                            Enumerable.Empty<StochasticSoilModel>(),
                                                             pipingFailureMechanism,
                                                             assessmentSection);
         }
@@ -1399,7 +1399,7 @@
                     data = calculation;
                     dataContext = new PipingCalculationContext(calculation,
                                                                Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                               Enumerable.Empty<PipingSoilProfile>(),
+                                                               Enumerable.Empty<StochasticSoilModel>(),
                                                                pipingFailureMechanism,
                                                                assessmentSection);
                     break;
@@ -1412,7 +1412,7 @@
                     data = group;
                     dataContext = new PipingCalculationGroupContext(group,
                                                                     Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                    Enumerable.Empty<PipingSoilProfile>(),
+                                                                    Enumerable.Empty<StochasticSoilModel>(),
                                                                     pipingFailureMechanism,
                                                                     assessmentSection);
                     break;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u -r08ab7af115b5bbad87eaffb9bc1b1c4379ec8738 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision 08ab7af115b5bbad87eaffb9bc1b1c4379ec8738)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -156,7 +156,7 @@
             Assert.AreEqual("Berekeningen", calculationsFolder.WrappedData.Name);
             CollectionAssert.AreEqual(pipingFailureMechanism.CalculationsGroup.Children, calculationsFolder.WrappedData.Children);
             Assert.AreSame(pipingFailureMechanism.SurfaceLines, calculationsFolder.AvailablePipingSurfaceLines);
-            Assert.AreEqual(pipingFailureMechanism.SoilProfiles, calculationsFolder.AvailablePipingSoilProfiles);
+            Assert.AreEqual(pipingFailureMechanism.StochasticSoilModels, calculationsFolder.AvailableStochasticSoilModels);
             Assert.AreSame(pipingFailureMechanism, calculationsFolder.PipingFailureMechanism);
 
             var outputsFolder = (CategoryTreeFolder) children[2];
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs	(.../PipingInputContextTreeNodeInfoTest.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs	(.../PipingInputContextTreeNodeInfoTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -55,7 +55,7 @@
         {
             // Setup
             var assessmentSection = mocks.StrictMock<AssessmentSectionBase>();
-            var pipingInputContext = mocks.StrictMock<PipingInputContext>(new PipingInput(new GeneralPipingInput()), Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<PipingSoilProfile>(), assessmentSection);
+            var pipingInputContext = mocks.StrictMock<PipingInputContext>(new PipingInput(new GeneralPipingInput()), Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<StochasticSoilModel>(), assessmentSection);
 
             mocks.ReplayAll();
 
@@ -73,7 +73,7 @@
         {
             // Setup
             var assessmentSection = mocks.StrictMock<AssessmentSectionBase>();
-            var pipingInputContext = mocks.StrictMock<PipingInputContext>(new PipingInput(new GeneralPipingInput()), Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<PipingSoilProfile>(), assessmentSection);
+            var pipingInputContext = mocks.StrictMock<PipingInputContext>(new PipingInput(new GeneralPipingInput()), Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<StochasticSoilModel>(), assessmentSection);
 
             mocks.ReplayAll();
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs
===================================================================
diff -u -r0f6f1fc37266c0c6cf2c4b6301796ff168d9b955 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs	(.../LognormalDistributionDesignVariableTypeConverterTest.cs)	(revision 0f6f1fc37266c0c6cf2c4b6301796ff168d9b955)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs	(.../LognormalDistributionDesignVariableTypeConverterTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -200,7 +200,7 @@
             var inputParameters = new PipingInput(new GeneralPipingInput());
             var inputParametersContext = new PipingInputContext(inputParameters,
                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                Enumerable.Empty<PipingSoilProfile>(),
+                                                                Enumerable.Empty<StochasticSoilModel>(),
                                                                 assessmentSectionMock);
 
             var inputParameterContextProperties = new PipingInputContextProperties
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs
===================================================================
diff -u -r9a4c2aa9a079d1d9389b488a90cffaa9db043570 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs	(.../NormalDistributionDesignVariableTypeConverterTest.cs)	(revision 9a4c2aa9a079d1d9389b488a90cffaa9db043570)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs	(.../NormalDistributionDesignVariableTypeConverterTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -199,7 +199,7 @@
             var inputParameters = new PipingInput(new GeneralPipingInput());
             var inputParametersContext = new PipingInputContext(inputParameters,
                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                Enumerable.Empty<PipingSoilProfile>(),
+                                                                Enumerable.Empty<StochasticSoilModel>(),
                                                                 assessmentSectionMock);
             var inputParameterContextProperties = new PipingInputContextProperties
             {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs	(.../PipingInputContextHydraulicBoundaryLocationEditorTest.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs	(.../PipingInputContextHydraulicBoundaryLocationEditorTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -39,7 +39,7 @@
             };
             var pipingInputContext = new PipingInputContext(pipingInput,
                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                            Enumerable.Empty<PipingSoilProfile>(),
+                                                            Enumerable.Empty<StochasticSoilModel>(),
                                                             assessmentSectionMock);
 
             var properties = new PipingInputContextProperties
@@ -87,7 +87,7 @@
             hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
             var inputParametersContext = new PipingInputContext(pipingInput,
                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
-                                                                Enumerable.Empty<PipingSoilProfile>(),
+                                                                Enumerable.Empty<StochasticSoilModel>(),
                                                                 assessmentSectionMock);
 
             var properties = new PipingInputContextProperties
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs	(.../PipingInputContextSoilProfileSelectionEditorTest.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs	(.../PipingInputContextSoilProfileSelectionEditorTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -1,16 +1,19 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows.Forms.Design;
-
+using Core.Common.Base.Geometry;
 using Core.Common.Gui.PropertyBag;
 
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Data.TestUtil;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.PropertyClasses;
+using Ringtoets.Piping.Forms.Test.PresentationObjects;
 using Ringtoets.Piping.Forms.UITypeEditors;
 using Ringtoets.Piping.KernelWrapper.TestUtil;
 using Ringtoets.Piping.Primitives;
@@ -38,7 +41,7 @@
                                                             Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                                             new[]
                                                             {
-                                                                new TestPipingSoilProfile()
+                                                                new TestStochasticSoilModel()
                                                             },
                                                             assessmentSectionMock);
 
@@ -77,15 +80,38 @@
             var assessmentSectionMock = mockRepository.StrictMock<AssessmentSectionBase>();
 
             var soilProfile = new TestPipingSoilProfile();
+            var stochasticSoilModel = new StochasticSoilModel(0, string.Empty, string.Empty)
+            {
+                Geometry = 
+                {
+                    new Point2D(0,2),
+                    new Point2D(4,2)
+                },
+                StochasticSoilProfiles =
+                {
+                    new StochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 0)
+                    {
+                        SoilProfile = soilProfile
+                    }
+                }
+            };
+            var surfaceLine = new RingtoetsPipingSurfaceLine();
+            surfaceLine.SetGeometry(new []
+            {
+                new Point3D(2, 1, 0), 
+                new Point3D(2, 3, 0)
+            });
+
             var pipingInput = new PipingInput(new GeneralPipingInput())
             {
+                SurfaceLine = surfaceLine,
                 SoilProfile = soilProfile
             };
             var inputParametersContext = new PipingInputContext(pipingInput,
                                                                 Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                                                 new[]
                                                                 {
-                                                                    soilProfile
+                                                                    stochasticSoilModel
                                                                 },
                                                                 assessmentSectionMock);
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs
===================================================================
diff -u -r10779bb6a6db2d00f4627b2bc190e7e35e1fee3e -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs	(.../PipingInputContextSurfaceLineSelectionEditorTest.cs)	(revision 10779bb6a6db2d00f4627b2bc190e7e35e1fee3e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs	(.../PipingInputContextSurfaceLineSelectionEditorTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -37,7 +37,7 @@
                                                                 {
                                                                     new RingtoetsPipingSurfaceLine()
                                                                 },
-                                                                Enumerable.Empty<PipingSoilProfile>(),
+                                                                Enumerable.Empty<StochasticSoilModel>(),
                                                                 assessmentSectionMock);
 
             var properties = new PipingInputContextProperties
@@ -89,7 +89,7 @@
                                                                 {
                                                                     surfaceLine
                                                                 },
-                                                                Enumerable.Empty<PipingSoilProfile>(),
+                                                                Enumerable.Empty<StochasticSoilModel>(),
                                                                 assessmentSectionMock);
 
             var properties = new PipingInputContextProperties
Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/ImportSoilProfileFromDatabaseTest.cs
===================================================================
diff -u -r17651988db014bcbf2059c03ba0aef438f79bec4 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/ImportSoilProfileFromDatabaseTest.cs	(.../ImportSoilProfileFromDatabaseTest.cs)	(revision 17651988db014bcbf2059c03ba0aef438f79bec4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/ImportSoilProfileFromDatabaseTest.cs	(.../ImportSoilProfileFromDatabaseTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -39,8 +39,8 @@
             importer.Import(context, databasePath);
 
             // Then
-            Assert.AreEqual(1, pipingFailureMechanism.SoilProfiles.Count());
-            PipingSoilProfile profile = pipingFailureMechanism.SoilProfiles.ElementAt(0);
+            Assert.AreEqual(1, pipingFailureMechanism.StochasticSoilModels.Count);
+            PipingSoilProfile profile = pipingFailureMechanism.StochasticSoilModels[0].StochasticSoilProfiles[0].SoilProfile;
 
             PipingProfile pipingProfile = PipingProfileCreator.Create(profile);
 
@@ -102,8 +102,8 @@
             importer.Import(context, databasePath);
 
             // Then
-            Assert.AreEqual(1, pipingFailureMechanism.SoilProfiles.Count());
-            PipingSoilProfile profile = pipingFailureMechanism.SoilProfiles.ElementAt(0);
+            Assert.AreEqual(1, pipingFailureMechanism.StochasticSoilModels.Count);
+            PipingSoilProfile profile = pipingFailureMechanism.StochasticSoilModels[0].StochasticSoilProfiles[0].SoilProfile;
 
             PipingProfile pipingProfile = PipingProfileCreator.Create(profile);
 
@@ -164,8 +164,8 @@
             importer.Import(context, databasePath);
 
             // Then
-            Assert.AreEqual(1, pipingFailureMechanism.SoilProfiles.Count());
-            PipingSoilProfile profile = pipingFailureMechanism.SoilProfiles.ElementAt(0);
+            Assert.AreEqual(1, pipingFailureMechanism.StochasticSoilModels.Count);
+            PipingSoilProfile profile = pipingFailureMechanism.StochasticSoilModels[0].StochasticSoilProfiles[0].SoilProfile;
 
             PipingProfile pipingProfile = PipingProfileCreator.Create(profile);
             var defaultPipingLayer = new PipingLayer();
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs
===================================================================
diff -u -rcd0902ce3bc76ec95c89e60cfc8f1ae7919fa455 -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs	(.../PipingCalculationsViewInfoTest.cs)	(revision cd0902ce3bc76ec95c89e60cfc8f1ae7919fa455)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs	(.../PipingCalculationsViewInfoTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
@@ -49,7 +49,7 @@
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var pipingCalculationsGroupMock = mocks.StrictMock<PipingCalculationGroup>();
-            var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingCalculationsGroupMock, Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<PipingSoilProfile>(), pipingFailureMechanismMock, assessmentSectionMock);
+            var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingCalculationsGroupMock, Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<StochasticSoilModel>(), pipingFailureMechanismMock, assessmentSectionMock);
 
             mocks.ReplayAll();
 
@@ -78,7 +78,7 @@
             // Setup
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
-            var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingFailureMechanismMock.CalculationsGroup, Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<PipingSoilProfile>(), pipingFailureMechanismMock, assessmentSectionMock);
+            var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingFailureMechanismMock.CalculationsGroup, Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<StochasticSoilModel>(), pipingFailureMechanismMock, assessmentSectionMock);
 
             mocks.ReplayAll();
 
@@ -93,7 +93,7 @@
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var pipingCalculationsGroupMock = mocks.StrictMock<PipingCalculationGroup>();
-            var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingCalculationsGroupMock, Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<PipingSoilProfile>(), pipingFailureMechanismMock, assessmentSectionMock);
+            var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingCalculationsGroupMock, Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<StochasticSoilModel>(), pipingFailureMechanismMock, assessmentSectionMock);
 
             mocks.ReplayAll();
 
@@ -167,7 +167,7 @@
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
             var pipingCalculationsGroupMock = mocks.StrictMock<PipingCalculationGroup>();
-            var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingCalculationsGroupMock, Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<PipingSoilProfile>(), pipingFailureMechanismMock, assessmentSectionMock);
+            var pipingCalculationGroupContext = new PipingCalculationGroupContext(pipingCalculationsGroupMock, Enumerable.Empty<RingtoetsPipingSurfaceLine>(), Enumerable.Empty<StochasticSoilModel>(), pipingFailureMechanismMock, assessmentSectionMock);
 
             viewMock.Expect(v => v.AssessmentSection = assessmentSectionMock);
             viewMock.Expect(v => v.PipingFailureMechanism = pipingFailureMechanismMock);