Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r5255068f26299b26ed9ee7fd0266e4cfc85c7dbd -r8aa61d95648dc0fa15af7be45d1aff4aa11d66fc
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 5255068f26299b26ed9ee7fd0266e4cfc85c7dbd)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 8aa61d95648dc0fa15af7be45d1aff4aa11d66fc)
@@ -24,7 +24,6 @@
 using Assembly.Kernel.Model;
 using Assembly.Kernel.Model.AssessmentSection;
 using Assembly.Kernel.Model.Categories;
-using Assembly.Kernel.Model.FailurePathSections;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -36,6 +35,8 @@
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Categories;
+using AssemblyFailureMechanismSectionAssemblyResult = Assembly.Kernel.Model.FailureMechanismSections.FailureMechanismSectionAssemblyResult;
+using RiskeerFailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Test.Calculators.Assembly
 {
@@ -103,7 +104,7 @@
 
             var random = new Random(21);
             var input = new FailureMechanismSectionAssemblyInput(lowerLimitNorm, signalingNorm,
-                                                                 isRelevant, hasProbabilitySpecified, 
+                                                                 isRelevant, hasProbabilitySpecified,
                                                                  random.NextDouble(), random.NextDouble(),
                                                                  random.NextBoolean(),
                                                                  random.NextDouble(), random.NextDouble());
@@ -115,7 +116,7 @@
                 categoryLimitsKernel.CategoryLimits = categoryLimits;
 
                 FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
-                failureMechanismSectionAssemblyKernel.FailurePathSectionAssemblyResult = new FailurePathSectionAssemblyResult(
+                failureMechanismSectionAssemblyKernel.FailurePathSectionAssemblyResult = new AssemblyFailureMechanismSectionAssemblyResult(
                     new Probability(random.NextDouble(0.0, 0.01)), new Probability(random.NextDouble(0.01, 0.02)), random.NextEnumValue<EInterpretationCategory>());
 
                 var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
@@ -151,15 +152,15 @@
                 categoryLimitsKernel.CategoryLimits = CreateCategoryLimits();
 
                 FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
-                var kernelResult = new FailurePathSectionAssemblyResult(new Probability(random.NextDouble()),
-                                                                        new Probability(random.NextDouble()),
-                                                                        random.NextEnumValue<EInterpretationCategory>());
+                var kernelResult = new AssemblyFailureMechanismSectionAssemblyResult(new Probability(random.NextDouble()),
+                                                                                     new Probability(random.NextDouble()),
+                                                                                     random.NextEnumValue<EInterpretationCategory>());
                 failureMechanismSectionAssemblyKernel.FailurePathSectionAssemblyResult = kernelResult;
 
                 var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
 
                 // Call
-                FailureMechanismSectionAssemblyResult result = calculator.AssembleFailureMechanismSection(input);
+                RiskeerFailureMechanismSectionAssemblyResult result = calculator.AssembleFailureMechanismSection(input);
 
                 // Assert
                 Assert.IsTrue(categoryLimitsKernel.Calculated);
@@ -186,9 +187,9 @@
                 categoryLimitsKernel.CategoryLimits = CreateCategoryLimits();
 
                 FailureMechanismSectionAssemblyKernelStub failureMechanismSectionAssemblyKernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel;
-                var kernelResult = new FailurePathSectionAssemblyResult(new Probability(random.NextDouble()),
-                                                                        new Probability(random.NextDouble()),
-                                                                        (EInterpretationCategory) 99);
+                var kernelResult = new AssemblyFailureMechanismSectionAssemblyResult(new Probability(random.NextDouble()),
+                                                                                     new Probability(random.NextDouble()),
+                                                                                     (EInterpretationCategory) 99);
                 failureMechanismSectionAssemblyKernel.FailurePathSectionAssemblyResult = kernelResult;
 
                 var calculator = new FailureMechanismSectionAssemblyCalculator(factory);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailurePathAssemblyCalculatorTest.cs
===================================================================
diff -u -r16432bad3326522095632720f06f4df31ef3c2ff -r8aa61d95648dc0fa15af7be45d1aff4aa11d66fc
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailurePathAssemblyCalculatorTest.cs	(.../FailurePathAssemblyCalculatorTest.cs)	(revision 16432bad3326522095632720f06f4df31ef3c2ff)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailurePathAssemblyCalculatorTest.cs	(.../FailurePathAssemblyCalculatorTest.cs)	(revision 8aa61d95648dc0fa15af7be45d1aff4aa11d66fc)
@@ -25,7 +25,6 @@
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Model;
 using Assembly.Kernel.Model.Categories;
-using Assembly.Kernel.Model.FailurePathSections;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -36,6 +35,8 @@
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
+using AssemblyFailureMechanismSectionAssemblyResult = Assembly.Kernel.Model.FailureMechanismSections.FailureMechanismSectionAssemblyResult;
+using RiskeerFailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Test.Calculators.Assembly
 {
@@ -97,7 +98,7 @@
             // Setup
             var random = new Random(21);
             double failurePathN = random.NextDouble();
-            FailureMechanismSectionAssemblyResult[] sectionAssemblyResults =
+            RiskeerFailureMechanismSectionAssemblyResult[] sectionAssemblyResults =
             {
                 CreateSectionAssemblyResult(random.Next()),
                 CreateSectionAssemblyResult(random.Next())
@@ -137,7 +138,7 @@
                 var calculator = new FailurePathAssemblyCalculator(factory);
 
                 // Call
-                double assemblyResult = calculator.Assemble(random.NextDouble(), Enumerable.Empty<FailureMechanismSectionAssemblyResult>());
+                double assemblyResult = calculator.Assemble(random.NextDouble(), Enumerable.Empty<RiskeerFailureMechanismSectionAssemblyResult>());
 
                 // Assert
                 Assert.IsTrue(kernel.Calculated);
@@ -151,8 +152,8 @@
             // Setup
             var random = new Random(21);
             double probability = random.NextDouble();
-            var invalidInput = new FailureMechanismSectionAssemblyResult(probability, probability, random.NextDouble(),
-                                                                         (FailureMechanismSectionAssemblyGroup) 99);
+            var invalidInput = new RiskeerFailureMechanismSectionAssemblyResult(probability, probability, random.NextDouble(),
+                                                                                (FailureMechanismSectionAssemblyGroup) 99);
 
             using (new AssemblyToolKernelFactoryConfig())
             {
@@ -191,7 +192,7 @@
                 var calculator = new FailurePathAssemblyCalculator(factory);
 
                 // Call
-                void Call() => calculator.Assemble(random.NextDouble(), Enumerable.Empty<FailureMechanismSectionAssemblyResult>());
+                void Call() => calculator.Assemble(random.NextDouble(), Enumerable.Empty<RiskeerFailureMechanismSectionAssemblyResult>());
 
                 // Assert
                 Assert.IsFalse(kernel.Calculated);
@@ -217,7 +218,7 @@
                 var calculator = new FailurePathAssemblyCalculator(factory);
 
                 // Call
-                void Call() => calculator.Assemble(random.NextDouble(), Enumerable.Empty<FailureMechanismSectionAssemblyResult>());
+                void Call() => calculator.Assemble(random.NextDouble(), Enumerable.Empty<RiskeerFailureMechanismSectionAssemblyResult>());
 
                 // Assert
                 Assert.IsFalse(kernel.Calculated);
@@ -229,16 +230,16 @@
             }
         }
 
-        private static FailureMechanismSectionAssemblyResult CreateSectionAssemblyResult(int seed)
+        private static RiskeerFailureMechanismSectionAssemblyResult CreateSectionAssemblyResult(int seed)
         {
             var random = new Random(seed);
             double probability = random.NextDouble();
-            return new FailureMechanismSectionAssemblyResult(probability, probability + 0.001, random.NextDouble(),
-                                                             random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
+            return new RiskeerFailureMechanismSectionAssemblyResult(probability, probability + 0.001, random.NextDouble(),
+                                                                    random.NextEnumValue<FailureMechanismSectionAssemblyGroup>());
         }
 
-        private static void AssertFailurePathSectionAssemblyResults(IEnumerable<FailureMechanismSectionAssemblyResult> expected,
-                                                                    IEnumerable<FailurePathSectionAssemblyResult> actual)
+        private static void AssertFailurePathSectionAssemblyResults(IEnumerable<RiskeerFailureMechanismSectionAssemblyResult> expected,
+                                                                    IEnumerable<AssemblyFailureMechanismSectionAssemblyResult> actual)
         {
             int nrOfExpectedResults = expected.Count();
             Assert.AreEqual(nrOfExpectedResults, actual.Count());
@@ -249,8 +250,8 @@
             }
         }
 
-        private static void AssertFailurePathSectionAssemblyResult(FailureMechanismSectionAssemblyResult expected,
-                                                                   FailurePathSectionAssemblyResult actual)
+        private static void AssertFailurePathSectionAssemblyResult(RiskeerFailureMechanismSectionAssemblyResult expected,
+                                                                   AssemblyFailureMechanismSectionAssemblyResult actual)
         {
             ProbabilityAssert.AreEqual(expected.ProfileProbability, actual.ProbabilityProfile);
             ProbabilityAssert.AreEqual(expected.SectionProbability, actual.ProbabilitySection);
@@ -262,15 +263,13 @@
             switch (assemblyGroup)
             {
                 case FailureMechanismSectionAssemblyGroup.ND:
-                    return EInterpretationCategory.ND;
+                    return EInterpretationCategory.NotDominant;
                 case FailureMechanismSectionAssemblyGroup.III:
                     return EInterpretationCategory.III;
                 case FailureMechanismSectionAssemblyGroup.II:
                     return EInterpretationCategory.II;
                 case FailureMechanismSectionAssemblyGroup.I:
                     return EInterpretationCategory.I;
-                case FailureMechanismSectionAssemblyGroup.ZeroPlus:
-                    return EInterpretationCategory.ZeroPlus;
                 case FailureMechanismSectionAssemblyGroup.Zero:
                     return EInterpretationCategory.Zero;
                 case FailureMechanismSectionAssemblyGroup.IMin:
@@ -280,7 +279,7 @@
                 case FailureMechanismSectionAssemblyGroup.IIIMin:
                     return EInterpretationCategory.IIIMin;
                 case FailureMechanismSectionAssemblyGroup.D:
-                    return EInterpretationCategory.D;
+                    return EInterpretationCategory.Dominant;
                 case FailureMechanismSectionAssemblyGroup.Gr:
                     return EInterpretationCategory.Gr;
                 default: