Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs
===================================================================
diff -u -rd55719870031108810684119674758d0f0ba9a66 -r49084c971c0de5668befdcf5c8d6b65debf0b659
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision d55719870031108810684119674758d0f0ba9a66)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(.../HeightStructuresCalculationTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
@@ -34,18 +34,18 @@
         public void Constructor_NullGeneralInput_ThrowsArgumentNullException()
         {
             // Setup
-            var normProbabilityInput = new NormProbabilityInput();
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
 
             // Call
-            TestDelegate test = () => new HeightStructuresCalculation(null, normProbabilityInput);
+            TestDelegate test = () => new HeightStructuresCalculation(null, probabilityAssessmentInput);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("generalInputParameters", exception.ParamName);
         }
 
         [Test]
-        public void Constructor_NullNormProbabilityInput_ThrowsArgumentNullException()
+        public void Constructor_NullProbabilityAssessmentInput_ThrowsArgumentNullException()
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
@@ -63,17 +63,17 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
 
             // Call
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput);
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput);
 
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
             Assert.IsNotNull(calculation.InputParameters);
-            Assert.AreEqual(normProbabilityInput, calculation.NormProbabilityInput);
+            Assert.AreEqual(probabilityAssessmentInput, calculation.NormProbabilityInput);
             Assert.IsNull(calculation.Comments);
             Assert.IsFalse(calculation.HasOutput);
             AssertDemoInput(calculation.InputParameters);
@@ -84,8 +84,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -102,8 +102,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = null
             };
@@ -117,8 +117,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -132,8 +132,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput);
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput);
 
             // Call
             ICalculationInput input = calculation.GetObservableInput();
@@ -147,8 +147,8 @@
         {
             // Setup
             var generalInput = new GeneralHeightStructuresInput();
-            var normProbabilityInput = new NormProbabilityInput();
-            var calculation = new HeightStructuresCalculation(generalInput, normProbabilityInput)
+            var probabilityAssessmentInput = new ProbabilityAssessmentInput();
+            var calculation = new HeightStructuresCalculation(generalInput, probabilityAssessmentInput)
             {
                 Output = new TestHeightStructuresOutput()
             };