Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFactoryTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -rbf8325a96ad94571f35d7e745e30b6e1d634949b
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFactoryTest.cs	(.../AssemblyMapDataFactoryTest.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Factories/AssemblyMapDataFactoryTest.cs	(.../AssemblyMapDataFactoryTest.cs)	(revision bf8325a96ad94571f35d7e745e30b6e1d634949b)
@@ -89,7 +89,7 @@
             Assert.AreEqual(expectedVisibility, actualMapLineData.IsVisible);
             Assert.AreEqual("Categorie", actualMapLineData.SelectedMetaDataAttribute);
             RiskeerMapDataFactoryTestHelper.AssertEqualStyle(actualMapLineData.Style, Color.Empty, 6, LineDashStyle.Solid);
-            MapThemeTestHelper.AssertDisplayFailureMechanismSectionAssemblyCategoryGroupMapTheme(actualMapLineData.Theme);
+            MapThemeTestHelper.AssertDisplayFailureMechanismSectionAssemblyGroupMapTheme(actualMapLineData.Theme);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapThemeTestHelper.cs
===================================================================
diff -u -rc36957d0b7c7da0c4e5d5c0bb5e186b49d493d97 -rbf8325a96ad94571f35d7e745e30b6e1d634949b
--- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapThemeTestHelper.cs	(.../MapThemeTestHelper.cs)	(revision c36957d0b7c7da0c4e5d5c0bb5e186b49d493d97)
+++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/MapThemeTestHelper.cs	(.../MapThemeTestHelper.cs)	(revision bf8325a96ad94571f35d7e745e30b6e1d634949b)
@@ -25,7 +25,6 @@
 using Core.Components.Gis.Theme;
 using NUnit.Framework;
 using Riskeer.AssemblyTool.Data;
-using Riskeer.AssemblyTool.Forms;
 
 namespace Riskeer.Common.Forms.TestUtil
 {
@@ -36,32 +35,6 @@
     {
         /// <summary>
         /// Asserts whether the <paramref name="theme"/> is configured for category values
-        /// of type <see cref="DisplayFailureMechanismSectionAssemblyCategoryGroup"/>.
-        /// </summary>
-        /// <param name="theme">The <see cref="MapTheme{T}"/> to assert.</param>
-        /// <exception cref="AssertionException">Thrown when:
-        /// <list type="bullet">
-        /// <item><paramref name="theme"/> does not have the expected attribute name it categorizes its data on.</item>
-        /// <item><paramref name="theme"/> does not have the expected number of criteria as themes.</item>
-        /// <item><paramref name="theme"/> does not have the expected categorical criteria as themes.</item>
-        /// </list></exception>
-        public static void AssertDisplayFailureMechanismSectionAssemblyCategoryGroupMapTheme(MapTheme<LineCategoryTheme> theme)
-        {
-            Assert.AreEqual("Categorie", theme.AttributeName);
-            Assert.AreEqual(9, theme.CategoryThemes.Count());
-            AssertCategoryTheme("Iv", Color.FromArgb(255, 0, 255, 0), theme.CategoryThemes.ElementAt(0));
-            AssertCategoryTheme("IIv", Color.FromArgb(255, 118, 147, 60), theme.CategoryThemes.ElementAt(1));
-            AssertCategoryTheme("IIIv", Color.FromArgb(255, 255, 255, 0), theme.CategoryThemes.ElementAt(2));
-            AssertCategoryTheme("IVv", Color.FromArgb(255, 204, 192, 218), theme.CategoryThemes.ElementAt(3));
-            AssertCategoryTheme("Vv", Color.FromArgb(255, 255, 153, 0), theme.CategoryThemes.ElementAt(4));
-            AssertCategoryTheme("VIv", Color.FromArgb(255, 255, 0, 0), theme.CategoryThemes.ElementAt(5));
-            AssertCategoryTheme("VIIv", Color.FromArgb(255, 255, 255, 255), theme.CategoryThemes.ElementAt(6));
-            AssertCategoryTheme("-", Color.FromArgb(0, 0, 0, 0), theme.CategoryThemes.ElementAt(7));
-            AssertCategoryTheme(string.Empty, Color.FromArgb(0, 0, 0, 0), theme.CategoryThemes.ElementAt(8));
-        }
-        
-        /// <summary>
-        /// Asserts whether the <paramref name="theme"/> is configured for category values
         /// of type <see cref="FailureMechanismSectionAssemblyGroup"/>.
         /// </summary>
         /// <param name="theme">The <see cref="MapTheme{T}"/> to assert.</param>
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/CombinedSectionAssemblyMapDataFactoryTest.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -rbf8325a96ad94571f35d7e745e30b6e1d634949b
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/CombinedSectionAssemblyMapDataFactoryTest.cs	(.../CombinedSectionAssemblyMapDataFactoryTest.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Factories/CombinedSectionAssemblyMapDataFactoryTest.cs	(.../CombinedSectionAssemblyMapDataFactoryTest.cs)	(revision bf8325a96ad94571f35d7e745e30b6e1d634949b)
@@ -49,7 +49,7 @@
             Assert.AreEqual(LineDashStyle.Solid, lineStyle.DashStyle);
 
             Assert.AreEqual("Vaknummer", data.SelectedMetaDataAttribute);
-            MapThemeTestHelper.AssertDisplayFailureMechanismSectionAssemblyCategoryGroupMapTheme(data.Theme);
+            MapThemeTestHelper.AssertDisplayFailureMechanismSectionAssemblyGroupMapTheme(data.Theme);
         }
     }
 }
\ No newline at end of file
Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs
===================================================================
diff -u -rcb91b638a8a64b4926a0211f86f6cfd2a745faf3 -rbf8325a96ad94571f35d7e745e30b6e1d634949b
--- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision cb91b638a8a64b4926a0211f86f6cfd2a745faf3)
+++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyResultPerSectionMapViewTest.cs	(.../AssemblyResultPerSectionMapViewTest.cs)	(revision bf8325a96ad94571f35d7e745e30b6e1d634949b)
@@ -487,7 +487,7 @@
                 Assert.AreEqual(expectedAssemblyResult.SectionNumber, actualFeature.MetaData["Vaknummer"]);
                 Assert.AreEqual(new EnumDisplayWrapper<DisplayFailureMechanismSectionAssemblyGroup>(
                                     DisplayFailureMechanismSectionAssemblyGroupConverter.Convert(expectedAssemblyResult.TotalResult)).DisplayName,
-                                mapFeatures.ElementAt(i).MetaData["Categorie"]);
+                                mapFeatures.ElementAt(i).MetaData["Duidingsklasse"]);
             }
         }