Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroup.cs
===================================================================
diff -u -rde62c12fc22556b393b7fa539c3f8e10a53756b3 -r9a74e582accc7364423a32cc2c0135f303c7cc5b
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroup.cs	(.../AssessmentSectionAssemblyGroup.cs)	(revision de62c12fc22556b393b7fa539c3f8e10a53756b3)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyGroup.cs	(.../AssessmentSectionAssemblyGroup.cs)	(revision 9a74e582accc7364423a32cc2c0135f303c7cc5b)
@@ -32,49 +32,49 @@
         /// <summary>
         /// Represents group GR (No result).
         /// </summary>
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_None_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_None_DisplayName))]
         None = 1,
 
         /// <summary>
         /// Represents group NVT (Not applicable).
         /// </summary>
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_Empty_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_Empty_DisplayName))]
         NotApplicable = 2,
 
         /// <summary>
         /// Represents group NGO (Not assessed).
         /// </summary>
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_NotAssessed_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_NotAssessed_DisplayName))]
         NotAssessed = 3,
 
         /// <summary>
         /// Represents group A+.
         /// </summary>
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_APlus_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_APlus_DisplayName))]
         APlus = 4,
 
         /// <summary>
         /// Represents group A.
         /// </summary>
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_A_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_A_DisplayName))]
         A = 5,
 
         /// <summary>
         /// Represents group B.
         /// </summary>
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_B_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_B_DisplayName))]
         B = 6,
 
         /// <summary>
         /// Represents group C.
         /// </summary>
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_C_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_C_DisplayName))]
         C = 7,
 
         /// <summary>
         /// Represents group D.
         /// </summary>
-        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyCategoryGroup_D_DisplayName))]
+        [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionAssemblyGroup_D_DisplayName))]
         D = 8
     }
 }
\ No newline at end of file
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r9a74e582accc7364423a32cc2c0135f303c7cc5b
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9a74e582accc7364423a32cc2c0135f303c7cc5b)
@@ -84,72 +84,72 @@
         /// <summary>
         ///   Looks up a localized string similar to A.
         /// </summary>
-        internal static string AssessmentSectionAssemblyCategoryGroup_A_DisplayName {
+        internal static string AssessmentSectionAssemblyGroup_A_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_A_DisplayName", resourceCulture);
+                return ResourceManager.GetString("AssessmentSectionAssemblyGroup_A_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to A+.
         /// </summary>
-        internal static string AssessmentSectionAssemblyCategoryGroup_APlus_DisplayName {
+        internal static string AssessmentSectionAssemblyGroup_APlus_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_APlus_DisplayName", resourceCulture);
+                return ResourceManager.GetString("AssessmentSectionAssemblyGroup_APlus_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to B.
         /// </summary>
-        internal static string AssessmentSectionAssemblyCategoryGroup_B_DisplayName {
+        internal static string AssessmentSectionAssemblyGroup_B_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_B_DisplayName", resourceCulture);
+                return ResourceManager.GetString("AssessmentSectionAssemblyGroup_B_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to C.
         /// </summary>
-        internal static string AssessmentSectionAssemblyCategoryGroup_C_DisplayName {
+        internal static string AssessmentSectionAssemblyGroup_C_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_C_DisplayName", resourceCulture);
+                return ResourceManager.GetString("AssessmentSectionAssemblyGroup_C_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to D.
         /// </summary>
-        internal static string AssessmentSectionAssemblyCategoryGroup_D_DisplayName {
+        internal static string AssessmentSectionAssemblyGroup_D_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_D_DisplayName", resourceCulture);
+                return ResourceManager.GetString("AssessmentSectionAssemblyGroup_D_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to -.
         /// </summary>
-        internal static string AssessmentSectionAssemblyCategoryGroup_Empty_DisplayName {
+        internal static string AssessmentSectionAssemblyGroup_Empty_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_Empty_DisplayName", resourceCulture);
+                return ResourceManager.GetString("AssessmentSectionAssemblyGroup_Empty_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to .
         /// </summary>
-        internal static string AssessmentSectionAssemblyCategoryGroup_None_DisplayName {
+        internal static string AssessmentSectionAssemblyGroup_None_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_None_DisplayName", resourceCulture);
+                return ResourceManager.GetString("AssessmentSectionAssemblyGroup_None_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to NGO.
         /// </summary>
-        internal static string AssessmentSectionAssemblyCategoryGroup_NotAssessed_DisplayName {
+        internal static string AssessmentSectionAssemblyGroup_NotAssessed_DisplayName {
             get {
-                return ResourceManager.GetString("AssessmentSectionAssemblyCategoryGroup_NotAssessed_DisplayName", resourceCulture);
+                return ResourceManager.GetString("AssessmentSectionAssemblyGroup_NotAssessed_DisplayName", resourceCulture);
             }
         }
         
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx
===================================================================
diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r9a74e582accc7364423a32cc2c0135f303c7cc5b
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 2e55afd890468db1b25c734216956ab5c2126e58)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 9a74e582accc7364423a32cc2c0135f303c7cc5b)
@@ -117,28 +117,28 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="AssessmentSectionAssemblyCategoryGroup_APlus_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionAssemblyGroup_APlus_DisplayName" xml:space="preserve">
     <value>A+</value>
   </data>
-  <data name="AssessmentSectionAssemblyCategoryGroup_A_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionAssemblyGroup_A_DisplayName" xml:space="preserve">
     <value>A</value>
   </data>
-  <data name="AssessmentSectionAssemblyCategoryGroup_B_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionAssemblyGroup_B_DisplayName" xml:space="preserve">
     <value>B</value>
   </data>
-  <data name="AssessmentSectionAssemblyCategoryGroup_C_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionAssemblyGroup_C_DisplayName" xml:space="preserve">
     <value>C</value>
   </data>
-  <data name="AssessmentSectionAssemblyCategoryGroup_D_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionAssemblyGroup_D_DisplayName" xml:space="preserve">
     <value>D</value>
   </data>
-  <data name="AssessmentSectionAssemblyCategoryGroup_Empty_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionAssemblyGroup_Empty_DisplayName" xml:space="preserve">
     <value>-</value>
   </data>
-  <data name="AssessmentSectionAssemblyCategoryGroup_NotAssessed_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionAssemblyGroup_NotAssessed_DisplayName" xml:space="preserve">
     <value>NGO</value>
   </data>
-  <data name="AssessmentSectionAssemblyCategoryGroup_None_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionAssemblyGroup_None_DisplayName" xml:space="preserve">
     <value />
   </data>
   <data name="FailureMechanismAssemblyCategoryGroup_IIIt_DisplayName" xml:space="preserve">