Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -37,14 +37,14 @@
     /// </summary>
     public class AssessmentSectionAssemblyCalculator : IAssessmentSectionAssemblyCalculator
     {
-        private readonly IAssemblyToolKernelFactory factory;
+        private readonly IAssemblyToolKernelFactoryOld factory;
 
         /// <summary>
         /// Creates a new instance of <see cref="AssessmentSectionAssemblyCalculator"/>.
         /// </summary>
         /// <param name="factory">The factory responsible for creating the assembly kernel.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public AssessmentSectionAssemblyCalculator(IAssemblyToolKernelFactory factory)
+        public AssessmentSectionAssemblyCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             if (factory == null)
             {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -37,14 +37,14 @@
     /// </summary>
     public class FailureMechanismAssemblyCalculator : IFailureMechanismAssemblyCalculator
     {
-        private readonly IAssemblyToolKernelFactory factory;
+        private readonly IAssemblyToolKernelFactoryOld factory;
 
         /// <summary>
         /// Creates a new instance of <see cref="FailureMechanismAssemblyCalculator"/>.
         /// </summary>
         /// <param name="factory">The factory responsible for creating the assembly kernel.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public FailureMechanismAssemblyCalculator(IAssemblyToolKernelFactory factory)
+        public FailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             if (factory == null)
             {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -39,14 +39,14 @@
     /// </summary>
     public class FailureMechanismSectionAssemblyCalculator : IFailureMechanismSectionAssemblyCalculator
     {
-        private readonly IAssemblyToolKernelFactory factory;
+        private readonly IAssemblyToolKernelFactoryOld factory;
 
         /// <summary>
         /// Creates a new instance of <see cref="FailureMechanismSectionAssemblyCalculator"/>.
         /// </summary>
         /// <param name="factory">The factory responsible for creating the assembly kernel.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public FailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactory factory)
+        public FailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             if (factory == null)
             {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactory.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactory.cs	(.../AssemblyToolCalculatorFactory.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/AssemblyToolCalculatorFactory.cs	(.../AssemblyToolCalculatorFactory.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -49,22 +49,22 @@
             }
         }
 
-        public IAssemblyCategoriesCalculator CreateAssemblyCategoriesCalculator(IAssemblyToolKernelFactory factory)
+        public IAssemblyCategoriesCalculator CreateAssemblyCategoriesCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             return new AssemblyCategoriesCalculator(factory);
         }
 
-        public IFailureMechanismSectionAssemblyCalculator CreateFailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactory factory)
+        public IFailureMechanismSectionAssemblyCalculator CreateFailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             return new FailureMechanismSectionAssemblyCalculator(factory);
         }
 
-        public IFailureMechanismAssemblyCalculator CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactory factory)
+        public IFailureMechanismAssemblyCalculator CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             return new FailureMechanismAssemblyCalculator(factory);
         }
 
-        public IAssessmentSectionAssemblyCalculator CreateAssessmentSectionAssemblyCalculator(IAssemblyToolKernelFactory factory)
+        public IAssessmentSectionAssemblyCalculator CreateAssessmentSectionAssemblyCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             return new AssessmentSectionAssemblyCalculator(factory);
         }
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -36,14 +36,14 @@
     /// </summary>
     public class AssemblyCategoriesCalculator : IAssemblyCategoriesCalculator
     {
-        private readonly IAssemblyToolKernelFactory factory;
+        private readonly IAssemblyToolKernelFactoryOld factory;
 
         /// <summary>
         /// Creates a new instance of <see cref="AssemblyCategoriesCalculator"/>.
         /// </summary>
         /// <param name="factory">The factory responsible for creating the assembly categories kernel.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public AssemblyCategoriesCalculator(IAssemblyToolKernelFactory factory)
+        public AssemblyCategoriesCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             if (factory == null)
             {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs	(.../IAssemblyToolCalculatorFactory.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/IAssemblyToolCalculatorFactory.cs	(.../IAssemblyToolCalculatorFactory.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -37,30 +37,30 @@
         /// <param name="factory">The factory responsible for creating the assembly categories kernel.</param>
         /// <returns>The assembly categories calculator.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="factory"/> is <c>null</c>.</exception>
-        IAssemblyCategoriesCalculator CreateAssemblyCategoriesCalculator(IAssemblyToolKernelFactory factory);
+        IAssemblyCategoriesCalculator CreateAssemblyCategoriesCalculator(IAssemblyToolKernelFactoryOld factory);
 
         /// <summary>
         /// Creates a failure mechanism section assembly calculator.
         /// </summary>
         /// <param name="factory">The factory responsible for creating the assembly kernel.</param>
         /// <returns>The failure mechanism section assembly calculator.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="factory"/> is <c>null</c>.</exception>
-        IFailureMechanismSectionAssemblyCalculator CreateFailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactory factory);
+        IFailureMechanismSectionAssemblyCalculator CreateFailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactoryOld factory);
 
         /// <summary>
         /// Creates a failure mechanism assembly calculator.
         /// </summary>
         /// <param name="factory">The factory responsible for creating the assembly kernel.</param>
         /// <returns>The failure mechanism assembly calculator.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="factory"/> is <c>null</c>.</exception>
-        IFailureMechanismAssemblyCalculator CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactory factory);
+        IFailureMechanismAssemblyCalculator CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory);
 
         /// <summary>
         /// Creates an assessment section assembly calculator.
         /// </summary>
         /// <param name="factory">The factory responsible for creating the assembly kernel.</param>
         /// <returns>The assessment section assembly calculator.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="factory"/> is <c>null</c>.</exception>
