Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs
===================================================================
diff -u -r7f7cb92f29ad73708c2346df6efd1c39fc29d41c -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision 7f7cb92f29ad73708c2346df6efd1c39fc29d41c)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Categories/AssemblyCategoriesCalculator.cs	(.../AssemblyCategoriesCalculator.cs)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -28,7 +28,6 @@
 using AssemblyTool.Kernel.Data.AssemblyCategories;
 using Ringtoets.AssemblyTool.KernelWrapper.Creators;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
-using Ringtoets.AssemblyTool.KernelWrapper.Kernels.Categories;
 using Ringtoets.Common.Data.AssemblyTool;
 
 namespace Ringtoets.AssemblyTool.KernelWrapper.Calculators.Categories
@@ -64,7 +63,7 @@
 
                 return AssessmentSectionAssemblyCategoryCreator.CreateAssessmentSectionAssemblyCategories(output);
             }
-            catch (AssemblyCategoriesKernelWrapperException e)
+            catch (Exception e)
             {
                 throw new AssemblyCategoriesCalculatorException(e.Message, e);
             }
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs	(revision 0)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -0,0 +1,52 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets 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 AssemblyTool.Kernel.Categories;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.Kernels
+{
+    /// <summary>
+    /// Factory that creates the assembly tool kernels.
+    /// </summary>
+    public class AssemblyToolKernelFactory : IAssemblyToolKernelFactory
+    {
+        private static IAssemblyToolKernelFactory instance;
+
+        private AssemblyToolKernelFactory() {}
+
+        public static IAssemblyToolKernelFactory Instance
+        {
+            get
+            {
+                return instance ?? (instance = new AssemblyToolKernelFactory());
+            }
+            set
+            {
+                instance = value;
+            }
+        }
+
+        public ICategoriesCalculator CreateAssemblyCategoriesKernel()
+        {
+            return new CategoriesCalculator();
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag af2dccd51c7d3ece1434603ea37e8f75cdbb54a2 refers to a dead (removed) revision in file `Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelWrapperFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag af2dccd51c7d3ece1434603ea37e8f75cdbb54a2 refers to a dead (removed) revision in file `Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/Categories/AssemblyCategoriesKernelWrapperException.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag af2dccd51c7d3ece1434603ea37e8f75cdbb54a2 refers to a dead (removed) revision in file `Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Kernels/Categories/IAssemblyCategoriesKernel.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj
===================================================================
diff -u -r4b4fec782deaf4c58bb91b0a0dd24947dcd19e14 -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.csproj)	(revision 4b4fec782deaf4c58bb91b0a0dd24947dcd19e14)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Ringtoets.AssemblyTool.KernelWrapper.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.csproj)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -22,9 +22,7 @@
     <Compile Include="Calculators\Categories\IAssemblyCategoriesCalculator.cs" />
     <Compile Include="Calculators\IAssemblyToolCalculatorFactory.cs" />
     <Compile Include="Creators\AssessmentSectionAssemblyCategoryCreator.cs" />
-    <Compile Include="Kernels\AssemblyToolKernelWrapperFactory.cs" />
-    <Compile Include="Kernels\Categories\AssemblyCategoriesKernelWrapperException.cs" />
-    <Compile Include="Kernels\Categories\IAssemblyCategoriesKernel.cs" />
+    <Compile Include="Kernels\AssemblyToolKernelFactory.cs" />
     <Compile Include="Kernels\IAssemblyToolKernelFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs
===================================================================
diff -u -r9c274457523062aad7b755fa88b20277c5d86bcb -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs	(.../AssemblyToolCalculatorFactoryTest.cs)	(revision 9c274457523062aad7b755fa88b20277c5d86bcb)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/AssemblyToolCalculatorFactoryTest.cs	(.../AssemblyToolCalculatorFactoryTest.cs)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -71,7 +71,7 @@
         }
 
         [Test]
-        public void CreateAssemblyCategoriesCalculator_WithKernelWrapperFactory_ReturnsAssemblyCategoriesCalculator()
+        public void CreateAssemblyCategoriesCalculator_WithKernelFactory_ReturnsAssemblyCategoriesCalculator()
         {
             // Setup
             IAssemblyToolCalculatorFactory factory = AssemblyToolCalculatorFactory.Instance;
@@ -80,15 +80,15 @@
             {
                 // Call
                 IAssemblyCategoriesCalculator calculator = factory.CreateAssemblyCategoriesCalculator(
-                    AssemblyToolKernelWrapperFactory.Instance);
+                    AssemblyToolKernelFactory.Instance);
 
                 // Assert
                 Assert.IsInstanceOf<AssemblyCategoriesCalculator>(calculator);
             }
         }
 
         [Test]
-        public void CreateFailureMechanismSectionAssessmentAssemblyCalculator_WithKernelWrapperFactory_ReturnsFailureMechanismSectionAssessmentAssemblyCalculator()
+        public void CreateFailureMechanismSectionAssessmentAssemblyCalculator_WithKernelFactory_ReturnsFailureMechanismSectionAssessmentAssemblyCalculator()
         {
             // Setup
             IAssemblyToolCalculatorFactory factory = AssemblyToolCalculatorFactory.Instance;
@@ -97,7 +97,7 @@
             {
                 // Call
                 IFailureMechanismSectionAssessmentAssemblyCalculator calculator = factory.CreateFailureMechanismSectionAssessmentAssemblyCalculator(
-                    AssemblyToolKernelWrapperFactory.Instance);
+                    AssemblyToolKernelFactory.Instance);
 
                 // Assert
                 Assert.IsInstanceOf<FailureMechanismSectionAssessmentAssemblyCalculator>(calculator);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs
===================================================================
diff -u -r7f7cb92f29ad73708c2346df6efd1c39fc29d41c -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision 7f7cb92f29ad73708c2346df6efd1c39fc29d41c)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Categories/AssemblyCategoriesCalculatorTest.cs	(.../AssemblyCategoriesCalculatorTest.cs)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -29,7 +29,6 @@
 using Rhino.Mocks;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Categories;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
-using Ringtoets.AssemblyTool.KernelWrapper.Kernels.Categories;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels.Categories;
 using Ringtoets.Common.Data.AssemblyTool;
@@ -76,7 +75,7 @@
 
             using (new AssemblyToolKernelFactoryConfig())
             {
-                var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelWrapperFactory.Instance;
+                var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub kernel = factory.LastCreatedAssemblyCategoriesKernel;
                 kernel.AssessmentSectionCategoriesOutput = CreateKernelOutput();
 
@@ -102,7 +101,7 @@
 
             using (new AssemblyToolKernelFactoryConfig())
             {
-                var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelWrapperFactory.Instance;
+                var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub kernel = factory.LastCreatedAssemblyCategoriesKernel;
                 kernel.AssessmentSectionCategoriesOutput = output;
 
@@ -117,7 +116,7 @@
         }
 
         [Test]
-        public void CalculateAssessmentSectionCategories_KernelThrowsAssemblyCategoriesKernelWrapperException_ThrowAssemblyCategoriesCalculatorException()
+        public void CalculateAssessmentSectionCategories_KernelThrowsException_ThrowAssemblyCategoriesCalculatorException()
         {
             // Setup
             var random = new Random(11);
@@ -126,7 +125,7 @@
 
             using (new AssemblyToolKernelFactoryConfig())
             {
-                var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelWrapperFactory.Instance;
+                var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 AssemblyCategoriesKernelStub kernel = factory.LastCreatedAssemblyCategoriesKernel;
                 kernel.ThrowExceptionOnCalculate = true;
 
@@ -137,7 +136,7 @@
 
                 // Assert
                 var exception = Assert.Throws<AssemblyCategoriesCalculatorException>(test);
-                Assert.IsInstanceOf<AssemblyCategoriesKernelWrapperException>(exception.InnerException);
+                Assert.IsInstanceOf<Exception>(exception.InnerException);
                 Assert.AreEqual(exception.InnerException.Message, exception.Message);
             }
         }
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs	(revision 0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -0,0 +1,83 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets 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 AssemblyTool.Kernel.Categories;
+using NUnit.Framework;
+using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels;
+
+namespace Ringtoets.AssemblyTool.KernelWrapper.Test.Kernels
+{
+    [TestFixture]
+    public class AssemblyToolKernelFactoryTest
+    {
+        [Test]
+        public void Instance_Always_ReturnsAnInstance()
+        {
+            // Call
+            IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance;
+
+            // Assert
+            Assert.IsInstanceOf<AssemblyToolKernelFactory>(factory);
+        }
+
+        [Test]
+        public void Instance_WhenSetToNull_ReturnsNewInstance()
+        {
+            // Setup
+            IAssemblyToolKernelFactory firstFactory = AssemblyToolKernelFactory.Instance;
+            AssemblyToolKernelFactory.Instance = null;
+
+            // Call
+            IAssemblyToolKernelFactory secondFactory = AssemblyToolKernelFactory.Instance;
+
+            // Assert
+            Assert.AreNotSame(firstFactory, secondFactory);
+        }
+
+        [Test]
+        public void Instance_WhenSetToInstance_ReturnsThatInstance()
+        {
+            // Setup
+            var firstFactory = new TestAssemblyToolKernelFactory();
+            AssemblyToolKernelFactory.Instance = firstFactory;
+
+            // Call
+            IAssemblyToolKernelFactory secondFactory = AssemblyToolKernelFactory.Instance;
+
+            // Assert
+            Assert.AreSame(firstFactory, secondFactory);
+        }
+
+        [Test]
+        public void CreateAssemblyCategoriesKernel_Always_ReturnsKernelCategoriesCalculator()
+        {
+            // Setup
+            IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance;
+
+            // Call
+            ICategoriesCalculator assemblyCategoriesKernel = factory.CreateAssemblyCategoriesKernel();
+
+            // Assert
+            Assert.IsInstanceOf<CategoriesCalculator>(assemblyCategoriesKernel);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag af2dccd51c7d3ece1434603ea37e8f75cdbb54a2 refers to a dead (removed) revision in file `Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelWrapperFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag af2dccd51c7d3ece1434603ea37e8f75cdbb54a2 refers to a dead (removed) revision in file `Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Kernels/Categories/AssemblyCategoriesKernelWrapperExceptionTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj
===================================================================
diff -u -r4b4fec782deaf4c58bb91b0a0dd24947dcd19e14 -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj)	(revision 4b4fec782deaf4c58bb91b0a0dd24947dcd19e14)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Ringtoets.AssemblyTool.KernelWrapper.Test.csproj	(.../Ringtoets.AssemblyTool.KernelWrapper.Test.csproj)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -26,8 +26,7 @@
     <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorExceptionTest.cs" />
     <Compile Include="Calculators\Categories\AssemblyCategoriesCalculatorTest.cs" />
     <Compile Include="Creators\AssessmentSectionAssemblyCategoryCreatorTest.cs" />
-    <Compile Include="Kernels\AssemblyToolKernelWrapperFactoryTest.cs" />
-    <Compile Include="Kernels\Categories\AssemblyCategoriesKernelWrapperExceptionTest.cs" />
+    <Compile Include="Kernels\AssemblyToolKernelFactoryTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/AssemblyToolKernelFactoryConfigTest.cs
===================================================================
diff -u -r6be8d4073d017fede7f0b8bdcd602b07d56a9e61 -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/AssemblyToolKernelFactoryConfigTest.cs	(.../AssemblyToolKernelFactoryConfigTest.cs)	(revision 6be8d4073d017fede7f0b8bdcd602b07d56a9e61)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/AssemblyToolKernelFactoryConfigTest.cs	(.../AssemblyToolKernelFactoryConfigTest.cs)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -41,27 +41,27 @@
         }
 
         [Test]
-        public void Constructor_SetsTestFactoryForAssemblyToolKernelWrapperFactory()
+        public void Constructor_SetsTestFactoryForAssemblyToolKernelFactory()
         {
             // Call
             using (new AssemblyToolKernelFactoryConfig())
             {
                 // Assert
-                Assert.IsInstanceOf<TestAssemblyToolKernelFactory>(AssemblyToolKernelWrapperFactory.Instance);
+                Assert.IsInstanceOf<TestAssemblyToolKernelFactory>(AssemblyToolKernelFactory.Instance);
             }
         }
 
         [Test]
         public void Dispose_Always_ResetsFactoryToPreviousValue()
         {
             // Setup
-            IAssemblyToolKernelFactory expectedFactory = AssemblyToolKernelWrapperFactory.Instance;
+            IAssemblyToolKernelFactory expectedFactory = AssemblyToolKernelFactory.Instance;
 
             // Call
             using (new AssemblyToolKernelFactoryConfig()) {}
 
             // Assert
-            Assert.AreSame(expectedFactory, AssemblyToolKernelWrapperFactory.Instance);
+            Assert.AreSame(expectedFactory, AssemblyToolKernelFactory.Instance);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs
===================================================================
diff -u -r7f7cb92f29ad73708c2346df6efd1c39fc29d41c -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision 7f7cb92f29ad73708c2346df6efd1c39fc29d41c)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -26,7 +26,6 @@
 using AssemblyTool.Kernel.Data;
 using AssemblyTool.Kernel.Data.AssemblyCategories;
 using NUnit.Framework;
-using Ringtoets.AssemblyTool.KernelWrapper.Kernels.Categories;
 using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels.Categories;
 
 namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Categories
@@ -97,7 +96,7 @@
         }
 
         [Test]
-        public void CalculateAssessmentSectionCategories_ThrowExceptionOnCalculateTrue_ThrowsAssemblyCategoriesKernelWrapperException()
+        public void CalculateAssessmentSectionCategories_ThrowExceptionOnCalculateTrue_ThrowsException()
         {
             // Setup
             var kernelStub = new AssemblyCategoriesKernelStub
@@ -112,7 +111,7 @@
             TestDelegate test = () => kernelStub.CalculateAssessmentSectionCategories(new CalculateAssessmentSectionCategoriesInput(new Probability(0), new Probability(0)));
 
             // Assert
-            var exception = Assert.Throws<AssemblyCategoriesKernelWrapperException>(test);
+            var exception = Assert.Throws<Exception>(test);
             Assert.AreEqual("Message", exception.Message);
             Assert.IsNotNull(exception.InnerException);
             Assert.IsFalse(kernelStub.Calculated);
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyCategoriesCalculatorStub.cs
===================================================================
diff -u -r7f7cb92f29ad73708c2346df6efd1c39fc29d41c -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyCategoriesCalculatorStub.cs	(.../AssemblyCategoriesCalculatorStub.cs)	(revision 7f7cb92f29ad73708c2346df6efd1c39fc29d41c)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Categories/AssemblyCategoriesCalculatorStub.cs	(.../AssemblyCategoriesCalculatorStub.cs)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -19,9 +19,9 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Collections.Generic;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Categories;
-using Ringtoets.AssemblyTool.KernelWrapper.Kernels.Categories;
 using Ringtoets.Common.Data.AssemblyTool;
 
 namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories
@@ -55,7 +55,7 @@
         {
             if (ThrowExceptionOnCalculate)
             {
-                throw new AssemblyCategoriesCalculatorException("Message", new AssemblyCategoriesKernelWrapperException());
+                throw new AssemblyCategoriesCalculatorException("Message", new Exception());
             }
 
             SignalingNorm = signalingNorm;
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/AssemblyToolKernelFactoryConfig.cs
===================================================================
diff -u -r6be8d4073d017fede7f0b8bdcd602b07d56a9e61 -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/AssemblyToolKernelFactoryConfig.cs	(.../AssemblyToolKernelFactoryConfig.cs)	(revision 6be8d4073d017fede7f0b8bdcd602b07d56a9e61)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/AssemblyToolKernelFactoryConfig.cs	(.../AssemblyToolKernelFactoryConfig.cs)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -26,15 +26,15 @@
 {
     /// <summary>
     /// This class can be used to set a temporary <see cref="TestAssemblyToolKernelFactory"/> 
-    /// for <see cref="AssemblyToolKernelWrapperFactory.Instance"/> while testing. 
-    /// Disposing an instance of this class will revert the <see cref="AssemblyToolKernelWrapperFactory.Instance"/>.
+    /// for <see cref="AssemblyToolKernelFactory.Instance"/> while testing. 
+    /// Disposing an instance of this class will revert the <see cref="AssemblyToolKernelFactory.Instance"/>.
     /// </summary>
     /// <example>
     /// The following is an example for how to use this class:
     /// <code>
     /// using(new AssemblyToolKernelFactoryConfig())
     /// {
-    ///     var testFactory = (TestAssemblyToolKernelFactory) AssemblyToolKernelWrapperFactory.Instance;
+    ///     var testFactory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
     /// 
     ///     // Perform tests with testFactory
     /// }
@@ -47,21 +47,21 @@
         /// <summary>
         /// Creates a new instance of <see cref="AssemblyToolKernelFactoryConfig"/>.
         /// Sets a <see cref="TestAssemblyToolKernelFactory"/> to 
-        /// <see cref="AssemblyToolKernelWrapperFactory.Instance"/>
+        /// <see cref="AssemblyToolKernelFactory.Instance"/>
         /// </summary>
         public AssemblyToolKernelFactoryConfig()
         {
-            previousFactory = AssemblyToolKernelWrapperFactory.Instance;
-            AssemblyToolKernelWrapperFactory.Instance = new TestAssemblyToolKernelFactory();
+            previousFactory = AssemblyToolKernelFactory.Instance;
+            AssemblyToolKernelFactory.Instance = new TestAssemblyToolKernelFactory();
         }
 
         /// <summary>
-        /// Reverts the <see cref="AssemblyToolKernelWrapperFactory.Instance"/> to the value
+        /// Reverts the <see cref="AssemblyToolKernelFactory.Instance"/> to the value
         /// it had at time of construction of the <see cref="AssemblyToolKernelFactoryConfig"/>.
         /// </summary>
         public void Dispose()
         {
-            AssemblyToolKernelWrapperFactory.Instance = previousFactory;
+            AssemblyToolKernelFactory.Instance = previousFactory;
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs
===================================================================
diff -u -r7f7cb92f29ad73708c2346df6efd1c39fc29d41c -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs	(.../AssemblyCategoriesKernelStub.cs)	(revision 7f7cb92f29ad73708c2346df6efd1c39fc29d41c)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Categories/AssemblyCategoriesKernelStub.cs	(.../AssemblyCategoriesKernelStub.cs)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -24,7 +24,6 @@
 using AssemblyTool.Kernel.Categories;
 using AssemblyTool.Kernel.Categories.CalculatorInput;
 using AssemblyTool.Kernel.Data.AssemblyCategories;
-using Ringtoets.AssemblyTool.KernelWrapper.Kernels.Categories;
 
 namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels.Categories
 {
@@ -62,7 +61,7 @@
         {
             if (ThrowExceptionOnCalculate)
             {
-                throw new AssemblyCategoriesKernelWrapperException("Message", new Exception());
+                throw new Exception("Message", new Exception());
             }
 
 
Index: Ringtoets/Common/src/Ringtoets.Common.Service/AssemblyTool/AssemblyToolCategoriesCalculationService.cs
===================================================================
diff -u -r7f7cb92f29ad73708c2346df6efd1c39fc29d41c -raf2dccd51c7d3ece1434603ea37e8f75cdbb54a2
--- Ringtoets/Common/src/Ringtoets.Common.Service/AssemblyTool/AssemblyToolCategoriesCalculationService.cs	(.../AssemblyToolCategoriesCalculationService.cs)	(revision 7f7cb92f29ad73708c2346df6efd1c39fc29d41c)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/AssemblyTool/AssemblyToolCategoriesCalculationService.cs	(.../AssemblyToolCategoriesCalculationService.cs)	(revision af2dccd51c7d3ece1434603ea37e8f75cdbb54a2)
@@ -44,7 +44,7 @@
         public static IEnumerable<AssessmentSectionAssemblyCategory> CalculateAssessmentSectionAssemblyCategories(double signalingNorm, double lowerBoundaryNorm)
         {
             IAssemblyCategoriesCalculator calculator = AssemblyToolCalculatorFactory.Instance.CreateAssemblyCategoriesCalculator(
-                AssemblyToolKernelWrapperFactory.Instance);
+                AssemblyToolKernelFactory.Instance);
 
             try
             {