Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsView.Designer.cs
===================================================================
diff -u -r76b53d5d30a83b9e8c4675e322cc27d3ebc7fd25 -rd50a1f58ee3fe5506b092cb9b7a68cb2179024a5
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsView.Designer.cs	(.../AssemblyGroupsView.Designer.cs)	(revision 76b53d5d30a83b9e8c4675e322cc27d3ebc7fd25)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsView.Designer.cs	(.../AssemblyGroupsView.Designer.cs)	(revision d50a1f58ee3fe5506b092cb9b7a68cb2179024a5)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Forms;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
 namespace Riskeer.Integration.Forms.Views
@@ -39,7 +40,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.assemblyGroupsTable = new AssemblyCategoriesTable<FailureMechanismSectionAssemblyGroup>();
+            this.assemblyGroupsTable = new AssemblyCategoriesTable<DisplayFailureMechanismSectionAssemblyGroup>();
             this.groupBoxPanel = new System.Windows.Forms.Panel();
             this.groupBoxPanel.SuspendLayout();
             this.groupBox = new System.Windows.Forms.GroupBox();
@@ -87,7 +88,7 @@
 
         #endregion
 
-        private AssemblyCategoriesTable<FailureMechanismSectionAssemblyGroup> assemblyGroupsTable;
+        private AssemblyCategoriesTable<DisplayFailureMechanismSectionAssemblyGroup> assemblyGroupsTable;
         private System.Windows.Forms.GroupBox groupBox;
         private System.Windows.Forms.Panel groupBoxPanel;
     }
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsView.cs
===================================================================
diff -u -radfd2f45fc2145e7e762dffa9f5b8a0ae1fe0938 -rd50a1f58ee3fe5506b092cb9b7a68cb2179024a5
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsView.cs	(.../AssemblyGroupsView.cs)	(revision adfd2f45fc2145e7e762dffa9f5b8a0ae1fe0938)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsView.cs	(.../AssemblyGroupsView.cs)	(revision d50a1f58ee3fe5506b092cb9b7a68cb2179024a5)
@@ -26,6 +26,7 @@
 using Core.Common.Base;
 using Core.Common.Controls.Views;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Forms;
 using Riskeer.Common.Data.AssemblyTool;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Common.Forms.Helpers;
@@ -84,19 +85,19 @@
 
         private void UpdateTableData()
         {
-            Tuple<AssemblyGroupBoundaries, Color, FailureMechanismSectionAssemblyGroup>[] dataToSet;
+            Tuple<AssemblyGroupBoundaries, Color, DisplayFailureMechanismSectionAssemblyGroup>[] dataToSet;
             try
             {
                 dataToSet = AssemblyToolGroupBoundariesFactory.CreateFailureMechanismSectionAssemblyGroupBoundaries(
                     AssessmentSection.FailureMechanismContribution.SignalingNorm, AssessmentSection.FailureMechanismContribution.LowerLimitNorm).Select(
-                    assemblyGroupBoundaries => new Tuple<AssemblyGroupBoundaries, Color, FailureMechanismSectionAssemblyGroup>(
+                    assemblyGroupBoundaries => new Tuple<AssemblyGroupBoundaries, Color, DisplayFailureMechanismSectionAssemblyGroup>(
                         assemblyGroupBoundaries,
                         AssemblyGroupColorHelper.GetFailureMechanismSectionAssemblyCategoryGroupColor(assemblyGroupBoundaries.Group),
-                        assemblyGroupBoundaries.Group)).ToArray();
+                        DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(assemblyGroupBoundaries.Group))).ToArray();
             }
             catch (AssemblyException)
             {
-                dataToSet = Array.Empty<Tuple<AssemblyGroupBoundaries, Color, FailureMechanismSectionAssemblyGroup>>();
+                dataToSet = Array.Empty<Tuple<AssemblyGroupBoundaries, Color, DisplayFailureMechanismSectionAssemblyGroup>>();
             }
 
             assemblyGroupsTable.SetData(dataToSet);
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyGroupsViewTest.cs
===================================================================
diff -u -r5bf00df07b512b4e301e3b08dbd0192bac1332a5 -rd50a1f58ee3fe5506b092cb9b7a68cb2179024a5
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyGroupsViewTest.cs	(.../AssemblyGroupsViewTest.cs)	(revision 5bf00df07b512b4e301e3b08dbd0192bac1332a5)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyGroupsViewTest.cs	(.../AssemblyGroupsViewTest.cs)	(revision d50a1f58ee3fe5506b092cb9b7a68cb2179024a5)
@@ -27,6 +27,7 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Forms;
 using Riskeer.AssemblyTool.KernelWrapper.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Calculators.Categories;
