Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactory.cs
===================================================================
diff -u -r831679b86afac322970d8d1c511666f9416a516b -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactory.cs	(.../AssemblyToolCalculatorFactory.cs)	(revision 831679b86afac322970d8d1c511666f9416a516b)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactory.cs	(.../AssemblyToolCalculatorFactory.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -48,9 +48,9 @@
             return new AssessmentSectionAssemblyGroupBoundariesCalculator(factory);
         }
 
-        public IAssemblyGroupBoundariesCalculator CreateAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory)
+        public IFailureMechanismSectionAssemblyGroupBoundariesCalculator CreateAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory)
         {
-            return new AssemblyGroupBoundariesCalculator(factory);
+            return new FailureMechanismSectionAssemblyGroupBoundariesCalculator(factory);
         }
 
         public IFailureMechanismSectionAssemblyCalculator CreateFailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactory factory)
Fisheye: Tag 00190b5745e366cf2b9977d53401f8182555fe13 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyGroupBoundariesCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssessmentSectionAssemblyGroupBoundariesCalculator.cs
===================================================================
diff -u -rc3caf1fa5120ae8daa493203f88756b1f86775d1 -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssessmentSectionAssemblyGroupBoundariesCalculator.cs	(.../AssessmentSectionAssemblyGroupBoundariesCalculator.cs)	(revision c3caf1fa5120ae8daa493203f88756b1f86775d1)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssessmentSectionAssemblyGroupBoundariesCalculator.cs	(.../AssessmentSectionAssemblyGroupBoundariesCalculator.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -42,7 +42,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="AssessmentSectionAssemblyGroupBoundariesCalculator"/>.
         /// </summary>
-        /// <param name="factory">The factory responsible for creating the assembly categories kernel.</param>
+        /// <param name="factory">The factory responsible for creating the assembly groups kernel.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public AssessmentSectionAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory)
         {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs
===================================================================
diff -u
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs	(revision 0)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -0,0 +1,78 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Assembly.Kernel.Exceptions;
+using Assembly.Kernel.Interfaces;
+using Assembly.Kernel.Model.AssessmentSection;
+using Assembly.Kernel.Model.Categories;
+using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.KernelWrapper.Creators;
+using Riskeer.AssemblyTool.KernelWrapper.Kernels;
+
+namespace Riskeer.AssemblyTool.KernelWrapper.Calculators.Categories
+{
+    /// <summary>
+    /// Class representing a failure mechanism section assembly group boundaries calculator.
+    /// </summary>
+    public class FailureMechanismSectionAssemblyGroupBoundariesCalculator : IFailureMechanismSectionAssemblyGroupBoundariesCalculator
+    {
+        private readonly IAssemblyToolKernelFactory factory;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="FailureMechanismSectionAssemblyGroupBoundariesCalculator"/>.
+        /// </summary>
+        /// <param name="factory">The factory responsible for creating the assembly groups kernel.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="factory"/> is <c>null</c>.</exception>
+        public FailureMechanismSectionAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory)
+        {
+            if (factory == null)
+            {
+                throw new ArgumentNullException(nameof(factory));
+            }
+
+            this.factory = factory;
+        }
+
+        public IEnumerable<FailureMechanismSectionAssemblyGroupBoundaries> CalculateFailureMechanismSectionAssemblyGroupBoundaries(
+            double signalingNorm, double lowerLimitNorm)
+        {
+            try
+            {
+                ICategoryLimitsCalculator kernel = factory.CreateAssemblyCategoriesKernel();
+                CategoriesList<InterpretationCategory> output = kernel.CalculateInterpretationCategoryLimitsWbi03(
+                    new AssessmentSection(AssemblyCalculatorInputCreator.CreateProbability(signalingNorm),
+                                          AssemblyCalculatorInputCreator.CreateProbability(lowerLimitNorm)));
+
+                return AssemblyGroupBoundariesCreator.CreateFailureMechanismSectionAssemblyGroupBoundaries(output);
+            }
+            catch (AssemblyException e)
+            {
+                throw new AssemblyGroupBoundariesCalculatorException(AssemblyErrorMessageCreator.CreateErrorMessage(e.Errors), e);
+            }
+            catch (Exception e)
+            {
+                throw new AssemblyGroupBoundariesCalculatorException(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), e);
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 00190b5745e366cf2b9977d53401f8182555fe13 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyGroupBoundariesCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/IFailureMechanismSectionAssemblyGroupBoundariesCalculator.cs
===================================================================
diff -u
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/IFailureMechanismSectionAssemblyGroupBoundariesCalculator.cs	(revision 0)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/IFailureMechanismSectionAssemblyGroupBoundariesCalculator.cs	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -0,0 +1,43 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Riskeer.AssemblyTool.Data;
+
+namespace Riskeer.AssemblyTool.KernelWrapper.Calculators.Categories
+{
+    /// <summary>
+    /// Interface representing a failure mechanism section assembly group boundaries calculator.
+    /// </summary>
+    public interface IFailureMechanismSectionAssemblyGroupBoundariesCalculator
+    {
+        /// <summary>
+        /// Performs the calculation to get a collection of assembly group boundaries for a failure mechanism section.
+        /// </summary>
+        /// <param name="signalingNorm">The signaling norm to calculate with.</param>
+        /// <param name="lowerLimitNorm">The lower limit norm to calculate with.</param>
+        /// <returns>A collection of <see cref="FailureMechanismSectionAssemblyGroupBoundaries"/>.</returns>
+        /// <exception cref="AssemblyGroupBoundariesCalculatorException">Thrown when an error occurs
+        /// while performing the calculation.</exception>
+        IEnumerable<FailureMechanismSectionAssemblyGroupBoundaries> CalculateFailureMechanismSectionAssemblyGroupBoundaries(
+            double signalingNorm, double lowerLimitNorm);
+    }
+}
\ No newline at end of file
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs
===================================================================
diff -u -r6b76c8ed96481d346fd994cba4eb430143eef1eb -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs	(.../IAssemblyToolCalculatorFactory.cs)	(revision 6b76c8ed96481d346fd994cba4eb430143eef1eb)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs	(.../IAssemblyToolCalculatorFactory.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -45,7 +45,7 @@
         /// <param name="factory">The factory responsible for creating the kernel.</param>
         /// <returns>The assembly group boundaries calculator.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="factory"/> is <c>null</c>.</exception>
-        IAssemblyGroupBoundariesCalculator CreateAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory);
+        IFailureMechanismSectionAssemblyGroupBoundariesCalculator CreateAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory);
 
         /// <summary>
         /// Creates a failure mechanism section assembly calculator.
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs
===================================================================
diff -u -rf541cc599a6bfc6a25db047b1b7b838f4a8ddbf4 -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs	(.../AssemblyToolCalculatorFactoryTest.cs)	(revision f541cc599a6bfc6a25db047b1b7b838f4a8ddbf4)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs	(.../AssemblyToolCalculatorFactoryTest.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -83,11 +83,11 @@
             using (new AssemblyToolKernelFactoryConfig())
             {
                 // Call
-                IAssemblyGroupBoundariesCalculator calculator = factory.CreateAssemblyGroupBoundariesCalculator(
+                IFailureMechanismSectionAssemblyGroupBoundariesCalculator calculator = factory.CreateAssemblyGroupBoundariesCalculator(
                     AssemblyToolKernelFactory.Instance);
 
                 // Assert
-                Assert.IsInstanceOf<AssemblyGroupBoundariesCalculator>(calculator);
+                Assert.IsInstanceOf<FailureMechanismSectionAssemblyGroupBoundariesCalculator>(calculator);
             }
         }
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyGroupBoundariesCalculatorTest.cs
===================================================================
diff -u -r34db16dffea0a12211fe7b576752168a809c03bf -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyGroupBoundariesCalculatorTest.cs	(.../AssemblyGroupBoundariesCalculatorTest.cs)	(revision 34db16dffea0a12211fe7b576752168a809c03bf)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyGroupBoundariesCalculatorTest.cs	(.../AssemblyGroupBoundariesCalculatorTest.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -50,18 +50,18 @@
             mocks.ReplayAll();
 
             // Call
-            var calculator = new AssemblyGroupBoundariesCalculator(factory);
+            var calculator = new FailureMechanismSectionAssemblyGroupBoundariesCalculator(factory);
 
             // Assert
-            Assert.IsInstanceOf<IAssemblyGroupBoundariesCalculator>(calculator);
+            Assert.IsInstanceOf<IFailureMechanismSectionAssemblyGroupBoundariesCalculator>(calculator);
             mocks.VerifyAll();
         }
 
         [Test]
         public void Constructor_FactoryNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => new AssemblyGroupBoundariesCalculator(null);
+            void Call() => new FailureMechanismSectionAssemblyGroupBoundariesCalculator(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
@@ -82,7 +82,7 @@
                 CategoriesList<InterpretationCategory> categoryLimits = CreateCategoryLimits();
                 categoryLimitsKernel.InterpretationCategoryLimits = categoryLimits;
 
-                var calculator = new AssemblyGroupBoundariesCalculator(factory);
+                var calculator = new FailureMechanismSectionAssemblyGroupBoundariesCalculator(factory);
 
                 // Call
                 calculator.CalculateFailureMechanismSectionAssemblyGroupBoundaries(signalingNorm, lowerLimitNorm);
@@ -108,7 +108,7 @@
                 CategoriesList<InterpretationCategory> categoryLimits = CreateCategoryLimits();
                 categoryLimitsKernel.InterpretationCategoryLimits = categoryLimits;
 
-                var calculator = new AssemblyGroupBoundariesCalculator(factory);
+                var calculator = new FailureMechanismSectionAssemblyGroupBoundariesCalculator(factory);
 
                 // Call
                 IEnumerable<FailureMechanismSectionAssemblyGroupBoundaries> result =
@@ -138,7 +138,7 @@
                 });
                 categoryLimitsKernel.InterpretationCategoryLimits = categoryLimits;
 
-                var calculator = new AssemblyGroupBoundariesCalculator(factory);
+                var calculator = new FailureMechanismSectionAssemblyGroupBoundariesCalculator(factory);
 
                 // Call
                 void Call() => calculator.CalculateFailureMechanismSectionAssemblyGroupBoundaries(signalingNorm, lowerLimitNorm);
@@ -165,7 +165,7 @@
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
                 categoryLimitsKernel.ThrowExceptionOnCalculate = true;
 
-                var calculator = new AssemblyGroupBoundariesCalculator(factory);
+                var calculator = new FailureMechanismSectionAssemblyGroupBoundariesCalculator(factory);
 
                 // Call
                 void Call() => calculator.CalculateFailureMechanismSectionAssemblyGroupBoundaries(signalingNorm, lowerLimitNorm);
@@ -192,7 +192,7 @@
                 AssemblyCategoryLimitsKernelStub categoryLimitsKernel = factory.LastCreatedAssemblyCategoryLimitsKernel;
                 categoryLimitsKernel.ThrowAssemblyExceptionOnCalculate = true;
 
-                var calculator = new AssemblyGroupBoundariesCalculator(factory);
+                var calculator = new FailureMechanismSectionAssemblyGroupBoundariesCalculator(factory);
 
                 // Call
                 void Call() => calculator.CalculateFailureMechanismSectionAssemblyGroupBoundaries(signalingNorm, lowerLimitNorm);
Fisheye: Tag 00190b5745e366cf2b9977d53401f8182555fe13 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyGroupBoundariesCalculatorStub.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub.cs
===================================================================
diff -u
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub.cs	(revision 0)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub.cs	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -0,0 +1,74 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.KernelWrapper.Calculators.Categories;
+
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories
+{
+    /// <summary>
+    /// Assembly group boundaries calculator stub for testing purposes.
+    /// </summary>
+    public class FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub : IFailureMechanismSectionAssemblyGroupBoundariesCalculator
+    {
+        /// <summary>
+        /// Gets the signaling norm that is used in the calculation.
+        /// </summary>
+        public double SignalingNorm { get; private set; }
+
+        /// <summary>
+        /// Gets the lower limit norm that is used in the calculation.
+        /// </summary>
+        public double LowerLimitNorm { get; private set; }
+
+        /// <summary>
+        /// Sets an indicator whether an exception must be thrown while performing the calculation.
+        /// </summary>
+        public bool ThrowExceptionOnCalculate { private get; set; }
+
+        /// <summary>
+        /// Gets or sets the output of the <see cref="FailureMechanismSectionAssemblyGroupBoundaries"/> calculation.
+        /// </summary>
+        public IEnumerable<FailureMechanismSectionAssemblyGroupBoundaries> FailureMechanismSectionAssemblyGroupBoundariesOutput { get; set; }
+
+        public IEnumerable<FailureMechanismSectionAssemblyGroupBoundaries> CalculateFailureMechanismSectionAssemblyGroupBoundaries(double signalingNorm,
+                                                                                                                                   double lowerLimitNorm)
+        {
+            if (ThrowExceptionOnCalculate)
+            {
+                throw new AssessmentSectionAssemblyGroupBoundariesException("Message", new Exception());
+            }
+
+            SignalingNorm = signalingNorm;
+            LowerLimitNorm = lowerLimitNorm;
+
+            return FailureMechanismSectionAssemblyGroupBoundariesOutput ??
+                   (FailureMechanismSectionAssemblyGroupBoundariesOutput = new[]
+                       {
+                           new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.I, 1, 2),
+                           new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.II, 2.01, 3),
+                           new FailureMechanismSectionAssemblyGroupBoundaries(FailureMechanismSectionAssemblyGroup.III, 3.01, 4)
+                       });
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs
===================================================================
diff -u -r6b76c8ed96481d346fd994cba4eb430143eef1eb -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs	(.../TestAssemblyToolCalculatorFactory.cs)	(revision 6b76c8ed96481d346fd994cba4eb430143eef1eb)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs	(.../TestAssemblyToolCalculatorFactory.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -39,7 +39,7 @@
         public TestAssemblyToolCalculatorFactory()
         {
             LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator = new AssessmentSectionAssemblyGroupBoundariesCalculatorStub();
-            LastCreatedAssemblyGroupBoundariesCalculator = new AssemblyGroupBoundariesCalculatorStub();
+            LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator = new FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub();
             LastCreatedFailureMechanismSectionAssemblyCalculator = new FailureMechanismSectionAssemblyCalculatorStub();
             LastCreatedFailureMechanismAssemblyCalculator = new FailureMechanismAssemblyCalculatorStub();
             LastCreatedAssessmentSectionAssemblyCalculator = new AssessmentSectionAssemblyCalculatorStub();
@@ -51,9 +51,9 @@
         public AssessmentSectionAssemblyGroupBoundariesCalculatorStub LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator { get; }
 
         /// <summary>
-        /// Gets the last created <see cref="AssemblyGroupBoundariesCalculatorStub"/>.
+        /// Gets the last created <see cref="FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub"/>.
         /// </summary>
-        public AssemblyGroupBoundariesCalculatorStub LastCreatedAssemblyGroupBoundariesCalculator { get; }
+        public FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator { get; }
 
         /// <summary>
         /// Gets the last created <see cref="FailureMechanismSectionAssemblyCalculatorStub"/>.
@@ -75,9 +75,9 @@
             return LastCreatedAssessmentSectionAssemblyGroupBoundariesCalculator;
         }
 
-        public IAssemblyGroupBoundariesCalculator CreateAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory)
+        public IFailureMechanismSectionAssemblyGroupBoundariesCalculator CreateAssemblyGroupBoundariesCalculator(IAssemblyToolKernelFactory factory)
         {
-            return LastCreatedAssemblyGroupBoundariesCalculator;
+            return LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
         }
 
         public IFailureMechanismSectionAssemblyCalculator CreateFailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactory factory)
Index: Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupBoundariesFactory.cs
===================================================================
diff -u -rb0ed2483777a856479818b03fa5d5250abd64f99 -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupBoundariesFactory.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesFactory.cs)	(revision b0ed2483777a856479818b03fa5d5250abd64f99)
+++ Riskeer/Common/src/Riskeer.Common.Data/AssemblyTool/FailureMechanismSectionAssemblyGroupBoundariesFactory.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesFactory.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -43,7 +43,7 @@
         public static IEnumerable<FailureMechanismSectionAssemblyGroupBoundaries> CreateFailureMechanismSectionAssemblyGroupBoundaries(
             double signalingNorm, double lowerLimitNorm)
         {
-            IAssemblyGroupBoundariesCalculator calculator = AssemblyToolCalculatorFactory.Instance.CreateAssemblyGroupBoundariesCalculator(
+            IFailureMechanismSectionAssemblyGroupBoundariesCalculator calculator = AssemblyToolCalculatorFactory.Instance.CreateAssemblyGroupBoundariesCalculator(
                 AssemblyToolKernelFactory.Instance);
 
             try
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyGroupBoundariesFactoryTest.cs
===================================================================
diff -u -rb0ed2483777a856479818b03fa5d5250abd64f99 -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyGroupBoundariesFactoryTest.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesFactoryTest.cs)	(revision b0ed2483777a856479818b03fa5d5250abd64f99)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/AssemblyTool/FailureMechanismSectionAssemblyGroupBoundariesFactoryTest.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesFactoryTest.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -46,7 +46,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
 
                 // Call
                 FailureMechanismSectionAssemblyGroupBoundariesFactory.CreateFailureMechanismSectionAssemblyGroupBoundaries(signalingNorm, lowerLimitNorm);
@@ -68,7 +68,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
 
                 // Call
                 FailureMechanismSectionAssemblyGroupBoundaries[] output =
@@ -99,7 +99,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupsPropertiesTest.cs
===================================================================
diff -u -r7ced486f0fd290de08668b1145ba43ce6195ddf8 -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupsPropertiesTest.cs	(.../FailureMechanismSectionAssemblyGroupsPropertiesTest.cs)	(revision 7ced486f0fd290de08668b1145ba43ce6195ddf8)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/FailureMechanismSectionAssemblyGroupsPropertiesTest.cs	(.../FailureMechanismSectionAssemblyGroupsPropertiesTest.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -95,7 +95,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
@@ -113,7 +113,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
 
                 // Call
                 var properties = new FailureMechanismSectionAssemblyGroupsProperties(new AssessmentSection(AssessmentSectionComposition.Dike));
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismSectionAssemblyGroupsViewTest.cs
===================================================================
diff -u -r183353ff0cfc6b0ac85adab36e2eac50c58a3fe8 -r00190b5745e366cf2b9977d53401f8182555fe13
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismSectionAssemblyGroupsViewTest.cs	(.../FailureMechanismSectionAssemblyGroupsViewTest.cs)	(revision 183353ff0cfc6b0ac85adab36e2eac50c58a3fe8)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/FailureMechanismSectionAssemblyGroupsViewTest.cs	(.../FailureMechanismSectionAssemblyGroupsViewTest.cs)	(revision 00190b5745e366cf2b9977d53401f8182555fe13)
@@ -88,7 +88,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
                 using (new FailureMechanismSectionAssemblyGroupsView(assessmentSection))
                 {
                     // Assert
@@ -107,7 +107,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
 
                 // Call
                 using (var view = new FailureMechanismSectionAssemblyGroupsView(assessmentSection))
@@ -138,7 +138,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 // Call
@@ -160,7 +160,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
 
                 using (var view = new FailureMechanismSectionAssemblyGroupsView(assessmentSection))
                 {
@@ -187,7 +187,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
                 calculator.ThrowExceptionOnCalculate = true;
 
                 using (var view = new FailureMechanismSectionAssemblyGroupsView(assessmentSection))
@@ -217,7 +217,7 @@
             using (new AssemblyToolCalculatorFactoryConfig())
             {
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
-                AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
+                FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator;
                 var output = new List<FailureMechanismSectionAssemblyGroupBoundaries>
                 {
                     CreateFailureMechanismSectionAssemblyGroupBoundaries(random)