Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -rdb2a21e6d5285bfd38f4797c30ed4d7c71b3215e -rd100891e1e3198966bf906399f570a1e1c0849fb
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision db2a21e6d5285bfd38f4797c30ed4d7c71b3215e)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IAssessmentSectionAssemblyCalculator.cs	(.../IAssessmentSectionAssemblyCalculator.cs)	(revision d100891e1e3198966bf906399f570a1e1c0849fb)
@@ -35,22 +35,22 @@
         /// <param name="input">The collection of failure mechanism assemblies to assemble for.</param>
         /// <param name="signalingNorm">The signaling norm to calculate with.</param>
         /// <param name="lowerLimitNorm">The lower limit norm to calculate with.</param>
-        /// <returns>An <see cref="AssessmentSectionAssembly"/>.</returns>
+        /// <returns>An <see cref="FailureMechanismAssembly"/>.</returns>
         /// <exception cref="AssessmentSectionAssemblyCalculatorException">Thrown when
         /// an error occurs while assembling.</exception>
-        AssessmentSectionAssembly AssembleFailureMechanisms(IEnumerable<FailureMechanismAssembly> input,
-                                                            double signalingNorm,
-                                                            double lowerLimitNorm);
+        FailureMechanismAssembly AssembleFailureMechanisms(IEnumerable<FailureMechanismAssembly> input,
+                                                           double signalingNorm,
+                                                           double lowerLimitNorm);
 
         /// <summary>
         /// Assembles the failure mechanisms for the given <paramref name="input"/>.
         /// </summary>
         /// <param name="input">The collection of failure mechanism assembly category groups
         /// to assemble for.</param>
-        /// <returns>An <see cref="AssessmentSectionAssemblyCategoryGroup"/>.</returns>
+        /// <returns>An <see cref="FailureMechanismAssemblyCategoryGroup"/>.</returns>
         /// <exception cref="AssessmentSectionAssemblyCalculatorException">Thrown when
         /// an error occurs while assembling.</exception>
-        AssessmentSectionAssemblyCategoryGroup AssembleFailureMechanisms(IEnumerable<FailureMechanismAssemblyCategoryGroup> input);
+        FailureMechanismAssemblyCategoryGroup AssembleFailureMechanisms(IEnumerable<FailureMechanismAssemblyCategoryGroup> input);
 
         /// <summary>
         /// Assembles the assessment section for the given inputs.
@@ -62,8 +62,8 @@
         /// <returns>An <see cref="AssessmentSectionAssemblyCategoryGroup"/>.</returns>
         /// <exception cref="AssessmentSectionAssemblyCalculatorException">Thrown when
         /// an error occurs while assembling.</exception>
-        AssessmentSectionAssemblyCategoryGroup AssembleAssessmentSection(AssessmentSectionAssemblyCategoryGroup failureMechanismsWithoutProbability,
-                                                                         AssessmentSectionAssembly failureMechanismsWithProbability);
+        AssessmentSectionAssemblyCategoryGroup AssembleAssessmentSection(FailureMechanismAssemblyCategoryGroup failureMechanismsWithoutProbability,
+                                                                         FailureMechanismAssembly failureMechanismsWithProbability);
 
         /// <summary>
         /// Assembles the combined assessment section for the given input.
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs
===================================================================
diff -u -r5d0928a8491661dce472e35fef6aeac9227ccf7f -rd100891e1e3198966bf906399f570a1e1c0849fb
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs	(.../AssessmentSectionAssemblyCalculatorStubTest.cs)	(revision 5d0928a8491661dce472e35fef6aeac9227ccf7f)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs	(.../AssessmentSectionAssemblyCalculatorStubTest.cs)	(revision d100891e1e3198966bf906399f570a1e1c0849fb)
@@ -58,8 +58,8 @@
             var calculator = new AssessmentSectionAssemblyCalculatorStub();
 
             // Call
-            AssessmentSectionAssembly output = calculator.AssembleFailureMechanisms(Enumerable.Empty<FailureMechanismAssembly>(),
-                                                                                    random.NextDouble(), random.NextDouble());
+            FailureMechanismAssembly output = calculator.AssembleFailureMechanisms(Enumerable.Empty<FailureMechanismAssembly>(),
+                                                                                   random.NextDouble(), random.NextDouble());
 
             // Assert
             Assert.AreEqual(0.75, output.Probability);
@@ -73,13 +73,13 @@
             var random = new Random(21);
             var calculator = new AssessmentSectionAssemblyCalculatorStub
             {
-                AssembleFailureMechanismsAssemblyOutput = new AssessmentSectionAssembly(random.NextDouble(),
-                                                                                        random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>())
+                AssembleFailureMechanismsAssemblyOutput = new FailureMechanismAssembly(random.NextDouble(),
+                                                                                       random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>())
             };
 
             // Call
