Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision de8e5c0dd97c9e53a07e905a0f59617e570b2259)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -148,7 +148,7 @@
         {
             GrassCoverErosionInwardsFailureMechanism failureMechanism = demoAssessmentSection.GrassCoverErosionInwards;
 
-            var calculation = new GrassCoverErosionInwardsCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput);
+            var calculation = new GrassCoverErosionInwardsCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput);
             failureMechanism.CalculationsGroup.Children.Add(calculation);
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
             calculation.InputParameters.NotifyObservers();
@@ -158,7 +158,7 @@
         {
             HeightStructuresFailureMechanism failureMechanism = demoAssessmentSection.HeightStructures;
 
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput);
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput);
             failureMechanism.CalculationsGroup.Children.Add(calculation);
             calculation.InputParameters.HydraulicBoundaryLocation = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
             calculation.InputParameters.NotifyObservers();
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs
===================================================================
diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs	(.../GrassCoverErosionInwardsFailureMechanism.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs	(.../GrassCoverErosionInwardsFailureMechanism.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -44,7 +44,7 @@
         {
             CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, false);
             GeneralInput = new GeneralGrassCoverErosionInwardsInput();
-            NormProbabilityInput = new ProbabilityAssessmentInput();
+            ProbabilityAssessmentInput = new ProbabilityAssessmentInput();
             sectionResults = new List<GrassCoverErosionInwardsFailureMechanismSectionResult>();
         }
 
@@ -60,11 +60,11 @@
         {
             get
             {
-                return NormProbabilityInput.Contribution;
+                return ProbabilityAssessmentInput.Contribution;
             }
             set
             {
-                NormProbabilityInput.Contribution = value;
+                ProbabilityAssessmentInput.Contribution = value;
             }
         }
 
@@ -74,9 +74,10 @@
         public GeneralGrassCoverErosionInwardsInput GeneralInput { get; private set; }
 
         /// <summary>
-        /// Gets the length-effect parameters.
+        /// Gets the general probabilistic assessment input parameters that apply to each calculation 
+        /// in a probabilistic assessment.
         /// </summary>
-        public ProbabilityAssessmentInput NormProbabilityInput { get; private set; }
+        public ProbabilityAssessmentInput ProbabilityAssessmentInput { get; private set; }
 
         public CalculationGroup CalculationsGroup { get; private set; }
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs
===================================================================
diff -u -rf5ac9de8b45cef4515fa7a051c5af54446f96712 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs	(.../GrassCoverErosionInwardsFailureMechanismContextProperties.cs)	(revision f5ac9de8b45cef4515fa7a051c5af54446f96712)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextProperties.cs	(.../GrassCoverErosionInwardsFailureMechanismContextProperties.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -51,11 +51,11 @@
         {
             get
             {
-                return data.WrappedData.NormProbabilityInput.N;
+                return data.WrappedData.ProbabilityAssessmentInput.N;
             }
             set
             {
-                data.WrappedData.NormProbabilityInput.N = value;
+                data.WrappedData.ProbabilityAssessmentInput.N = value;
                 data.WrappedData.NotifyObservers();
             }
         }
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs
===================================================================
diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 5b8f476716cb75977616203318fa250f608fe7a5)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -452,7 +452,7 @@
 
         private static void AddCalculation(GrassCoverErosionInwardsCalculationGroupContext context)
         {
-            var calculation = new GrassCoverErosionInwardsCalculation(context.FailureMechanism.GeneralInput, context.FailureMechanism.NormProbabilityInput)
+            var calculation = new GrassCoverErosionInwardsCalculation(context.FailureMechanism.GeneralInput, context.FailureMechanism.ProbabilityAssessmentInput)
             {
                 Name = NamingHelper.GetUniqueName(context.WrappedData.Children, GrassCoverErosionInwardsDataResources.GrassCoverErosionInwardsCalculation_DefaultName, c => c.Name)
             };
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs
===================================================================
diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs	(.../GrassCoverErosionInwardsFailureMechanismTest.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -46,7 +46,7 @@
             Assert.AreEqual(Resources.GrassCoverErosionInwardsFailureMechanism_DisplayCode, failureMechanism.Code);
             CollectionAssert.IsEmpty(failureMechanism.Calculations);
             Assert.IsInstanceOf<GeneralGrassCoverErosionInwardsInput>(failureMechanism.GeneralInput);
-            Assert.IsInstanceOf<ProbabilityAssessmentInput>(failureMechanism.NormProbabilityInput);
+            Assert.IsInstanceOf<ProbabilityAssessmentInput>(failureMechanism.ProbabilityAssessmentInput);
             Assert.AreEqual("Berekeningen", failureMechanism.CalculationsGroup.Name);
             Assert.IsEmpty(failureMechanism.CalculationsGroup.Children);
         }
@@ -126,7 +126,7 @@
         }
 
         [Test]
-        public void Contribution_Always_UpdatesNormProbabilityInputContribution()
+        public void Contribution_Always_UpdatesProbabilityAssessmentInputContribution()
         {
             // Setup
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
@@ -136,7 +136,7 @@
             failureMechanism.Contribution = newContribution;
 
             // Assert
-            Assert.AreEqual(newContribution, failureMechanism.NormProbabilityInput.Contribution);
+            Assert.AreEqual(newContribution, failureMechanism.ProbabilityAssessmentInput.Contribution);
             Assert.AreEqual(newContribution, failureMechanism.Contribution);
         }
     }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs)	(revision 704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -109,7 +109,7 @@
             properties.LengthEffect = newLengthEffect;
 
             // Assert
-            Assert.AreEqual(newLengthEffect, failureMechanism.NormProbabilityInput.N);
+            Assert.AreEqual(newLengthEffect, failureMechanism.ProbabilityAssessmentInput.N);
             mockRepository.VerifyAll();
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -129,7 +129,7 @@
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var group = new CalculationGroup();
             var childGroup = new CalculationGroup();
-            var childCalculation = new GrassCoverErosionInwardsCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput);
+            var childCalculation = new GrassCoverErosionInwardsCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput);
 
             group.Children.Add(childGroup);
             group.Children.Add(calculationItemMock);
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs
===================================================================
diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs	(.../HeightStructuresFailureMechanism.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -44,7 +44,7 @@
         {
             sectionResults = new List<HeightStructuresFailureMechanismSectionResult>();
             CalculationsGroup = new CalculationGroup(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, false);
-            NormProbabilityInput = new ProbabilityAssessmentInput();
+            ProbabilityAssessmentInput = new ProbabilityAssessmentInput();
             GeneralInput = new GeneralHeightStructuresInput();
         }
 
@@ -60,18 +60,19 @@
         {
             get
             {
-                return NormProbabilityInput.Contribution;
+                return ProbabilityAssessmentInput.Contribution;
             }
             set
             {
-                NormProbabilityInput.Contribution = value;
+                ProbabilityAssessmentInput.Contribution = value;
             }
         }
 
         /// <summary>
-        /// Gets the length-effect parameters.
+        /// Gets the general probabilistic assessment input parameters that apply to each calculation 
+        /// in a probabilistic assessment.
         /// </summary>
-        public ProbabilityAssessmentInput NormProbabilityInput { get; private set; }
+        public ProbabilityAssessmentInput ProbabilityAssessmentInput { get; private set; }
 
         /// <summary>
         /// Gets the height structures calculation input parameters that apply to each calculation.
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismContextProperties.cs
===================================================================
diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismContextProperties.cs	(.../HeightStructuresFailureMechanismContextProperties.cs)	(revision 5b8f476716cb75977616203318fa250f608fe7a5)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresFailureMechanismContextProperties.cs	(.../HeightStructuresFailureMechanismContextProperties.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -52,11 +52,11 @@
         {
             get
             {
-                return data.WrappedData.NormProbabilityInput.N;
+                return data.WrappedData.ProbabilityAssessmentInput.N;
             }
             set
             {
-                data.WrappedData.NormProbabilityInput.N = value;
+                data.WrappedData.ProbabilityAssessmentInput.N = value;
                 data.WrappedData.NotifyObservers();
             }
         }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs
===================================================================
diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision 5b8f476716cb75977616203318fa250f608fe7a5)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -412,7 +412,7 @@
 
         private static void AddCalculation(HeightStructuresCalculationGroupContext context)
         {
-            var calculation = new HeightStructuresCalculation(context.FailureMechanism.GeneralInput, context.FailureMechanism.NormProbabilityInput)
+            var calculation = new HeightStructuresCalculation(context.FailureMechanism.GeneralInput, context.FailureMechanism.ProbabilityAssessmentInput)
             {
                 Name = NamingHelper.GetUniqueName(context.WrappedData.Children, HeightStructuresDataResources.HeightStructuresCalculation_DefaultName, c => c.Name)
             };
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs
===================================================================
diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs	(.../HeightStructuresFailureMechanismTest.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -47,7 +47,7 @@
             CollectionAssert.IsEmpty(failureMechanism.Calculations);
             Assert.IsNotNull(failureMechanism.CalculationsGroup);
             CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children);
-            Assert.IsNotNull(failureMechanism.NormProbabilityInput);
+            Assert.IsNotNull(failureMechanism.ProbabilityAssessmentInput);
             Assert.IsInstanceOf<GeneralHeightStructuresInput>(failureMechanism.GeneralInput);
         }
 
@@ -128,7 +128,7 @@
         }
 
         [Test]
