Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailurePathAssemblyCalculatorInputCreatorTest.cs
===================================================================
diff -u -r368312895bc9b673831dd308d041c8ed6a9340c7 -r5e762467ddf0cf45d48d5dcba2ac0e6ed21e5a17
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailurePathAssemblyCalculatorInputCreatorTest.cs	(.../FailurePathAssemblyCalculatorInputCreatorTest.cs)	(revision 368312895bc9b673831dd308d041c8ed6a9340c7)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/FailurePathAssemblyCalculatorInputCreatorTest.cs	(.../FailurePathAssemblyCalculatorInputCreatorTest.cs)	(revision 5e762467ddf0cf45d48d5dcba2ac0e6ed21e5a17)
@@ -22,12 +22,13 @@
 using System;
 using System.ComponentModel;
 using Assembly.Kernel.Model.Categories;
-using Assembly.Kernel.Model.FailurePathSections;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
+using AssemblyFailureMechanismSectionAssemblyResult = Assembly.Kernel.Model.FailureMechanismSections.FailureMechanismSectionAssemblyResult;
+using RiskeerFailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Test.Creators
 {
@@ -47,16 +48,15 @@
         }
 
         [Test]
-        [TestCase(FailureMechanismSectionAssemblyGroup.ND, EInterpretationCategory.ND)]
+        [TestCase(FailureMechanismSectionAssemblyGroup.ND, EInterpretationCategory.NotDominant)]
         [TestCase(FailureMechanismSectionAssemblyGroup.III, EInterpretationCategory.III)]
         [TestCase(FailureMechanismSectionAssemblyGroup.II, EInterpretationCategory.II)]
         [TestCase(FailureMechanismSectionAssemblyGroup.I, EInterpretationCategory.I)]
-        [TestCase(FailureMechanismSectionAssemblyGroup.ZeroPlus, EInterpretationCategory.ZeroPlus)]
         [TestCase(FailureMechanismSectionAssemblyGroup.Zero, EInterpretationCategory.Zero)]
         [TestCase(FailureMechanismSectionAssemblyGroup.IMin, EInterpretationCategory.IMin)]
         [TestCase(FailureMechanismSectionAssemblyGroup.IIMin, EInterpretationCategory.IIMin)]
         [TestCase(FailureMechanismSectionAssemblyGroup.IIIMin, EInterpretationCategory.IIIMin)]
-        [TestCase(FailureMechanismSectionAssemblyGroup.D, EInterpretationCategory.D)]
+        [TestCase(FailureMechanismSectionAssemblyGroup.D, EInterpretationCategory.Dominant)]
         [TestCase(FailureMechanismSectionAssemblyGroup.Gr, EInterpretationCategory.Gr)]
         public void CreateFailurePathSectionAssemblyResult_WithValidResult_ReturnsExpectedFailurePathSectionAssemblyResult(
             FailureMechanismSectionAssemblyGroup assemblyGroup, EInterpretationCategory expectedCategory)
@@ -66,11 +66,11 @@
             double profileProbability = random.NextDouble();
             double sectionProbability = profileProbability + 0.001;
 
-            var result = new FailureMechanismSectionAssemblyResult(profileProbability, sectionProbability,
-                                                                   random.NextDouble(),
-                                                                   assemblyGroup);
+            var result = new RiskeerFailureMechanismSectionAssemblyResult(profileProbability, sectionProbability,
+                                                                          random.NextDouble(),
+                                                                          assemblyGroup);
             // Call
-            FailurePathSectionAssemblyResult createdResult = FailurePathAssemblyCalculatorInputCreator.CreateFailurePathSectionAssemblyResult(result);
+            AssemblyFailureMechanismSectionAssemblyResult createdResult = FailurePathAssemblyCalculatorInputCreator.CreateFailurePathSectionAssemblyResult(result);
 
             // Assert
             ProbabilityAssert.AreEqual(profileProbability, createdResult.ProbabilityProfile);
@@ -84,9 +84,9 @@
             // Setup
             var random = new Random(21);
             double probability = random.NextDouble();
-            var result = new FailureMechanismSectionAssemblyResult(probability, probability,
-                                                                   random.NextDouble(),
-                                                                   (FailureMechanismSectionAssemblyGroup) 99);
+            var result = new RiskeerFailureMechanismSectionAssemblyResult(probability, probability,
+                                                                          random.NextDouble(),
+                                                                          (FailureMechanismSectionAssemblyGroup) 99);
 
             // Call
             void Call() => FailurePathAssemblyCalculatorInputCreator.CreateFailurePathSectionAssemblyResult(result);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs
===================================================================
diff -u -rb00f90b641c3c2975346118800c76fd95b738703 -r5e762467ddf0cf45d48d5dcba2ac0e6ed21e5a17
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs	(.../AssemblyToolKernelFactoryTest.cs)	(revision b00f90b641c3c2975346118800c76fd95b738703)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Kernels/AssemblyToolKernelFactoryTest.cs	(.../AssemblyToolKernelFactoryTest.cs)	(revision 5e762467ddf0cf45d48d5dcba2ac0e6ed21e5a17)
@@ -105,10 +105,10 @@
             IAssemblyToolKernelFactory factory = AssemblyToolKernelFactory.Instance;
 
             // Call
-            IFailurePathResultAssembler kernel = factory.CreateFailurePathAssemblyKernel();
+            IFailureMechanismResultAssembler kernel = factory.CreateFailurePathAssemblyKernel();
 
             // Assert
