Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/FailureMechanismAssembly.cs
===================================================================
diff -u -re795afb9d63bcdce8fb0e8902d13654590ea777c -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/FailureMechanismAssembly.cs	(.../FailureMechanismAssembly.cs)	(revision e795afb9d63bcdce8fb0e8902d13654590ea777c)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/FailureMechanismAssembly.cs	(.../FailureMechanismAssembly.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -22,7 +22,7 @@
 namespace Ringtoets.AssemblyTool.Data
 {
     /// <summary>
-    /// Assembly for failure mechanisms.
+    /// Assembly for a failure mechanism.
     /// </summary>
     public class FailureMechanismAssembly
     {
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -radc7ea257dbb54e7beea7b39e78687f09c65fb01 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision adc7ea257dbb54e7beea7b39e78687f09c65fb01)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -52,7 +52,7 @@
             this.factory = factory;
         }
 
-        public FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionCategories)
+        public FailureMechanismAssemblyCategoryGroup Assemble(IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionCategories)
         {
             try
             {
@@ -69,8 +69,8 @@
             }
         }
 
-        public FailureMechanismAssembly AssembleFailureMechanism(IEnumerable<FailureMechanismSectionAssembly> sectionAssemblies,
-                                                                 AssemblyCategoriesInput assemblyCategoriesInput)
+        public FailureMechanismAssembly Assemble(IEnumerable<FailureMechanismSectionAssembly> sectionAssemblies,
+                                                 AssemblyCategoriesInput assemblyCategoriesInput)
         {
             try
             {
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -r9cb9df81153f33c4a236447dc3daf0c65c4a45a3 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs	(.../IFailureMechanismAssemblyCalculator.cs)	(revision 9cb9df81153f33c4a236447dc3daf0c65c4a45a3)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs	(.../IFailureMechanismAssemblyCalculator.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -36,7 +36,7 @@
         /// <returns>A <see cref="FailureMechanismAssemblyCategoryGroup"/>.</returns>
         /// <exception cref="FailureMechanismAssemblyCalculatorException">Thrown when
         /// an error occurs when performing the assembly.</exception>
-        FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionCategories);
+        FailureMechanismAssemblyCategoryGroup Assemble(IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionCategories);
 
         /// <summary>
         /// Assembles the failure mechanism with failure probabilities using the given parameters.
@@ -47,7 +47,7 @@
         /// <returns>A <see cref="FailureMechanismSectionAssembly"/>.</returns>
         /// <exception cref="FailureMechanismAssemblyCalculatorException">Thrown when
         /// an error occurs when performing the assembly.</exception>
-        FailureMechanismAssembly AssembleFailureMechanism(IEnumerable<FailureMechanismSectionAssembly> sectionAssemblies,
+        FailureMechanismAssembly Assemble(IEnumerable<FailureMechanismSectionAssembly> sectionAssemblies,
                                                           AssemblyCategoriesInput assemblyCategoriesInput);
     }
 }
\ No newline at end of file
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs
===================================================================
diff -u -rc0263fd00d9cc433209bbc0f4f68798bfd845bae -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision c0263fd00d9cc433209bbc0f4f68798bfd845bae)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs	(.../AssemblyCategoryCreator.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -48,7 +48,7 @@
         /// contains an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="categoryLimits"/>
         /// contains a valid value, but unsupported.</exception>
-        internal static IEnumerable<AssessmentSectionAssemblyCategory> CreateAssessmentSectionAssemblyCategories(
+        public static IEnumerable<AssessmentSectionAssemblyCategory> CreateAssessmentSectionAssemblyCategories(
             IEnumerable<AssessmentSectionCategoryLimits> categoryLimits)
         {
             if (categoryLimits == null)
@@ -76,7 +76,7 @@
         /// contains an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="categoryLimits"/>
         /// contains a valid value, but unsupported.</exception>
-        internal static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateFailureMechanismSectionAssemblyCategories(
+        public static IEnumerable<FailureMechanismSectionAssemblyCategory> CreateFailureMechanismSectionAssemblyCategories(
             IEnumerable<FmSectionCategoryLimits> categoryLimits)
         {
             if (categoryLimits == null)
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCreator.cs
===================================================================
diff -u -r9cb9df81153f33c4a236447dc3daf0c65c4a45a3 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCreator.cs	(.../FailureMechanismAssemblyCreator.cs)	(revision 9cb9df81153f33c4a236447dc3daf0c65c4a45a3)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismAssemblyCreator.cs	(.../FailureMechanismAssemblyCreator.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -42,7 +42,7 @@
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <see cref="EFailureMechanismCategory"/>
         /// is a valid value, but unsupported.</exception>
-        internal static FailureMechanismAssembly Create(FailureMechanismAssemblyResult result)
+        public static FailureMechanismAssembly Create(FailureMechanismAssemblyResult result)
         {
             if (result == null)
             {
@@ -62,7 +62,7 @@
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="category"/>
         /// is a valid value, but unsupported.</exception>
-        internal static FailureMechanismAssemblyCategoryGroup CreateFailureMechanismAssemblyCategoryGroup(EFailureMechanismCategory category)
+        public static FailureMechanismAssemblyCategoryGroup CreateFailureMechanismAssemblyCategoryGroup(EFailureMechanismCategory category)
         {
             if (!Enum.IsDefined(typeof(EFailureMechanismCategory), category))
             {
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs
===================================================================
diff -u -rc620a480d44f4099fcf02a2ef9cc1d15c586ab03 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs)	(revision c620a480d44f4099fcf02a2ef9cc1d15c586ab03)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -45,7 +45,7 @@
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <see cref="SimpleAssessmentResultType"/>
         /// is a valid value, but unsupported.</exception>
-        internal static EAssessmentResultTypeE1 CreateAssessmentResultTypeE1(SimpleAssessmentResultType input)
+        public static EAssessmentResultTypeE1 CreateAssessmentResultTypeE1(SimpleAssessmentResultType input)
         {
             if (!Enum.IsDefined(typeof(SimpleAssessmentResultType), input))
             {
@@ -78,7 +78,7 @@
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <see cref="SimpleAssessmentValidityOnlyResultType"/>
         /// is a valid value, but unsupported.</exception>
-        internal static EAssessmentResultTypeE2 CreateAssessmentResultTypeE2(SimpleAssessmentValidityOnlyResultType input)
+        public static EAssessmentResultTypeE2 CreateAssessmentResultTypeE2(SimpleAssessmentValidityOnlyResultType input)
         {
             if (!Enum.IsDefined(typeof(SimpleAssessmentValidityOnlyResultType), input))
             {
@@ -114,7 +114,7 @@
         /// a valid but unsupported <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>.</exception>
         /// <exception cref="AssemblyException">Thrown when <paramref name="assembly"/> has an
         /// invalid value.</exception>
-        internal static FmSectionAssemblyDirectResult CreateFailureMechanismSectionAssemblyDirectResult(FailureMechanismSectionAssembly assembly)
+        public static FmSectionAssemblyDirectResult CreateFailureMechanismSectionAssemblyDirectResult(FailureMechanismSectionAssembly assembly)
         {
             if (assembly == null)
             {
@@ -138,7 +138,7 @@
         /// a valid but unsupported <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>.</exception>
         /// <exception cref="AssemblyException">Thrown when <paramref name="categoryGroup"/> has an
         /// invalid value.</exception>
-        internal static FmSectionAssemblyDirectResult CreateFailureMechanismSectionAssemblyDirectResult(
+        public static FmSectionAssemblyDirectResult CreateFailureMechanismSectionAssemblyDirectResult(
             FailureMechanismSectionAssemblyCategoryGroup categoryGroup)
         {
             return new FmSectionAssemblyDirectResult(CreateFailureMechanismSectionCategory(categoryGroup));
@@ -162,7 +162,7 @@
         /// <see cref="DetailedAssessmentResultType"/>.</exception>
         /// <exception cref="NotSupportedException">Thrown when any parameter is a valid, but unsupported
         /// <see cref="DetailedAssessmentResultType"/>.</exception>
-        internal static FmSectionCategoryCompliancyResults CreateCategoryCompliancyResults(
+        public static FmSectionCategoryCompliancyResults CreateCategoryCompliancyResults(
             DetailedAssessmentResultType detailedAssessmentResultForFactorizedSignalingNorm,
             DetailedAssessmentResultType detailedAssessmentResultForSignalingNorm,
             DetailedAssessmentResultType detailedAssessmentResultForMechanismSpecificLowerLimitNorm,
@@ -187,7 +187,7 @@
         /// is an invalid <see cref="DetailedAssessmentResultType"/>.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="detailedAssessmentResult"/>
         /// is a valid, but unsupported <see cref="DetailedAssessmentResultType"/>.</exception>
-        internal static EAssessmentResultTypeG1 CreateAssessmentResultTypeG1(DetailedAssessmentResultType detailedAssessmentResult)
+        public static EAssessmentResultTypeG1 CreateAssessmentResultTypeG1(DetailedAssessmentResultType detailedAssessmentResult)
         {
             if (!Enum.IsDefined(typeof(DetailedAssessmentResultType), detailedAssessmentResult))
             {
@@ -220,7 +220,7 @@
         /// is an invalid <see cref="DetailedAssessmentProbabilityOnlyResultType"/>.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="detailedAssessmentResult"/>
         /// is a valid, but unsupported <see cref="DetailedAssessmentProbabilityOnlyResultType"/>.</exception>
-        internal static EAssessmentResultTypeG2 CreateAssessmentResultTypeG2(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult)
+        public static EAssessmentResultTypeG2 CreateAssessmentResultTypeG2(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult)
         {
             if (!Enum.IsDefined(typeof(DetailedAssessmentProbabilityOnlyResultType), detailedAssessmentResult))
             {
@@ -249,7 +249,7 @@
         /// is an invalid <see cref="TailorMadeAssessmentResultType"/>.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="tailorMadeAssessmentResult"/>
         /// is a valid, but unsupported <see cref="TailorMadeAssessmentResultType"/>.</exception>
-        internal static EAssessmentResultTypeT1 CreateAssessmentResultTypeT1(TailorMadeAssessmentResultType tailorMadeAssessmentResult)
+        public static EAssessmentResultTypeT1 CreateAssessmentResultTypeT1(TailorMadeAssessmentResultType tailorMadeAssessmentResult)
         {
             if (!Enum.IsDefined(typeof(TailorMadeAssessmentResultType), tailorMadeAssessmentResult))
             {
@@ -284,7 +284,7 @@
         /// is an invalid <see cref="TailorMadeAssessmentProbabilityCalculationResultType"/>.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="tailorMadeAssessmentResult"/>
         /// is a valid, but unsupported <see cref="TailorMadeAssessmentProbabilityCalculationResultType"/>.</exception>
-        internal static EAssessmentResultTypeT3 CreateAssessmentResultTypeT3(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult)
+        public static EAssessmentResultTypeT3 CreateAssessmentResultTypeT3(TailorMadeAssessmentProbabilityCalculationResultType tailorMadeAssessmentResult)
         {
             if (!Enum.IsDefined(typeof(TailorMadeAssessmentProbabilityCalculationResultType), tailorMadeAssessmentResult))
             {
@@ -318,7 +318,7 @@
         /// is an invalid <see cref="TailorMadeAssessmentProbabilityCalculationResultType"/>.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="tailorMadeAssessmentResult"/>
         /// is a valid, but unsupported <see cref="TailorMadeAssessmentProbabilityCalculationResultType"/>.</exception>
-        internal static EAssessmentResultTypeT4 CreateAssessmentResultTypeT4(
+        public static EAssessmentResultTypeT4 CreateAssessmentResultTypeT4(
             TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult)
         {
             if (!Enum.IsDefined(typeof(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType), tailorMadeAssessmentResult))
@@ -356,7 +356,7 @@
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="category"/>
         /// is a valid value, but unsupported.</exception>
-        internal static Tuple<EAssessmentResultTypeT3, EFmSectionCategory?> CreateAssessmentResultTypeT3WithSectionCategory(
+        public static Tuple<EAssessmentResultTypeT3, EFmSectionCategory?> CreateAssessmentResultTypeT3WithSectionCategory(
             FailureMechanismSectionAssemblyCategoryGroup category)
         {
             EFmSectionCategory result = CreateFailureMechanismSectionCategory(category);
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs
===================================================================
diff -u -r66d6f7a3b583d9bca7b5a9c9697f8f4f332cc5c9 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs	(.../FailureMechanismSectionAssemblyCreator.cs)	(revision 66d6f7a3b583d9bca7b5a9c9697f8f4f332cc5c9)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs	(.../FailureMechanismSectionAssemblyCreator.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -42,7 +42,7 @@
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <see cref="EFmSectionCategory"/>
         /// is a valid value, but unsupported.</exception>
-        internal static FailureMechanismSectionAssembly Create(FmSectionAssemblyDirectResult result)
+        public static FailureMechanismSectionAssembly Create(FmSectionAssemblyDirectResult result)
         {
             if (result == null)
             {
@@ -62,7 +62,7 @@
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="category"/>
         /// is a valid value, but unsupported.</exception>
-        internal static FailureMechanismSectionAssemblyCategoryGroup CreateFailureMechanismSectionAssemblyCategoryGroup(EFmSectionCategory category)
+        public static FailureMechanismSectionAssemblyCategoryGroup CreateFailureMechanismSectionAssemblyCategoryGroup(EFmSectionCategory category)
         {
             if (!Enum.IsDefined(typeof(EFmSectionCategory), category))
             {
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs
===================================================================
diff -u -r9cb9df81153f33c4a236447dc3daf0c65c4a45a3 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 9cb9df81153f33c4a236447dc3daf0c65c4a45a3)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -41,7 +41,7 @@
     public class FailureMechanismAssemblyCalculatorTest
     {
         [Test]
-        public void Constructor_ExpectedValues()
+        public void Constructor_WithKernelFactory_ExpectedValues()
         {
             // Setup
             var mocks = new MockRepository();
@@ -68,7 +68,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanism_WithInvalidEnumInput_ThrowFailureMechanismAssemblyCalculatorException()
+        public void Assemble_WithInvalidEnumInput_ThrowFailureMechanismAssemblyCalculatorException()
         {
             // Setup
             using (new AssemblyToolKernelFactoryConfig())
@@ -77,7 +77,7 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                TestDelegate test = () => calculator.AssembleFailureMechanism(new[]
+                TestDelegate test = () => calculator.Assemble(new[]
                 {
                     (FailureMechanismSectionAssemblyCategoryGroup) 99
                 });
@@ -91,7 +91,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanism_WithValidInput_InputCorrectlySetToKernel()
+        public void Assemble_WithValidInput_InputCorrectlySetToKernel()
         {
             // Setup
             var random = new Random(39);
@@ -109,18 +109,19 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                calculator.AssembleFailureMechanism(categoryGroups);
+                calculator.Assemble(categoryGroups);
 
                 // Assert
+                FailureMechanismSectionAssemblyCategoryGroup actualCategoryGroup =
+                    FailureMechanismSectionAssemblyCreator.CreateFailureMechanismSectionAssemblyCategoryGroup(kernel.FmSectionAssemblyResultsInput.Single().Result);
                 Assert.AreEqual(categoryGroups.Single(),
-                                FailureMechanismSectionAssemblyCreator.CreateFailureMechanismSectionAssemblyCategoryGroup(
-                                    kernel.FmSectionAssemblyResultsInput.Single().Result));
+                                actualCategoryGroup);
                 Assert.IsFalse(kernel.PartialAssembly);
             }
         }
 
         [Test]
-        public void AssembleFailureMechanism_KernelWithCompleteOutput_OutputCorrectlyReturnedByCalculator()
+        public void Assemble_KernelWithCompleteOutput_OutputCorrectlyReturnedByCalculator()
         {
             // Setup
             using (new AssemblyToolKernelFactoryConfig())
@@ -132,7 +133,7 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                FailureMechanismAssemblyCategoryGroup category = calculator.AssembleFailureMechanism(
+                FailureMechanismAssemblyCategoryGroup category = calculator.Assemble(
                     new List<FailureMechanismSectionAssemblyCategoryGroup>());
 
                 // Assert
@@ -142,7 +143,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanism_KernelWithInvalidOutput_ThrowFailureMechanismAssemblyCalculatorException()
+        public void Assemble_KernelWithInvalidOutput_ThrowFailureMechanismAssemblyCalculatorException()
         {
             // Setup
             using (new AssemblyToolKernelFactoryConfig())
@@ -154,7 +155,7 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                TestDelegate test = () => calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssemblyCategoryGroup>());
+                TestDelegate test = () => calculator.Assemble(new List<FailureMechanismSectionAssemblyCategoryGroup>());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(test);
@@ -165,7 +166,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanism_KernelThrowsException_ThrowFailureMechanismAssemblyCalculatorException()
+        public void Assemble_KernelThrowsException_ThrowFailureMechanismAssemblyCalculatorException()
         {
             // Setup
             using (new AssemblyToolKernelFactoryConfig())
@@ -177,7 +178,7 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                TestDelegate test = () => calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssemblyCategoryGroup>());
+                TestDelegate test = () => calculator.Assemble(new List<FailureMechanismSectionAssemblyCategoryGroup>());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(test);
@@ -188,7 +189,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanismWithProbabilities_WithInvalidEnumInput_ThrowFailureMechanismAssemblyCalculatorException()
+        public void AssembleWithProbabilities_WithInvalidEnumInput_ThrowFailureMechanismAssemblyCalculatorException()
         {
             // Setup
             using (new AssemblyToolKernelFactoryConfig())
@@ -197,7 +198,7 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                TestDelegate test = () => calculator.AssembleFailureMechanism(new[]
+                TestDelegate test = () => calculator.Assemble(new[]
                 {
                     new FailureMechanismSectionAssembly(new Random(39).NextDouble(), (FailureMechanismSectionAssemblyCategoryGroup) 99)
                 }, CreateAssemblyCategoriesInput());
@@ -211,7 +212,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanismWithProbabilities_WithValidInput_InputCorrectlySetToKernel()
+        public void AssembleWithProbabilities_WithValidInput_InputCorrectlySetToKernel()
         {
             // Setup
             var random = new Random(39);
@@ -230,7 +231,7 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                calculator.AssembleFailureMechanism(expectedResults, assemblyCategoriesInput);
+                calculator.Assemble(expectedResults, assemblyCategoriesInput);
 
                 // Assert
                 AssertCalculatorOutput(expectedResults.Single(), kernel.FmSectionAssemblyResultsInput.Single());
@@ -243,7 +244,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanismWithProbabilities_KernelWithCompleteOutput_OutputCorrectlyReturnedByCalculator()
+        public void AssembleWithProbabilities_KernelWithCompleteOutput_OutputCorrectlyReturnedByCalculator()
         {
             // Setup
             var random = new Random(39);
@@ -257,8 +258,8 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                FailureMechanismAssembly assembly = calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssembly>(),
-                                                                                        CreateAssemblyCategoriesInput());
+                FailureMechanismAssembly assembly = calculator.Assemble(Enumerable.Empty<FailureMechanismSectionAssembly>(),
+                                                                        CreateAssemblyCategoriesInput());
 
                 // Assert
                 Assert.AreEqual(FailureMechanismAssemblyCreator.CreateFailureMechanismAssemblyCategoryGroup(kernel.FailureMechanismAssemblyResult.Category),
@@ -268,7 +269,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanismWithProbabilities_KernelWithInvalidOutput_ThrowFailureMechanismAssemblyCalculatorException()
+        public void AssembleWithProbabilities_KernelWithInvalidOutput_ThrowFailureMechanismAssemblyCalculatorException()
         {
             // Setup
             using (new AssemblyToolKernelFactoryConfig())
@@ -280,8 +281,8 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                TestDelegate test = () => calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssembly>(),
-                                                                              CreateAssemblyCategoriesInput());
+                TestDelegate test = () => calculator.Assemble(Enumerable.Empty<FailureMechanismSectionAssembly>(),
+                                                              CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(test);
@@ -292,7 +293,7 @@
         }
 
         [Test]
-        public void AssembleFailureMechanismWithProbabilities_KernelThrowsException_ThrowFailureMechanismAssemblyCalculatorException()
+        public void AssembleWithProbabilities_KernelThrowsException_ThrowFailureMechanismAssemblyCalculatorException()
         {
             // Setup
             using (new AssemblyToolKernelFactoryConfig())
@@ -304,8 +305,8 @@
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
-                TestDelegate test = () => calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssembly>(),
-                                                                              CreateAssemblyCategoriesInput());
+                TestDelegate test = () => calculator.Assemble(Enumerable.Empty<FailureMechanismSectionAssembly>(),
+                                                              CreateAssemblyCategoriesInput());
 
                 // Assert
                 var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(test);
@@ -323,7 +324,7 @@
             Assert.AreEqual(expectedSectionAssembly.Probability, actualResult.FailureProbability);
         }
 
-        private AssemblyCategoriesInput CreateAssemblyCategoriesInput()
+        private static AssemblyCategoriesInput CreateAssemblyCategoriesInput()
         {
             var random = new Random(39);
             return new AssemblyCategoriesInput(random.NextDouble(1.0, 5.0),
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCreatorTest.cs
===================================================================
diff -u -r374da125ffedac3464062034bb3d0c2dedc606d9 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCreatorTest.cs	(.../FailureMechanismAssemblyCreatorTest.cs)	(revision 374da125ffedac3464062034bb3d0c2dedc606d9)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismAssemblyCreatorTest.cs	(.../FailureMechanismAssemblyCreatorTest.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using Assembly.Kernel.Model;
 using Core.Common.TestUtil;
@@ -53,20 +54,12 @@
             TestDelegate test = () => FailureMechanismAssemblyCreator.Create(result);
 
             // Assert
-            const string expectedMessage = "The value of argument 'category' (99) is invalid for Enum type 'EFailureMechanismCategory'.";
+            string expectedMessage = $"The value of argument 'category' (99) is invalid for Enum type '{nameof(EFailureMechanismCategory)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, expectedMessage);
         }
 
         [Test]
-        [TestCase(EFailureMechanismCategory.Gr, FailureMechanismAssemblyCategoryGroup.None)]
-        [TestCase(EFailureMechanismCategory.Nvt, FailureMechanismAssemblyCategoryGroup.NotApplicable)]
-        [TestCase(EFailureMechanismCategory.It, FailureMechanismAssemblyCategoryGroup.It)]
-        [TestCase(EFailureMechanismCategory.IIt, FailureMechanismAssemblyCategoryGroup.IIt)]
-        [TestCase(EFailureMechanismCategory.IIIt, FailureMechanismAssemblyCategoryGroup.IIIt)]
-        [TestCase(EFailureMechanismCategory.IVt, FailureMechanismAssemblyCategoryGroup.IVt)]
-        [TestCase(EFailureMechanismCategory.Vt, FailureMechanismAssemblyCategoryGroup.Vt)]
-        [TestCase(EFailureMechanismCategory.VIt, FailureMechanismAssemblyCategoryGroup.VIt)]
-        [TestCase(EFailureMechanismCategory.VIIt, FailureMechanismAssemblyCategoryGroup.VIIt)]
+        [TestCaseSource(nameof(FailureMechanismAssemblyCategoryGroupCases))]
         public void Create_ValidResult_ReturnFailureMechanismAssembly(EFailureMechanismCategory originalGroup,
                                                                       FailureMechanismAssemblyCategoryGroup expectedGroup)
         {
@@ -105,20 +98,12 @@
             TestDelegate test = () => FailureMechanismAssemblyCreator.CreateFailureMechanismAssemblyCategoryGroup((EFailureMechanismCategory) 99);
 
             // Assert
-            const string expectedMessage = "The value of argument 'category' (99) is invalid for Enum type 'EFailureMechanismCategory'.";
+            string expectedMessage = $"The value of argument 'category' (99) is invalid for Enum type '{nameof(EFailureMechanismCategory)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, expectedMessage);
         }
 
         [Test]
-        [TestCase(EFailureMechanismCategory.Gr, FailureMechanismAssemblyCategoryGroup.None)]
-        [TestCase(EFailureMechanismCategory.Nvt, FailureMechanismAssemblyCategoryGroup.NotApplicable)]
-        [TestCase(EFailureMechanismCategory.It, FailureMechanismAssemblyCategoryGroup.It)]
-        [TestCase(EFailureMechanismCategory.IIt, FailureMechanismAssemblyCategoryGroup.IIt)]
-        [TestCase(EFailureMechanismCategory.IIIt, FailureMechanismAssemblyCategoryGroup.IIIt)]
-        [TestCase(EFailureMechanismCategory.IVt, FailureMechanismAssemblyCategoryGroup.IVt)]
-        [TestCase(EFailureMechanismCategory.Vt, FailureMechanismAssemblyCategoryGroup.Vt)]
-        [TestCase(EFailureMechanismCategory.VIt, FailureMechanismAssemblyCategoryGroup.VIt)]
-        [TestCase(EFailureMechanismCategory.VIIt, FailureMechanismAssemblyCategoryGroup.VIIt)]
+        [TestCaseSource(nameof(FailureMechanismAssemblyCategoryGroupCases))]
         public void CreateFailureMechanismAssemblyCategoryGroup_ValidGroup_ReturnFailureMechanismAssemblyCategoryGroup(
             EFailureMechanismCategory originalGroup,
             FailureMechanismAssemblyCategoryGroup expectedGroup)
@@ -129,5 +114,18 @@
             // Assert
             Assert.AreEqual(expectedGroup, actualGroup);
         }
+
+        private static IEnumerable<TestCaseData> FailureMechanismAssemblyCategoryGroupCases()
+        {
+            yield return new TestCaseData(EFailureMechanismCategory.Gr, FailureMechanismAssemblyCategoryGroup.None);
+            yield return new TestCaseData(EFailureMechanismCategory.Nvt, FailureMechanismAssemblyCategoryGroup.NotApplicable);
+            yield return new TestCaseData(EFailureMechanismCategory.It, FailureMechanismAssemblyCategoryGroup.It);
+            yield return new TestCaseData(EFailureMechanismCategory.IIt, FailureMechanismAssemblyCategoryGroup.IIt);
+            yield return new TestCaseData(EFailureMechanismCategory.IIIt, FailureMechanismAssemblyCategoryGroup.IIIt);
+            yield return new TestCaseData(EFailureMechanismCategory.IVt, FailureMechanismAssemblyCategoryGroup.IVt);
+            yield return new TestCaseData(EFailureMechanismCategory.Vt, FailureMechanismAssemblyCategoryGroup.Vt);
+            yield return new TestCaseData(EFailureMechanismCategory.VIt, FailureMechanismAssemblyCategoryGroup.VIt);
+            yield return new TestCaseData(EFailureMechanismCategory.VIIt, FailureMechanismAssemblyCategoryGroup.VIIt);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorStubTest.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorStubTest.cs	(.../FailureMechanismAssemblyCalculatorStubTest.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorStubTest.cs	(.../FailureMechanismAssemblyCalculatorStubTest.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
@@ -48,20 +49,20 @@
         }
 
         [Test]
-        public void AssembleFailureMechanism_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
+        public void Assemble_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var calculator = new FailureMechanismAssemblyCalculatorStub();
 
             // Call
-            FailureMechanismAssemblyCategoryGroup category = calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssemblyCategoryGroup>());
+            FailureMechanismAssemblyCategoryGroup category = calculator.Assemble(Enumerable.Empty<FailureMechanismSectionAssemblyCategoryGroup>());
 
             // Assert
             Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.IIt, category);
         }
 
         [Test]
-        public void AssembleFailureMechanism_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
+        public void Assemble_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
         {
             // Setup
             var random = new Random(39);
@@ -71,28 +72,28 @@
             };
 
             // Call
-            FailureMechanismAssemblyCategoryGroup category = calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssemblyCategoryGroup>());
+            FailureMechanismAssemblyCategoryGroup category = calculator.Assemble(Enumerable.Empty<FailureMechanismSectionAssemblyCategoryGroup>());
 
             // Assert
             Assert.AreEqual(calculator.FailureMechanismAssemblyCategoryGroupOutput, category);
         }
 
         [Test]
-        public void AssembleFailureMechanism_ThrowExceptionOnCalculateFalse_SetsInput()
+        public void Assemble_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
             var calculator = new FailureMechanismAssemblyCalculatorStub();
-            var sectionResults = new List<FailureMechanismSectionAssemblyCategoryGroup>();
+            IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionResults = Enumerable.Empty<FailureMechanismSectionAssemblyCategoryGroup>();
 
             // Call
-            calculator.AssembleFailureMechanism(sectionResults);
+            calculator.Assemble(sectionResults);
 
             // Assert
             Assert.AreEqual(sectionResults, calculator.FailureMechanismSectionCategories);
         }
 
         [Test]
-        public void AssembleFailureMechanism_ThrowExceptionOnCalculateTrue_ThrowsFailureMechanismSectionAssemblyCalculatorException()
+        public void Assemble_ThrowExceptionOnCalculateTrue_ThrowsFailureMechanismSectionAssemblyCalculatorException()
         {
             // Setup
             var calculator = new FailureMechanismAssemblyCalculatorStub
@@ -101,7 +102,7 @@
             };
 
             // Call
-            TestDelegate test = () => calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssemblyCategoryGroup>());
+            TestDelegate test = () => calculator.Assemble(Enumerable.Empty<FailureMechanismSectionAssemblyCategoryGroup>());
 
             // Assert
             var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(test);
@@ -110,22 +111,22 @@
         }
 
         [Test]
-        public void AssembleFailureMechanismWithProbabilities_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
+        public void AssembleWithProbabilities_ThrowExceptionOnCalculateFalseAndOutputNotSet_ReturnOutput()
         {
             // Setup
             var calculator = new FailureMechanismAssemblyCalculatorStub();
 
             // Call
-            FailureMechanismAssembly assembly = calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssembly>(),
-                                                                                    CreateAssemblyCategoriesInput());
+            FailureMechanismAssembly assembly = calculator.Assemble(Enumerable.Empty<FailureMechanismSectionAssembly>(),
+                                                                    CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.IIIt, assembly.Group);
             Assert.AreEqual(1.0, assembly.Probability);
         }
 
         [Test]
-        public void AssembleFailureMechanismWithProbabilities_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
+        public void AssembleWithProbabilities_ThrowExceptionOnCalculateFalseAndOutputSet_ReturnOutput()
         {
             // Setup
             var random = new Random(39);
@@ -136,31 +137,31 @@
             };
 
             // Call
-            FailureMechanismAssembly assembly = calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssembly>(),
-                                                                                    CreateAssemblyCategoriesInput());
+            FailureMechanismAssembly assembly = calculator.Assemble(Enumerable.Empty<FailureMechanismSectionAssembly>(),
+                                                                    CreateAssemblyCategoriesInput());
 
             // Assert
             Assert.AreSame(calculator.FailureMechanismAssemblyOutput, assembly);
         }
 
         [Test]
-        public void AssembleFailureMechanismWithProbabilities_ThrowExceptionOnCalculateFalse_SetsInput()
+        public void AssembleWithProbabilities_ThrowExceptionOnCalculateFalse_SetsInput()
         {
             // Setup
             var calculator = new FailureMechanismAssemblyCalculatorStub();
-            var sectionResults = new List<FailureMechanismSectionAssembly>();
+            IEnumerable<FailureMechanismSectionAssembly> sectionResults = Enumerable.Empty<FailureMechanismSectionAssembly>();
             AssemblyCategoriesInput assemblyCategoriesInput = CreateAssemblyCategoriesInput();
 
             // Call
-            calculator.AssembleFailureMechanism(sectionResults, assemblyCategoriesInput);
+            calculator.Assemble(sectionResults, assemblyCategoriesInput);
 
             // Assert
             Assert.AreEqual(sectionResults, calculator.FailureMechanismSectionAssemblies);
             Assert.AreEqual(assemblyCategoriesInput, calculator.AssemblyCategoriesInput);
         }
 
         [Test]
-        public void AssembleFailureMechanismWithProbabilities_ThrowExceptionOnCalculateTrue_ThrowsFailureMechanismSectionAssemblyCalculatorException()
+        public void AssembleWithProbabilities_ThrowExceptionOnCalculateTrue_ThrowsFailureMechanismSectionAssemblyCalculatorException()
         {
             // Setup
             var calculator = new FailureMechanismAssemblyCalculatorStub
@@ -169,16 +170,16 @@
             };
 
             // Call
-            TestDelegate test = () => calculator.AssembleFailureMechanism(new List<FailureMechanismSectionAssembly>(),
-                                                                          CreateAssemblyCategoriesInput());
+            TestDelegate test = () => calculator.Assemble(Enumerable.Empty<FailureMechanismSectionAssembly>(),
+                                                          CreateAssemblyCategoriesInput());
 
             // Assert
             var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(test);
             Assert.AreEqual("Message", exception.Message);
             Assert.IsNotNull(exception.InnerException);
         }
 
-        private AssemblyCategoriesInput CreateAssemblyCategoriesInput()
+        private static AssemblyCategoriesInput CreateAssemblyCategoriesInput()
         {
             var random = new Random(39);
             return new AssemblyCategoriesInput(random.NextDouble(),
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismAssemblyKernelStubTest.cs
===================================================================
diff -u -r2903f7033d125ab724acc44f5d40610bc3f88765 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismAssemblyKernelStubTest.cs	(.../FailureMechanismAssemblyKernelStubTest.cs)	(revision 2903f7033d125ab724acc44f5d40610bc3f88765)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismAssemblyKernelStubTest.cs	(.../FailureMechanismAssemblyKernelStubTest.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Assembly.Kernel.Interfaces;
 using Assembly.Kernel.Model;
 using Assembly.Kernel.Model.FmSectionTypes;
@@ -54,7 +55,7 @@
             // Setup
             var random = new Random(39);
             bool partialAssembly = random.NextBoolean();
-            var sectionAssemblyResults = new List<FmSectionAssemblyDirectResult>();
+            IEnumerable<FmSectionAssemblyDirectResult> sectionAssemblyResults = Enumerable.Empty<FmSectionAssemblyDirectResult>();
             var kernel = new FailureMechanismAssemblyKernelStub();
 
             // Precondition
@@ -80,7 +81,7 @@
             };
 
             // Call
-            EFailureMechanismCategory result = kernel.AssembleFailureMechanismWbi1A1(new List<FmSectionAssemblyDirectResult>(), random.NextBoolean());
+            EFailureMechanismCategory result = kernel.AssembleFailureMechanismWbi1A1(Enumerable.Empty<FmSectionAssemblyDirectResult>(), random.NextBoolean());
 
             // Assert
             Assert.AreEqual(kernel.FailureMechanismCategoryResult, result);
@@ -96,7 +97,7 @@
             };
 
             // Call
-            TestDelegate test = () => kernel.AssembleFailureMechanismWbi1A1(new List<FmSectionAssemblyDirectResult>(), true);
+            TestDelegate test = () => kernel.AssembleFailureMechanismWbi1A1(Enumerable.Empty<FmSectionAssemblyDirectResult>(), true);
 
             // Assert
             var exception = Assert.Throws<Exception>(test);
@@ -128,7 +129,7 @@
             var random = new Random(39);
             AssessmentSection assessmentSection = CreateRandomAssessmentSection(random);
             FailureMechanism failureMechanism = CreateRandomFailureMechanism(random);
-            var sectionAssemblyResults = new List<FmSectionAssemblyDirectResult>();
+            IEnumerable<FmSectionAssemblyDirectResult> sectionAssemblyResults = Enumerable.Empty<FmSectionAssemblyDirectResult>();
             bool partialAssembly = random.NextBoolean();
             var kernel = new FailureMechanismAssemblyKernelStub();
 
@@ -159,7 +160,7 @@
             // Call
             FailureMechanismAssemblyResult result = kernel.AssembleFailureMechanismWbi1B1(CreateRandomAssessmentSection(random),
                                                                                           CreateRandomFailureMechanism(random),
-                                                                                          new List<FmSectionAssemblyDirectResult>(),
+                                                                                          Enumerable.Empty<FmSectionAssemblyDirectResult>(),
                                                                                           random.NextBoolean());
 
             // Assert
@@ -179,7 +180,7 @@
             // Call
             TestDelegate test = () => kernel.AssembleFailureMechanismWbi1B1(CreateRandomAssessmentSection(random),
                                                                             CreateRandomFailureMechanism(random),
-                                                                            new List<FmSectionAssemblyDirectResult>(),
+                                                                            Enumerable.Empty<FmSectionAssemblyDirectResult>(),
                                                                             true);
 
             // Assert
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs
===================================================================
diff -u -radc7ea257dbb54e7beea7b39e78687f09c65fb01 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs	(.../FailureMechanismAssemblyCalculatorStub.cs)	(revision adc7ea257dbb54e7beea7b39e78687f09c65fb01)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs	(.../FailureMechanismAssemblyCalculatorStub.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -61,7 +61,7 @@
         /// </summary>
         public bool ThrowExceptionOnCalculate { private get; set; }
 
-        public FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionCategories)
+        public FailureMechanismAssemblyCategoryGroup Assemble(IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionCategories)
         {
             if (ThrowExceptionOnCalculate)
             {
@@ -78,7 +78,7 @@
             return FailureMechanismAssemblyCategoryGroupOutput.Value;
         }
 
-        public FailureMechanismAssembly AssembleFailureMechanism(IEnumerable<FailureMechanismSectionAssembly> sectionAssemblies,
+        public FailureMechanismAssembly Assemble(IEnumerable<FailureMechanismSectionAssembly> sectionAssemblies,
                                                                  AssemblyCategoriesInput assemblyCategoriesInput)
         {
             if (ThrowExceptionOnCalculate)
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r150a1c072e1b1e91c35b606cd78da5eac3396671 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision 150a1c072e1b1e91c35b606cd78da5eac3396671)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../ClosingStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -267,7 +267,7 @@
                 IFailureMechanismAssemblyCalculator calculator =
                     calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactory.Instance);
 
-                return calculator.AssembleFailureMechanism(sectionAssemblies, assemblyCategoriesInput);
+                return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput);
             }
             catch (Exception e) when (e is FailureMechanismAssemblyCalculatorException || e is FailureMechanismSectionAssemblyCalculatorException)
             {
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResultAssemblyFactory.cs	(.../DuneErosionFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismSectionResultAssemblyFactory.cs	(.../DuneErosionFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -208,7 +208,7 @@
 
             try
             {
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r150a1c072e1b1e91c35b606cd78da5eac3396671 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 150a1c072e1b1e91c35b606cd78da5eac3396671)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -269,7 +269,7 @@
                 IFailureMechanismAssemblyCalculator calculator =
                     calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactory.Instance);
 
-                return calculator.AssembleFailureMechanism(sectionAssemblies, assemblyCategoriesInput);
+                return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput);
             }
             catch (Exception e) when (e is FailureMechanismAssemblyCalculatorException || e is FailureMechanismSectionAssemblyCalculatorException)
             {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -209,7 +209,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r150a1c072e1b1e91c35b606cd78da5eac3396671 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision 150a1c072e1b1e91c35b606cd78da5eac3396671)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../HeightStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -269,7 +269,7 @@
                 IFailureMechanismAssemblyCalculator calculator =
                     calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactory.Instance);
 
-                return calculator.AssembleFailureMechanism(sectionAssemblies, assemblyCategoriesInput);
+                return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput);
             }
             catch (Exception e) when (e is FailureMechanismAssemblyCalculatorException || e is FailureMechanismSectionAssemblyCalculatorException)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -208,7 +208,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -208,7 +208,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r150a1c072e1b1e91c35b606cd78da5eac3396671 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 150a1c072e1b1e91c35b606cd78da5eac3396671)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -261,7 +261,7 @@
                 calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactory.Instance);
             try
             {
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs	(.../MicrostabilityFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -208,7 +208,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingStructureFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingStructureFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -208,7 +208,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -174,7 +174,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -174,7 +174,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -174,7 +174,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r150a1c072e1b1e91c35b606cd78da5eac3396671 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision 150a1c072e1b1e91c35b606cd78da5eac3396671)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -289,7 +289,7 @@
                 IFailureMechanismAssemblyCalculator calculator =
                     calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactory.Instance);
 
-                return calculator.AssembleFailureMechanism(sectionAssemblies, assemblyCategoriesInput);
+                return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput);
             }
             catch (Exception e) when (e is FailureMechanismAssemblyCalculatorException || e is FailureMechanismSectionAssemblyCalculatorException)
             {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r150a1c072e1b1e91c35b606cd78da5eac3396671 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingFailureMechanismSectionResultAssemblyFactory.cs)	(revision 150a1c072e1b1e91c35b606cd78da5eac3396671)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResultAssemblyFactory.cs	(.../PipingFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -289,7 +289,7 @@
                 IFailureMechanismAssemblyCalculator calculator =
                     calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactory.Instance);
 
-                return calculator.AssembleFailureMechanism(sectionAssemblies, assemblyCategoriesInput);
+                return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput);
             }
             catch (Exception e) when (e is FailureMechanismAssemblyCalculatorException || e is FailureMechanismSectionAssemblyCalculatorException)
             {
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r150a1c072e1b1e91c35b606cd78da5eac3396671 -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision 150a1c072e1b1e91c35b606cd78da5eac3396671)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -267,7 +267,7 @@
                 IFailureMechanismAssemblyCalculator calculator =
                     calculatorFactory.CreateFailureMechanismAssemblyCalculator(AssemblyToolKernelFactory.Instance);
 
-                return calculator.AssembleFailureMechanism(sectionAssemblies, assemblyCategoriesInput);
+                return calculator.Assemble(sectionAssemblies, assemblyCategoriesInput);
             }
             catch (Exception e) when (e is FailureMechanismAssemblyCalculatorException || e is FailureMechanismSectionAssemblyCalculatorException)
             {
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -209,7 +209,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs
===================================================================
diff -u -r33daf7aa033f72852bfbd81bf24c5d42e59c058b -recd4e132deb2683aadc0f83f0853dc1b79602033
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision 33daf7aa033f72852bfbd81bf24c5d42e59c058b)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismSectionResultAssemblyFactory.cs)	(revision ecd4e132deb2683aadc0f83f0853dc1b79602033)
@@ -209,7 +209,7 @@
 
             try
             {  
-                return calculator.AssembleFailureMechanism(sectionAssemblies);
+                return calculator.Assemble(sectionAssemblies);
             }
             catch (FailureMechanismAssemblyCalculatorException e)
             {