Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -rce921ee0727d9c3ce1f0fdad2d2f89bf287c91f1 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision ce921ee0727d9c3ce1f0fdad2d2f89bf287c91f1)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -334,12 +334,24 @@
             }
         }
 
+        /// <summary>
+        /// Lookup class for administration related to drawn map data layers.
+        /// </summary>
         private class DrawnMapData
         {
+            /// <summary>
+            /// The feature based map data which the drawn <see cref="FeatureBasedMapDataLayer"/> is based upon.
+            /// </summary>
             public FeatureBasedMapData FeatureBasedMapData { get; set; }
 
+            /// <summary>
+            /// The drawn map data layer.
+            /// </summary>
             public IFeatureBasedMapDataLayer FeatureBasedMapDataLayer { get; set; }
 
+            /// <summary>
+            /// The observer attached to <see cref="FeatureBasedMapData"/> and responsible for updating <see cref="FeatureBasedMapDataLayer"/>.
+            /// </summary>
             public Observer Observer { get; set; }
         }
     }
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs
===================================================================
diff -u -r778ffc42baaaf50f68d84359fd7dbe63be311a4b -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 778ffc42baaaf50f68d84359fd7dbe63be311a4b)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/MapControlTest.cs	(.../MapControlTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -171,7 +171,7 @@
                 mapLineData.NotifyObservers();
 
                 // Then
-                Assert.AreEqual(0, layersBeforeUpdate.Except(mapView.Layers).Count());
+                CollectionAssert.AreEqual(layersBeforeUpdate, mapView.Layers);
             }
         }
 
@@ -199,6 +199,9 @@
 
                 var layersBeforeUpdate = mapView.Layers.ToList();
 
+                // Precondition
+                Assert.AreEqual(3, layersBeforeUpdate.Count);
+
                 // When
                 nestedMapDataCollection1.Remove(mapLineData);
                 nestedMapDataCollection1.NotifyObservers();
@@ -236,6 +239,9 @@
 
                 var layersBeforeUpdate = mapView.Layers.ToList();
 
+                // Precondition
+                Assert.AreEqual(3, layersBeforeUpdate.Count);
+
                 // When
                 nestedMapDataCollection1.Insert(0, new MapPolygonData("Additional polygons"));
                 nestedMapDataCollection1.NotifyObservers();
@@ -269,8 +275,14 @@
 
                 map.Data = mapDataCollection;
 
-                var layersBeforeUpdate = mapView.Layers.ToList();
+                var layersBeforeUpdate = mapView.Layers.Cast<FeatureLayer>().ToList();
 
+                // Precondition
+                Assert.AreEqual(3, layersBeforeUpdate.Count);
+                Assert.AreEqual("Points", layersBeforeUpdate[0].Name);
+                Assert.AreEqual("Lines", layersBeforeUpdate[1].Name);
+                Assert.AreEqual("Polygons", layersBeforeUpdate[2].Name);
+
                 // When
                 mapDataCollection.Remove(mapPointData);
                 mapDataCollection.Add(mapPointData);
@@ -282,7 +294,7 @@
                 Assert.AreEqual("Lines", featureLayers[0].Name);
                 Assert.AreEqual("Polygons", featureLayers[1].Name);
                 Assert.AreEqual("Points", featureLayers[2].Name);
