Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/IFailureMechanismContributionNormChangeHandler.cs
===================================================================
diff -u -ra18a961b395ee6b46324cc00b022074eb091ff19 -rfd0878d829eff722d33331e9a95f7b75ad6c6e9c
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/IFailureMechanismContributionNormChangeHandler.cs	(.../IFailureMechanismContributionNormChangeHandler.cs)	(revision a18a961b395ee6b46324cc00b022074eb091ff19)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/IFailureMechanismContributionNormChangeHandler.cs	(.../IFailureMechanismContributionNormChangeHandler.cs)	(revision fd0878d829eff722d33331e9a95f7b75ad6c6e9c)
@@ -32,27 +32,27 @@
     public interface IFailureMechanismContributionNormChangeHandler
     {
         /// <summary>
-        /// Change the normative norm type.
+        /// Change the normative probability type.
         /// </summary>
         /// <param name="action">The action to perform.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="action"/>
         /// is <c>null</c>.</exception>
-        void ChangeNormativeNormType(Action action);
+        void ChangeNormativeProbabilityType(Action action);
 
         /// <summary>
-        /// Change the normative norm.
+        /// Change the normative probability.
         /// </summary>
         /// <param name="action">The action to perform.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="action"/>
         /// is <c>null</c>.</exception>
-        void ChangeNormativeNorm(Action action);
+        void ChangeNormativeProbability(Action action);
 
         /// <summary>
-        /// Change the norm.
+        /// Change the probability.
         /// </summary>
         /// <param name="action">The action to perform.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="action"/>
         /// is <c>null</c>.</exception>
-        void ChangeNorm(Action action);
+        void ChangeProbability(Action action);
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs
===================================================================
diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -rfd0878d829eff722d33331e9a95f7b75ad6c6e9c
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs	(.../NormProperties.cs)	(revision 391d022746e1bd895983935af75594fd3b1912d4)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/NormProperties.cs	(.../NormProperties.cs)	(revision fd0878d829eff722d33331e9a95f7b75ad6c6e9c)
@@ -100,19 +100,19 @@
             get => data.NormativeProbabilityType;
             set
             {
-                normChangeHandler.ChangeNormativeNormType(() => data.NormativeProbabilityType = value);
+                normChangeHandler.ChangeNormativeProbabilityType(() => data.NormativeProbabilityType = value);
             }
         }
 
         private void ChangeNorm(Action action, NormativeProbabilityType normativeProbabilityType)
         {
             if (data.NormativeProbabilityType == normativeProbabilityType)
             {
-                normChangeHandler.ChangeNormativeNorm(action);
+                normChangeHandler.ChangeNormativeProbability(action);
             }
             else
             {
-                normChangeHandler.ChangeNorm(action);
+                normChangeHandler.ChangeProbability(action);
             }
         }
     }
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -rfd0878d829eff722d33331e9a95f7b75ad6c6e9c
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs	(.../FailureMechanismContributionNormChangeHandler.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs	(.../FailureMechanismContributionNormChangeHandler.cs)	(revision fd0878d829eff722d33331e9a95f7b75ad6c6e9c)
@@ -63,7 +63,7 @@
             this.assessmentSection = assessmentSection;
         }
 
-        public void ChangeNormativeNormType(Action action)
+        public void ChangeNormativeProbabilityType(Action action)
         {
             PerformAction(action, Resources.FailureMechanismContributionNormChangeHandler_Confirm_change_norm_and_clear_dependent_semi_probabilistic_data,
                           () =>
@@ -74,7 +74,7 @@
                           });
         }
 
-        public void ChangeNormativeNorm(Action action)
+        public void ChangeNormativeProbability(Action action)
         {
             PerformAction(action, Resources.FailureMechanismContributionNormChangeHandler_Confirm_change_norm_and_clear_dependent_hydraulic_calculations_data_and_semi_probabilistic_data,
                           () =>
@@ -86,7 +86,7 @@
                           });
         }
 
