Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs
===================================================================
diff -u -rff7d35236a40e27f08a25a0d39a958ba9d22331f -r98d0e5da457d6789536a76b8c7591f22aafe32d7
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs)	(revision ff7d35236a40e27f08a25a0d39a958ba9d22331f)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyCalculatorInputCreator.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreator.cs)	(revision 98d0e5da457d6789536a76b8c7591f22aafe32d7)
@@ -23,32 +23,28 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using AssemblyTool.Kernel.Assembly;
-using AssemblyTool.Kernel.Assembly.CalculatorInput;
-using AssemblyTool.Kernel.Data;
-using AssemblyTool.Kernel.Data.AssemblyCategories;
-using AssemblyTool.Kernel.Data.CalculationResults;
-using AssemblyTool.Kernel.ErrorHandling;
+using Assembly.Kernel.Interfaces;
+using Assembly.Kernel.Model.AssessmentResultTypes;
 using Ringtoets.AssemblyTool.Data;
 using Ringtoets.Common.Primitives;
 
 namespace Ringtoets.AssemblyTool.KernelWrapper.Creators
 {
     /// <summary>
-    /// Creates input instances that can be used in <see cref="IFailureMechanismSectionAssemblyCalculator"/>.
+    /// Creates input instances that can be used in <see cref="IAssessmentResultsTranslator"/>.
     /// </summary>
     public static class FailureMechanismSectionAssemblyCalculatorInputCreator
     {
         /// <summary>
-        /// Creates <see cref="SimpleCalculationResult"/> based on the given <paramref name="input"/>.
+        /// Creates <see cref="EAssessmentResultTypeE1"/> based on the given <paramref name="input"/>.
         /// </summary>
         /// <param name="input">The <see cref="SimpleAssessmentResultType"/> to create the result for.</param>
-        /// <returns>The created <see cref="SimpleCalculationResult"/>.</returns>
+        /// <returns>The created <see cref="EAssessmentResultTypeE1"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <see cref="SimpleAssessmentResultType"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <see cref="SimpleAssessmentResultType"/>
         /// is a valid value, but unsupported.</exception>
-        public static SimpleCalculationResult CreateSimpleCalculationResult(SimpleAssessmentResultType input)
+        public static EAssessmentResultTypeE1 CreateAssessmentResultE1(SimpleAssessmentResultType input)
         {
             if (!Enum.IsDefined(typeof(SimpleAssessmentResultType), input))
             {
@@ -60,13 +56,13 @@
             switch (input)
             {
                 case SimpleAssessmentResultType.None:
-                    return SimpleCalculationResult.None;
+                    return EAssessmentResultTypeE1.Gr;
                 case SimpleAssessmentResultType.NotApplicable:
-                    return SimpleCalculationResult.NVT;
+                    return EAssessmentResultTypeE1.Nvt;
                 case SimpleAssessmentResultType.ProbabilityNegligible:
-                    return SimpleCalculationResult.FV;
+                    return EAssessmentResultTypeE1.Fv;
                 case SimpleAssessmentResultType.AssessFurther:
-                    return SimpleCalculationResult.VB;
+                    return EAssessmentResultTypeE1.Vb;
                 default:
                     throw new NotSupportedException();
             }
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -rff7d35236a40e27f08a25a0d39a958ba9d22331f -r98d0e5da457d6789536a76b8c7591f22aafe32d7
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision ff7d35236a40e27f08a25a0d39a958ba9d22331f)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Creators/FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorInputCreatorTest.cs)	(revision 98d0e5da457d6789536a76b8c7591f22aafe32d7)
@@ -23,9 +23,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using AssemblyTool.Kernel.Assembly.CalculatorInput;
-using AssemblyTool.Kernel.Data.AssemblyCategories;
-using AssemblyTool.Kernel.Data.CalculationResults;
+using Assembly.Kernel.Model.AssessmentResultTypes;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.AssemblyTool.Data;
@@ -40,26 +38,26 @@
         #region Simple Assessment
 
         [Test]
-        public void CreateSimpleCalculationResult_WithInvalidEnumInput_ThrowInvalidEnumArgumentException()
+        public void CreateAssessmentResultE1_WithInvalidEnumInput_ThrowInvalidEnumArgumentException()
         {
             // Call
-            TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateSimpleCalculationResult((SimpleAssessmentResultType) 99);
+            TestDelegate test = () => FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultE1((SimpleAssessmentResultType) 99);
 
             // Assert
             const string expectedMessage = "The value of argument 'input' (99) is invalid for Enum type 'SimpleAssessmentResultType'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(test, expectedMessage);
         }
 
         [Test]
-        [TestCase(SimpleAssessmentResultType.None, SimpleCalculationResult.None)]
-        [TestCase(SimpleAssessmentResultType.NotApplicable, SimpleCalculationResult.NVT)]
-        [TestCase(SimpleAssessmentResultType.ProbabilityNegligible, SimpleCalculationResult.FV)]
-        [TestCase(SimpleAssessmentResultType.AssessFurther, SimpleCalculationResult.VB)]
-        public void CreateSimpleCalculationResult_ValidData_ReturnSimpleCalculationResult(SimpleAssessmentResultType originalResult,
-                                                                                          SimpleCalculationResult expectedResult)
+        [TestCase(SimpleAssessmentResultType.None, EAssessmentResultTypeE1.Gr)]
+        [TestCase(SimpleAssessmentResultType.NotApplicable, EAssessmentResultTypeE1.Nvt)]
+        [TestCase(SimpleAssessmentResultType.ProbabilityNegligible, EAssessmentResultTypeE1.Fv)]
+        [TestCase(SimpleAssessmentResultType.AssessFurther, EAssessmentResultTypeE1.Vb)]
+        public void CreateAssessmentResultE1_ValidData_ReturnSimpleCalculationResult(SimpleAssessmentResultType originalResult,
+                                                                                     EAssessmentResultTypeE1 expectedResult)
         {
             // Call
-            SimpleCalculationResult result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateSimpleCalculationResult(originalResult);
+            EAssessmentResultTypeE1 result = FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultE1(originalResult);
 
             // Assert
             Assert.AreEqual(expectedResult, result);