Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/AssessmentGradeConversionTestHelperTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/AssessmentGradeConversionTestHelperTest.cs	(.../AssessmentGradeConversionTestHelperTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/AssessmentGradeConversionTestHelperTest.cs	(.../AssessmentGradeConversionTestHelperTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -24,9 +24,8 @@
 using Assembly.Kernel.Model;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test
 {
     [TestFixture]
     public class AssessmentGradeConversionTestHelperTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs	(.../AssessmentSectionAssemblyCalculatorStubTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorStubTest.cs	(.../AssessmentSectionAssemblyCalculatorStubTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -28,7 +28,7 @@
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators.Assembly
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators.Assembly
 {
     [TestFixture]
     public class AssessmentSectionAssemblyCalculatorStubTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorStubTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorStubTest.cs	(.../FailureMechanismAssemblyCalculatorStubTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorStubTest.cs	(.../FailureMechanismAssemblyCalculatorStubTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -28,7 +28,7 @@
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators.Assembly
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators.Assembly
 {
     [TestFixture]
     public class FailureMechanismAssemblyCalculatorStubTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs	(.../FailureMechanismSectionAssemblyCalculatorStubTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStubTest.cs	(.../FailureMechanismSectionAssemblyCalculatorStubTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -27,7 +27,7 @@
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators.Assembly
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators.Assembly
 {
     [TestFixture]
     public class FailureMechanismSectionAssemblyCalculatorStubTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/AssemblyToolCalculatorFactoryConfigTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/AssemblyToolCalculatorFactoryConfigTest.cs	(.../AssemblyToolCalculatorFactoryConfigTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/AssemblyToolCalculatorFactoryConfigTest.cs	(.../AssemblyToolCalculatorFactoryConfigTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -24,7 +24,7 @@
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators
 {
     [TestFixture]
     public class AssemblyToolCalculatorFactoryConfigTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs	(.../AssemblyCategoriesCalculatorStubTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Categories/AssemblyCategoriesCalculatorStubTest.cs	(.../AssemblyCategoriesCalculatorStubTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -27,7 +27,7 @@
 using Riskeer.AssemblyTool.KernelWrapper.Calculators.Categories;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators.Categories
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators.Categories
 {
     [TestFixture]
     public class AssemblyCategoriesCalculatorStubTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/TestAssemblyToolCalculatorFactoryTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/TestAssemblyToolCalculatorFactoryTest.cs	(.../TestAssemblyToolCalculatorFactoryTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/TestAssemblyToolCalculatorFactoryTest.cs	(.../TestAssemblyToolCalculatorFactoryTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -27,7 +27,7 @@
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Calculators
 {
     [TestFixture]
     public class TestAssemblyToolCalculatorFactoryTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/CategoriesListTestFactoryTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/CategoriesListTestFactoryTest.cs	(.../CategoriesListTestFactoryTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/CategoriesListTestFactoryTest.cs	(.../CategoriesListTestFactoryTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -21,9 +21,8 @@
 
 using Assembly.Kernel.Model.CategoryLimits;
 using NUnit.Framework;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test
 {
     [TestFixture]
     public class CategoriesListTestFactoryTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/AssessmentSectionAssemblyKernelStubTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/AssessmentSectionAssemblyKernelStubTest.cs	(.../AssessmentSectionAssemblyKernelStubTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/AssessmentSectionAssemblyKernelStubTest.cs	(.../AssessmentSectionAssemblyKernelStubTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -28,10 +28,9 @@
 using Assembly.Kernel.Model.CategoryLimits;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Assembly
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Assembly
 {
     [TestFixture]
     public class AssessmentSectionAssemblyKernelStubTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs	(.../CombinedFailureMechanismSectionAssemblyKernelStubTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs	(.../CombinedFailureMechanismSectionAssemblyKernelStubTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -29,7 +29,7 @@
 using NUnit.Framework;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Assembly
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Assembly
 {
     [TestFixture]
     public class CombinedFailureMechanismSectionAssemblyKernelStubTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismAssemblyKernelStubTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismAssemblyKernelStubTest.cs	(.../FailureMechanismAssemblyKernelStubTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismAssemblyKernelStubTest.cs	(.../FailureMechanismAssemblyKernelStubTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -29,10 +29,9 @@
 using Assembly.Kernel.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Assembly
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Assembly
 {
     [TestFixture]
     public class FailureMechanismAssemblyKernelStubTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs	(.../FailureMechanismSectionAssemblyKernelStubTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs	(.../FailureMechanismSectionAssemblyKernelStubTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -28,10 +28,9 @@
 using Assembly.Kernel.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Assembly
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Assembly
 {
     [TestFixture]
     public class FailureMechanismSectionAssemblyKernelStubTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/AssemblyToolKernelFactoryConfigTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/AssemblyToolKernelFactoryConfigTest.cs	(.../AssemblyToolKernelFactoryConfigTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/AssemblyToolKernelFactoryConfigTest.cs	(.../AssemblyToolKernelFactoryConfigTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -24,7 +24,7 @@
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels
 {
     [TestFixture]
     public class AssemblyToolKernelFactoryConfigTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Categories/AssemblyCategoriesKernelStubTest.cs	(.../AssemblyCategoriesKernelStubTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -27,10 +27,9 @@
 using Assembly.Kernel.Model.CategoryLimits;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Categories;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Categories
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels.Categories
 {
     [TestFixture]
     public class AssemblyCategoriesKernelStubTest
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/TestAssemblyToolKernelFactoryTest.cs
===================================================================
diff -u -r4daef8e3a2342b70b706b7fdf5837ffe7e75dc24 -rdeecb094b4fd47650f9ad3cb558eae18cc339368
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/TestAssemblyToolKernelFactoryTest.cs	(.../TestAssemblyToolKernelFactoryTest.cs)	(revision 4daef8e3a2342b70b706b7fdf5837ffe7e75dc24)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/TestAssemblyToolKernelFactoryTest.cs	(.../TestAssemblyToolKernelFactoryTest.cs)	(revision deecb094b4fd47650f9ad3cb558eae18cc339368)
@@ -24,7 +24,7 @@
 using Riskeer.AssemblyTool.KernelWrapper.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels;
 
-namespace Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels
+namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Test.Kernels
 {
     [TestFixture]
     public class TestAssemblyToolKernelFactoryTest