-        public void Contribution_Always_UpdatesNormProbabilityInputContribution()
+        public void Contribution_Always_UpdatesProbabilityAssessmentInputContribution()
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
@@ -138,7 +138,7 @@
             failureMechanism.Contribution = newContribution;
 
             // Assert
-            Assert.AreEqual(newContribution, failureMechanism.NormProbabilityInput.Contribution);
+            Assert.AreEqual(newContribution, failureMechanism.ProbabilityAssessmentInput.Contribution);
             Assert.AreEqual(newContribution, failureMechanism.Contribution);
         }
     }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs
===================================================================
diff -u -r7ddd944b70d252ae493bba48ea9b31c01634082d -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision 7ddd944b70d252ae493bba48ea9b31c01634082d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationContextTest.cs	(.../HeightStructuresCalculationContextTest.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -44,7 +44,7 @@
         {
             // Setup
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput);
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput);
             var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs	(.../HeightStructuresFailureMechanismContextPropertiesTest.cs)	(revision 704afb8fb7f33cd38ab25e08bd3dbeaf9e79ceb1)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs	(.../HeightStructuresFailureMechanismContextPropertiesTest.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -105,7 +105,7 @@
             properties.LengthEffect = newLengthEffect;
 
             // Assert
-            Assert.AreEqual(newLengthEffect, failureMechanism.NormProbabilityInput.N);
+            Assert.AreEqual(newLengthEffect, failureMechanism.ProbabilityAssessmentInput.N);
             mockRepository.VerifyAll();
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -109,7 +109,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput);
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput);
             var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
             // Call