-                Assert.AreEqual(0, layersBeforeUpdate.Except(mapView.Layers).Count());
+                Assert.AreEqual(0, layersBeforeUpdate.Except(featureLayers).Count());
             }
         }
 
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapLineDataLayerTest.cs
===================================================================
diff -u -rcfaf7a697ebd90c7929af22bd4b17126ae03e6c0 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapLineDataLayerTest.cs	(.../MapLineDataLayerTest.cs)	(revision cfaf7a697ebd90c7929af22bd4b17126ae03e6c0)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapLineDataLayerTest.cs	(.../MapLineDataLayerTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -28,6 +28,7 @@
 using Core.Components.Gis.Data;
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
+using DotSpatial.Controls;
 using DotSpatial.Symbology;
 using NUnit.Framework;
 using LineStyle = Core.Components.Gis.Style.LineStyle;
@@ -60,6 +61,8 @@
             var mapLineDataLayer = new MapLineDataLayer(mapLineData);
 
             // Assert
+            Assert.IsInstanceOf<MapLineLayer>(mapLineDataLayer);
+            Assert.IsInstanceOf<IFeatureBasedMapDataLayer>(mapLineDataLayer);
             AssertMapLineDataLayerTestProperties(mapLineDataLayer);
         }
 
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapPointDataLayerTest.cs
===================================================================
diff -u -rcfaf7a697ebd90c7929af22bd4b17126ae03e6c0 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapPointDataLayerTest.cs	(.../MapPointDataLayerTest.cs)	(revision cfaf7a697ebd90c7929af22bd4b17126ae03e6c0)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapPointDataLayerTest.cs	(.../MapPointDataLayerTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -28,6 +28,7 @@
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
 using Core.Components.Gis.Style;
+using DotSpatial.Controls;
 using DotSpatial.Symbology;
 using NUnit.Framework;
 
@@ -59,6 +60,8 @@
             var mapPointDataLayer = new MapPointDataLayer(mapPointData);
 
             // Assert
+            Assert.IsInstanceOf<MapPointLayer>(mapPointDataLayer);
+            Assert.IsInstanceOf<IFeatureBasedMapDataLayer>(mapPointDataLayer);
             AssertMapPointDataLayerTestProperties(mapPointDataLayer);
         }
 
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapPolygonDataLayerTest.cs
===================================================================
diff -u -rcfaf7a697ebd90c7929af22bd4b17126ae03e6c0 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapPolygonDataLayerTest.cs	(.../MapPolygonDataLayerTest.cs)	(revision cfaf7a697ebd90c7929af22bd4b17126ae03e6c0)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/MapPolygonDataLayerTest.cs	(.../MapPolygonDataLayerTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -28,6 +28,7 @@
 using Core.Components.Gis.Features;
 using Core.Components.Gis.Geometries;
 using Core.Components.Gis.Style;
+using DotSpatial.Controls;
 using DotSpatial.Symbology;
 using NUnit.Framework;
 
@@ -59,6 +60,8 @@
             var mapPolygonDataLayer = new MapPolygonDataLayer(mapPolygonData);
 
             // Assert
+            Assert.IsInstanceOf<MapPolygonLayer>(mapPolygonDataLayer);
+            Assert.IsInstanceOf<IFeatureBasedMapDataLayer>(mapPolygonDataLayer);
             AssertMapPolygonDataLayerTestProperties(mapPolygonDataLayer);
         }
 
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs
===================================================================
diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -34,7 +34,6 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.Views;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using ClosingStructuresDataResources = Ringtoets.ClosingStructures.Data.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Forms.Views
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs	(.../ClosingStructuresFailureMechanismViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismViewTest.cs	(.../ClosingStructuresFailureMechanismViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -43,9 +43,6 @@
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.TestUtil;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using ClosingStructuresDataResources = Ringtoets.ClosingStructures.Data.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Forms.Test.Views
 {
@@ -129,7 +126,7 @@
             using (var view = new ClosingStructuresFailureMechanismView())
             {
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(
-                    new ClosingStructuresFailureMechanism(), 
+                    new ClosingStructuresFailureMechanism(),
                     new TestAssessmentSection());
 
                 view.Data = failureMechanismContext;
@@ -153,7 +150,7 @@
             using (var view = new ClosingStructuresFailureMechanismView())
             {
                 var failureMechanismContext = new ClosingStructuresFailureMechanismContext(
-                    new ClosingStructuresFailureMechanism(), 
+                    new ClosingStructuresFailureMechanism(),
                     new TestAssessmentSection());
 
                 // Call
@@ -899,23 +896,16 @@
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
             CollectionAssert.IsEmpty(calculationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, sectionsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.ForeshoreProfiles_DisplayName, foreshoreProfilesMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.StructuresCollection_DisplayName, structuresMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, calculationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Vakindeling", sectionsMapData.Name);
+            Assert.AreEqual("Voorlandprofielen", foreshoreProfilesMapData.Name);
+            Assert.AreEqual("Kunstwerken", structuresMapData.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Berekeningen", calculationsMapData.Name);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                 name);
-        }
-
         private class TestAssessmentSection : Observable, IAssessmentSection
         {
             public string Id { get; set; }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs	(.../FailureMechanismView.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/FailureMechanismView.cs	(.../FailureMechanismView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -28,7 +28,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Forms.PresentationObjects;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Common.Forms.Views
 {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs	(.../FailureMechanismViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/FailureMechanismViewTest.cs	(.../FailureMechanismViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -38,8 +38,6 @@
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.Common.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Common.Forms.Test.Views
 {
@@ -582,20 +580,13 @@
             CollectionAssert.IsEmpty(sectionsEndPointMapData.Features);
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, sectionsMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Vakindeling", sectionsMapData.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                 name);
-        }
-
         private class TestAssessmentSection : Observable, IAssessmentSection
         {
             public string Id { get; set; }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFactoryTest.cs
===================================================================
diff -u -r01b71caa420a2f0f71ec35aa62289ea67e71ad2b -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFactoryTest.cs	(.../RingtoetsMapDataFactoryTest.cs)	(revision 01b71caa420a2f0f71ec35aa62289ea67e71ad2b)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/RingtoetsMapDataFactoryTest.cs	(.../RingtoetsMapDataFactoryTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -65,7 +65,7 @@
 
             // Assert
             Assert.IsEmpty(data.Features);
-            Assert.AreEqual(GetSectionPointDisplayName("startpunten"), data.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", data.Name);
             AssertEqualStyle(data.Style, Color.DarkKhaki, 15, PointSymbol.Triangle);
         }
 
@@ -77,7 +77,7 @@
 
             // Assert
             Assert.IsEmpty(data.Features);
-            Assert.AreEqual(GetSectionPointDisplayName("eindpunten"), data.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", data.Name);
             AssertEqualStyle(data.Style, Color.DarkKhaki, 15, PointSymbol.Triangle);
         }
 
@@ -143,13 +143,6 @@
             AssertEqualStyle(data.Style, Color.MediumPurple, 2, DashStyle.Dash);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 "Vakindeling",
-                                 name);
-        }
-
         private static void AssertEqualStyle(LineStyle lineStyle, Color color, int width, DashStyle style)
         {
             Assert.AreEqual(color, lineStyle.Color);
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismView.cs	(.../GrassCoverErosionInwardsFailureMechanismView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -33,9 +33,7 @@
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using GrassCoverErosionInwardsDataResources = Ringtoets.GrassCoverErosionInwards.Data.Properties.Resources;
-using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.Views
 {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -40,10 +40,6 @@
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using GrassCoverErosionInwardsDataResources = Ringtoets.GrassCoverErosionInwards.Data.Properties.Resources;
-using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.Views
 {
@@ -886,23 +882,16 @@
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
             CollectionAssert.IsEmpty(calculationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, sectionsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.DikeProfiles_DisplayName, dikeProfilesMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.ForeshoreProfiles_DisplayName, foreshoreProfilesMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, calculationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Vakindeling", sectionsMapData.Name);
+            Assert.AreEqual("Dijkprofielen", dikeProfilesMapData.Name);
+            Assert.AreEqual("Voorlandprofielen", foreshoreProfilesMapData.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Berekeningen", calculationsMapData.Name);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                 name);
-        }
-
         private class TestAssessmentSection : Observable, IAssessmentSection
         {
             public string Id { get; set; }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -34,9 +34,7 @@
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.Revetment.Data;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using GrassCoverErosionOutwardsDataResources = Ringtoets.GrassCoverErosionOutwards.Data.Properties.Resources;
-using GrassCoverErosionOutwardsFormsResources = Ringtoets.GrassCoverErosionOutwards.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Views
 {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -40,10 +40,6 @@
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using GrassCoverErosionOutwardsDataResources = Ringtoets.GrassCoverErosionOutwards.Data.Properties.Resources;
-using GrassCoverErosionOutwardsFormsResources = Ringtoets.GrassCoverErosionOutwards.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.Views
 {
@@ -719,22 +715,15 @@
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
             CollectionAssert.IsEmpty(calculationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, sectionsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.ForeshoreProfiles_DisplayName, foreshoreProfilesMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, calculationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Vakindeling", sectionsMapData.Name);
+            Assert.AreEqual("Voorlandprofielen", foreshoreProfilesMapData.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Berekeningen", calculationsMapData.Name);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                 name);
-        }
-
         private class TestAssessmentSection : Observable, IAssessmentSection
         {
             public string Id { get; set; }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs
===================================================================
diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismView.cs	(.../HeightStructuresFailureMechanismView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -34,7 +34,6 @@
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using HeightStructuresDataResources = Ringtoets.HeightStructures.Data.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Forms.Views
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -42,9 +42,6 @@
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using HeightStructuresDataResources = Ringtoets.HeightStructures.Data.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Forms.Test.Views
 {
@@ -893,23 +890,16 @@
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
             CollectionAssert.IsEmpty(calculationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, sectionsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.ForeshoreProfiles_DisplayName, foreshoreProfilesMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.StructuresCollection_DisplayName, structuresMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, calculationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Vakindeling", sectionsMapData.Name);
+            Assert.AreEqual("Voorlandprofielen", foreshoreProfilesMapData.Name);
+            Assert.AreEqual("Kunstwerken", structuresMapData.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Berekeningen", calculationsMapData.Name);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                 name);
-        }
-
         private class TestAssessmentSection : Observable, IAssessmentSection
         {
             public string Id { get; set; }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs
===================================================================
diff -u -ra9c4acd761eeb0a5313d2c50a38ced02a018653e -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision a9c4acd761eeb0a5313d2c50a38ced02a018653e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -26,7 +26,6 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Forms.Properties;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Views
 {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -34,7 +34,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Integration.Forms.Views;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Integration.Forms.Test.Views
 {
@@ -368,15 +367,15 @@
         {
             var hrLocationsMapData = (MapPointData) mapData.Collection.ElementAt(hydraulicBoundaryLocationsIndex);
             CollectionAssert.AreEqual(hydraulicBoundaryDatabase.Locations.Select(l => l.Location), hrLocationsMapData.Features.First().MapGeometries.First().PointCollections.First());
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hrLocationsMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hrLocationsMapData.Name);
             Assert.IsTrue(hrLocationsMapData.IsVisible);
         }
 
         private static void AssertReferenceLineData(MapDataCollection mapData, ReferenceLine referenceLine)
         {
             var referenceLineMapData = (MapLineData) mapData.Collection.ElementAt(referenceLineIndex);
             CollectionAssert.AreEqual(referenceLine.Points, referenceLineMapData.Features.First().MapGeometries.First().PointCollections.First());
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
             Assert.IsTrue(referenceLineMapData.IsVisible);
         }
 
@@ -394,8 +393,8 @@
             CollectionAssert.IsEmpty(referenceLineMapData.Features);
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
         }
 
         private class TestAssessmentSection : Observable, IAssessmentSection
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -33,9 +33,7 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Primitives;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
-using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Views
 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -41,10 +41,6 @@
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.Forms.Views;
 using Ringtoets.Piping.Primitives;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
-using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Test.Views
 {
@@ -920,23 +916,16 @@
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
             CollectionAssert.IsEmpty(calculationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, sectionsMapData.Name);
-            Assert.AreEqual(PipingFormsResources.StochasticSoilModelCollection_DisplayName, stochasticSoilModelsMapData.Name);
-            Assert.AreEqual(PipingFormsResources.PipingSurfaceLinesCollection_DisplayName, surfaceLinesMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, calculationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Vakindeling", sectionsMapData.Name);
+            Assert.AreEqual("Stochastische ondergrondmodellen", stochasticSoilModelsMapData.Name);
+            Assert.AreEqual("Profielschematisaties", surfaceLinesMapData.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Berekeningen", calculationsMapData.Name);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                 name);
-        }
-
         private class TestAssessmentSection : Observable, IAssessmentSection
         {
             public string Id { get; set; }
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs
===================================================================
diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs	(.../StabilityPointStructuresFailureMechanismView.cs)	(revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismView.cs	(.../StabilityPointStructuresFailureMechanismView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -34,7 +34,6 @@
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using StabilityPointStructuresDataResources = Ringtoets.StabilityPointStructures.Data.Properties.Resources;
 
 namespace Ringtoets.StabilityPointStructures.Forms.Views
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs	(.../StabilityPointStructuresFailureMechanismViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismViewTest.cs	(.../StabilityPointStructuresFailureMechanismViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -42,9 +42,6 @@
 using Ringtoets.StabilityPointStructures.Data.TestUtil;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
 using Ringtoets.StabilityPointStructures.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using StabilityPointStructuresDataResources = Ringtoets.StabilityPointStructures.Data.Properties.Resources;
 
 namespace Ringtoets.StabilityPointStructures.Forms.Test.Views
 {
@@ -893,23 +890,16 @@
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
             CollectionAssert.IsEmpty(calculationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, sectionsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.ForeshoreProfiles_DisplayName, foreshoreProfilesMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.StructuresCollection_DisplayName, structuresMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, calculationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Vakindeling", sectionsMapData.Name);
+            Assert.AreEqual("Voorlandprofielen", foreshoreProfilesMapData.Name);
+            Assert.AreEqual("Kunstwerken", structuresMapData.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Berekeningen", calculationsMapData.Name);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                 name);
-        }
-
         private class TestAssessmentSection : Observable, IAssessmentSection
         {
             public string Id { get; set; }
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Ringtoets.StabilityStoneCover.Forms.csproj
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Ringtoets.StabilityStoneCover.Forms.csproj	(.../Ringtoets.StabilityStoneCover.Forms.csproj)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Ringtoets.StabilityStoneCover.Forms.csproj	(.../Ringtoets.StabilityStoneCover.Forms.csproj)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -144,6 +144,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Views\StabilityStoneCoverFailureMechanismView.resx">
       <DependentUpon>StabilityStoneCoverFailureMechanismView.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs
===================================================================
diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs	(.../StabilityStoneCoverFailureMechanismView.cs)	(revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Views/StabilityStoneCoverFailureMechanismView.cs	(.../StabilityStoneCoverFailureMechanismView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -34,9 +34,7 @@
 using Ringtoets.Revetment.Data;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using StabilityStoneCoverDataResources = Ringtoets.StabilityStoneCover.Data.Properties.Resources;
-using StabilityStoneCoverFormsResources = Ringtoets.StabilityStoneCover.Forms.Properties.Resources;
 
 namespace Ringtoets.StabilityStoneCover.Forms.Views
 {
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs	(.../StabilityStoneCoverFailureMechanismViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverFailureMechanismViewTest.cs	(.../StabilityStoneCoverFailureMechanismViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -40,10 +40,6 @@
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using StabilityStoneCoverDataResources = Ringtoets.StabilityStoneCover.Data.Properties.Resources;
-using StabilityStoneCoverFormsResources = Ringtoets.StabilityStoneCover.Forms.Properties.Resources;
 
 namespace Ringtoets.StabilityStoneCover.Forms.Test.Views
 {
@@ -745,8 +741,7 @@
                 {
                     calculation.InputParameters.ForeshoreProfile.WorldReferencePoint,
                     calculation.InputParameters.HydraulicBoundaryLocation.Location
-                },
-                geometries[0].PointCollections.First());
+                }, geometries[0].PointCollections.First());
             }
             Assert.AreEqual("Berekeningen", mapData.Name);
         }
@@ -775,22 +770,15 @@
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
             CollectionAssert.IsEmpty(calculationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, sectionsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.ForeshoreProfiles_DisplayName, foreshoreProfilesMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, calculationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Vakindeling", sectionsMapData.Name);
+            Assert.AreEqual("Voorlandprofielen", foreshoreProfilesMapData.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Berekeningen", calculationsMapData.Name);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                 name);
-        }
-
         private class TestAssessmentSection : Observable, IAssessmentSection
         {
             public string Id { get; set; }
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs
===================================================================
diff -u -r4af9b44a7b9bea4035396ef522fe83c4cdd6f398 -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.cs)	(revision 4af9b44a7b9bea4035396ef522fe83c4cdd6f398)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismView.cs	(.../WaveImpactAsphaltCoverFailureMechanismView.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -34,9 +34,7 @@
 using Ringtoets.Revetment.Data;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using WaveImpactAsphaltCoverDataResources = Ringtoets.WaveImpactAsphaltCover.Data.Properties.Resources;
-using WaveImpactAsphaltCoverFormsResources = Ringtoets.WaveImpactAsphaltCover.Forms.Properties.Resources;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Forms.Views
 {
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs
===================================================================
diff -u -r93010486c4df362e66929a5743c59ae53cbe008d -r2cafb330e0b90d1103bc9329eafbcba24836787f
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs)	(revision 93010486c4df362e66929a5743c59ae53cbe008d)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismViewTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewTest.cs)	(revision 2cafb330e0b90d1103bc9329eafbcba24836787f)
@@ -40,10 +40,6 @@
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
 using Ringtoets.WaveImpactAsphaltCover.Forms.Views;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using WaveImpactAsphaltCoverDataResources = Ringtoets.WaveImpactAsphaltCover.Data.Properties.Resources;
-using WaveImpactAsphaltCoverFormsResources = Ringtoets.WaveImpactAsphaltCover.Forms.Properties.Resources;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Forms.Test.Views
 {
@@ -746,8 +742,7 @@
                 {
                     calculation.InputParameters.ForeshoreProfile.WorldReferencePoint,
                     calculation.InputParameters.HydraulicBoundaryLocation.Location
-                },
-                geometries[0].PointCollections.First());
+                }, geometries[0].PointCollections.First());
             }
             Assert.AreEqual("Berekeningen", mapData.Name);
         }
@@ -776,22 +771,15 @@
             CollectionAssert.IsEmpty(hydraulicBoundaryLocationsMapData.Features);
             CollectionAssert.IsEmpty(calculationsMapData.Features);
 
-            Assert.AreEqual(RingtoetsCommonDataResources.ReferenceLine_DisplayName, referenceLineMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, sectionsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonFormsResources.ForeshoreProfiles_DisplayName, foreshoreProfilesMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_StartPoints_DisplayName), sectionsStartPointMapData.Name);
-            Assert.AreEqual(GetSectionPointDisplayName(RingtoetsCommonFormsResources.FailureMechanismSections_EndPoints_DisplayName), sectionsEndPointMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName, hydraulicBoundaryLocationsMapData.Name);
-            Assert.AreEqual(RingtoetsCommonDataResources.FailureMechanism_Calculations_DisplayName, calculationsMapData.Name);
+            Assert.AreEqual("Referentielijn", referenceLineMapData.Name);
+            Assert.AreEqual("Vakindeling", sectionsMapData.Name);
+            Assert.AreEqual("Voorlandprofielen", foreshoreProfilesMapData.Name);
+            Assert.AreEqual("Vakindeling (startpunten)", sectionsStartPointMapData.Name);
+            Assert.AreEqual("Vakindeling (eindpunten)", sectionsEndPointMapData.Name);
+            Assert.AreEqual("Hydraulische randvoorwaarden", hydraulicBoundaryLocationsMapData.Name);
+            Assert.AreEqual("Berekeningen", calculationsMapData.Name);
         }
 
-        private static string GetSectionPointDisplayName(string name)
-        {
-            return string.Format("{0} ({1})",
-                                 RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName,
-                                 name);
-        }
-
         private class TestAssessmentSection : Observable, IAssessmentSection
         {
             public string Id { get; set; }