Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs
===================================================================
diff -u -r6badc3eccf485d334217250d2e261e18dfc86727 -ra19b349a904f33edd89b2f1fb8a746b30857594d
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs	(.../FailureMechanismSectionAssemblyCreator.cs)	(revision 6badc3eccf485d334217250d2e261e18dfc86727)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCreator.cs	(.../FailureMechanismSectionAssemblyCreator.cs)	(revision a19b349a904f33edd89b2f1fb8a746b30857594d)
@@ -21,6 +21,7 @@
 
 using System;
 using System.ComponentModel;
+using Assembly.Kernel.Model.FmSectionTypes;
 using AssemblyTool.Kernel.Data.AssemblyCategories;
 using Ringtoets.AssemblyTool.Data;
 
@@ -38,9 +39,9 @@
         /// <param name="result">The result to create the assembly from.</param>
         /// <returns>The created assembly.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="result"/> is <c>null</c>.</exception>
-        /// <exception cref="InvalidEnumArgumentException">Thrown when <see cref="FailureMechanismSectionCategoryGroup"/>
+        /// <exception cref="InvalidEnumArgumentException">Thrown when <see cref="EFmSectionCategory"/>
         /// is an invalid value.</exception>
-        /// <exception cref="NotSupportedException">Thrown when <see cref="FailureMechanismSectionCategoryGroup"/>
+        /// <exception cref="NotSupportedException">Thrown when <see cref="EFmSectionCategory"/>
         /// is a valid value, but unsupported.</exception>
         public static FailureMechanismSectionAssembly Create(FailureMechanismSectionAssemblyCategoryResult result)
         {
@@ -50,46 +51,46 @@
             }
 
             return new FailureMechanismSectionAssembly(result.EstimatedProbabilityOfFailure.Value,
-                                                       ConvertFailureMechanismSectionCategoryGroup(result.CategoryGroup));
+                                                       ConvertFailureMechanismSectionCategory(result.CategoryGroup));
         }
 
         /// <summary>
-        /// Converts a <see cref="FailureMechanismSectionCategoryGroup"/> into a <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>.
+        /// Converts a <see cref="EFmSectionCategory"/> into a <see cref="FailureMechanismSectionAssemblyCategoryGroup"/>.
         /// </summary>
-        /// <param name="category">The <see cref="FailureMechanismSectionCategoryGroup"/> to convert.</param>
+        /// <param name="category">The <see cref="EFmSectionCategory"/> to convert.</param>
         /// <returns>A <see cref="FailureMechanismSectionAssemblyCategoryGroup"/> based on <paramref name="category"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="category"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="category"/>
         /// is a valid value, but unsupported.</exception>
-        public static FailureMechanismSectionAssemblyCategoryGroup ConvertFailureMechanismSectionCategoryGroup(FailureMechanismSectionCategoryGroup category)
+        public static FailureMechanismSectionAssemblyCategoryGroup ConvertFailureMechanismSectionCategory(EFmSectionCategory category)
         {
-            if (!Enum.IsDefined(typeof(FailureMechanismSectionCategoryGroup), category))
+            if (!Enum.IsDefined(typeof(EFmSectionCategory), category))
             {
                 throw new InvalidEnumArgumentException(nameof(category),
                                                        (int) category,
-                                                       typeof(FailureMechanismSectionCategoryGroup));
+                                                       typeof(EFmSectionCategory));
             }
 
             switch (category)
             {
-                case FailureMechanismSectionCategoryGroup.Iv:
+                case EFmSectionCategory.Iv:
                     return FailureMechanismSectionAssemblyCategoryGroup.Iv;
-                case FailureMechanismSectionCategoryGroup.IIv:
+                case EFmSectionCategory.IIv:
                     return FailureMechanismSectionAssemblyCategoryGroup.IIv;
-                case FailureMechanismSectionCategoryGroup.IIIv:
+                case EFmSectionCategory.IIIv:
                     return FailureMechanismSectionAssemblyCategoryGroup.IIIv;
-                case FailureMechanismSectionCategoryGroup.IVv:
+                case EFmSectionCategory.IVv:
                     return FailureMechanismSectionAssemblyCategoryGroup.IVv;
-                case FailureMechanismSectionCategoryGroup.Vv:
+                case EFmSectionCategory.Vv:
                     return FailureMechanismSectionAssemblyCategoryGroup.Vv;
-                case FailureMechanismSectionCategoryGroup.VIv:
+                case EFmSectionCategory.VIv:
                     return FailureMechanismSectionAssemblyCategoryGroup.VIv;
-                case FailureMechanismSectionCategoryGroup.VIIv:
+                case EFmSectionCategory.VIIv:
                     return FailureMechanismSectionAssemblyCategoryGroup.VIIv;
-                case FailureMechanismSectionCategoryGroup.None:
+                case EFmSectionCategory.Gr:
                     return FailureMechanismSectionAssemblyCategoryGroup.None;
-                case FailureMechanismSectionCategoryGroup.NotApplicable:
+                case EFmSectionCategory.NotApplicable:
                     return FailureMechanismSectionAssemblyCategoryGroup.NotApplicable;
                 default:
                     throw new NotSupportedException();
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -rdfe89063627bf9208166e87a3da54fbbaeb9bda0 -ra19b349a904f33edd89b2f1fb8a746b30857594d
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision dfe89063627bf9208166e87a3da54fbbaeb9bda0)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision a19b349a904f33edd89b2f1fb8a746b30857594d)
@@ -22,10 +22,6 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using AssemblyTool.Kernel;
-using AssemblyTool.Kernel.Data;
-using AssemblyTool.Kernel.Data.AssemblyCategories;
-using AssemblyTool.Kernel.Data.CalculationResults;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCreatorTest.cs
===================================================================
diff -u -r6badc3eccf485d334217250d2e261e18dfc86727 -ra19b349a904f33edd89b2f1fb8a746b30857594d
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCreatorTest.cs	(.../FailureMechanismSectionAssemblyCreatorTest.cs)	(revision 6badc3eccf485d334217250d2e261e18dfc86727)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCreatorTest.cs	(.../FailureMechanismSectionAssemblyCreatorTest.cs)	(revision a19b349a904f33edd89b2f1fb8a746b30857594d)
@@ -21,8 +21,7 @@
 
 using System;
 using System.ComponentModel;