@@ -139,7 +139,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput)
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput)
             {
                 Output = new TestHeightStructuresOutput()
             };
@@ -174,7 +174,7 @@
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput);
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput);
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
@@ -213,7 +213,7 @@
             var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
-            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput);
+            var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput);
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -486,7 +486,7 @@
             // Setup
             var group = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
-            var elementToBeRemoved = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput);
+            var elementToBeRemoved = new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput);
             var observerMock = mocks.StrictMock<IObserver>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculationContext = new HeightStructuresCalculationContext(elementToBeRemoved,
@@ -501,7 +501,7 @@
             mocks.ReplayAll();
 
             group.Children.Add(elementToBeRemoved);
-            group.Children.Add(new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.NormProbabilityInput));
+            group.Children.Add(new HeightStructuresCalculation(failureMechanism.GeneralInput, failureMechanism.ProbabilityAssessmentInput));
             group.Attach(observerMock);
 
             // Precondition
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r49084c971c0de5668befdcf5c8d6b65debf0b659 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 49084c971c0de5668befdcf5c8d6b65debf0b659)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -129,7 +129,7 @@
             var group = new CalculationGroup();
             var childGroup = new CalculationGroup();
             var childCalculation = new HeightStructuresCalculation(failureMechanism.GeneralInput,
-                                                                   failureMechanism.NormProbabilityInput);
+                                                                   failureMechanism.ProbabilityAssessmentInput);
 
             group.Children.Add(childGroup);
             group.Children.Add(calculationItemMock);
@@ -679,7 +679,7 @@
                                                                        failureMechanism,
                                                                        assessmentSectionMock);
             var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput,
-                                                              failureMechanism.NormProbabilityInput)
+                                                              failureMechanism.ProbabilityAssessmentInput)
             {
                 Name = "Nieuwe berekening"
             };
@@ -762,7 +762,7 @@
                                                                              failureMechanism,
                                                                              assessmentSectionMock);
             var calculation = new HeightStructuresCalculation(failureMechanism.GeneralInput,
-                                                              failureMechanism.NormProbabilityInput);
+                                                              failureMechanism.ProbabilityAssessmentInput);
 
             observerMock.Expect(o => o.UpdateObserver());
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision de8e5c0dd97c9e53a07e905a0f59617e570b2259)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs	(.../AssessmentSection.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -195,9 +195,9 @@
             private set
             {
                 contribution = value;
-                GrassCoverErosionInwards.NormProbabilityInput.Norm = value.Norm;
+                GrassCoverErosionInwards.ProbabilityAssessmentInput.Norm = value.Norm;
                 PipingFailureMechanism.PipingProbabilityAssessmentInput.Norm = value.Norm;
-                HeightStructures.NormProbabilityInput.Norm = value.Norm;
+                HeightStructures.ProbabilityAssessmentInput.Norm = value.Norm;
             }
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs
===================================================================
diff -u -rde8e5c0dd97c9e53a07e905a0f59617e570b2259 -r3c1ed9049be26ab9460bf2192c55149c45fbba3c
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs	(.../AssessmentSectionTest.cs)	(revision de8e5c0dd97c9e53a07e905a0f59617e570b2259)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs	(.../AssessmentSectionTest.cs)	(revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c)
@@ -148,9 +148,9 @@
             Assert.AreEqual(30000.0, section.PipingFailureMechanism.PipingProbabilityAssessmentInput.Norm);
             Assert.AreEqual(double.NaN, section.PipingFailureMechanism.PipingProbabilityAssessmentInput.SectionLength);
 
-            Assert.AreEqual(30000.0, section.HeightStructures.NormProbabilityInput.Norm);
+            Assert.AreEqual(30000.0, section.HeightStructures.ProbabilityAssessmentInput.Norm);
 
-            Assert.AreEqual(30000.0, section.GrassCoverErosionInwards.NormProbabilityInput.Norm);
+            Assert.AreEqual(30000.0, section.GrassCoverErosionInwards.ProbabilityAssessmentInput.Norm);
 
             Assert.AreEqual(sum, section.FailureMechanismContribution.Distribution.Sum(d => d.Contribution));
         }