Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs
===================================================================
diff -u -r314545f25db70366badcc527aeca68d241bfdcdc -r8c60e937f4b8009fea80f3702879e100fe03b63f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs	(.../PipingCalculationConfigurationHelper.cs)	(revision 314545f25db70366badcc527aeca68d241bfdcdc)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs	(.../PipingCalculationConfigurationHelper.cs)	(revision 8c60e937f4b8009fea80f3702879e100fe03b63f)
@@ -25,7 +25,7 @@
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using log4net;
-using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Properties;
@@ -49,7 +49,7 @@
         /// <param name="soilModels">The soil models from which profiles are taken to configure <see cref="PipingCalculation"/> with.</param>
         /// <param name="generalInput">General input to assign to each generated piping calculation.</param>
         /// <param name="semiProbabilisticInput">Semi probabilistic input to assign to each generated piping calculation.</param>
-        /// <returns>A structure or <see cref="ICalculation"/> matching combinations of <paramref name="surfaceLines"/> and
+        /// <returns>A structure or <see cref="ICalculationItem"/> matching combinations of <paramref name="surfaceLines"/> and
         /// profiles of intersecting <paramref name="soilModels"/>.</returns>
         /// <exception cref="ArgumentNullException">Throw when either:
         /// <list type="bullet">
@@ -58,7 +58,7 @@
         /// <item><paramref name="generalInput"/> is <c>null</c></item>
         /// <item><paramref name="semiProbabilisticInput"/> is <c>null</c></item>
         /// </list></exception>
-        public static IEnumerable<ICalculation> GenerateCalculationsStructure(IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> soilModels, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput)
+        public static IEnumerable<ICalculationItem> GenerateCalculationItemsStructure(IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> soilModels, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput)
         {
             if (surfaceLines == null)
             {
@@ -77,7 +77,7 @@
                 throw new ArgumentNullException("semiProbabilisticInput");
             }
 
-            List<ICalculation> groups = new List<ICalculation>();
+            List<ICalculationItem> groups = new List<ICalculationItem>();
             foreach (var surfaceLine in surfaceLines)
             {
                 var group = CreateCalculationGroup(surfaceLine, soilModels, generalInput, semiProbabilisticInput);
@@ -123,7 +123,7 @@
             return soilModelObjectsForCalculation;
         }
 
-        private static ICalculation CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable<StochasticSoilModel> soilModels, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput)
+        private static ICalculationItem CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable<StochasticSoilModel> soilModels, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput)
         {
             var pipingCalculationGroup = new PipingCalculationGroup(surfaceLine.Name, true);
             var stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels);
@@ -138,7 +138,7 @@
             return pipingCalculationGroup;
         }
 
-        private static ICalculation CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable<ICalculation> calculations, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput)
+        private static ICalculationItem CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable<ICalculationItem> calculations, GeneralPipingInput generalInput, SemiProbabilisticPipingInput semiProbabilisticInput)
         {
             var nameBase = string.Format("{0} {1}", surfaceLine.Name, stochasticSoilProfile);
             var name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name);