Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r3ab14c6b8e436522a052d5bb21385a2fe75041fa -rb9ef465bd1c7ab5515c6c592573a3901efe63b5b
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3ab14c6b8e436522a052d5bb21385a2fe75041fa)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b9ef465bd1c7ab5515c6c592573a3901efe63b5b)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. All rights reserved.
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
 //
 // This file is part of Riskeer.
 //
@@ -119,33 +119,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Naam.
-        /// </summary>
-        public static string AssemblyGroup_Group_DisplayName {
-            get {
-                return ResourceManager.GetString("AssemblyGroup_Group_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De duidingsklassen per vak voor dit toetsspoor..
-        /// </summary>
-        public static string AssemblyGroups_Description {
-            get {
-                return ResourceManager.GetString("AssemblyGroups_Description", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Duidingsklassen.
-        /// </summary>
-        public static string AssemblyGroups_DisplayName {
-            get {
-                return ResourceManager.GetString("AssemblyGroups_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Rekenwaarde faalkans per vak.
         /// </summary>
         public static string AssemblyMapDataFeaturesFactory_ProbabilityPerSection_DisplayName {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r3ab14c6b8e436522a052d5bb21385a2fe75041fa -rb9ef465bd1c7ab5515c6c592573a3901efe63b5b
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 3ab14c6b8e436522a052d5bb21385a2fe75041fa)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision b9ef465bd1c7ab5515c6c592573a3901efe63b5b)
@@ -1337,9 +1337,6 @@
     <data name="FailureMechanismResultView_FailureMechanismAssemblyLabel" xml:space="preserve">
       <value>Gecombineerde faalkans [1/jaar]</value>
     </data>
-    <data name="AssemblyGroup_Group_DisplayName" xml:space="preserve">
-    <value>Naam</value>
-  </data>
     <data name="AssemblyGroup_Color_DisplayName" xml:space="preserve">
     <value>Kleur</value>
   </data>
@@ -1615,12 +1612,6 @@
     <data name="AssemblyCategoryPerSection_DisplayName" xml:space="preserve">
       <value>Duidingsklasse per vak</value>
     </data>
-    <data name="AssemblyGroups_DisplayName" xml:space="preserve">
-    <value>Duidingsklassen</value>
-  </data>
-    <data name="AssemblyGroups_Description" xml:space="preserve">
-    <value>De duidingsklassen per vak voor dit toetsspoor.</value>
-  </data>
     <data name="AssemblyMapDataFeaturesFactory_ProbabilityPerSection_DisplayName" xml:space="preserve">
       <value>Rekenwaarde faalkans per vak</value>
     </data>
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/FailureMechanismSectionAssemblyGroupsContext.cs
===================================================================
diff -u -re3707b3ce2e92905286dd070c4eb0445d62aff94 -rb9ef465bd1c7ab5515c6c592573a3901efe63b5b
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/FailureMechanismSectionAssemblyGroupsContext.cs	(.../FailureMechanismSectionAssemblyGroupsContext.cs)	(revision e3707b3ce2e92905286dd070c4eb0445d62aff94)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/FailureMechanismSectionAssemblyGroupsContext.cs	(.../FailureMechanismSectionAssemblyGroupsContext.cs)	(revision b9ef465bd1c7ab5515c6c592573a3901efe63b5b)
@@ -26,7 +26,7 @@
 namespace Riskeer.Integration.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for the assembly groups.
+    /// Presentation object for the failure mechanism section assembly groups.
     /// </summary>
     public class FailureMechanismSectionAssemblyGroupsContext : ObservableWrappedObjectContextBase<AssessmentSection>
     {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r25762139fbc218bb086d0f2ba2b1649d721f8d3e -rb9ef465bd1c7ab5515c6c592573a3901efe63b5b
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 25762139fbc218bb086d0f2ba2b1649d721f8d3e)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision b9ef465bd1c7ab5515c6c592573a3901efe63b5b)
@@ -464,6 +464,24 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De duidingsklassen per vak voor dit toetsspoor..
+        /// </summary>
+        public static string FailureMechanismSectionAssemblyGroups_Description {
+            get {
+                return ResourceManager.GetString("FailureMechanismSectionAssemblyGroups_Description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Duidingsklassen.
+        /// </summary>
+        public static string FailureMechanismSectionAssemblyGroups_DisplayName {
+            get {
+                return ResourceManager.GetString("FailureMechanismSectionAssemblyGroups_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Het label van het faalpad..
         /// </summary>
         public static string FailurePath_Code_Description {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r25762139fbc218bb086d0f2ba2b1649d721f8d3e -rb9ef465bd1c7ab5515c6c592573a3901efe63b5b
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 25762139fbc218bb086d0f2ba2b1649d721f8d3e)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision b9ef465bd1c7ab5515c6c592573a3901efe63b5b)
@@ -386,4 +386,10 @@
   <data name="AssessmentSectionAssemblyGroups_Description" xml:space="preserve">
     <value>De normklassen voor het traject.</value>
   </data>
+  <data name="FailureMechanismSectionAssemblyGroups_DisplayName" xml:space="preserve">
+    <value>Duidingsklassen</value>
+  </data>
+  <data name="FailureMechanismSectionAssemblyGroups_Description" xml:space="preserve">
+    <value>De duidingsklassen per vak voor dit toetsspoor.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupsProperties.cs
===================================================================
diff -u -r4be489e7d23513ed631c6b604e13fd2340d0fc4f -rb9ef465bd1c7ab5515c6c592573a3901efe63b5b
--- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupsProperties.cs	(.../FailureMechanismSectionAssemblyGroupsProperties.cs)	(revision 4be489e7d23513ed631c6b604e13fd2340d0fc4f)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/FailureMechanismSectionAssemblyGroupsProperties.cs	(.../FailureMechanismSectionAssemblyGroupsProperties.cs)	(revision b9ef465bd1c7ab5515c6c592573a3901efe63b5b)
@@ -31,6 +31,7 @@
 using Riskeer.Common.Data.Contribution;
 using Riskeer.Common.Data.Exceptions;
 using Riskeer.Integration.Data;
+using Riskeer.Integration.Forms.Properties;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
 namespace Riskeer.Integration.Forms.PropertyClasses
@@ -59,8 +60,8 @@
 
         [PropertyOrder(failureMechanismSectionAssemblyGroupPropertyIndex)]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_General))]
-        [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyGroups_DisplayName))]
-        [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.AssemblyGroups_Description))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroups_DisplayName))]
+        [ResourcesDescription(typeof(Resources), nameof(Resources.FailureMechanismSectionAssemblyGroups_Description))]
         [TypeConverter(typeof(ExpandableArrayConverter))]
         public FailureMechanismSectionAssemblyGroupProperties[] FailureMechanismAssemblyGroups
         {
Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsTable.cs
===================================================================
diff -u -r900196824f2f860b124571e3ebe8f3c0338b49d2 -rb9ef465bd1c7ab5515c6c592573a3901efe63b5b
--- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsTable.cs	(.../AssemblyGroupsTable.cs)	(revision 900196824f2f860b124571e3ebe8f3c0338b49d2)
+++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyGroupsTable.cs	(.../AssemblyGroupsTable.cs)	(revision b9ef465bd1c7ab5515c6c592573a3901efe63b5b)
@@ -57,7 +57,7 @@
         private void AddColumns()
         {
             AddTextBoxColumn(nameof(AssemblyGroupRow<T>.Group),
-                             RiskeerCommonFormsResources.AssemblyGroup_Group_DisplayName,
+                             Resources.AssemblyGroup_Name_DisplayName,
                              true);
 
             AddColorColumn(nameof(AssemblyGroupRow<T>.Color),
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r839c963cd7ecbc5d3931041e7d9840d5fdcf7d06 -rb9ef465bd1c7ab5515c6c592573a3901efe63b5b
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 839c963cd7ecbc5d3931041e7d9840d5fdcf7d06)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision b9ef465bd1c7ab5515c6c592573a3901efe63b5b)
@@ -499,7 +499,7 @@
 
             yield return new RiskeerViewInfo<FailureMechanismSectionAssemblyGroupsContext, AssessmentSection, FailureMechanismSectionAssemblyGroupsView>(() => Gui)
             {
-                GetViewName = (view, context) => RiskeerCommonFormsResources.AssemblyGroups_DisplayName,
+                GetViewName = (view, context) => RiskeerFormsResources.FailureMechanismSectionAssemblyGroups_DisplayName,
                 CloseForData = (view, dataToCloseFor) => ReferenceEquals(view.AssessmentSection, dataToCloseFor),
                 CreateInstance = context => new FailureMechanismSectionAssemblyGroupsView(context.WrappedData)
             };
@@ -813,7 +813,7 @@
 
             yield return new TreeNodeInfo<FailureMechanismSectionAssemblyGroupsContext>
             {
-                Text = context => RiskeerCommonFormsResources.AssemblyGroups_DisplayName,
+                Text = context => RiskeerFormsResources.FailureMechanismSectionAssemblyGroups_DisplayName,
                 Image = context => RiskeerCommonFormsResources.NormsIcon,
                 ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
                                                                                  .AddOpenItem()