@@ -65,7 +66,7 @@
                 // Call
                 using (var view = new AssemblyGroupsView(assessmentSection))
                 {
-                    AssemblyCategoriesTable<FailureMechanismSectionAssemblyGroup> failureMechanismSectionCategoriesTable = GetAssemblyGroupsTable(view);
+                    AssemblyCategoriesTable<DisplayFailureMechanismSectionAssemblyGroup> failureMechanismSectionCategoriesTable = GetAssemblyGroupsTable(view);
 
                     // Assert
                     Assert.IsEmpty(failureMechanismSectionCategoriesTable.Rows);
@@ -99,7 +100,7 @@
                 Assert.AreEqual(DockStyle.Fill, groupBox.Dock);
                 Assert.AreEqual("Duidingsklassen", groupBox.Text);
 
-                AssemblyCategoriesTable<FailureMechanismSectionAssemblyGroup> assemblyGroupsTable = GetAssemblyGroupsTable(view);
+                AssemblyCategoriesTable<DisplayFailureMechanismSectionAssemblyGroup> assemblyGroupsTable = GetAssemblyGroupsTable(view);
                 Assert.AreEqual(DockStyle.Fill, assemblyGroupsTable.Dock);
             }
         }
@@ -146,12 +147,12 @@
                 // Call
                 using (var view = new AssemblyGroupsView(assessmentSection))
                 {
-                    AssemblyCategoriesTable<FailureMechanismSectionAssemblyGroup> assemblyGroupsTable = GetAssemblyGroupsTable(view);
+                    AssemblyCategoriesTable<DisplayFailureMechanismSectionAssemblyGroup> assemblyGroupsTable = GetAssemblyGroupsTable(view);
 
                     // Assert
                     Assert.AreEqual(1, assemblyGroupsTable.Rows.Count);
-                    var row = (AssemblyCategoryRow<FailureMechanismSectionAssemblyGroup>) assemblyGroupsTable.Rows[0].DataBoundItem;
-                    Assert.AreEqual(failureMechanismSectionAssemblyGroup, row.Group);
+                    var row = (AssemblyCategoryRow<DisplayFailureMechanismSectionAssemblyGroup>) assemblyGroupsTable.Rows[0].DataBoundItem;
+                    Assert.AreEqual(DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(failureMechanismSectionAssemblyGroup), row.Group);
                     Assert.AreEqual(lowerBoundary, row.LowerBoundary);
                     Assert.AreEqual(upperBoundary, row.UpperBoundary);
                 }
@@ -171,14 +172,14 @@
                 AssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedAssemblyGroupBoundariesCalculator;
                 var output = new List<FailureMechanismSectionAssemblyGroupBoundaries>
                 {
-                    CreateRandomFailureMechanismSectionAssemblyGroupBoundaries(random)
+                    CreateRandomDisplayFailureMechanismSectionAssemblyGroupBoundaries(random)
                 };
 
                 calculator.FailureMechanismSectionAssemblyGroupBoundariesOutput = output;
 
                 using (var view = new AssemblyGroupsView(assessmentSection))
                 {
-                    AssemblyCategoriesTable<FailureMechanismSectionAssemblyGroup> failureMechanismSectionCategoriesTable = GetAssemblyGroupsTable(view);
+                    AssemblyCategoriesTable<DisplayFailureMechanismSectionAssemblyGroup> failureMechanismSectionCategoriesTable = GetAssemblyGroupsTable(view);
 
                     // Precondition
                     int groupBoundaries = output.Count;
@@ -187,7 +188,7 @@
                     int newGroupBoundaries = random.Next(1, 10);
                     for (var i = 1; i <= newGroupBoundaries; i++)
                     {
-                        output.Add(CreateRandomFailureMechanismSectionAssemblyGroupBoundaries(random));
+                        output.Add(CreateRandomDisplayFailureMechanismSectionAssemblyGroupBoundaries(random));
                     }
 
                     // When
@@ -199,14 +200,14 @@
             }
         }
 
-        private static AssemblyCategoriesTable<FailureMechanismSectionAssemblyGroup> GetAssemblyGroupsTable(
+        private static AssemblyCategoriesTable<DisplayFailureMechanismSectionAssemblyGroup> GetAssemblyGroupsTable(
             AssemblyGroupsView view)
         {
-            return ControlTestHelper.GetControls<AssemblyCategoriesTable<FailureMechanismSectionAssemblyGroup>>(
+            return ControlTestHelper.GetControls<AssemblyCategoriesTable<DisplayFailureMechanismSectionAssemblyGroup>>(
                 view, "assemblyGroupsTable").Single();
         }
 
-        private static FailureMechanismSectionAssemblyGroupBoundaries CreateRandomFailureMechanismSectionAssemblyGroupBoundaries(Random random)
+        private static FailureMechanismSectionAssemblyGroupBoundaries CreateRandomDisplayFailureMechanismSectionAssemblyGroupBoundaries(Random random)
         {
             return new FailureMechanismSectionAssemblyGroupBoundaries(random.NextEnumValue<FailureMechanismSectionAssemblyGroup>(),
                                                                       random.NextDouble(),