Index: Riskeer/Piping/src/Riskeer.Piping.Data/GeneralPipingInput.cs
===================================================================
diff -u -r8a5a2af1c372dc43f80d28175359d3cb547b4b86 -r278ec381ad6072c9cb5adead003fe74aa9d80a2f
--- Riskeer/Piping/src/Riskeer.Piping.Data/GeneralPipingInput.cs	(.../GeneralPipingInput.cs)	(revision 8a5a2af1c372dc43f80d28175359d3cb547b4b86)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/GeneralPipingInput.cs	(.../GeneralPipingInput.cs)	(revision 278ec381ad6072c9cb5adead003fe74aa9d80a2f)
@@ -104,12 +104,12 @@
         #region Model factors
 
         /// <summary>
-        /// Gets the calculation value used to account for uncertainty in the model for uplift.
+        /// Gets the distribution used to account for uncertainty in the model for uplift.
         /// </summary>
         public LogNormalDistribution UpliftModelFactor { get; }
 
         /// <summary>
-        /// Gets the calculation value used to account for uncertainty in the model for Sellmeijer.
+        /// Gets the distribution used to account for uncertainty in the model for Sellmeijer.
         /// </summary>
         public LogNormalDistribution SellmeijerModelFactor { get; }
 
Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingInput.cs
===================================================================
diff -u -rc1978a8b48e7f75ad9ba7c00d5012f8f00bd4d28 -r278ec381ad6072c9cb5adead003fe74aa9d80a2f
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingInput.cs	(.../PipingInput.cs)	(revision c1978a8b48e7f75ad9ba7c00d5012f8f00bd4d28)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingInput.cs	(.../PipingInput.cs)	(revision 278ec381ad6072c9cb5adead003fe74aa9d80a2f)
@@ -411,7 +411,7 @@
         }
 
         /// <summary>
-        /// Gets the calculation value used to account for uncertainty in the model for uplift.
+        /// Gets the distribution used to account for uncertainty in the model for uplift.
         /// </summary>
         public LogNormalDistribution UpliftModelFactor
         {
@@ -422,7 +422,7 @@
         }
 
         /// <summary>
