Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r21097a1fedd476246df0694deed1d3630a7960d2
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingCalculationScenarioCreateExtensions.cs	(.../PipingCalculationScenarioCreateExtensions.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingCalculationScenarioCreateExtensions.cs	(.../PipingCalculationScenarioCreateExtensions.cs)	(revision 21097a1fedd476246df0694deed1d3630a7960d2)
@@ -61,7 +61,7 @@
             return entity;
         }
 
-        private static void SetInputParametersToEntity(PipingCalculationEntity entity, PipingInput inputParameters, PersistenceRegistry registry)
+        private static void SetInputParametersToEntity(PipingCalculationEntity entity, SemiProbabilisticPipingInput inputParameters, PersistenceRegistry registry)
         {
             if (inputParameters.SurfaceLine != null)
             {
@@ -85,7 +85,7 @@
             entity.DampingFactorExitStandardDeviation = inputParameters.DampingFactorExit.StandardDeviation.ToNaNAsNull();
         }
 
-        private static void SetHydraulicBoundaryLocationInputToEntity(PipingCalculationEntity entity, PipingInput inputParameters, PersistenceRegistry registry)
+        private static void SetHydraulicBoundaryLocationInputToEntity(PipingCalculationEntity entity, SemiProbabilisticPipingInput inputParameters, PersistenceRegistry registry)
         {
             entity.UseAssessmentLevelManualInput = Convert.ToByte(inputParameters.UseAssessmentLevelManualInput);
             entity.AssessmentLevel = inputParameters.AssessmentLevel.ToNaNAsNull();
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingCalculationEntityReadExtensions.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r21097a1fedd476246df0694deed1d3630a7960d2
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingCalculationEntityReadExtensions.cs	(.../PipingCalculationEntityReadExtensions.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingCalculationEntityReadExtensions.cs	(.../PipingCalculationEntityReadExtensions.cs)	(revision 21097a1fedd476246df0694deed1d3630a7960d2)
@@ -77,7 +77,7 @@
             }
         }
 
-        private static void ReadInputParameters(PipingInput inputParameters, PipingCalculationEntity entity, ReadConversionCollector collector)
+        private static void ReadInputParameters(SemiProbabilisticPipingInput inputParameters, PipingCalculationEntity entity, ReadConversionCollector collector)
         {
             if (entity.SurfaceLineEntity != null)
             {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r2f38d99573f6027e41bccc157013ca2fee9e1689 -r21097a1fedd476246df0694deed1d3630a7960d2
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision 2f38d99573f6027e41bccc157013ca2fee9e1689)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs	(.../PipingCalculationScenarioCreateExtensionsTest.cs)	(revision 21097a1fedd476246df0694deed1d3630a7960d2)
@@ -107,7 +107,7 @@
             Assert.AreEqual(exitPoint.ToNaNAsNull(), entity.ExitPointL);
             Assert.AreEqual(entryPoint.ToNaNAsNull(), entity.EntryPointL);
 
-            PipingInput input = calculation.InputParameters;
+            SemiProbabilisticPipingInput input = calculation.InputParameters;
             Assert.AreEqual(input.PhreaticLevelExit.Mean.Value, entity.PhreaticLevelExitMean);
             Assert.AreEqual(input.PhreaticLevelExit.StandardDeviation.Value, entity.PhreaticLevelExitStandardDeviation);
             Assert.AreEqual(input.DampingFactorExit.Mean.Value, entity.DampingFactorExitMean);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r502628993928a1e34023af884433fd19ebac2adb -r21097a1fedd476246df0694deed1d3630a7960d2
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 502628993928a1e34023af884433fd19ebac2adb)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 21097a1fedd476246df0694deed1d3630a7960d2)
@@ -1246,7 +1246,7 @@
             AssertPipingOutput(expectedPipingCalculation.Output, actualPipingCalculation.Output);
         }
 
-        private static void AssertPipingInput(PipingInput expectedPipingInput, PipingInput actualPipingInput)
+        private static void AssertPipingInput(SemiProbabilisticPipingInput expectedPipingInput, SemiProbabilisticPipingInput actualPipingInput)
         {
             AssertReferencedObject(() => expectedPipingInput.HydraulicBoundaryLocation,
                                    () => actualPipingInput.HydraulicBoundaryLocation,