Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/AssemblyGroupProperties.cs
===================================================================
diff -u -r4470ed201301c00461f6e7ff510c6f80832b33c1 -r4894fb9c1b51e36a35e2afa60e542c3a32eb9068
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/AssemblyGroupProperties.cs	(.../AssemblyGroupProperties.cs)	(revision 4470ed201301c00461f6e7ff510c6f80832b33c1)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/AssemblyGroupProperties.cs	(.../AssemblyGroupProperties.cs)	(revision 4894fb9c1b51e36a35e2afa60e542c3a32eb9068)
@@ -26,6 +26,7 @@
 using Core.Gui.Attributes;
 using Core.Gui.PropertyBag;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Forms;
 using Riskeer.Common.Forms.TypeConverters;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
@@ -60,11 +61,11 @@
         [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyGroup_Name_DisplayName))]
         [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyGroup_Name_Description))]
         [TypeConverter(typeof(EnumTypeConverter))]
-        public FailureMechanismSectionAssemblyGroup Group
+        public DisplayFailureMechanismSectionAssemblyGroup Group
         {
             get
             {
-                return data.Group;
+                return DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(data.Group);
             }
         }
 
@@ -96,7 +97,7 @@
 
         public override string ToString()
         {
-            return new EnumDisplayWrapper<FailureMechanismSectionAssemblyGroup>(data.Group).DisplayName;
+            return new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(Group).DisplayName;
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssemblyGroupPropertiesTest.cs
===================================================================
diff -u -rc1a92b999dcc6a79240c5d16710942cde7ad6669 -r4894fb9c1b51e36a35e2afa60e542c3a32eb9068
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssemblyGroupPropertiesTest.cs	(.../AssemblyGroupPropertiesTest.cs)	(revision c1a92b999dcc6a79240c5d16710942cde7ad6669)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/PropertyClasses/AssemblyGroupPropertiesTest.cs	(.../AssemblyGroupPropertiesTest.cs)	(revision 4894fb9c1b51e36a35e2afa60e542c3a32eb9068)
@@ -27,6 +27,7 @@
 using Core.Gui.TestUtil;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
+using Riskeer.AssemblyTool.Forms;
 using Riskeer.Integration.Forms.PropertyClasses;
 
 namespace Riskeer.Integration.Forms.Test.PropertyClasses
@@ -62,13 +63,13 @@
             Assert.AreSame(assemblyCategory, properties.Data);
             TestHelper.AssertTypeConverter<AssemblyGroupProperties, ExpandableObjectConverter>();
 
-            Assert.AreEqual(assemblyCategory.Group, properties.Group);
+            Assert.AreEqual(DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(assemblyCategory.Group), properties.Group);
             Assert.AreEqual(assemblyCategory.LowerBoundary, properties.LowerBoundary);
             Assert.AreEqual(assemblyCategory.UpperBoundary, properties.UpperBoundary);
         }
 
         [Test]
-        public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
+        public void Constructor_Always_PropertiesHaveExpectedAttributeValues()
         {
             // Setup
             var random = new Random(39);
@@ -107,7 +108,7 @@
         }
 
         [Test]
-        public void ToString_Always_ReturnsCategoryGroupDisplayName()
+        public void ToString_Always_ReturnsAssemblyGroupDisplayName()
         {
             // Setup
             var random = new Random(39);
@@ -120,8 +121,8 @@
             var result = properties.ToString();
 
             // Assert
-            Assert.AreEqual(new EnumDisplayWrapper<FailureMechanismSectionAssemblyGroup>(categoryGroup).DisplayName,
-                            result);
+            Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(
+                                DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(categoryGroup)).DisplayName, result);
         }
     }
 }
\ No newline at end of file