-        /// Gets the calculation value used to account for uncertainty in the model for Sellmeijer.
+        /// Gets the distribution used to account for uncertainty in the model for Sellmeijer.
         /// </summary>
         public LogNormalDistribution SellmeijerModelFactor
         {
Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingSemiProbabilisticDesignVariableFactory.cs
===================================================================
diff -u -r4b7e26c020c56044c2001a1b5425ab61af4b312a -r278ec381ad6072c9cb5adead003fe74aa9d80a2f
--- Riskeer/Piping/src/Riskeer.Piping.Data/PipingSemiProbabilisticDesignVariableFactory.cs	(.../PipingSemiProbabilisticDesignVariableFactory.cs)	(revision 4b7e26c020c56044c2001a1b5425ab61af4b312a)
+++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingSemiProbabilisticDesignVariableFactory.cs	(.../PipingSemiProbabilisticDesignVariableFactory.cs)	(revision 278ec381ad6072c9cb5adead003fe74aa9d80a2f)
@@ -30,12 +30,21 @@
     {
         #region General parameters
 
+        /// <summary>
+        /// Creates the deterministic design variable for the uplift model factor.
+        /// </summary>
+        /// <param name="parameters">The piping input.</param>
+        /// <returns>Returns the corresponding deterministic design variable.</returns>
         public static DeterministicDesignVariable<LogNormalDistribution> GetUpliftModelFactorDesignVariable(PipingInput parameters)
         {
             return new DeterministicDesignVariable<LogNormalDistribution>(parameters.UpliftModelFactor, parameters.UpliftModelFactor.Mean);
         }
 
-
+        /// <summary>
+        /// Creates the deterministic design variable for the sellmeijer model factor.
+        /// </summary>
+        /// <param name="parameters">The piping input.</param>
+        /// <returns>Returns the corresponding deterministic design variable.</returns>
         public static DeterministicDesignVariable<LogNormalDistribution> GetSellmeijerModelFactorDesignVariable(PipingInput parameters)
         {
             return new DeterministicDesignVariable<LogNormalDistribution>(parameters.SellmeijerModelFactor, parameters.SellmeijerModelFactor.Mean);
Index: Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs
===================================================================
diff -u -r4b7e26c020c56044c2001a1b5425ab61af4b312a -r278ec381ad6072c9cb5adead003fe74aa9d80a2f
--- Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs	(.../IUpliftCalculator.cs)	(revision 4b7e26c020c56044c2001a1b5425ab61af4b312a)
+++ Riskeer/Piping/src/Riskeer.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs	(.../IUpliftCalculator.cs)	(revision 278ec381ad6072c9cb5adead003fe74aa9d80a2f)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System.Collections.Generic;
-using Riskeer.Common.Data.Probabilistics;
 
 namespace Riskeer.Piping.KernelWrapper.SubCalculator
 {
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/GeneralPipingInputTest.cs
===================================================================
diff -u -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc -r278ec381ad6072c9cb5adead003fe74aa9d80a2f
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/GeneralPipingInputTest.cs	(.../GeneralPipingInputTest.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/GeneralPipingInputTest.cs	(.../GeneralPipingInputTest.cs)	(revision 278ec381ad6072c9cb5adead003fe74aa9d80a2f)
@@ -34,23 +34,21 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
-            // Setup
+            // Call
+            var inputParameters = new GeneralPipingInput();
+
+            // Assert
             var upliftModelFactor = new LogNormalDistribution(2)
             {
-                Mean = (RoundedDouble) 1.0,
-                StandardDeviation = (RoundedDouble) 0.1
+                Mean = (RoundedDouble)1.0,
+                StandardDeviation = (RoundedDouble)0.1
             };
 
             var sellmeijerModelFactor = new LogNormalDistribution(2)
             {
-                Mean = (RoundedDouble) 1.0,
-                StandardDeviation = (RoundedDouble) 0.12
+                Mean = (RoundedDouble)1.0,
+                StandardDeviation = (RoundedDouble)0.12
             };
-
-            // Call
-            var inputParameters = new GeneralPipingInput();
-
-            // Assert
             DistributionAssert.AreEqual(upliftModelFactor, inputParameters.UpliftModelFactor);
             DistributionAssert.AreEqual(sellmeijerModelFactor, inputParameters.SellmeijerModelFactor);
 
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingSemiProbabilisticDesignVariableFactoryTest.cs
===================================================================
diff -u -rd9d8e014cf65da1b04948bdac73797c5f8fd87cc -r278ec381ad6072c9cb5adead003fe74aa9d80a2f
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingSemiProbabilisticDesignVariableFactoryTest.cs	(.../PipingSemiProbabilisticDesignVariableFactoryTest.cs)	(revision d9d8e014cf65da1b04948bdac73797c5f8fd87cc)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingSemiProbabilisticDesignVariableFactoryTest.cs	(.../PipingSemiProbabilisticDesignVariableFactoryTest.cs)	(revision 278ec381ad6072c9cb5adead003fe74aa9d80a2f)
@@ -54,11 +54,11 @@
             PipingInput inputParameters = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
 
             // Call
-            DesignVariable<LogNormalDistribution> upliftModelFactor = PipingSemiProbabilisticDesignVariableFactory.GetUpliftModelFactorDesignVariable(inputParameters);
+            DeterministicDesignVariable<LogNormalDistribution> upliftModelFactor = PipingSemiProbabilisticDesignVariableFactory.GetUpliftModelFactorDesignVariable(inputParameters);
 
             // Assert
-            Assert.IsInstanceOf<DeterministicDesignVariable<LogNormalDistribution>>(upliftModelFactor);
             DistributionAssert.AreEqual(inputParameters.UpliftModelFactor, upliftModelFactor.Distribution);
+            Assert.AreEqual(inputParameters.UpliftModelFactor.Mean, upliftModelFactor.GetDesignValue());
         }
 
         [Test]
@@ -68,11 +68,11 @@
             PipingInput inputParameters = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer();
 
             // Call
-            DesignVariable<LogNormalDistribution> sellmeijerModelFactor = PipingSemiProbabilisticDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(inputParameters);
+            DeterministicDesignVariable<LogNormalDistribution> sellmeijerModelFactor = PipingSemiProbabilisticDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(inputParameters);
 
             // Assert
-            Assert.IsInstanceOf<DeterministicDesignVariable<LogNormalDistribution>>(sellmeijerModelFactor);
             DistributionAssert.AreEqual(inputParameters.SellmeijerModelFactor, sellmeijerModelFactor.Distribution);
+            Assert.AreEqual(inputParameters.SellmeijerModelFactor.Mean, sellmeijerModelFactor.GetDesignValue());
         }
 
         [Test]
Index: Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs
===================================================================
diff -u -r4b7e26c020c56044c2001a1b5425ab61af4b312a -r278ec381ad6072c9cb5adead003fe74aa9d80a2f
--- Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs	(.../UpliftCalculatorStub.cs)	(revision 4b7e26c020c56044c2001a1b5425ab61af4b312a)
+++ Riskeer/Piping/test/Riskeer.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs	(.../UpliftCalculatorStub.cs)	(revision 278ec381ad6072c9cb5adead003fe74aa9d80a2f)
@@ -22,7 +22,6 @@
 using System;
 using System.Collections.Generic;
 using Deltares.WTIPiping;
-using Riskeer.Common.Data.Probabilistics;
 using Riskeer.Piping.KernelWrapper.SubCalculator;
 
 namespace Riskeer.Piping.KernelWrapper.TestUtil.SubCalculator