-        IAssessmentSectionAssemblyCalculator CreateAssessmentSectionAssemblyCalculator(IAssemblyToolKernelFactory factory);
+        IAssessmentSectionAssemblyCalculator CreateAssessmentSectionAssemblyCalculator(IAssemblyToolKernelFactoryOld factory);
     }
 }
\ No newline at end of file
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs	(.../AssemblyToolKernelFactory.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs	(.../AssemblyToolKernelFactory.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -27,13 +27,13 @@
     /// <summary>
     /// Factory that creates the assembly tool kernels.
     /// </summary>
-    public class AssemblyToolKernelFactory : IAssemblyToolKernelFactory
+    public class AssemblyToolKernelFactory : IAssemblyToolKernelFactoryOld
     {
-        private static IAssemblyToolKernelFactory instance;
+        private static IAssemblyToolKernelFactoryOld instance;
 
         private AssemblyToolKernelFactory() {}
 
-        public static IAssemblyToolKernelFactory Instance
+        public static IAssemblyToolKernelFactoryOld Instance
         {
             get
             {
Fisheye: Tag 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactoryOld.cs
===================================================================
diff -u
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactoryOld.cs	(revision 0)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactoryOld.cs	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -0,0 +1,61 @@
+// 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 Assembly.Kernel.Old.Interfaces;
+
+namespace Riskeer.AssemblyTool.KernelWrapper.Kernels
+{
+    /// <summary>
+    /// Factory responsible for creating kernels that can be used for performing an assembly tool calculation.
+    /// </summary>
+    public interface IAssemblyToolKernelFactoryOld
+    {
+        /// <summary>
+        /// Creates an assembly categories kernel.
+        /// </summary>
+        /// <returns>A new <see cref="ICategoryLimitsCalculator"/>.</returns>
+        ICategoryLimitsCalculator CreateAssemblyCategoriesKernel();
+
+        /// <summary>
+        /// Creates a failure mechanism section assembly kernel.
+        /// </summary>
+        /// <returns>A new <see cref="IAssessmentResultsTranslator"/>.</returns>
+        IAssessmentResultsTranslator CreateFailureMechanismSectionAssemblyKernel();
+
+        /// <summary>
+        /// Creates a failure mechanism assembly kernel.
+        /// </summary>
+        /// <returns>A new <see cref="IFailureMechanismResultAssembler"/>.</returns>
+        IFailureMechanismResultAssembler CreateFailureMechanismAssemblyKernel();
+
+        /// <summary>
+        /// Creates an assessment section assembly kernel.
+        /// </summary>
+        /// <returns>A new <see cref="IAssessmentGradeAssembler"/>.</returns>
+        IAssessmentGradeAssembler CreateAssessmentSectionAssemblyKernel();
+
+        /// <summary>
+        /// Creates a combined failure mechanism section assembly kernel.
+        /// </summary>
+        /// <returns>A new <see cref="ICommonFailureMechanismSectionAssembler"/>.</returns>
+        ICommonFailureMechanismSectionAssembler CreateCombinedFailureMechanismSectionAssemblyKernel();
+    }
+}
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs	(.../AssessmentSectionAssemblyCalculatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs	(.../AssessmentSectionAssemblyCalculatorTest.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -47,7 +47,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var kernelFactory = mocks.Stub<IAssemblyToolKernelFactory>();
+            var kernelFactory = mocks.Stub<IAssemblyToolKernelFactoryOld>();
             mocks.ReplayAll();
 
             // Call
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -48,7 +48,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var kernelFactory = mocks.Stub<IAssemblyToolKernelFactory>();
+            var kernelFactory = mocks.Stub<IAssemblyToolKernelFactoryOld>();
             mocks.ReplayAll();
 
             // Call
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -49,7 +49,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var kernelFactory = mocks.Stub<IAssemblyToolKernelFactory>();
+            var kernelFactory = mocks.Stub<IAssemblyToolKernelFactoryOld>();
             mocks.ReplayAll();
 
             // Call
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -55,7 +55,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var factory = mocks.Stub<IAssemblyToolKernelFactory>();
+            var factory = mocks.Stub<IAssemblyToolKernelFactoryOld>();
             mocks.ReplayAll();
 
             // Call
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs	(.../AssemblyToolKernelFactoryTest.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs	(.../AssemblyToolKernelFactoryTest.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -34,7 +34,7 @@
         public void Instance_Always_ReturnsAnInstance()
         {
             // Call
-            IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance;
+            IAssemblyToolKernelFactoryOld factory = AssemblyToolKernelFactory.Instance;
 
             // Assert
             Assert.IsInstanceOf<AssemblyToolKernelFactory>(factory);
@@ -44,11 +44,11 @@
         public void Instance_WhenSetToNull_ReturnsNewInstance()
         {
             // Setup
-            IAssemblyToolKernelFactory firstFactory = AssemblyToolKernelFactory.Instance;
+            IAssemblyToolKernelFactoryOld firstFactory = AssemblyToolKernelFactory.Instance;
             AssemblyToolKernelFactory.Instance = null;
 
             // Call
-            IAssemblyToolKernelFactory secondFactory = AssemblyToolKernelFactory.Instance;
+            IAssemblyToolKernelFactoryOld secondFactory = AssemblyToolKernelFactory.Instance;
 
             // Assert
             Assert.AreNotSame(firstFactory, secondFactory);
@@ -62,7 +62,7 @@
             AssemblyToolKernelFactory.Instance = firstFactory;
 
             // Call
-            IAssemblyToolKernelFactory secondFactory = AssemblyToolKernelFactory.Instance;
+            IAssemblyToolKernelFactoryOld secondFactory = AssemblyToolKernelFactory.Instance;
 
             // Assert
             Assert.AreSame(firstFactory, secondFactory);
@@ -72,7 +72,7 @@
         public void CreateAssemblyCategoriesKernel_Always_ReturnsKernelCategoryLimitsCalculator()
         {
             // Setup
-            IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance;
+            IAssemblyToolKernelFactoryOld factory = AssemblyToolKernelFactory.Instance;
 
             // Call
             ICategoryLimitsCalculator assemblyCategoriesKernel = factory.CreateAssemblyCategoriesKernel();
@@ -85,7 +85,7 @@
         public void CreateFailureMechanismSectionAssemblyKernel_Always_ReturnsKernelAssessmentResultsTranslator()
         {
             // Setup
-            IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance;
+            IAssemblyToolKernelFactoryOld factory = AssemblyToolKernelFactory.Instance;
 
             // Call
             IAssessmentResultsTranslator kernel = factory.CreateFailureMechanismSectionAssemblyKernel();
@@ -98,7 +98,7 @@
         public void CreateFailureMechanismAssemblyKernel_Always_ReturnsKernelFailureMechanismResultAssembler()
         {
             // Setup
-            IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance;
+            IAssemblyToolKernelFactoryOld factory = AssemblyToolKernelFactory.Instance;
 
             // Call
             IFailureMechanismResultAssembler kernel = factory.CreateFailureMechanismAssemblyKernel();
@@ -111,7 +111,7 @@
         public void CreateAssessmentSectionAssemblyKernel_Always_ReturnsKernelAssessmentGradeAssembler()
         {
             // Setup
-            IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance;
+            IAssemblyToolKernelFactoryOld factory = AssemblyToolKernelFactory.Instance;
 
             // Call
             IAssessmentGradeAssembler kernel = factory.CreateAssessmentSectionAssemblyKernel();
@@ -124,7 +124,7 @@
         public void CreateCombinedFailureMechanismSectionAssemblyKernel_Always_ReturnsKernelCommonFailureMechanismSectionAssembler()
         {
             // Setup
-            IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance;
+            IAssemblyToolKernelFactoryOld factory = AssemblyToolKernelFactory.Instance;
 
             // Call
             ICommonFailureMechanismSectionAssembler kernel = factory.CreateCombinedFailureMechanismSectionAssemblyKernel();
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs	(.../TestAssemblyToolCalculatorFactory.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Calculators/TestAssemblyToolCalculatorFactory.cs	(.../TestAssemblyToolCalculatorFactory.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -64,22 +64,22 @@
         /// </summary>
         public AssessmentSectionAssemblyCalculatorStub LastCreatedAssessmentSectionAssemblyCalculator { get; }
 
-        public IAssemblyCategoriesCalculator CreateAssemblyCategoriesCalculator(IAssemblyToolKernelFactory factory)
+        public IAssemblyCategoriesCalculator CreateAssemblyCategoriesCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             return LastCreatedAssemblyCategoriesCalculator;
         }
 
-        public IFailureMechanismSectionAssemblyCalculator CreateFailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactory factory)
+        public IFailureMechanismSectionAssemblyCalculator CreateFailureMechanismSectionAssemblyCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             return LastCreatedFailureMechanismSectionAssemblyCalculator;
         }
 
-        public IFailureMechanismAssemblyCalculator CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactory factory)
+        public IFailureMechanismAssemblyCalculator CreateFailureMechanismAssemblyCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             return LastCreatedFailureMechanismAssemblyCalculator;
         }
 
-        public IAssessmentSectionAssemblyCalculator CreateAssessmentSectionAssemblyCalculator(IAssemblyToolKernelFactory factory)
+        public IAssessmentSectionAssemblyCalculator CreateAssessmentSectionAssemblyCalculator(IAssemblyToolKernelFactoryOld factory)
         {
             return LastCreatedAssessmentSectionAssemblyCalculator;
         }
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/AssemblyToolKernelFactoryConfig.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/AssemblyToolKernelFactoryConfig.cs	(.../AssemblyToolKernelFactoryConfig.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/AssemblyToolKernelFactoryConfig.cs	(.../AssemblyToolKernelFactoryConfig.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -42,7 +42,7 @@
     /// </example>
     public class AssemblyToolKernelFactoryConfig : IDisposable
     {
-        private readonly IAssemblyToolKernelFactory previousFactory;
+        private readonly IAssemblyToolKernelFactoryOld previousFactory;
 
         /// <summary>
         /// Creates a new instance of <see cref="AssemblyToolKernelFactoryConfig"/>.
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs
===================================================================
diff -u -r86db41f54622d8d64a9e70cd96ae8a4198de4703 -r68ebb6b14ea8c83ceec53c424f6af8c896f2ace8
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs	(.../TestAssemblyToolKernelFactory.cs)	(revision 86db41f54622d8d64a9e70cd96ae8a4198de4703)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/TestAssemblyToolKernelFactory.cs	(.../TestAssemblyToolKernelFactory.cs)	(revision 68ebb6b14ea8c83ceec53c424f6af8c896f2ace8)
@@ -29,7 +29,7 @@
     /// <summary>
     /// Factory that creates assembly tool kernel stubs for testing purposes.
     /// </summary>
-    public class TestAssemblyToolKernelFactory : IAssemblyToolKernelFactory
+    public class TestAssemblyToolKernelFactory : IAssemblyToolKernelFactoryOld
     {
         /// <summary>
         /// Creates a new instance of <see cref="TestAssemblyToolKernelFactory"/>.