Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs
===================================================================
diff -u -rd75cba7f33dd4264452ed4dcceddd5ec79b210ea -r60c186de01b089481c7393257abeb730241ac5f4
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs	(.../AssemblyToolCategoriesFactory.cs)	(revision d75cba7f33dd4264452ed4dcceddd5ec79b210ea)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs	(.../AssemblyToolCategoriesFactory.cs)	(revision 60c186de01b089481c7393257abeb730241ac5f4)
@@ -122,16 +122,14 @@
         /// <summary>
         /// Creates the geotechnical failure mechanism section assembly categories.
         /// </summary>
-        /// <param name="signalingNorm">The signaling norm to use in the calculation.</param>
-        /// <param name="lowerLimitNorm">The lower limit norm to use in the calculation.</param>
+        /// <param name="normativeNorm">The norm to use in the calculation.</param>
         /// <param name="failureMechanismContribution">The failure mechanism contribution to calculate with.</param>
         /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
         /// <returns>An <see cref="IEnumerable{T}"/> with categories of
         /// <see cref="FailureMechanismSectionAssemblyCategory"/>.</returns>
         /// <exception cref="AssemblyException">Thrown when an error occurred while creating the categories.</exception>
         public static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateGeotechnicalFailureMechanismSectionAssemblyCategories(
-            double signalingNorm,
-            double lowerLimitNorm,
+            double normativeNorm,
             double failureMechanismContribution,
             double n)
         {
@@ -140,10 +138,9 @@
 
             try
             {
-                return calculator.CalculateGeotechnicalFailureMechanismSectionCategories(new AssemblyCategoriesInput(n,
-                                                                                                                     failureMechanismContribution,
-                                                                                                                     signalingNorm,
-                                                                                                                     lowerLimitNorm));
+                return calculator.CalculateGeotechnicalFailureMechanismSectionCategories(normativeNorm,
+                                                                                         n,
+                                                                                         failureMechanismContribution);
             }
             catch (AssemblyCategoriesCalculatorException e)
             {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/GeotechnicalFailureMechanismAssemblyCategoriesContext.cs
===================================================================
diff -u -r9b496f8bf4a477227a06cb1716f2f02966c80ef1 -r60c186de01b089481c7393257abeb730241ac5f4
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/GeotechnicalFailureMechanismAssemblyCategoriesContext.cs	(.../GeotechnicalFailureMechanismAssemblyCategoriesContext.cs)	(revision 9b496f8bf4a477227a06cb1716f2f02966c80ef1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/GeotechnicalFailureMechanismAssemblyCategoriesContext.cs	(.../GeotechnicalFailureMechanismAssemblyCategoriesContext.cs)	(revision 60c186de01b089481c7393257abeb730241ac5f4)
@@ -47,8 +47,7 @@
             : base(wrappedData, assessmentSection, getNFunc)
         {
             GetFailureMechanismSectionAssemblyCategoriesFunc = () =>
-                AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(FailureMechanismContribution.SignalingNorm,
-                                                                                                          FailureMechanismContribution.LowerLimitNorm,
+                AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(assessmentSection.FailureMechanismContribution.Norm,
                                                                                                           wrappedData.Contribution,
                                                                                                           getNFunc());
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs
===================================================================
diff -u -r4f8de1ec63217365ef12dbbca6092f49a4b24113 -r60c186de01b089481c7393257abeb730241ac5f4
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs	(.../AssemblyToolCategoriesFactoryTest.cs)	(revision 4f8de1ec63217365ef12dbbca6092f49a4b24113)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyToolCategoriesFactoryTest.cs	(.../AssemblyToolCategoriesFactoryTest.cs)	(revision 60c186de01b089481c7393257abeb730241ac5f4)
@@ -272,8 +272,7 @@
         {
             // Setup
             var random = new Random(11);
-            double signalingNorm = random.NextDouble();
-            double lowerLimitNorm = random.NextDouble();
+            double normativeNorm = random.NextDouble();
             double failureMechanismContribution = random.NextDouble();
             double n = random.NextDouble();
 
@@ -283,17 +282,14 @@
                 AssemblyCategoriesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyCategoriesCalculator;
 
                 // Call
-                AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(signalingNorm,
-                                                                                                          lowerLimitNorm,
+                AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(normativeNorm,
                                                                                                           failureMechanismContribution,
                                                                                                           n);
 
                 // Assert
-                AssemblyCategoriesInput assemblyCategoriesInput = calculator.AssemblyCategoriesInput;
-                Assert.AreEqual(signalingNorm, assemblyCategoriesInput.SignalingNorm);
-                Assert.AreEqual(lowerLimitNorm, assemblyCategoriesInput.LowerLimitNorm);
-                Assert.AreEqual(failureMechanismContribution / 100, assemblyCategoriesInput.FailureMechanismContribution);
-                Assert.AreEqual(n, assemblyCategoriesInput.N);
+                Assert.AreEqual(normativeNorm, calculator.NormativeNorm);
+                Assert.AreEqual(failureMechanismContribution / 100, calculator.FailureMechanismContribution);
+                Assert.AreEqual(n, calculator.FailureMechanismN);
             }
         }
 
@@ -302,8 +298,7 @@
         {
             // Setup
             var random = new Random(11);
-            double signalingNorm = random.NextDouble();
-            double lowerLimitNorm = random.NextDouble();
+            double normativeNorm = random.NextDouble();
             double failureMechanismContribution = random.NextDouble();
             double n = random.NextDouble();
 
@@ -314,8 +309,7 @@
 
                 // Call
                 FailureMechanismSectionAssemblyCategory[] output = AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(
-                    signalingNorm,
-                    lowerLimitNorm,
+                    normativeNorm,
                     failureMechanismContribution,
                     n).ToArray();
 
@@ -340,7 +334,7 @@
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
-                TestDelegate test = () => AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(0, 0, 0, 0);
+                TestDelegate test = () => AssemblyToolCategoriesFactory.CreateGeotechnicalFailureMechanismSectionAssemblyCategories(0, 0, 0);
 
                 // Assert
                 var exception = Assert.Throws<AssemblyException>(test);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/GeotechnicalFailureMechanismAssemblyCategoriesContextTest.cs
===================================================================
diff -u -r1afad22e15469e5656c2cab8e59223e82d29503f -r60c186de01b089481c7393257abeb730241ac5f4
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/GeotechnicalFailureMechanismAssemblyCategoriesContextTest.cs	(.../GeotechnicalFailureMechanismAssemblyCategoriesContextTest.cs)	(revision 1afad22e15469e5656c2cab8e59223e82d29503f)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/GeotechnicalFailureMechanismAssemblyCategoriesContextTest.cs	(.../GeotechnicalFailureMechanismAssemblyCategoriesContextTest.cs)	(revision 60c186de01b089481c7393257abeb730241ac5f4)
@@ -72,12 +72,10 @@
                 IEnumerable<FailureMechanismSectionAssemblyCategory> calculatorOutput = calculator.GeoTechnicalFailureMechanismSectionCategoriesOutput;
                 Assert.AreSame(calculatorOutput, output);
 
-                AssemblyCategoriesInput actualCalculatorInput = calculator.AssemblyCategoriesInput;
-                FailureMechanismContribution expectedContribution = assessmentSection.FailureMechanismContribution;
-                Assert.AreEqual(failureMechanism.Contribution / 100, actualCalculatorInput.FailureMechanismContribution, tolerance);
-                Assert.AreEqual(expectedContribution.LowerLimitNorm, actualCalculatorInput.LowerLimitNorm, tolerance);
-                Assert.AreEqual(expectedContribution.SignalingNorm, actualCalculatorInput.SignalingNorm, tolerance);
-                Assert.AreEqual(n, actualCalculatorInput.N);
+                double normativeNorm = assessmentSection.FailureMechanismContribution.Norm;
+                Assert.AreEqual(failureMechanism.Contribution / 100, calculator.FailureMechanismContribution, tolerance);
+                Assert.AreEqual(normativeNorm, calculator.NormativeNorm, tolerance);
+                Assert.AreEqual(n, calculator.FailureMechanismN);
             }
 
             mocks.VerifyAll();