-using AssemblyTool.Kernel.Data;
-using AssemblyTool.Kernel.Data.AssemblyCategories;
+using Assembly.Kernel.Model.FmSectionTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
@@ -86,31 +85,31 @@
         }
 
         [Test]
-        public void ConvertFailureMechanismSectionCategoryGroup_InvalidGroup_ThrowsInvalidEnumArgumentException()
+        public void ConvertFailureMechanismSectionCategory_InvalidGroup_ThrowsInvalidEnumArgumentException()
         {
             // Call
-            TestDelegate test = () => FailureMechanismSectionAssemblyCreator.ConvertFailureMechanismSectionCategoryGroup((FailureMechanismSectionCategoryGroup) 99);
+            TestDelegate test = () => FailureMechanismSectionAssemblyCreator.ConvertFailureMechanismSectionCategory((EFmSectionCategory) 99);
 
             // Assert
-            const string expectedMessage = "The value of argument 'category' (99) is invalid for Enum type 'FailureMechanismSectionCategoryGroup'.";
+            const string expectedMessage = "The value of argument 'category' (99) is invalid for Enum type 'EFmSectionCategory'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, expectedMessage);
         }
 
         [Test]
-        [TestCase(FailureMechanismSectionCategoryGroup.None, FailureMechanismSectionAssemblyCategoryGroup.None)]
-        [TestCase(FailureMechanismSectionCategoryGroup.NotApplicable, FailureMechanismSectionAssemblyCategoryGroup.NotApplicable)]
-        [TestCase(FailureMechanismSectionCategoryGroup.Iv, FailureMechanismSectionAssemblyCategoryGroup.Iv)]
-        [TestCase(FailureMechanismSectionCategoryGroup.IIv, FailureMechanismSectionAssemblyCategoryGroup.IIv)]
-        [TestCase(FailureMechanismSectionCategoryGroup.IIIv, FailureMechanismSectionAssemblyCategoryGroup.IIIv)]
-        [TestCase(FailureMechanismSectionCategoryGroup.IVv, FailureMechanismSectionAssemblyCategoryGroup.IVv)]
-        [TestCase(FailureMechanismSectionCategoryGroup.Vv, FailureMechanismSectionAssemblyCategoryGroup.Vv)]
-        [TestCase(FailureMechanismSectionCategoryGroup.VIv, FailureMechanismSectionAssemblyCategoryGroup.VIv)]
-        [TestCase(FailureMechanismSectionCategoryGroup.VIIv, FailureMechanismSectionAssemblyCategoryGroup.VIIv)]
-        public void ConvertFailureMechanismSectionCategoryGroup_ValidGroup_ReturnFailureMechanismSectionAssemblyCategoryGroup(FailureMechanismSectionCategoryGroup originalGroup,
-                                                                                                                              FailureMechanismSectionAssemblyCategoryGroup expectedGroup)
+        [TestCase(EFmSectionCategory.Gr, FailureMechanismSectionAssemblyCategoryGroup.None)]
+        [TestCase(EFmSectionCategory.NotApplicable, FailureMechanismSectionAssemblyCategoryGroup.NotApplicable)]
+        [TestCase(EFmSectionCategory.Iv, FailureMechanismSectionAssemblyCategoryGroup.Iv)]
+        [TestCase(EFmSectionCategory.IIv, FailureMechanismSectionAssemblyCategoryGroup.IIv)]
+        [TestCase(EFmSectionCategory.IIIv, FailureMechanismSectionAssemblyCategoryGroup.IIIv)]
+        [TestCase(EFmSectionCategory.IVv, FailureMechanismSectionAssemblyCategoryGroup.IVv)]
+        [TestCase(EFmSectionCategory.Vv, FailureMechanismSectionAssemblyCategoryGroup.Vv)]
+        [TestCase(EFmSectionCategory.VIv, FailureMechanismSectionAssemblyCategoryGroup.VIv)]
+        [TestCase(EFmSectionCategory.VIIv, FailureMechanismSectionAssemblyCategoryGroup.VIIv)]
+        public void ConvertFailureMechanismSectionCategory_ValidGroup_ReturnFailureMechanismSectionAssemblyCategoryGroup(EFmSectionCategory originalGroup,
+                                                                                                                         FailureMechanismSectionAssemblyCategoryGroup expectedGroup)
         {
             // Call
-            FailureMechanismSectionAssemblyCategoryGroup actualGroup = FailureMechanismSectionAssemblyCreator.ConvertFailureMechanismSectionCategoryGroup(originalGroup);
+            FailureMechanismSectionAssemblyCategoryGroup actualGroup = FailureMechanismSectionAssemblyCreator.ConvertFailureMechanismSectionCategory(originalGroup);
 
             // Assert
             Assert.AreEqual(expectedGroup, actualGroup);