Index: Core/Components/src/Core.Components.Gis/Data/MapData.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/src/Core.Components.Gis/Data/MapData.cs	(.../MapData.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/src/Core.Components.Gis/Data/MapData.cs	(.../MapData.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -33,12 +33,12 @@
         /// Creates a new instance of <see cref="MapData"/>.
         /// </summary>
         /// <param name="name">The name of the <see cref="MapData"/>.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="name"/> is <c>null</c> or only whitespace.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is <c>null</c> or only whitespace.</exception>
         protected MapData(string name)
         {
             if (string.IsNullOrWhiteSpace(name))
             {
-                throw new ArgumentNullException("name", "A name must be set to map data");
+                throw new ArgumentException("A name must be set to map data", "name");
             }
 
             Name = name;
Index: Core/Components/src/Core.Components.Gis/Data/MapDataCollection.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/src/Core.Components.Gis/Data/MapDataCollection.cs	(.../MapDataCollection.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/src/Core.Components.Gis/Data/MapDataCollection.cs	(.../MapDataCollection.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -34,12 +34,10 @@
         /// </summary>
         /// <param name="list">A <see cref="List{T}"/> of <see cref="MapData"/>.</param>
         /// <param name="name">The name of the <see cref="MapData"/>.</param>
-        /// <exception cref="ArgumentNullException">Thrown when 
-        /// <list type="bullet">
-        /// <item><paramref name="list"/> is <c>null</c>.</item>
-        /// <item><paramref name="name"/> is <c>null</c> or only whitespace.</item>
-        /// </list>
-        /// </exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="list"/> is 
+        /// <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is 
+        /// <c>null</c> or only whitespace.</exception>
         public MapDataCollection(IList<MapData> list, string name) : base(name)
         {
             if (list == null)
Index: Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs	(.../MapMultiLineData.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/src/Core.Components.Gis/Data/MapMultiLineData.cs	(.../MapMultiLineData.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -36,12 +36,10 @@
         /// </summary>
         /// <param name="lines">A <see cref="IEnumerable{T}"/> of <see cref="Point2D"/> as (X,Y) lines.</param>
         /// <param name="name">The name of the <see cref="MapData"/>.</param>
-        /// <exception cref="ArgumentNullException">Thrown when 
-        /// <list type="bullet">
-        /// <item><paramref name="lines"/> is <c>null</c>.</item>
-        /// <item><paramref name="name"/> is <c>null</c> or only whitespace.</item>
-        /// </list>
-        /// </exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="lines"/> 
+        /// is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is 
+        /// <c>null</c> or only whitespace.</exception>
         public MapMultiLineData(IEnumerable<IEnumerable<Point2D>> lines, string name): base(name)
         {
             if (lines == null)
Index: Core/Components/src/Core.Components.Gis/Data/PointBasedMapData.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/src/Core.Components.Gis/Data/PointBasedMapData.cs	(.../PointBasedMapData.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/src/Core.Components.Gis/Data/PointBasedMapData.cs	(.../PointBasedMapData.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -34,14 +34,13 @@
         /// <summary>
         /// Create a new instance of <see cref="PointBasedMapData"/>.
         /// </summary>
-        /// <param name="points">A <see cref="IEnumerable{T}"/> of <see cref="Point2D"/> which describe locations in 2D space.</param>
+        /// <param name="points">A <see cref="IEnumerable{T}"/> of <see cref="Point2D"/> 
+        /// which describe locations in 2D space.</param>
         /// <param name="name">The name of the <see cref="MapData"/>.</param>
-        /// <exception cref="ArgumentNullException">Thrown when 
-        /// <list type="bullet">
-        /// <item><paramref name="points"/> is <c>null</c>.</item>
-        /// <item><paramref name="name"/> is <c>null</c> or only whitespace.</item>
-        /// </list>
-        /// </exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="points"/>
+        /// is <c>null</c>.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="name"/> is 
+        /// <c>null</c> or only whitespace.</exception>
         protected PointBasedMapData(IEnumerable<Point2D> points, string name) : base(name)
         {
             if (points == null)
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs	(.../MapDataCollectionTest.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapDataCollectionTest.cs	(.../MapDataCollectionTest.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -22,32 +22,22 @@
         }
 
         [Test]
-        public void Constructor_NullName_ThrowsArgumentNullExcpetion()
+        [TestCase("")]
+        [TestCase("    ")]
+        [TestCase(null)]
+        public void Constructor_InvalidName_ThrowsArgumentExcpetion(string invalidName)
         {
             // Setup
             var list = Enumerable.Empty<MapData>().ToList();
 
             // Call
-            TestDelegate test = () => new MapDataCollection(list, null);
+            TestDelegate test = () => new MapDataCollection(list, invalidName);
 
             // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, "A name must be set to map data");
         }
 
         [Test]
-        public void Constructor_EmptyName_ThrowsArgumentNullExcpetion()
-        {
-            // Setup
-            var list = Enumerable.Empty<MapData>().ToList();
-
-            // Call
-            TestDelegate test = () => new MapDataCollection(list, "");
-
-            // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
-        }
-
-        [Test]
         public void Constructor_ListSet_InstanceWithListSet()
         {
             // Setup
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapDataTest.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/test/Core.Components.Gis.Test/Data/MapDataTest.cs	(.../MapDataTest.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapDataTest.cs	(.../MapDataTest.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -10,45 +10,29 @@
     public class MapDataTest
     {
         [Test]
-        public void Constructor_Values()
+        [TestCase(null)]
+        [TestCase("   ")]
+        [TestCase("")]
+        public void Constructor_InvalidName_ThrowsArgumentException(string invalidName)
         {
             // Call
-            var mapData = new MapDataChild("test data");
+            TestDelegate call = () => new MapDataChild(invalidName);
 
             // Assert
-            Assert.IsInstanceOf<Observable>(mapData);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "A name must be set to map data");
         }
 
         [Test]
-        public void Constructor_NameNull_ThrowsArgumentNullException()
+        public void Constructor_WithName_ExpectedValues()
         {
-            // Call
-            TestDelegate call = () => new MapDataChild(null);
-
-            // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "A name must be set to map data");
-        }
-
-        [Test]
-        public void Constructor_NameEmpty_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate call = () => new MapDataChild("");
-
-            // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, "A name must be set to map data");
-        }
-
-        [Test]
-        public void Constructor_WithName_SetsName()
-        {
             // Setup
             var name = "Some name";
 
             // Call
             var data = new MapDataChild(name);
 
             // Assert
+            Assert.IsInstanceOf<Observable>(data);
             Assert.AreEqual(name, data.Name);
         }
 
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs	(.../MapLineDataTest.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs	(.../MapLineDataTest.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -23,27 +23,19 @@
         }
 
         [Test]
-        public void Constructor_NullName_ThrowsArgumentNullExcpetion()
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("     ")]
+        public void Constructor_InvalidName_ThrowsArgumentException(string invalidName)
         {
             // Call
-            TestDelegate test = () => new MapLineData(Enumerable.Empty<Point2D>(), null);
+            TestDelegate test = () => new MapLineData(Enumerable.Empty<Point2D>(), invalidName);
 
             // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, "A name must be set to map data");
         }
 
         [Test]
-        public void Constructor_EmptyName_ThrowsArgumentNullExcpetion()
-        {
-            // Call
-            TestDelegate test = () => new MapLineData(Enumerable.Empty<Point2D>(), "");
-
-            // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
-        }
-				
-
-        [Test]
         public void Constructor_WithEmptyPoints_CreatesNewMapLineData()
         {
             // Setup
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs	(.../MapMultiLineDataTest.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapMultiLineDataTest.cs	(.../MapMultiLineDataTest.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -24,32 +24,22 @@
         }
 
         [Test]
-        public void Constructor_NullName_ThrowsArgumentNullExcpetion()
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("  ")]
+        public void Constructor_NullName_ThrowsArgumentException(string invalidName)
         {
             // Setup
             var collection = new Collection<IEnumerable<Point2D>>();
 
             // Call
-            TestDelegate test = () => new MapMultiLineData(collection, null);
+            TestDelegate test = () => new MapMultiLineData(collection, invalidName);
 
             // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, "A name must be set to map data");
         }
 
         [Test]
-        public void Constructor_EmptyName_ThrowsArgumentNullExcpetion()
-        {
-            // Setup
-            var collection = new Collection<IEnumerable<Point2D>>();
-
-            // Call
-            TestDelegate test = () => new MapMultiLineData(collection, "");
-
-            // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
-        }
-
-        [Test]
         public void Constructor_WithEmptyCollection_CreatesNewMapLineData()
         {
             // Setup
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs	(.../MapPointDataTest.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs	(.../MapPointDataTest.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -22,32 +22,22 @@
         }
 
         [Test]
-        public void Constructor_NullName_ThrowsArgumentNullExcpetion()
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("   ")]
+        public void Constructor_InvalidName_ThrowsArgumentException(string invalidName)
         {
             // Setup
             var points = new Collection<Point2D>();
 
             // Call
-            TestDelegate test = () => new MapPointData(points, null);
+            TestDelegate test = () => new MapPointData(points, invalidName);
 
             // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, "A name must be set to map data");
         }
 
         [Test]
-        public void Constructor_EmptyName_ThrowsArgumentNullExcpetion()
-        {
-            // Setup
-            var points = new Collection<Point2D>();
-
-            // Call
-            TestDelegate test = () => new MapPointData(points, "");
-
-            // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
-        }
-
-        [Test]
         public void Constructor_WithEmptyPoints_CreatesNewMapPointData()
         {
             // Setup
Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs	(.../MapPolygonDataTest.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs	(.../MapPolygonDataTest.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -22,33 +22,22 @@
         }
 
         [Test]
-        public void Constructor_NullName_ThrowsArgumentNullExcpetion()
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("        ")]
+        public void Constructor_InvalidName_ThrowsArgumentException(string invalidName)
         {
             // Setup
             var points = new Collection<Point2D>();
 
             // Call
-            TestDelegate test = () => new MapPolygonData(points, null);
+            TestDelegate test = () => new MapPolygonData(points, invalidName);
 
             // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, "A name must be set to map data");
         }
 
         [Test]
-        public void Constructor_EmptyName_ThrowsArgumentNullExcpetion()
-        {
-            // Setup
-            var points = new Collection<Point2D>();
-
-            // Call
-            TestDelegate test = () => new MapPolygonData(points, "");
-
-            // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
-        }
-
-
-        [Test]
         public void Constructor_WithEmptyPoints_CreatesNewMapPolygonData()
         {
             // Setup
Index: Core/Components/test/Core.Components.Gis.Test/Data/PointsBasedMapDataTest.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Core/Components/test/Core.Components.Gis.Test/Data/PointsBasedMapDataTest.cs	(.../PointsBasedMapDataTest.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Core/Components/test/Core.Components.Gis.Test/Data/PointsBasedMapDataTest.cs	(.../PointsBasedMapDataTest.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -24,32 +24,22 @@
         }
 
         [Test]
-        public void Constructor_NullName_ThrowsArgumentNullExcpetion()
+        [TestCase(null)]
+        [TestCase("")]
+        [TestCase("        ")]
+        public void Constructor_InvalidName_ThrowsArgumentExcpetion(string invalidName)
         {
             // Setup
             var points = new Collection<Point2D>();
 
             // Call
-            TestDelegate test = () => new TestPointBasedMapData(points, null);
+            TestDelegate test = () => new TestPointBasedMapData(points, invalidName);
 
             // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, "A name must be set to map data");
         }
 
         [Test]
-        public void Constructor_EmptyName_ThrowsArgumentNullExcpetion()
-        {
-            // Setup
-            var points = new Collection<Point2D>();
-
-            // Call
-            TestDelegate test = () => new TestPointBasedMapData(points, "");
-
-            // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, "A name must be set to map data");
-        }
-
-        [Test]
         public void Constructor_WithPoints_PropertiesSet()
         {
             // Setup
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -155,9 +155,9 @@
         /// <summary>
         ///   Looks up a localized string similar to Hydraulische randvoorwaarden.
         /// </summary>
-        public static string HydraulicBoundareyConditions_DisplayName {
+        public static string HydraulicBoundaryConditions_DisplayName {
             get {
-                return ResourceManager.GetString("HydraulicBoundareyConditions_DisplayName", resourceCulture);
+                return ResourceManager.GetString("HydraulicBoundaryConditions_DisplayName", resourceCulture);
             }
         }
         
@@ -171,15 +171,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Dijken - Piping.
-        /// </summary>
-        public static string PipingFailureMechanism_DisplayName {
-            get {
-                return ResourceManager.GetString("PipingFailureMechanism_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Referentielijn.
         /// </summary>
         public static string ReferenceLine_DisplayName {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -156,12 +156,9 @@
   <data name="OtherFailureMechanism_DisplayName" xml:space="preserve">
     <value>Overig</value>
   </data>
-  <data name="HydraulicBoundareyConditions_DisplayName" xml:space="preserve">
+  <data name="HydraulicBoundaryConditions_DisplayName" xml:space="preserve">
     <value>Hydraulische randvoorwaarden</value>
   </data>
-  <data name="PipingFailureMechanism_DisplayName" xml:space="preserve">
-    <value>Dijken - Piping</value>
-  </data>
   <data name="ReferenceLine_DisplayName" xml:space="preserve">
     <value>Referentielijn</value>
   </data>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -89,6 +89,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Trajectkaart.
+        /// </summary>
+        public static string AssessmentSectionMap_DisplayName {
+            get {
+                return ResourceManager.GetString("AssessmentSectionMap_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to De uitvoer van alle afhankelijke berekeningen is verwijderd..
         /// </summary>
         public static string Calculations_Deleted {
@@ -411,14 +420,5 @@
                 return ResourceManager.GetString("SelectHydraulicBoundaryDatabaseFile_Title", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Trajectkaart.
-        /// </summary>
-        public static string TrajectMap_DisplayName {
-            get {
-                return ResourceManager.GetString("TrajectMap_DisplayName", resourceCulture);
-            }
-        }
     }
 }
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -151,7 +151,7 @@
   <data name="ReferenceLineContext_Parent_assessment_section_cannot_be_null" xml:space="preserve">
     <value>Kan geen presentatie object maken voor een referentielijn zonder een traject als eigenaar.</value>
   </data>
-  <data name="TrajectMap_DisplayName" xml:space="preserve">
+  <data name="AssessmentSectionMap_DisplayName" xml:space="preserve">
     <value>Trajectkaart</value>
   </data>
   <data name="Map" type="System.Resources.ResXFileRef, System.Windows.Forms">
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs	(.../AssessmentSectionView.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -104,7 +104,7 @@
                 mapDataList.Add(GetHydraulicBoundaryLocations());
             }
 
-            map.Data = new MapDataCollection(mapDataList, Resources.TrajectMap_DisplayName);
+            map.Data = new MapDataCollection(mapDataList, Resources.AssessmentSectionMap_DisplayName);
         }
 
         private MapData GetReferenceLineData()
@@ -116,7 +116,7 @@
         private MapData GetHydraulicBoundaryLocations()
         {
             Point2D[] hrLocations = data.HydraulicBoundaryDatabase.Locations.Select(h => h.Location).ToArray();
-            return new MapPointData(hrLocations, RingtoetsCommonDataResources.HydraulicBoundareyConditions_DisplayName);
+            return new MapPointData(hrLocations, RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName);
         }
 
         private bool HasReferenceLinePoints()
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -rf760a191fb5e4826ef1b7a5ab4e04bee993c1215 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision f760a191fb5e4826ef1b7a5ab4e04bee993c1215)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -103,7 +103,7 @@
 
             yield return new ViewInfo<AssessmentSectionBase, AssessmentSectionView>
             {
-                GetViewName = (v, o) => RingtoetsFormsResources.TrajectMap_DisplayName,
+                GetViewName = (v, o) => RingtoetsFormsResources.AssessmentSectionMap_DisplayName,
                 Image = RingtoetsFormsResources.Map
             };
         }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -25,6 +25,7 @@
 using Ringtoets.Common.Placeholder;
 using Ringtoets.Piping.Data.Properties;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
+using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Data
 {
@@ -37,7 +38,7 @@
         /// Initializes a new instance of the <see cref="PipingFailureMechanism"/> class.
         /// </summary>
         public PipingFailureMechanism()
-            : base(RingtoetsCommonDataResources.PipingFailureMechanism_DisplayName)
+            : base(PipingDataResources.PipingFailureMechanism_DisplayName)
         {
             SurfaceLines = new ObservableList<RingtoetsPipingSurfaceLine>();
             SoilProfiles = new ObservableList<PipingSoilProfile>();
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -214,6 +214,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Dijken - Piping.
+        /// </summary>
+        public static string PipingFailureMechanism_DisplayName {
+            get {
+                return ResourceManager.GetString("PipingFailureMechanism_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Toetspeil moet een geldige waarde hebben..
         /// </summary>
         public static string PipingInput_AssessmentLevel_Cannot_set_to_NaN {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx	(.../Resources.resx)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -195,4 +195,7 @@
   <data name="PipingInput_AssessmentLevel_Cannot_set_to_NaN" xml:space="preserve">
     <value>Toetspeil moet een geldige waarde hebben.</value>
   </data>
+  <data name="PipingFailureMechanism_DisplayName" xml:space="preserve">
+    <value>Dijken - Piping</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r207af0b28fe411ebed2e6b0fa7e1924adbf7afdb -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 207af0b28fe411ebed2e6b0fa7e1924adbf7afdb)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -524,15 +524,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Vakindelingen.
-        /// </summary>
-        public static string PipingFailureMechanismView_GetSectionsMapData_Sections {
-            get {
-                return ResourceManager.GetString("PipingFailureMechanismView_GetSectionsMapData_Sections", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap PipingIcon {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -r207af0b28fe411ebed2e6b0fa7e1924adbf7afdb -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 207af0b28fe411ebed2e6b0fa7e1924adbf7afdb)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -583,7 +583,4 @@
   <data name="PipingInputExtensions_UpdateThicknessCoverageLayer_Cannot_determine_thickness_coverage_layer" xml:space="preserve">
     <value>Kan deklaagdikte niet afleiden op basis van de invoer.</value>
   </data>
-  <data name="PipingFailureMechanismView_GetSectionsMapData_Sections" xml:space="preserve">
-    <value>Vakindelingen</value>
-  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r05f1e980d28b12f13fd803d9a6c682f708a325d9 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 05f1e980d28b12f13fd803d9a6c682f708a325d9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs	(.../PipingFailureMechanismView.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -28,8 +28,8 @@
 using Core.Components.Gis.Data;
 using Core.Plugins.DotSpatial.Forms;
 using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Piping.Forms.Properties;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
+using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Views
 {
@@ -134,8 +134,7 @@
                 }
             }
 
-            MapView.Data = new MapDataCollection(mapDataList, RingtoetsCommonDataResources.PipingFailureMechanism_DisplayName);
-        }
+            MapView.Data = new MapDataCollection(mapDataList, PipingDataResources.PipingFailureMechanism_DisplayName);        }
 
         private MapData GetReferenceLineMapData()
         {
@@ -146,7 +145,7 @@
         private MapData GetHydraulicBoundaryLocationsMapData()
         {
             Point2D[] hrLocations = data.Parent.HydraulicBoundaryDatabase.Locations.Select(h => h.Location).ToArray();
-            return new MapPointData(hrLocations, RingtoetsCommonDataResources.HydraulicBoundareyConditions_DisplayName);
+            return new MapPointData(hrLocations, RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName);
         }
 
         private MapData GetSurfaceLinesMapData()
@@ -158,7 +157,7 @@
         private MapData GetSectionsMapData()
         {
             IEnumerable<IEnumerable<Point2D>> sectionLines = data.WrappedData.Sections.Select(sl => sl.Points);
-            return new MapMultiLineData(sectionLines, Resources.PipingFailureMechanismView_GetSectionsMapData_Sections);
+            return new MapMultiLineData(sectionLines, RingtoetsCommonDataResources.FailureMechanism_Sections_DisplayName);
         }
 
         private bool HasReferenceLinePoints()
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -69,7 +69,7 @@
         {
             yield return new ViewInfo<PipingFailureMechanismContext, PipingFailureMechanismView>
             {
-                GetViewName = (view, mechanism) => RingtoetsCommonDataResources.PipingFailureMechanism_DisplayName,
+                GetViewName = (view, mechanism) => PipingDataResources.PipingFailureMechanism_DisplayName,
                 Image = PipingFormsResources.PipingIcon
             };
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u -rc9f9c04e4fc62406231afd07d63cd7da11673ec6 -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision c9f9c04e4fc62406231afd07d63cd7da11673ec6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
@@ -80,7 +80,7 @@
             var text = info.Text(mechanismContext);
 
             // Assert
-            Assert.AreEqual(RingtoetsDataResources.PipingFailureMechanism_DisplayName, text);
+            Assert.AreEqual("Dijken - Piping", text);
             mocks.VerifyAll();
         }