-            AssessmentSectionAssembly output = calculator.AssembleFailureMechanisms(Enumerable.Empty<FailureMechanismAssembly>(),
-                                                                                    random.NextDouble(), random.NextDouble());
+            FailureMechanismAssembly output = calculator.AssembleFailureMechanisms(Enumerable.Empty<FailureMechanismAssembly>(),
+                                                                                   random.NextDouble(), random.NextDouble());
 
             // Assert
             Assert.AreSame(calculator.AssembleFailureMechanismsAssemblyOutput, output);
@@ -134,7 +134,7 @@
             var calculator = new AssessmentSectionAssemblyCalculatorStub();
 
             // Call
-            AssessmentSectionAssemblyCategoryGroup output = calculator.AssembleFailureMechanisms(Enumerable.Empty<FailureMechanismAssemblyCategoryGroup>());
+            FailureMechanismAssemblyCategoryGroup output = calculator.AssembleFailureMechanisms(Enumerable.Empty<FailureMechanismAssemblyCategoryGroup>());
 
             // Assert
             Assert.AreEqual(AssessmentSectionAssemblyCategoryGroup.D, output);
@@ -147,11 +147,11 @@
             var random = new Random(21);
             var calculator = new AssessmentSectionAssemblyCalculatorStub
             {
-                AssembleFailureMechanismsAssemblyCategoryGroupOutput = random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>()
+                AssembleFailureMechanismsAssemblyCategoryGroupOutput = random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>()
             };
 
             // Call
-            AssessmentSectionAssemblyCategoryGroup output = calculator.AssembleFailureMechanisms(Enumerable.Empty<FailureMechanismAssemblyCategoryGroup>());
+            FailureMechanismAssemblyCategoryGroup output = calculator.AssembleFailureMechanisms(Enumerable.Empty<FailureMechanismAssemblyCategoryGroup>());
 
             // Assert
             Assert.AreEqual(calculator.AssembleFailureMechanismsAssemblyCategoryGroupOutput, output);
@@ -198,9 +198,9 @@
 
             // Call
             AssessmentSectionAssemblyCategoryGroup output =
-                calculator.AssembleAssessmentSection(random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>(),
-                                                     new AssessmentSectionAssembly(random.NextDouble(),
-                                                                                   random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>()));
+                calculator.AssembleAssessmentSection(random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>(),
+                                                     new FailureMechanismAssembly(random.NextDouble(),
+                                                                                  random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>()));
 
             // Assert
             Assert.AreEqual(AssessmentSectionAssemblyCategoryGroup.C, output);
@@ -218,9 +218,9 @@
 
             // Call
             AssessmentSectionAssemblyCategoryGroup output =
-                calculator.AssembleAssessmentSection(random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>(),
-                                                     new AssessmentSectionAssembly(random.NextDouble(),
-                                                                                   random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>()));
+                calculator.AssembleAssessmentSection(random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>(),
+                                                     new FailureMechanismAssembly(random.NextDouble(),
+                                                                                  random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>()));
 
             // Assert
             Assert.AreEqual(calculator.AssembleAssessmentSectionCategoryGroupOutput, output);
