Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyGroupConverter.cs
===================================================================
diff -u -r4556a16114b5de3a64a35a2c29bbaccf9f999f53 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyGroupConverter.cs	(.../FailureMechanismSectionAssemblyGroupConverter.cs)	(revision 4556a16114b5de3a64a35a2c29bbaccf9f999f53)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyGroupConverter.cs	(.../FailureMechanismSectionAssemblyGroupConverter.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -37,7 +37,7 @@
         /// Converts an <see cref="EInterpretationCategory"/> into a <see cref="FailureMechanismSectionAssemblyGroup"/>.
         /// </summary>
         /// <param name="interpretationCategory">The <see cref="EInterpretationCategory"/> to convert.</param>
-        /// <returns>A <see cref="FailureMechanismSectionAssemblyCategoryGroup"/> based on <paramref name="interpretationCategory"/>.</returns>
+        /// <returns>A <see cref="FailureMechanismSectionAssemblyGroup"/> based on <paramref name="interpretationCategory"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="interpretationCategory"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="interpretationCategory"/>
Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFactory.cs
===================================================================
diff -u -r0fd89ca862752d22af9e6543f05f891ef7c6380a -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFactory.cs	(.../AssemblyMapDataFactory.cs)	(revision 0fd89ca862752d22af9e6543f05f891ef7c6380a)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/AssemblyMapDataFactory.cs	(.../AssemblyMapDataFactory.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -44,7 +44,7 @@
                                        Width = lineWidth,
                                        DashStyle = lineDashStyle
                                    },
-                                   MapThemeFactory.CreateDisplayFailureMechanismAssemblyCategoryGroupMapTheme())
+                                   MapThemeFactory.CreateDisplayFailureMechanismSectionAssemblyGroupMapTheme())
             {
                 SelectedMetaDataAttribute = Resources.AssemblyGroup_DisplayName,
                 IsVisible = true
Index: Riskeer/Common/src/Riskeer.Common.Forms/Factories/MapThemeFactory.cs
===================================================================
diff -u -r79e08dab2ccc7817a35c79d422d6915c427ed908 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Common/src/Riskeer.Common.Forms/Factories/MapThemeFactory.cs	(.../MapThemeFactory.cs)	(revision 79e08dab2ccc7817a35c79d422d6915c427ed908)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Factories/MapThemeFactory.cs	(.../MapThemeFactory.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -40,24 +40,24 @@
         /// Creates a <see cref="MapTheme{T}"/> based on the values of <see cref="DisplayFailureMechanismSectionAssemblyGroup"/>.
         /// </summary>
         /// <returns>The created <see cref="MapTheme{T}"/>.</returns>
-        public static MapTheme<LineCategoryTheme> CreateDisplayFailureMechanismAssemblyCategoryGroupMapTheme()
+        public static MapTheme<LineCategoryTheme> CreateDisplayFailureMechanismSectionAssemblyGroupMapTheme()
         {
             return new MapTheme<LineCategoryTheme>(Resources.AssemblyGroup_DisplayName, new[]
             {
-                CreateCategoryTheme(Color.FromArgb(255, 34, 139, 34), DisplayFailureMechanismSectionAssemblyGroup.III),
-                CreateCategoryTheme(Color.FromArgb(255, 146, 208, 80), DisplayFailureMechanismSectionAssemblyGroup.II),
-                CreateCategoryTheme(Color.FromArgb(255, 198, 224, 180), DisplayFailureMechanismSectionAssemblyGroup.I),
-                CreateCategoryTheme(Color.FromArgb(255, 255, 255, 0), DisplayFailureMechanismSectionAssemblyGroup.Zero),
-                CreateCategoryTheme(Color.FromArgb(255, 255, 165, 0), DisplayFailureMechanismSectionAssemblyGroup.IMin),
-                CreateCategoryTheme(Color.FromArgb(255, 255, 0, 0), DisplayFailureMechanismSectionAssemblyGroup.IIMin),
-                CreateCategoryTheme(Color.FromArgb(255, 178, 34, 34), DisplayFailureMechanismSectionAssemblyGroup.IIIMin),
-                CreateCategoryTheme(Color.FromArgb(255, 255, 90, 172), DisplayFailureMechanismSectionAssemblyGroup.Dominant),
-                CreateCategoryTheme(Color.FromArgb(255, 192, 192, 192), DisplayFailureMechanismSectionAssemblyGroup.NotDominant),
-                CreateCategoryTheme(Color.FromArgb(0, 0, 0, 0), DisplayFailureMechanismSectionAssemblyGroup.GR)
+                CreateAssemblyGroupTheme(Color.FromArgb(255, 34, 139, 34), DisplayFailureMechanismSectionAssemblyGroup.III),
+                CreateAssemblyGroupTheme(Color.FromArgb(255, 146, 208, 80), DisplayFailureMechanismSectionAssemblyGroup.II),
+                CreateAssemblyGroupTheme(Color.FromArgb(255, 198, 224, 180), DisplayFailureMechanismSectionAssemblyGroup.I),
+                CreateAssemblyGroupTheme(Color.FromArgb(255, 255, 255, 0), DisplayFailureMechanismSectionAssemblyGroup.Zero),
+                CreateAssemblyGroupTheme(Color.FromArgb(255, 255, 165, 0), DisplayFailureMechanismSectionAssemblyGroup.IMin),
+                CreateAssemblyGroupTheme(Color.FromArgb(255, 255, 0, 0), DisplayFailureMechanismSectionAssemblyGroup.IIMin),
+                CreateAssemblyGroupTheme(Color.FromArgb(255, 178, 34, 34), DisplayFailureMechanismSectionAssemblyGroup.IIIMin),
+                CreateAssemblyGroupTheme(Color.FromArgb(255, 255, 90, 172), DisplayFailureMechanismSectionAssemblyGroup.Dominant),
+                CreateAssemblyGroupTheme(Color.FromArgb(255, 192, 192, 192), DisplayFailureMechanismSectionAssemblyGroup.NotDominant),
+                CreateAssemblyGroupTheme(Color.FromArgb(0, 0, 0, 0), DisplayFailureMechanismSectionAssemblyGroup.GR)
             });
         }
 
-        private static LineCategoryTheme CreateCategoryTheme(Color color, DisplayFailureMechanismSectionAssemblyGroup categoryGroup)
+        private static LineCategoryTheme CreateAssemblyGroupTheme(Color color, DisplayFailureMechanismSectionAssemblyGroup assemblyGroup)
         {
             var lineStyle = new LineStyle
             {
@@ -66,13 +66,13 @@
                 Width = lineWidth
             };
 
-            return new LineCategoryTheme(CreateCriterion(categoryGroup), lineStyle);
+            return new LineCategoryTheme(CreateCriterion(assemblyGroup), lineStyle);
         }
 
-        private static ValueCriterion CreateCriterion(DisplayFailureMechanismSectionAssemblyGroup category)
+        private static ValueCriterion CreateCriterion(DisplayFailureMechanismSectionAssemblyGroup assemblyGroup)
         {
             return new ValueCriterion(ValueCriterionOperator.EqualValue,
-                                      new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(category).DisplayName);
+                                      new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(assemblyGroup).DisplayName);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/MapThemeFactoryTest.cs
===================================================================
diff -u -rc36957d0b7c7da0c4e5d5c0bb5e186b49d493d97 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/MapThemeFactoryTest.cs	(.../MapThemeFactoryTest.cs)	(revision c36957d0b7c7da0c4e5d5c0bb5e186b49d493d97)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/MapThemeFactoryTest.cs	(.../MapThemeFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -30,10 +30,10 @@
     public class MapThemeFactoryTest
     {
         [Test]
-        public void CreateDisplayFailureMechanismAssemblyCategoryGroupMapTheme_ReturnsMapTheme()
+        public void CreateDisplayFailureMechanismSectionAssemblyGroupMapTheme_ReturnsMapTheme()
         {
             // Call
-            MapTheme<LineCategoryTheme> mapTheme = MapThemeFactory.CreateDisplayFailureMechanismAssemblyCategoryGroupMapTheme();
+            MapTheme<LineCategoryTheme> mapTheme = MapThemeFactory.CreateDisplayFailureMechanismSectionAssemblyGroupMapTheme();
 
             // Assert
             MapThemeTestHelper.AssertDisplayFailureMechanismSectionAssemblyGroupMapTheme(mapTheme);
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs
===================================================================
diff -u -re06cace538f362651bc9d08f2495c7de6cf5a01a -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs	(.../FailureMechanismSectionResultRowHelperTest.cs)	(revision e06cace538f362651bc9d08f2495c7de6cf5a01a)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Helpers/FailureMechanismSectionResultRowHelperTest.cs	(.../FailureMechanismSectionResultRowHelperTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -64,13 +64,13 @@
         [Test]
         [TestCaseSource(typeof(AssemblyGroupColorTestHelper), nameof(AssemblyGroupColorTestHelper.FailureMechanismSectionAssemblyGroupColorCases))]
         public void SetAssemblyGroupStyle_ValidFailureMechanismSectionAssemblyGroup_UpdatesColumnStyle(
-            FailureMechanismSectionAssemblyGroup assemblyCategoryGroup, Color expectedColor)
+            FailureMechanismSectionAssemblyGroup assemblyGroup, Color expectedColor)
         {
             // Setup
             var columnStateDefinition = new DataGridViewColumnStateDefinition();
 
             // Call
-            FailureMechanismSectionResultRowHelper.SetAssemblyGroupStyle(columnStateDefinition, assemblyCategoryGroup);
+            FailureMechanismSectionResultRowHelper.SetAssemblyGroupStyle(columnStateDefinition, assemblyGroup);
 
             // Assert
             Assert.AreEqual(expectedColor, columnStateDefinition.Style.BackgroundColor);
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapThemeTestHelper.cs
===================================================================
diff -u -r26bb1cc61fd676dfddecd364a6ff3fa551a0eaa3 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapThemeTestHelper.cs	(.../MapThemeTestHelper.cs)	(revision 26bb1cc61fd676dfddecd364a6ff3fa551a0eaa3)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapThemeTestHelper.cs	(.../MapThemeTestHelper.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -34,7 +34,7 @@
     public static class MapThemeTestHelper
     {
         /// <summary>
-        /// Asserts whether the <paramref name="theme"/> is configured for category values
+        /// Asserts whether the <paramref name="theme"/> is configured for values
         /// of type <see cref="FailureMechanismSectionAssemblyGroup"/>.
         /// </summary>
         /// <param name="theme">The <see cref="MapTheme{T}"/> to assert.</param>
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs	(.../AssessmentSectionAssemblyFactory.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs	(.../AssessmentSectionAssemblyFactory.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -54,7 +54,7 @@
         /// Assembles the assessment section.
         /// </summary>
         /// <param name="assessmentSection">The assessment section which contains the failure mechanisms to assemble for.</param>
-        /// <returns>A <see cref="FailureMechanismAssemblyCategoryGroup"/>.</returns>
+        /// <returns>A <see cref="AssessmentSectionAssemblyResult"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="assessmentSection"/> is <c>null</c>.</exception>
         /// <exception cref="AssemblyException">Thrown when <see cref="AssessmentSectionAssemblyResult"/> cannot be created.</exception>
         public static AssessmentSectionAssemblyResult AssembleAssessmentSection(AssessmentSection assessmentSection)
Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs
===================================================================
diff -u -r8a68895bd1459ff3707ef0e038e9fa14ceb4091a -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs	(.../CombinedFailureMechanismSectionAssemblyResultFactory.cs)	(revision 8a68895bd1459ff3707ef0e038e9fa14ceb4091a)
+++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs	(.../CombinedFailureMechanismSectionAssemblyResultFactory.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -77,27 +77,27 @@
         {
             var constructionProperties = new CombinedFailureMechanismSectionAssemblyResult.ConstructionProperties
             {
-                Piping = GetCategoryGroup(assessmentSection.Piping, failureMechanisms, failureMechanismResults),
-                GrassCoverErosionInwards = GetCategoryGroup(assessmentSection.GrassCoverErosionInwards, failureMechanisms, failureMechanismResults),
-                MacroStabilityInwards = GetCategoryGroup(assessmentSection.MacroStabilityInwards, failureMechanisms, failureMechanismResults),
-                Microstability = GetCategoryGroup(assessmentSection.Microstability, failureMechanisms, failureMechanismResults),
-                StabilityStoneCover = GetCategoryGroup(assessmentSection.StabilityStoneCover, failureMechanisms, failureMechanismResults),
-                WaveImpactAsphaltCover = GetCategoryGroup(assessmentSection.WaveImpactAsphaltCover, failureMechanisms, failureMechanismResults),
-                WaterPressureAsphaltCover = GetCategoryGroup(assessmentSection.WaterPressureAsphaltCover, failureMechanisms, failureMechanismResults),
-                GrassCoverErosionOutwards = GetCategoryGroup(assessmentSection.GrassCoverErosionOutwards, failureMechanisms, failureMechanismResults),
-                GrassCoverSlipOffOutwards = GetCategoryGroup(assessmentSection.GrassCoverSlipOffOutwards, failureMechanisms, failureMechanismResults),
-                GrassCoverSlipOffInwards = GetCategoryGroup(assessmentSection.GrassCoverSlipOffInwards, failureMechanisms, failureMechanismResults),
-                HeightStructures = GetCategoryGroup(assessmentSection.HeightStructures, failureMechanisms, failureMechanismResults),
-                ClosingStructures = GetCategoryGroup(assessmentSection.ClosingStructures, failureMechanisms, failureMechanismResults),
-                PipingStructure = GetCategoryGroup(assessmentSection.PipingStructure, failureMechanisms, failureMechanismResults),
-                StabilityPointStructures = GetCategoryGroup(assessmentSection.StabilityPointStructures, failureMechanisms, failureMechanismResults),
-                DuneErosion = GetCategoryGroup(assessmentSection.DuneErosion, failureMechanisms, failureMechanismResults)
+                Piping = GetAssemblyGroup(assessmentSection.Piping, failureMechanisms, failureMechanismResults),
+                GrassCoverErosionInwards = GetAssemblyGroup(assessmentSection.GrassCoverErosionInwards, failureMechanisms, failureMechanismResults),
+                MacroStabilityInwards = GetAssemblyGroup(assessmentSection.MacroStabilityInwards, failureMechanisms, failureMechanismResults),
+                Microstability = GetAssemblyGroup(assessmentSection.Microstability, failureMechanisms, failureMechanismResults),
+                StabilityStoneCover = GetAssemblyGroup(assessmentSection.StabilityStoneCover, failureMechanisms, failureMechanismResults),
+                WaveImpactAsphaltCover = GetAssemblyGroup(assessmentSection.WaveImpactAsphaltCover, failureMechanisms, failureMechanismResults),
+                WaterPressureAsphaltCover = GetAssemblyGroup(assessmentSection.WaterPressureAsphaltCover, failureMechanisms, failureMechanismResults),
+                GrassCoverErosionOutwards = GetAssemblyGroup(assessmentSection.GrassCoverErosionOutwards, failureMechanisms, failureMechanismResults),
+                GrassCoverSlipOffOutwards = GetAssemblyGroup(assessmentSection.GrassCoverSlipOffOutwards, failureMechanisms, failureMechanismResults),
+                GrassCoverSlipOffInwards = GetAssemblyGroup(assessmentSection.GrassCoverSlipOffInwards, failureMechanisms, failureMechanismResults),
+                HeightStructures = GetAssemblyGroup(assessmentSection.HeightStructures, failureMechanisms, failureMechanismResults),
+                ClosingStructures = GetAssemblyGroup(assessmentSection.ClosingStructures, failureMechanisms, failureMechanismResults),
+                PipingStructure = GetAssemblyGroup(assessmentSection.PipingStructure, failureMechanisms, failureMechanismResults),
+                StabilityPointStructures = GetAssemblyGroup(assessmentSection.StabilityPointStructures, failureMechanisms, failureMechanismResults),
+                DuneErosion = GetAssemblyGroup(assessmentSection.DuneErosion, failureMechanisms, failureMechanismResults)
             };
 
             return constructionProperties;
         }
 
-        private static FailureMechanismSectionAssemblyGroup GetCategoryGroup(IFailureMechanism failureMechanism,
+        private static FailureMechanismSectionAssemblyGroup GetAssemblyGroup(IFailureMechanism failureMechanism,
                                                                              IDictionary<IFailureMechanism, int> failureMechanisms,
                                                                              IEnumerable<FailureMechanismSectionAssemblyGroup> failureMechanismResults)
         {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssessmentSectionAssemblyResultControl.Designer.cs
===================================================================
diff -u -r62ca51b8ff808cf657e915c7307946cab9f973be -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssessmentSectionAssemblyResultControl.Designer.cs	(.../AssessmentSectionAssemblyResultControl.Designer.cs)	(revision 62ca51b8ff808cf657e915c7307946cab9f973be)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssessmentSectionAssemblyResultControl.Designer.cs	(.../AssessmentSectionAssemblyResultControl.Designer.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -58,7 +58,7 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AssessmentSectionAssemblyResultControl));
             this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
             this.resultLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
-            this.assemblyCategoryGroupDisplayNameLabel = new System.Windows.Forms.Label();
+            this.assemblyGroupDisplayNameLabel = new System.Windows.Forms.Label();
             this.assemblyProbabilityDisplayNameLabel = new System.Windows.Forms.Label();
             this.groupLabel = new Core.Common.Controls.BorderedLabel();
             this.probabilityLabel = new Core.Common.Controls.BorderedLabel();
@@ -77,7 +77,7 @@
             this.resultLayoutPanel.ColumnCount = 2;
             this.resultLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.resultLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.resultLayoutPanel.Controls.Add(this.assemblyCategoryGroupDisplayNameLabel, 0, 0);
+            this.resultLayoutPanel.Controls.Add(this.assemblyGroupDisplayNameLabel, 0, 0);
             this.resultLayoutPanel.Controls.Add(this.assemblyProbabilityDisplayNameLabel, 0, 1);
             this.resultLayoutPanel.Controls.Add(this.groupLabel, 1, 0);
             this.resultLayoutPanel.Controls.Add(this.probabilityLabel, 1, 1);
@@ -91,18 +91,18 @@
             this.resultLayoutPanel.AutoSize = true;
             this.resultLayoutPanel.TabIndex = 0;
             // 
-            // assemblyCategoryGroupDisplayNameLabel
+            // assemblyGroupDisplayNameLabel
             // 
-            this.assemblyCategoryGroupDisplayNameLabel.AutoSize = true;
-            this.assemblyCategoryGroupDisplayNameLabel.TextAlign = ContentAlignment.MiddleLeft;
-            this.assemblyCategoryGroupDisplayNameLabel.Location = new System.Drawing.Point(3, 0);
-            this.assemblyCategoryGroupDisplayNameLabel.Name = "assemblyCategoryGroupDisplayNameLabel";
-            this.assemblyCategoryGroupDisplayNameLabel.Size = new System.Drawing.Size(92, 13);
-            this.assemblyCategoryGroupDisplayNameLabel.Dock = DockStyle.Left;
-            this.assemblyCategoryGroupDisplayNameLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
-            this.assemblyCategoryGroupDisplayNameLabel.Margin = new System.Windows.Forms.Padding(3);
-            this.assemblyCategoryGroupDisplayNameLabel.TabIndex = 0;
-            this.assemblyCategoryGroupDisplayNameLabel.Text = Resources.AssessmentSectionAssemblyResultControl_AssemblyCategoryGroup_DisplayName;
+            this.assemblyGroupDisplayNameLabel.AutoSize = true;
+            this.assemblyGroupDisplayNameLabel.TextAlign = ContentAlignment.MiddleLeft;
+            this.assemblyGroupDisplayNameLabel.Location = new System.Drawing.Point(3, 0);
+            this.assemblyGroupDisplayNameLabel.Name = "assemblyGroupDisplayNameLabel";
+            this.assemblyGroupDisplayNameLabel.Size = new System.Drawing.Size(92, 13);
+            this.assemblyGroupDisplayNameLabel.Dock = DockStyle.Left;
+            this.assemblyGroupDisplayNameLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.assemblyGroupDisplayNameLabel.Margin = new System.Windows.Forms.Padding(3);
+            this.assemblyGroupDisplayNameLabel.TabIndex = 0;
+            this.assemblyGroupDisplayNameLabel.Text = Resources.AssessmentSectionAssemblyResultControl_AssemblyGroup_DisplayName;
             // 
             // assemblyProbabilityDisplayNameLabel
             // 
@@ -164,7 +164,7 @@
         
         private System.Windows.Forms.ErrorProvider errorProvider;
         private TableLayoutPanel resultLayoutPanel;
-        private Label assemblyCategoryGroupDisplayNameLabel;
+        private Label assemblyGroupDisplayNameLabel;
         private Label assemblyProbabilityDisplayNameLabel;
         private BorderedLabel groupLabel;
         private BorderedLabel probabilityLabel;
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/CombinedSectionAssemblyMapDataFactory.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/CombinedSectionAssemblyMapDataFactory.cs	(.../CombinedSectionAssemblyMapDataFactory.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/CombinedSectionAssemblyMapDataFactory.cs	(.../CombinedSectionAssemblyMapDataFactory.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -43,7 +43,7 @@
                                        Width = 6,
                                        DashStyle = LineDashStyle.Solid
                                    },
-                                   MapThemeFactory.CreateDisplayFailureMechanismAssemblyCategoryGroupMapTheme())
+                                   MapThemeFactory.CreateDisplayFailureMechanismSectionAssemblyGroupMapTheme())
             {
                 ShowLabels = true,
                 SelectedMetaDataAttribute = Resources.SectionNumber_DisplayName
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r4b2ed2e8f85f0d2bbf6d1a12e1abb1a2686122b7 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 4b2ed2e8f85f0d2bbf6d1a12e1abb1a2686122b7)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -1,25 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. All rights reserved.
-//
-// This file is part of Riskeer.
-//
-// Riskeer is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-// All names, logos, and references to "Deltares" are registered trademarks of
-// Stichting Deltares and remain full property of Stichting Deltares at all times.
-// All rights reserved.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -220,9 +199,9 @@
         /// <summary>
         ///   Looks up a localized string similar to Veiligheidsoordeel.
         /// </summary>
-        public static string AssessmentSectionAssemblyResultControl_AssemblyCategoryGroup_DisplayName {
+        public static string AssessmentSectionAssemblyResultControl_AssemblyGroup_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyResultControl_AssemblyCategoryGroup_DisplayName", resourceCulture);
+                return ResourceManager.GetString("AssessmentSectionAssemblyResultControl_AssemblyGroup_DisplayName", resourceCulture);
             }
         }
         
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r4b2ed2e8f85f0d2bbf6d1a12e1abb1a2686122b7 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 4b2ed2e8f85f0d2bbf6d1a12e1abb1a2686122b7)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -362,7 +362,7 @@
   <data name="FailurePath_Code_Description" xml:space="preserve">
     <value>Het label van het faalpad.</value>
   </data>
-  <data name="AssessmentSectionAssemblyResultControl_AssemblyCategoryGroup_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionAssemblyResultControl_AssemblyGroup_DisplayName" xml:space="preserve">
     <value>Veiligheidsoordeel</value>
   </data>
   <data name="AssemblyGroup_Name_DisplayName" xml:space="preserve">
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs
===================================================================
diff -u -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs	(.../AssemblyResultTotalView.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -199,10 +199,10 @@
 
         private void UpdateAssemblyResultControls()
         {
-            UpdateTotalAssemblyCategoryGroupControl();
+            UpdateTotalAssemblyGroupControl();
         }
         
-        private void UpdateTotalAssemblyCategoryGroupControl()
+        private void UpdateTotalAssemblyGroupControl()
         {
             assessmentSectionAssemblyControl.ClearAssemblyResult();
             assessmentSectionAssemblyControl.ClearErrors();
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs
===================================================================
diff -u -ref4b8ce7f0a64ec4cb2fe6d00c5e156560263f33 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs	(.../CombinedFailureMechanismSectionAssemblyResultRow.cs)	(revision ef4b8ce7f0a64ec4cb2fe6d00c5e156560263f33)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs	(.../CombinedFailureMechanismSectionAssemblyResultRow.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -329,10 +329,10 @@
             ColumnStateDefinitions[duneErosionIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.DuneErosion);
         }
 
-        private static CellStyle CreateCellStyle(FailureMechanismSectionAssemblyGroup assemblyCategoryGroup)
+        private static CellStyle CreateCellStyle(FailureMechanismSectionAssemblyGroup assemblyGroup)
         {
             return new CellStyle(Color.FromKnownColor(KnownColor.ControlText),
-                                 AssemblyGroupColorHelper.GetFailureMechanismSectionAssemblyGroupColor(assemblyCategoryGroup));
+                                 AssemblyGroupColorHelper.GetFailureMechanismSectionAssemblyGroupColor(assemblyGroup));
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismAssemblyResult.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismAssemblyResult.cs	(.../ExportableFailureMechanismAssemblyResult.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismAssemblyResult.cs	(.../ExportableFailureMechanismAssemblyResult.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -32,12 +32,12 @@
         /// Creates a new instance of <see cref="ExportableFailureMechanismAssemblyResult"/>.
         /// </summary>
         /// <param name="assemblyMethod">The method that was used to assemble this result.</param>
-        /// <param name="assemblyCategory">The assembly result.</param>
+        /// <param name="assemblyGroup">The assembly result.</param>
         public ExportableFailureMechanismAssemblyResult(ExportableAssemblyMethod assemblyMethod,
-                                                        FailureMechanismAssemblyCategoryGroup assemblyCategory)
+                                                        FailureMechanismAssemblyCategoryGroup assemblyGroup)
         {
             AssemblyMethod = assemblyMethod;
-            AssemblyCategory = assemblyCategory;
+            AssemblyGroup = assemblyGroup;
         }
 
         /// <summary>
@@ -46,8 +46,8 @@
         public ExportableAssemblyMethod AssemblyMethod { get; }
 
         /// <summary>
-        /// Gets the assembly category result.
+        /// Gets the assembly group result.
         /// </summary>
-        public FailureMechanismAssemblyCategoryGroup AssemblyCategory { get; }
+        public FailureMechanismAssemblyCategoryGroup AssemblyGroup { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismAssemblyResultWithProbability.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismAssemblyResultWithProbability.cs	(.../ExportableFailureMechanismAssemblyResultWithProbability.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Assembly/ExportableFailureMechanismAssemblyResultWithProbability.cs	(.../ExportableFailureMechanismAssemblyResultWithProbability.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -32,12 +32,12 @@
         /// Creates a new instance of <see cref="ExportableFailureMechanismAssemblyResultWithProbability"/>.
         /// </summary>
         /// <param name="assemblyMethod">The method that was used to assemble this result.</param>
-        /// <param name="assemblyCategory">The assembly result.</param>
+        /// <param name="assemblyGroup">The assembly result.</param>
         /// <param name="probability">The probability of the assembly result.</param>
         public ExportableFailureMechanismAssemblyResultWithProbability(ExportableAssemblyMethod assemblyMethod,
-                                                                       FailureMechanismAssemblyCategoryGroup assemblyCategory,
+                                                                       FailureMechanismAssemblyCategoryGroup assemblyGroup,
                                                                        double probability)
-            : base(assemblyMethod, assemblyCategory)
+            : base(assemblyMethod, assemblyGroup)
         {
             Probability = probability;
         }
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismResultCreator.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismResultCreator.cs	(.../SerializableFailureMechanismResultCreator.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Creators/SerializableFailureMechanismResultCreator.cs	(.../SerializableFailureMechanismResultCreator.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -53,7 +53,7 @@
             ValidateAssemblyResult(result);
 
             return new SerializableFailureMechanismAssemblyResult(SerializableAssemblyMethodCreator.Create(result.AssemblyMethod),
-                                                                  SerializableFailureMechanismCategoryGroupCreator.Create(result.AssemblyCategory));
+                                                                  SerializableFailureMechanismCategoryGroupCreator.Create(result.AssemblyGroup));
         }
 
         /// <summary>
@@ -77,7 +77,7 @@
             ValidateAssemblyResult(result);
 
             return new SerializableFailureMechanismAssemblyResult(SerializableAssemblyMethodCreator.Create(result.AssemblyMethod),
-                                                                  SerializableFailureMechanismCategoryGroupCreator.Create(result.AssemblyCategory),
+                                                                  SerializableFailureMechanismCategoryGroupCreator.Create(result.AssemblyGroup),
                                                                   result.Probability);
         }
 
@@ -89,7 +89,7 @@
         /// and a serializable assembly result cannot be created.</exception>
         private static void ValidateAssemblyResult(ExportableFailureMechanismAssemblyResult result)
         {
-            if (result.AssemblyCategory == FailureMechanismAssemblyCategoryGroup.None)
+            if (result.AssemblyGroup == FailureMechanismAssemblyCategoryGroup.None)
             {
                 throw new AssemblyCreatorException(@"The assembly result is invalid and cannot be created.");
             }
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismAssemblyResultTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismAssemblyResultTest.cs	(.../ExportableFailureMechanismAssemblyResultTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismAssemblyResultTest.cs	(.../ExportableFailureMechanismAssemblyResultTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -43,7 +43,7 @@
 
             // Assert
             Assert.AreEqual(assemblyMethod, assemblyResult.AssemblyMethod);
-            Assert.AreEqual(assemblyCategory, assemblyResult.AssemblyCategory);
+            Assert.AreEqual(assemblyCategory, assemblyResult.AssemblyGroup);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismAssemblyResultWithProbabilityTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismAssemblyResultWithProbabilityTest.cs	(.../ExportableFailureMechanismAssemblyResultWithProbabilityTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Assembly/ExportableFailureMechanismAssemblyResultWithProbabilityTest.cs	(.../ExportableFailureMechanismAssemblyResultWithProbabilityTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -46,7 +46,7 @@
             Assert.IsInstanceOf<ExportableFailureMechanismAssemblyResult>(assemblyResult);
 
             Assert.AreEqual(assemblyMethod, assemblyResult.AssemblyMethod);
-            Assert.AreEqual(assemblyCategory, assemblyResult.AssemblyCategory);
+            Assert.AreEqual(assemblyCategory, assemblyResult.AssemblyGroup);
             Assert.AreEqual(probability, assemblyResult.Probability);
         }
     }
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs	(.../SerializableAssemblyCreatorTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyCreatorTest.cs	(.../SerializableAssemblyCreatorTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -268,14 +268,14 @@
             Assert.AreEqual(expectedAssessmentProcess.Id, serializableTotalAssembly.AssessmentProcessId);
 
             SerializableFailureMechanismAssemblyResult serializableAssemblyResultWithoutProbability = serializableTotalAssembly.AssemblyResultWithoutProbability;
-            Assert.AreEqual(SerializableFailureMechanismCategoryGroupCreator.Create(expectedFailureMechanismAssemblyResultWithoutProbability.AssemblyCategory),
+            Assert.AreEqual(SerializableFailureMechanismCategoryGroupCreator.Create(expectedFailureMechanismAssemblyResultWithoutProbability.AssemblyGroup),
                             serializableAssemblyResultWithoutProbability.CategoryGroup);
             Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedFailureMechanismAssemblyResultWithoutProbability.AssemblyMethod),
                             serializableAssemblyResultWithoutProbability.AssemblyMethod);
             Assert.IsNull(serializableAssemblyResultWithoutProbability.Probability);
 
             SerializableFailureMechanismAssemblyResult serializableAssemblyResultWithProbability = serializableTotalAssembly.AssemblyResultWithProbability;
-            Assert.AreEqual(SerializableFailureMechanismCategoryGroupCreator.Create(expectedFailureMechanismAssemblyResultWithProbability.AssemblyCategory),
+            Assert.AreEqual(SerializableFailureMechanismCategoryGroupCreator.Create(expectedFailureMechanismAssemblyResultWithProbability.AssemblyGroup),
                             serializableAssemblyResultWithProbability.CategoryGroup);
             Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedFailureMechanismAssemblyResultWithProbability.AssemblyMethod),
                             serializableAssemblyResultWithProbability.AssemblyMethod);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
===================================================================
diff -u -r4db781b1deb4cbf6cd654b561a50637f95f2a3ab -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision 4db781b1deb4cbf6cd654b561a50637f95f2a3ab)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -98,12 +98,12 @@
 
                 ExportableFailureMechanismAssemblyResultWithProbability failureMechanismAssemblyWithProbability = exportableAssessmentSection.FailureMechanismAssemblyWithProbability;
                 Assert.AreEqual(ExportableAssemblyMethod.WBI2B1, failureMechanismAssemblyWithProbability.AssemblyMethod);
-                Assert.AreEqual(assemblyCategoryGroup, failureMechanismAssemblyWithProbability.AssemblyCategory);
+                Assert.AreEqual(assemblyCategoryGroup, failureMechanismAssemblyWithProbability.AssemblyGroup);
                 Assert.AreEqual(0, failureMechanismAssemblyWithProbability.Probability);
 
                 ExportableFailureMechanismAssemblyResult failureMechanismAssemblyWithoutProbability = exportableAssessmentSection.FailureMechanismAssemblyWithoutProbability;
                 Assert.AreEqual(ExportableAssemblyMethod.WBI2A1, failureMechanismAssemblyWithoutProbability.AssemblyMethod);
-                Assert.AreEqual(assemblyCategoryGroup, failureMechanismAssemblyWithoutProbability.AssemblyCategory);
+                Assert.AreEqual(assemblyCategoryGroup, failureMechanismAssemblyWithoutProbability.AssemblyGroup);
 
                 ExportableAssessmentSectionAssemblyResult exportableAssessmentSectionAssemblyResult = exportableAssessmentSection.AssessmentSectionAssembly;
                 Assert.AreEqual(AssessmentSectionAssemblyGroup.None, exportableAssessmentSectionAssemblyResult.AssemblyCategory);
@@ -167,7 +167,7 @@
             Assert.AreEqual(expectedFailureMechanismGroup, actualExportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssemblyResult = actualExportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(assemblyCategoryGroup, exportableFailureMechanismAssemblyResult.AssemblyCategory);
+            Assert.AreEqual(assemblyCategoryGroup, exportableFailureMechanismAssemblyResult.AssemblyGroup);
             Assert.AreEqual(0, exportableFailureMechanismAssemblyResult.Probability);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssemblyResult.AssemblyMethod);
 
@@ -239,7 +239,7 @@
             Assert.AreEqual(expectedFailureMechanismGroup, actualExportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssemblyResult = actualExportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(assemblyCategoryGroup, exportableFailureMechanismAssemblyResult.AssemblyCategory);
+            Assert.AreEqual(assemblyCategoryGroup, exportableFailureMechanismAssemblyResult.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssemblyResult.AssemblyMethod);
 
             Assert.AreEqual(failureMechanism.SectionResults.Count(), actualExportableFailureMechanism.SectionAssemblyResults.Count());
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs	(.../ExportableClosingStructuresFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs	(.../ExportableClosingStructuresFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -117,7 +117,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group1, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(0, exportableFailureMechanismAssembly.Probability);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod);
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableDuneErosionFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableDuneErosionFailureMechanismFactoryTest.cs	(.../ExportableDuneErosionFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableDuneErosionFailureMechanismFactoryTest.cs	(.../ExportableDuneErosionFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -120,7 +120,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group3, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -117,7 +117,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group1, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(0, exportableFailureMechanismAssembly.Probability);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod);
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -120,7 +120,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group3, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -120,7 +120,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group4, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs	(.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -120,7 +120,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group4, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs	(.../ExportableHeightStructuresFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs	(.../ExportableHeightStructuresFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -117,7 +117,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group1, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(0, exportableFailureMechanismAssembly.Probability);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod);
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs	(.../ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs	(.../ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -118,7 +118,7 @@
 
             ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
             Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod);
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(0, exportableFailureMechanismAssembly.Probability);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs	(.../ExportableMicrostabilityFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs	(.../ExportableMicrostabilityFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -120,7 +120,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group4, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs	(.../ExportablePipingFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs	(.../ExportablePipingFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -117,7 +117,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group2, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(0, exportableFailureMechanismAssembly.Probability);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod);
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs	(.../ExportablePipingStructureFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs	(.../ExportablePipingStructureFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -120,7 +120,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group4, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs	(.../ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs	(.../ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -117,7 +117,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group1, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResultWithProbability exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(0, exportableFailureMechanismAssembly.Probability);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod);
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs	(.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -120,7 +120,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group3, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs	(.../ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs	(.../ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -120,7 +120,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group4, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs	(.../ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs	(.../ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -120,7 +120,7 @@
             Assert.AreEqual(ExportableFailureMechanismGroup.Group3, exportableFailureMechanism.Group);
 
             ExportableFailureMechanismAssemblyResult exportableFailureMechanismAssembly = exportableFailureMechanism.FailureMechanismAssembly;
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.None, exportableFailureMechanismAssembly.AssemblyGroup);
             Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod);
 
             IEnumerable<ExportableFailureMechanismSection> exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection);
Index: Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableFailureMechanismTestHelper.cs
===================================================================
diff -u -rfc767eef0f40b1dd6130d52f6025a5a9181330e1 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableFailureMechanismTestHelper.cs	(.../ExportableFailureMechanismTestHelper.cs)	(revision fc767eef0f40b1dd6130d52f6025a5a9181330e1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/ExportableFailureMechanismTestHelper.cs	(.../ExportableFailureMechanismTestHelper.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -61,7 +61,7 @@
 
             ExportableFailureMechanismAssemblyResultWithProbability failureMechanismAssemblyResult = exportableFailureMechanism.FailureMechanismAssembly;
             Assert.AreEqual(expectedFailureMechanismAssemblyMethod, failureMechanismAssemblyResult.AssemblyMethod);
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyGroup);
             Assert.AreEqual(0, failureMechanismAssemblyResult.Probability);
 
             var exportableFailureMechanismSectionAssembly =
@@ -105,7 +105,7 @@
 
             ExportableFailureMechanismAssemblyResult failureMechanismAssemblyResult = exportableFailureMechanism.FailureMechanismAssembly;
             Assert.AreEqual(expectedFailureMechanismAssemblyMethod, failureMechanismAssemblyResult.AssemblyMethod);
-            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory);
+            Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyGroup);
 
             var exportableFailureMechanismSectionAssembly =
                 (ExportableAggregatedFailureMechanismSectionAssemblyWithCombinedResult) exportableFailureMechanism.SectionAssemblyResults.Single();
Index: Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/SerializableFailureMechanismAssemblyResultTestHelper.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -rfd2c32b8e7c97f7630a6cfb91361dd6c6514034e
--- Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/SerializableFailureMechanismAssemblyResultTestHelper.cs	(.../SerializableFailureMechanismAssemblyResultTestHelper.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.TestUtil/SerializableFailureMechanismAssemblyResultTestHelper.cs	(.../SerializableFailureMechanismAssemblyResultTestHelper.cs)	(revision fd2c32b8e7c97f7630a6cfb91361dd6c6514034e)
@@ -72,7 +72,7 @@
         private static void AssertSerializableBaseProperties(ExportableFailureMechanismAssemblyResult expectedResult,
                                                              SerializableFailureMechanismAssemblyResult actualResult)
         {
-            Assert.AreEqual(SerializableFailureMechanismCategoryGroupCreator.Create(expectedResult.AssemblyCategory), actualResult.CategoryGroup);
+            Assert.AreEqual(SerializableFailureMechanismCategoryGroupCreator.Create(expectedResult.AssemblyGroup), actualResult.CategoryGroup);
             Assert.AreEqual(SerializableAssemblyMethodCreator.Create(expectedResult.AssemblyMethod), actualResult.AssemblyMethod);
         }
     }