Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs	(.../DuneErosionFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneErosionFailureMechanismAssemblyFactory.cs	(.../DuneErosionFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -189,13 +189,13 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
-                failureMechanism.SectionResults.Select(sectionResult => (sectionResult.UseManualAssemblyCategoryGroup
-                                                                             ? sectionResult.ManualAssemblyCategoryGroup
-                                                                             : AssembleCombinedAssessment(sectionResult))).ToArray();
+                failureMechanism.SectionResults.Select(sectionResult => sectionResult.UseManualAssemblyCategoryGroup
+                                                                            ? sectionResult.ManualAssemblyCategoryGroup
+                                                                            : AssembleCombinedAssessment(sectionResult)).ToArray();
 
             IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
             IFailureMechanismAssemblyCalculator calculator =
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r618b76f6429ba110aae26879a227af8f4f3762f0 -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs)	(revision 618b76f6429ba110aae26879a227af8f4f3762f0)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -240,7 +240,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
             }
 
             IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs	(.../GrassCoverErosionInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -666,7 +666,7 @@
                     assessmentSection);
 
                 // Assert
-                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyFactory.CreateNotApplicableAssembly(), assembly);
+                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverErosionOutwardsFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Data
@@ -189,7 +190,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r618b76f6429ba110aae26879a227af8f4f3762f0 -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs	(.../HeightStructuresFailureMechanismAssemblyFactory.cs)	(revision 618b76f6429ba110aae26879a227af8f4f3762f0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanismAssemblyFactory.cs	(.../HeightStructuresFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -240,7 +240,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
             }
 
             IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismAssemblyFactoryTest.cs	(.../HeightStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -666,7 +666,7 @@
                     assessmentSection);
 
                 // Assert
-                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyFactory.CreateNotApplicableAssembly(), assembly);
+                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffInwardsFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
@@ -188,7 +189,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs	(.../GrassCoverSlipOffOutwardsFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
@@ -188,7 +189,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -248,7 +248,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs	(.../MicrostabilityFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MicrostabilityFailureMechanismAssemblyFactory.cs	(.../MicrostabilityFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
@@ -188,7 +189,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/PipingStructureFailureMechanismAssemblyFactory.cs	(.../PipingStructureFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
@@ -188,7 +189,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs	(.../StrengthStabilityLengthwiseConstructionFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
@@ -154,7 +155,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/TechnicalInnovationFailureMechanismAssemblyFactory.cs	(.../TechnicalInnovationFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
@@ -154,7 +155,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaterPressureAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 using Ringtoets.Integration.Data.StandAlone.SectionResults;
 
@@ -154,7 +155,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r618b76f6429ba110aae26879a227af8f4f3762f0 -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs)	(revision 618b76f6429ba110aae26879a227af8f4f3762f0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismAssemblyFactory.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -258,7 +258,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
             }
 
             IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r618b76f6429ba110aae26879a227af8f4f3762f0 -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 618b76f6429ba110aae26879a227af8f4f3762f0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityInwardsFailureMechanismAssemblyFactoryTest.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -745,7 +745,7 @@
                     assessmentSection);
 
                 // Assert
-                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyFactory.CreateNotApplicableAssembly(), assembly);
+                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r618b76f6429ba110aae26879a227af8f4f3762f0 -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision 618b76f6429ba110aae26879a227af8f4f3762f0)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismAssemblyFactory.cs	(.../PipingFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -258,7 +258,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
             }
 
             IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -r618b76f6429ba110aae26879a227af8f4f3762f0 -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision 618b76f6429ba110aae26879a227af8f4f3762f0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs	(.../PipingFailureMechanismAssemblyFactoryTest.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -746,7 +746,7 @@
                     assessmentSection);
 
                 // Assert
-                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyFactory.CreateNotApplicableAssembly(), assembly);
+                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -r618b76f6429ba110aae26879a227af8f4f3762f0 -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs)	(revision 618b76f6429ba110aae26879a227af8f4f3762f0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresFailureMechanismAssemblyFactory.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -238,7 +238,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyFactory.CreateNotApplicableAssembly();
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly();
             }
 
             IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance;
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs	(.../StabilityPointStructuresFailureMechanismAssemblyFactoryTest.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -666,7 +666,7 @@
                     assessmentSection);
 
                 // Assert
-                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyFactory.CreateNotApplicableAssembly(), assembly);
+                AssemblyToolTestHelper.AssertAreEqual(FailureMechanismAssemblyResultFactory.CreateNotApplicableAssembly(), assembly);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs	(.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 
 namespace Ringtoets.StabilityStoneCover.Data
@@ -189,7 +190,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs
===================================================================
diff -u -rae1937fe2fcb175b4a0f9fa5f1aaed132431f66c -r595b081a57d13a2eac6ff00a1a7ea5026d15422b
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision ae1937fe2fcb175b4a0f9fa5f1aaed132431f66c)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs	(.../WaveImpactAsphaltCoverFailureMechanismAssemblyFactory.cs)	(revision 595b081a57d13a2eac6ff00a1a7ea5026d15422b)
@@ -26,6 +26,7 @@
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators;
 using Ringtoets.AssemblyTool.KernelWrapper.Calculators.Assembly;
 using Ringtoets.AssemblyTool.KernelWrapper.Kernels;
+using Ringtoets.Common.Data.AssemblyTool;
 using Ringtoets.Common.Data.Exceptions;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Data
@@ -189,7 +190,7 @@
 
             if (!failureMechanism.IsRelevant)
             {
-                return FailureMechanismAssemblyCategoryGroup.NotApplicable;
+                return FailureMechanismAssemblyResultFactory.CreateNotApplicableCategory();
             }
 
             IEnumerable<FailureMechanismSectionAssemblyCategoryGroup> sectionAssemblies =