-            Assert.IsInstanceOf<FailurePathResultAssembler>(kernel);
+            Assert.IsInstanceOf<FailureMechanismResultAssembler>(kernel);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyGroupBoundariesAssert.cs
===================================================================
diff -u -r7547caf55a454c8aa66b1cf88885f520123e4ea9 -r5e762467ddf0cf45d48d5dcba2ac0e6ed21e5a17
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyGroupBoundariesAssert.cs	(.../AssemblyGroupBoundariesAssert.cs)	(revision 7547caf55a454c8aa66b1cf88885f520123e4ea9)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssemblyGroupBoundariesAssert.cs	(.../AssemblyGroupBoundariesAssert.cs)	(revision 5e762467ddf0cf45d48d5dcba2ac0e6ed21e5a17)
@@ -62,16 +62,14 @@
         {
             switch (category)
             {
-                case EInterpretationCategory.ND:
+                case EInterpretationCategory.NotDominant:
                     return FailureMechanismSectionAssemblyGroup.ND;
                 case EInterpretationCategory.III:
                     return FailureMechanismSectionAssemblyGroup.III;
                 case EInterpretationCategory.II:
                     return FailureMechanismSectionAssemblyGroup.II;
                 case EInterpretationCategory.I:
                     return FailureMechanismSectionAssemblyGroup.I;
-                case EInterpretationCategory.ZeroPlus:
-                    return FailureMechanismSectionAssemblyGroup.ZeroPlus;
                 case EInterpretationCategory.Zero:
                     return FailureMechanismSectionAssemblyGroup.Zero;
                 case EInterpretationCategory.IMin:
@@ -80,7 +78,7 @@
                     return FailureMechanismSectionAssemblyGroup.IIMin;
                 case EInterpretationCategory.IIIMin:
                     return FailureMechanismSectionAssemblyGroup.IIIMin;
-                case EInterpretationCategory.D:
+                case EInterpretationCategory.Dominant:
                     return FailureMechanismSectionAssemblyGroup.D;
                 case EInterpretationCategory.Gr:
                     return FailureMechanismSectionAssemblyGroup.Gr;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs
===================================================================
diff -u -r841793d896b63b42a504a5f8761609fbe23fec99 -r5e762467ddf0cf45d48d5dcba2ac0e6ed21e5a17
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs	(.../FailureMechanismSectionAssemblyKernelStub.cs)	(revision 841793d896b63b42a504a5f8761609fbe23fec99)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs	(.../FailureMechanismSectionAssemblyKernelStub.cs)	(revision 5e762467ddf0cf45d48d5dcba2ac0e6ed21e5a17)
@@ -24,7 +24,7 @@
 using Assembly.Kernel.Interfaces;
 using Assembly.Kernel.Model;
 using Assembly.Kernel.Model.Categories;
-using Assembly.Kernel.Model.FailurePathSections;
+using Assembly.Kernel.Model.FailureMechanismSections;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly
 {
@@ -86,20 +86,40 @@
         /// <summary>
         /// Sets the assembly result of a failure path section.
         /// </summary>
-        public FailurePathSectionAssemblyResult FailurePathSectionAssemblyResult { private get; set; }
+        public FailureMechanismSectionAssemblyResult FailurePathSectionAssemblyResult { private get; set; }
 
-        public FailurePathSectionAssemblyResult TranslateAssessmentResultWbi0A2(ESectionInitialMechanismProbabilitySpecification isRelevant,
-                                                                                Probability probabilityInitialMechanismProfile,
-                                                                                Probability probabilityInitialMechanismSection,
-                                                                                bool needsRefinement,
-                                                                                Probability refinedProbabilityProfile,
-                                                                                Probability refinedProbabilitySection,
-                                                                                CategoriesList<InterpretationCategory> categories)
+        public FailureMechanismSectionAssemblyResult TranslateAssessmentResultWbi0A2(ESectionInitialMechanismProbabilitySpecification isRelevant,
+                                                                                     Probability probabilityInitialMechanismSection,
+                                                                                     bool needsRefinement,
+                                                                                     Probability refinedProbabilitySection,
+                                                                                     CategoriesList<InterpretationCategory> categories)
         {
             ThrowException();
             Calculated = true;
 
             InitialMechanismProbabilitySpecification = isRelevant;
+            ProbabilityInitialMechanismSection = probabilityInitialMechanismSection;
+
+            NeedsRefinement = needsRefinement;
+            RefinedProbabilitySection = refinedProbabilitySection;
+
+            Categories = categories;
+
+            return FailurePathSectionAssemblyResult;
+        }
+
+        public FailureMechanismSectionAssemblyResult TranslateAssessmentResultWbi0A2(ESectionInitialMechanismProbabilitySpecification isRelevant,
+                                                                                     Probability probabilityInitialMechanismProfile,
+                                                                                     Probability probabilityInitialMechanismSection,
+                                                                                     bool needsRefinement,
+                                                                                     Probability refinedProbabilityProfile,
+                                                                                     Probability refinedProbabilitySection,
+                                                                                     CategoriesList<InterpretationCategory> categories)
+        {
+            ThrowException();
+            Calculated = true;
+
+            InitialMechanismProbabilitySpecification = isRelevant;
             ProbabilityInitialMechanismProfile = probabilityInitialMechanismProfile;
             ProbabilityInitialMechanismSection = probabilityInitialMechanismSection;