@@ -231,9 +231,9 @@
         {
             // Setup
             var random = new Random(21);
-            var failureMechanismsWithoutProbability = random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>();
-            var failureMechanismsWithProbability = new AssessmentSectionAssembly(random.NextDouble(),
-                                                                                 random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>());
+            var failureMechanismsWithoutProbability = random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>();
+            var failureMechanismsWithProbability = new FailureMechanismAssembly(random.NextDouble(),
+                                                                                random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>());
             var calculator = new AssessmentSectionAssemblyCalculatorStub();
 
             // Call
@@ -256,9 +256,9 @@
 
             // Call
             TestDelegate call = () =>
-                calculator.AssembleAssessmentSection(random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>(),
-                                                     new AssessmentSectionAssembly(random.NextDouble(),
-                                                                                   random.NextEnumValue<AssessmentSectionAssemblyCategoryGroup>()));
+                calculator.AssembleAssessmentSection(random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>(),
+                                                     new FailureMechanismAssembly(random.NextDouble(),
+                                                                                  random.NextEnumValue<FailureMechanismAssemblyCategoryGroup>()));
 
             // Assert
             var exception = Assert.Throws<AssessmentSectionAssemblyCalculatorException>(call);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs
===================================================================
diff -u -rcba20421f85c9a64ac28122303978067e07dcaaa -rd100891e1e3198966bf906399f570a1e1c0849fb
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs	(.../AssessmentSectionAssemblyCalculatorStub.cs)	(revision cba20421f85c9a64ac28122303978067e07dcaaa)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStub.cs	(.../AssessmentSectionAssemblyCalculatorStub.cs)	(revision d100891e1e3198966bf906399f570a1e1c0849fb)
@@ -59,12 +59,12 @@
         /// <summary>
         /// Gets the failure mechanisms without probability input when assembling the assessment section.
         /// </summary>
-        public AssessmentSectionAssemblyCategoryGroup FailureMechanismsWithoutProbabilityInput { get; private set; }
+        public FailureMechanismAssemblyCategoryGroup FailureMechanismsWithoutProbabilityInput { get; private set; }
 
         /// <summary>
         /// Gets the failure mechanisms with probability input when assembling the assessment section.
         /// </summary>
-        public AssessmentSectionAssembly FailureMechanismsWithProbabilityInput { get; private set; }
+        public FailureMechanismAssembly FailureMechanismsWithProbabilityInput { get; private set; }
 
         /// <summary>
         /// Gets the combined failure mechanism sections input.
@@ -80,13 +80,13 @@
         /// Gets or sets the output of the assessment section assembly for failure
         ///  mechanisms with probability.
         /// </summary>
-        public AssessmentSectionAssembly AssembleFailureMechanismsAssemblyOutput { get; set; }
+        public FailureMechanismAssembly AssembleFailureMechanismsAssemblyOutput { get; set; }
 
         /// <summary>
         /// Gets or sets the output of the assessment section assembly category group when assembling failure 
         /// mechanisms without probability.
         /// </summary>
-        public AssessmentSectionAssemblyCategoryGroup? AssembleFailureMechanismsAssemblyCategoryGroupOutput { get; set; }
+        public FailureMechanismAssemblyCategoryGroup? AssembleFailureMechanismsAssemblyCategoryGroupOutput { get; set; }
 
         /// <summary>
         /// Gets or sets the output of the assessment section assembly category group 
@@ -104,9 +104,9 @@
         /// </summary>
         public bool ThrowExceptionOnCalculate { private get; set; }
 
-        public AssessmentSectionAssembly AssembleFailureMechanisms(IEnumerable<FailureMechanismAssembly> input,
-                                                                   double signalingNorm,
-                                                                   double lowerLimitNorm)
+        public FailureMechanismAssembly AssembleFailureMechanisms(IEnumerable<FailureMechanismAssembly> input,
+                                                                  double signalingNorm,
+                                                                  double lowerLimitNorm)
         {
             if (ThrowExceptionOnCalculate)
             {
@@ -118,10 +118,10 @@
             SignalingNormInput = signalingNorm;
 
             return AssembleFailureMechanismsAssemblyOutput ??
-                   new AssessmentSectionAssembly(0.75, AssessmentSectionAssemblyCategoryGroup.D);
+                   new FailureMechanismAssembly(0.75, FailureMechanismAssemblyCategoryGroup.IIIt);
         }
 
-        public AssessmentSectionAssemblyCategoryGroup AssembleFailureMechanisms(IEnumerable<FailureMechanismAssemblyCategoryGroup> input)
+        public FailureMechanismAssemblyCategoryGroup AssembleFailureMechanisms(IEnumerable<FailureMechanismAssemblyCategoryGroup> input)
         {
             if (ThrowExceptionOnCalculate)
             {
@@ -132,14 +132,14 @@
 
             if (AssembleFailureMechanismsAssemblyCategoryGroupOutput == null)
             {
-                AssembleFailureMechanismsAssemblyCategoryGroupOutput = AssessmentSectionAssemblyCategoryGroup.D;
+                AssembleFailureMechanismsAssemblyCategoryGroupOutput = FailureMechanismAssemblyCategoryGroup.IIIt;
             }
 
             return AssembleFailureMechanismsAssemblyCategoryGroupOutput.Value;
         }
 
-        public AssessmentSectionAssemblyCategoryGroup AssembleAssessmentSection(AssessmentSectionAssemblyCategoryGroup failureMechanismsWithoutProbability,
-                                                                                AssessmentSectionAssembly failureMechanismsWithProbability)
+        public AssessmentSectionAssemblyCategoryGroup AssembleAssessmentSection(FailureMechanismAssemblyCategoryGroup failureMechanismsWithoutProbability,
+                                                                                FailureMechanismAssembly failureMechanismsWithProbability)
         {
             if (ThrowExceptionOnCalculate)
             {