-        public void ChangeNorm(Action action)
+        public void ChangeProbability(Action action)
         {
             PerformAction(action, Resources.FailureMechanismContributionNormChangeHandler_Confirm_change_norm_and_clear_dependent_hydraulic_calculations_data,
                           () =>
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs
===================================================================
diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -rfd0878d829eff722d33331e9a95f7b75ad6c6e9c
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs	(.../NormPropertiesTest.cs)	(revision 391d022746e1bd895983935af75594fd3b1912d4)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/NormPropertiesTest.cs	(.../NormPropertiesTest.cs)	(revision fd0878d829eff722d33331e9a95f7b75ad6c6e9c)
@@ -164,7 +164,7 @@
 
             var mocks = new MockRepository();
             var failureMechanismContributionNormChangeHandler = mocks.StrictMock<IFailureMechanismContributionNormChangeHandler>();
-            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeNormativeNorm(null))
+            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeNormativeProbability(null))
                                                          .IgnoreArguments()
                                                          .WhenCalled(invocation =>
                                                          {
@@ -194,7 +194,7 @@
 
             var mocks = new MockRepository();
             var failureMechanismContributionNormChangeHandler = mocks.StrictMock<IFailureMechanismContributionNormChangeHandler>();
-            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeNorm(null))
+            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeProbability(null))
                                                          .IgnoreArguments()
                                                          .WhenCalled(invocation =>
                                                          {
@@ -224,7 +224,7 @@
 
             var mocks = new MockRepository();
             var failureMechanismContributionNormChangeHandler = mocks.StrictMock<IFailureMechanismContributionNormChangeHandler>();
-            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeNormativeNorm(null))
+            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeNormativeProbability(null))
                                                          .IgnoreArguments()
                                                          .WhenCalled(invocation =>
                                                          {
@@ -253,7 +253,7 @@
 
             var mocks = new MockRepository();
             var failureMechanismContributionNormChangeHandler = mocks.StrictMock<IFailureMechanismContributionNormChangeHandler>();
-            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeNorm(null))
+            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeProbability(null))
                                                          .IgnoreArguments()
                                                          .WhenCalled(invocation =>
                                                          {
@@ -282,7 +282,7 @@
 
             var mocks = new MockRepository();
             var failureMechanismContributionNormChangeHandler = mocks.StrictMock<IFailureMechanismContributionNormChangeHandler>();
-            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeNormativeNormType(null))
+            failureMechanismContributionNormChangeHandler.Expect(h => h.ChangeNormativeProbabilityType(null))
                                                          .IgnoreArguments()
                                                          .WhenCalled(invocation =>
                                                          {
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -rfd0878d829eff722d33331e9a95f7b75ad6c6e9c
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs	(.../FailureMechanismContributionNormChangeHandlerTest.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs	(.../FailureMechanismContributionNormChangeHandlerTest.cs)	(revision fd0878d829eff722d33331e9a95f7b75ad6c6e9c)
@@ -76,7 +76,7 @@
         }
 
         [Test]
-        public void ChangeNormativeNormType_ActionNull_ThrowsArgumentNullException()
+        public void ChangeNormativeProbabilityType_ActionNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
@@ -86,7 +86,7 @@
             var handler = new FailureMechanismContributionNormChangeHandler(assessmentSection);
 
             // Call
-            void Call() => handler.ChangeNormativeNormType(null);
+            void Call() => handler.ChangeNormativeProbabilityType(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -95,7 +95,7 @@
         }
 
         [Test]
-        public void ChangeNormativeNormType_WithAction_ConfirmationRequired()
+        public void ChangeNormativeProbabilityType_WithAction_ConfirmationRequired()
         {
             // Setup
             var title = "";
@@ -116,7 +116,7 @@
             var handler = new FailureMechanismContributionNormChangeHandler(assessmentSection);
 
             // Call
-            handler.ChangeNormativeNormType(() => {});
+            handler.ChangeNormativeProbabilityType(() => {});
 
             // Assert
             Assert.AreEqual("Bevestigen", title);
@@ -129,7 +129,7 @@
         }
 
         [Test]
-        public void GivenCalculationsWithOutput_WhenChangingNormativeNormType_ThenAllDependingOutputClearedAndActionPerformedAndAllAffectedObjectsNotified()
+        public void GivenCalculationsWithOutput_WhenChangingNormativeProbabilityType_ThenAllDependingOutputClearedAndActionPerformedAndAllAffectedObjectsNotified()
         {
             // Given
             DialogBoxHandler = (name, wnd) =>
@@ -166,7 +166,7 @@
 
             // When
             var actionPerformed = false;
-            void Call() => handler.ChangeNormativeNormType(() => actionPerformed = true);
+            void Call() => handler.ChangeNormativeProbabilityType(() => actionPerformed = true);
 
             // Then
             var expectedMessages = new[]
@@ -180,7 +180,7 @@
         }
 
         [Test]
-        public void GivenCalculationsWithoutOutput_WhenChangingNormativeNormType_ThenActionPerformedAndContributionNotified()
+        public void GivenCalculationsWithoutOutput_WhenChangingNormativeProbabilityType_ThenActionPerformedAndContributionNotified()
         {
             // Given
             DialogBoxHandler = (name, wnd) =>
@@ -212,7 +212,7 @@
 
             // When
             var actionPerformed = false;
-            void Call() => handler.ChangeNormativeNormType(() => actionPerformed = true);
+            void Call() => handler.ChangeNormativeProbabilityType(() => actionPerformed = true);
 
             // Then
             TestHelper.AssertLogMessagesCount(Call, 0);
@@ -221,7 +221,7 @@
         }
 
         [Test]
-        public void ChangeNormativeNormActionNull_ThrowsArgumentNullException()
+        public void ChangeNormativeProbability_ActionNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
@@ -231,7 +231,7 @@
             var handler = new FailureMechanismContributionNormChangeHandler(assessmentSection);
 
             // Call
-            void Call() => handler.ChangeNormativeNorm(null);
+            void Call() => handler.ChangeNormativeProbability(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -240,7 +240,7 @@
         }
 
         [Test]
-        public void ChangeNormativeNorm_WithAction_ConfirmationRequired()
+        public void ChangeNormativeProbability_WithAction_ConfirmationRequired()
         {
             // Setup
             var title = "";
@@ -261,7 +261,7 @@
             var handler = new FailureMechanismContributionNormChangeHandler(assessmentSection);
 
             // Call
-            handler.ChangeNormativeNorm(() => {});
+            handler.ChangeNormativeProbability(() => {});
 
             // Assert
             Assert.AreEqual("Bevestigen", title);
@@ -274,8 +274,8 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetChangeNormativeNormCases))]
-        public void GivenCalculationsWithOutput_WhenChangingNormativeNorm_ThenAllDependingOutputClearedAndActionPerformedAndAllAffectedObjectsNotified(
+        [TestCaseSource(nameof(GetChangeNormativeProbabilityCases))]
+        public void GivenCalculationsWithOutput_WhenChangingNormativeProbability_ThenAllDependingOutputClearedAndActionPerformedAndAllAffectedObjectsNotified(
             NormativeProbabilityType normativeProbabilityType, Func<AssessmentSection, IEnumerable<HydraulicBoundaryLocationCalculation>> getLocationCalculationsFunc,
             WaveConditionsInputWaterLevelType waterLevelType)
         {
@@ -337,7 +337,7 @@
 
             // When
             var actionPerformed = false;
-            void Call() => handler.ChangeNormativeNorm(() => actionPerformed = true);
+            void Call() => handler.ChangeNormativeProbability(() => actionPerformed = true);
 
             // Then
             var expectedMessages = new[]
@@ -355,8 +355,8 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetChangeNormativeNormCases))]
-        public void GivenCalculationsWithoutOutput_WhenChangingNormativeNorm_ThenActionPerformedAndContributionNotified(
+        [TestCaseSource(nameof(GetChangeNormativeProbabilityCases))]
+        public void GivenCalculationsWithoutOutput_WhenChangingNormativeProbability_ThenActionPerformedAndContributionNotified(
             NormativeProbabilityType normativeProbabilityType, Func<AssessmentSection, IEnumerable<HydraulicBoundaryLocationCalculation>> getLocationCalculationsFunc,
             WaveConditionsInputWaterLevelType waterLevelType)
         {
@@ -412,7 +412,7 @@
 
             // When
             var actionPerformed = false;
-            void Call() => handler.ChangeNormativeNorm(() => actionPerformed = true);
+            void Call() => handler.ChangeNormativeProbability(() => actionPerformed = true);
 
             // Then
             TestHelper.AssertLogMessagesCount(Call, 0);
@@ -421,7 +421,7 @@
         }
 
         [Test]
-        public void ChangeNormActionNull_ThrowsArgumentNullException()
+        public void ChangeProbability_ActionNull_ThrowsArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
@@ -431,7 +431,7 @@
             var handler = new FailureMechanismContributionNormChangeHandler(assessmentSection);
 
             // Call
-            void Call() => handler.ChangeNorm(null);
+            void Call() => handler.ChangeProbability(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -440,7 +440,7 @@
         }
 
         [Test]
-        public void ChangeNorm_WithAction_ConfirmationRequired()
+        public void ChangeProbability_WithAction_ConfirmationRequired()
         {
             // Setup
             var title = "";
@@ -461,7 +461,7 @@
             var handler = new FailureMechanismContributionNormChangeHandler(assessmentSection);
 
             // Call
-            handler.ChangeNorm(() => {});
+            handler.ChangeProbability(() => {});
 
             // Assert
             Assert.AreEqual("Bevestigen", title);
@@ -474,8 +474,8 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetChangeNormCases))]
-        public void GivenCalculationsWithOutput_WhenChangingNorm_ThenAllDependingOutputClearedAndActionPerformedAndAllAffectedObjectsNotified(
+        [TestCaseSource(nameof(GetChangeProbabilityCases))]
+        public void GivenCalculationsWithOutput_WhenChangingProbability_ThenAllDependingOutputClearedAndActionPerformedAndAllAffectedObjectsNotified(
             NormativeProbabilityType normativeProbabilityType, Func<AssessmentSection, IEnumerable<HydraulicBoundaryLocationCalculation>> getCalculationsFunc,
             WaveConditionsInputWaterLevelType waterLevelType)
         {
@@ -527,7 +527,7 @@
 
             // When
             var actionPerformed = false;
-            void Call() => handler.ChangeNorm(() => actionPerformed = true);
+            void Call() => handler.ChangeProbability(() => actionPerformed = true);
 
             // Then
             var expectedMessages = new[]
@@ -543,8 +543,8 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(GetChangeNormCases))]
-        public void GivenCalculationsWithoutOutput_WhenChangingNorm_ThenActionPerformedAndContributionNotified(
+        [TestCaseSource(nameof(GetChangeProbabilityCases))]
+        public void GivenCalculationsWithoutOutput_WhenChangingProbability_ThenActionPerformedAndContributionNotified(
             NormativeProbabilityType normativeProbabilityType, Func<AssessmentSection, IEnumerable<HydraulicBoundaryLocationCalculation>> getLocationCalculationsFunc,
             WaveConditionsInputWaterLevelType waterLevelType)
         {
@@ -591,15 +591,15 @@
 
             // When
             var actionPerformed = false;
-            void Call() => handler.ChangeNorm(() => actionPerformed = true);
+            void Call() => handler.ChangeProbability(() => actionPerformed = true);
 
             // Then
             TestHelper.AssertLogMessagesCount(Call, 0);
             Assert.IsTrue(actionPerformed);
             mocks.VerifyAll();
         }
 
-        private static IEnumerable<TestCaseData> GetChangeNormativeNormCases()
+        private static IEnumerable<TestCaseData> GetChangeNormativeProbabilityCases()
         {
             yield return new TestCaseData(
                 NormativeProbabilityType.MaximumAllowableFloodingProbability, new Func<AssessmentSection, IEnumerable<HydraulicBoundaryLocationCalculation>>(
@@ -611,7 +611,7 @@
                 WaveConditionsInputWaterLevelType.SignalFloodingProbability);
         }
 
-        private static IEnumerable<TestCaseData> GetChangeNormCases()
+        private static IEnumerable<TestCaseData> GetChangeProbabilityCases()
         {
             yield return new TestCaseData(
                 NormativeProbabilityType.MaximumAllowableFloodingProbability, new Func<AssessmentSection, IEnumerable<HydraulicBoundaryLocationCalculation>>(