Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -r6a448aca43aee6e9ee31fbaef4f6421d49cbb871 -rbd25b82af4577a5726d49a82878e056f21249cd2
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision 6a448aca43aee6e9ee31fbaef4f6421d49cbb871)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision bd25b82af4577a5726d49a82878e056f21249cd2)
@@ -56,8 +56,8 @@
         }
 
         public AssessmentSectionAssemblyResult AssembleAssessmentSection(IEnumerable<double> failureMechanismProbabilities,
-                                                                         double lowerLimitNorm,
-                                                                         double signalingNorm)
+                                                                         double maximumAllowableFloodingProbability,
+                                                                         double signalFloodingProbability)
         {
             if (failureMechanismProbabilities == null)
             {
@@ -68,8 +68,8 @@
             {
                 ICategoryLimitsCalculator categoryLimitsKernel = factory.CreateAssemblyGroupsKernel();
                 CategoriesList<AssessmentSectionCategory> assessmentSectionCategories = categoryLimitsKernel.CalculateAssessmentSectionCategoryLimitsWbi21(
-                    new AssessmentSection(AssemblyCalculatorInputCreator.CreateProbability(signalingNorm),
-                                          AssemblyCalculatorInputCreator.CreateProbability(lowerLimitNorm)));
+                    new AssessmentSection(AssemblyCalculatorInputCreator.CreateProbability(signalFloodingProbability),
+                                          AssemblyCalculatorInputCreator.CreateProbability(maximumAllowableFloodingProbability)));
 
                 IAssessmentGradeAssembler assessmentSectionAssemblyKernel = factory.CreateAssessmentSectionAssemblyKernel();
                 IEnumerable<Probability> probabilities = failureMechanismProbabilities.Select(AssemblyCalculatorInputCreator.CreateProbability)
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -r6a448aca43aee6e9ee31fbaef4f6421d49cbb871 -rbd25b82af4577a5726d49a82878e056f21249cd2
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision 6a448aca43aee6e9ee31fbaef4f6421d49cbb871)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision bd25b82af4577a5726d49a82878e056f21249cd2)
@@ -34,15 +34,15 @@
         /// Assembles an assessment section based on the input arguments.
         /// </summary>
         /// <param name="failureMechanismProbabilities">The collection of failure mechanism probabilities.</param>
-        /// <param name="lowerLimitNorm">The lower limit norm to assemble with.</param>
-        /// <param name="signalingNorm">The signaling norm to assemble with.</param>
+        /// <param name="maximumAllowableFloodingProbability">The maximum allowable flooding probability to assemble with.</param>
+        /// <param name="signalFloodingProbability">The signal flooding probability to assemble with.</param>
         /// <returns>A <see cref="AssessmentSectionAssemblyResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanismProbabilities"/> is <c>null</c>.</exception>
         /// <exception cref="AssessmentSectionAssemblyCalculatorException">Thrown when
         /// an error occurs while assembling.</exception>
         AssessmentSectionAssemblyResult AssembleAssessmentSection(IEnumerable<double> failureMechanismProbabilities,
-                                                                  double lowerLimitNorm,
-                                                                  double signalingNorm);
+                                                                  double maximumAllowableFloodingProbability,
+                                                                  double signalFloodingProbability);
 
         /// <summary>
         /// Assembles the combined assessment section for the given input.
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs
===================================================================
diff -u -r4ad626086bf2bd4729ecdc7cd3e823091f264422 -rbd25b82af4577a5726d49a82878e056f21249cd2
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs	(.../AssessmentSectionAssemblyCalculatorStub.cs)	(revision 4ad626086bf2bd4729ecdc7cd3e823091f264422)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs	(.../AssessmentSectionAssemblyCalculatorStub.cs)	(revision bd25b82af4577a5726d49a82878e056f21249cd2)
@@ -43,14 +43,14 @@
         public IEnumerable<double> FailureMechanismProbabilitiesInput { get; private set; }
 
         /// <summary>
-        /// Gets the lower limit norm input.
+        /// Gets the maximum allowable flooding probability input.
         /// </summary>
-        public double LowerLimitNormInput { get; private set; }
+        public double MaximumAllowableFloodingProbabilityInput { get; private set; }
 
         /// <summary>
-        /// Gets the signaling norm input.
+        /// Gets the signal flooding probability input.
         /// </summary>
-        public double SignalingNormInput { get; private set; }
+        public double SignalFloodingProbability { get; private set; }
 
         /// <summary>
         /// Gets or sets the output of an assessment section assembly.
@@ -72,16 +72,16 @@
         /// </summary>
         public IEnumerable<CombinedFailureMechanismSectionAssembly> CombinedFailureMechanismSectionAssemblyOutput { get; set; }
 
-        public AssessmentSectionAssemblyResult AssembleAssessmentSection(IEnumerable<double> failureMechanismProbabilities, double lowerLimitNorm, double signalingNorm)
+        public AssessmentSectionAssemblyResult AssembleAssessmentSection(IEnumerable<double> failureMechanismProbabilities, double maximumAllowableFloodingProbability, double signalFloodingProbability)
         {
             if (ThrowExceptionOnCalculate)
             {
                 throw new AssessmentSectionAssemblyCalculatorException("Message", new Exception());
             }
 
             FailureMechanismProbabilitiesInput = failureMechanismProbabilities;
-            LowerLimitNormInput = lowerLimitNorm;
-            SignalingNormInput = signalingNorm;
+            MaximumAllowableFloodingProbabilityInput = maximumAllowableFloodingProbability;
+            SignalFloodingProbability = signalFloodingProbability;
 
             return AssessmentSectionAssemblyResult ?? (AssessmentSectionAssemblyResult = new AssessmentSectionAssemblyResult(0.14, AssessmentSectionAssemblyGroup.APlus));
         }
Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs
===================================================================
diff -u -r391d022746e1bd895983935af75594fd3b1912d4 -rbd25b82af4577a5726d49a82878e056f21249cd2
--- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs	(.../AssessmentSectionAssemblyFactoryTest.cs)	(revision 391d022746e1bd895983935af75594fd3b1912d4)
+++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs	(.../AssessmentSectionAssemblyFactoryTest.cs)	(revision bd25b82af4577a5726d49a82878e056f21249cd2)
@@ -73,8 +73,8 @@
 
                 // Assert
                 FailureMechanismContribution contribution = assessmentSection.FailureMechanismContribution;
-                Assert.AreEqual(contribution.SignalFloodingProbability, assessmentSectionAssemblyCalculator.SignalingNormInput);
-                Assert.AreEqual(contribution.MaximumAllowableFloodingProbability, assessmentSectionAssemblyCalculator.LowerLimitNormInput);
+                Assert.AreEqual(contribution.SignalFloodingProbability, assessmentSectionAssemblyCalculator.SignalFloodingProbability);
+                Assert.AreEqual(contribution.MaximumAllowableFloodingProbability, assessmentSectionAssemblyCalculator.MaximumAllowableFloodingProbabilityInput);
 
                 int expectedNrOfProbabilities = assessmentSection.GetFailureMechanisms()
                                                                  .Concat(assessmentSection.SpecificFailureMechanisms)