Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs
===================================================================
diff -u -r1520a1345ab3cbd5214edf0919495563d98b0e53 -rf45ce6328cf80a93c2f020ee77387a99a5832cf0
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision 1520a1345ab3cbd5214edf0919495563d98b0e53)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs	(.../MapLineDataConverterTest.cs)	(revision f45ce6328cf80a93c2f020ee77387a99a5832cf0)
@@ -133,20 +133,21 @@
             // Setup
             var converter = new MapLineDataConverter();
             var random = new Random(21);
-            var features = new List<MapFeature>();
-
-            features.Add(new MapFeature(new[]
+            var features = new List<MapFeature>
             {
-                new MapGeometry(new[]
+                new MapFeature(new[]
                 {
-                    new[]
+                    new MapGeometry(new[]
                     {
-                        new Point2D(random.NextDouble(), random.NextDouble()),
-                        new Point2D(random.NextDouble(), random.NextDouble()),
-                        new Point2D(random.NextDouble(), random.NextDouble())
-                    }
+                        new[]
+                        {
+                            new Point2D(random.NextDouble(), random.NextDouble()),
+                            new Point2D(random.NextDouble(), random.NextDouble()),
+                            new Point2D(random.NextDouble(), random.NextDouble())
+                        }
+                    })
                 })
-            }));
+            };
 
             var lineData = new MapLineData("test data")
             {
@@ -167,29 +168,30 @@
             // Setup
             var converter = new MapLineDataConverter();
             var random = new Random(21);
-            var features = new List<MapFeature>();
-
-            features.Add(new MapFeature(new[]
+            var features = new List<MapFeature>
             {
-                new MapGeometry(new[]
+                new MapFeature(new[]
                 {
-                    new[]
+                    new MapGeometry(new[]
                     {
-                        new Point2D(random.NextDouble(), random.NextDouble()),
-                        new Point2D(random.NextDouble(), random.NextDouble()),
-                        new Point2D(random.NextDouble(), random.NextDouble())
-                    }
-                }),
-                new MapGeometry(new[]
-                {
-                    new[]
+                        new[]
+                        {
+                            new Point2D(random.NextDouble(), random.NextDouble()),
+                            new Point2D(random.NextDouble(), random.NextDouble()),
+                            new Point2D(random.NextDouble(), random.NextDouble())
+                        }
+                    }),
+                    new MapGeometry(new[]
                     {
-                        new Point2D(random.NextDouble(), random.NextDouble()),
-                        new Point2D(random.NextDouble(), random.NextDouble()),
-                        new Point2D(random.NextDouble(), random.NextDouble())
-                    }
+                        new[]
+                        {
+                            new Point2D(random.NextDouble(), random.NextDouble()),
+                            new Point2D(random.NextDouble(), random.NextDouble()),
+                            new Point2D(random.NextDouble(), random.NextDouble())
+                        }
+                    })
                 })
-            }));
+            };
 
             var lineData = new MapLineData("test data")
             {
@@ -212,20 +214,21 @@
             // Setup
             var converter = new MapLineDataConverter();
             var random = new Random(21);
-            var features = new List<MapFeature>();
-
-            features.Add(new MapFeature(new[]
+            var features = new List<MapFeature>
             {
-                new MapGeometry(new[]
+                new MapFeature(new[]
                 {
-                    new[]
+                    new MapGeometry(new[]
                     {
-                        new Point2D(random.NextDouble(), random.NextDouble()),
-                        new Point2D(random.NextDouble(), random.NextDouble()),
-                        new Point2D(random.NextDouble(), random.NextDouble())
-                    }
+                        new[]
+                        {
+                            new Point2D(random.NextDouble(), random.NextDouble()),
+                            new Point2D(random.NextDouble(), random.NextDouble()),
+                            new Point2D(random.NextDouble(), random.NextDouble())
+                        }
+                    })
                 })
-            }));
+            };
 
             var lineData = new MapLineData("test data")
             {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFactory.cs
===================================================================
diff -u -r2aeb951ddc6e2137897569a2de4c55c9fb7e2420 -rf45ce6328cf80a93c2f020ee77387a99a5832cf0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFactory.cs	(.../PipingMapDataFactory.cs)	(revision 2aeb951ddc6e2137897569a2de4c55c9fb7e2420)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFactory.cs	(.../PipingMapDataFactory.cs)	(revision f45ce6328cf80a93c2f020ee77387a99a5832cf0)
@@ -43,7 +43,8 @@
         {
             return new MapLineData(Resources.PipingSurfaceLinesCollection_DisplayName)
             {
-                Style = new LineStyle(Color.DarkSeaGreen, 2, DashStyle.Solid)
+                Style = new LineStyle(Color.DarkSeaGreen, 2, DashStyle.Solid),
+                SelectedMetaDataAttribute = RingtoetsCommonFormsResources.MetaData_Name
             };
         }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFeaturesFactory.cs
===================================================================
diff -u -re866d883e0603dc8613eebc581953a9b2a8f5986 -rf45ce6328cf80a93c2f020ee77387a99a5832cf0
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFeaturesFactory.cs	(.../PipingMapDataFeaturesFactory.cs)	(revision e866d883e0603dc8613eebc581953a9b2a8f5986)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingMapDataFeaturesFactory.cs	(.../PipingMapDataFeaturesFactory.cs)	(revision f45ce6328cf80a93c2f020ee77387a99a5832cf0)
@@ -28,6 +28,7 @@
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Primitives;
+using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Views
 {
@@ -44,15 +45,27 @@
         /// <returns>An array of features or an empty array when <paramref name="surfaceLines"/> is <c>null</c> or empty.</returns>
         public static MapFeature[] CreateSurfaceLineFeatures(IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines)
         {
-            return surfaceLines != null && surfaceLines.Any()
-                       ? new[]
-                       {
-                           new MapFeature(surfaceLines.Select(surfaceLine => new MapGeometry(new[]
-                           {
-                               surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))
-                           })))
-                       }
-                       : new MapFeature[0];
+            var features = new List<MapFeature>();
+
+            if (surfaceLines != null && surfaceLines.Any())
+            {
+                foreach (var surfaceLine in surfaceLines)
+                {
+                    var feature = new MapFeature(new[]
+                    {
+                        new MapGeometry(new[]
+                        {
+                            surfaceLine.Points.Select(p => new Point2D(p.X, p.Y))
+                        })
+                    });
+
+                    feature.MetaData[RingtoetsCommonFormsResources.MetaData_Name] = surfaceLine.Name;
+
+                    features.Add(feature);
+                }
+            }
+
+            return features.ToArray();
         }
 
         /// <summary>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -radddff4153e676955aceeb958276c710a731cec4 -rf45ce6328cf80a93c2f020ee77387a99a5832cf0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision adddff4153e676955aceeb958276c710a731cec4)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision f45ce6328cf80a93c2f020ee77387a99a5832cf0)
@@ -759,16 +759,13 @@
             Assert.IsInstanceOf<MapLineData>(mapData);
             var surfacelinesMapData = (MapLineData) mapData;
             var surfacelineFeatures = surfacelinesMapData.Features.ToArray();
-            Assert.AreEqual(1, surfacelineFeatures.Length);
-
-            var geometries = surfacelineFeatures.First().MapGeometries.ToArray();
             var surfaceLinesArray = surfaceLines.ToArray();
-            Assert.AreEqual(surfaceLinesArray.Length, geometries.Length);
+            Assert.AreEqual(surfaceLinesArray.Length, surfacelineFeatures.Length);
 
             for (int index = 0; index < surfaceLinesArray.Length; index++)
             {
                 var surfaceLine = surfaceLinesArray[index];
-                CollectionAssert.AreEquivalent(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y)), geometries[index].PointCollections.First());
+                CollectionAssert.AreEquivalent(surfaceLine.Points.Select(p => new Point2D(p.X, p.Y)), surfacelineFeatures[index].MapGeometries.First().PointCollections.First());
             }
             Assert.AreEqual("Profielschematisaties", mapData.Name);
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFactoryTest.cs
===================================================================
diff -u -r2aeb951ddc6e2137897569a2de4c55c9fb7e2420 -rf45ce6328cf80a93c2f020ee77387a99a5832cf0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFactoryTest.cs	(.../PipingMapDataFactoryTest.cs)	(revision 2aeb951ddc6e2137897569a2de4c55c9fb7e2420)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFactoryTest.cs	(.../PipingMapDataFactoryTest.cs)	(revision f45ce6328cf80a93c2f020ee77387a99a5832cf0)
@@ -43,6 +43,7 @@
             Assert.IsEmpty(data.Features);
             Assert.AreEqual(Resources.PipingSurfaceLinesCollection_DisplayName, data.Name);
             AssertEqualStyle(data.Style, Color.DarkSeaGreen, 2, DashStyle.Solid);
+            Assert.AreEqual("Naam", data.SelectedMetaDataAttribute);
         }
 
         [Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -re866d883e0603dc8613eebc581953a9b2a8f5986 -rf45ce6328cf80a93c2f020ee77387a99a5832cf0
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFeaturesFactoryTest.cs	(.../PipingMapDataFeaturesFactoryTest.cs)	(revision e866d883e0603dc8613eebc581953a9b2a8f5986)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingMapDataFeaturesFactoryTest.cs	(.../PipingMapDataFeaturesFactoryTest.cs)	(revision f45ce6328cf80a93c2f020ee77387a99a5832cf0)
@@ -72,8 +72,14 @@
             };
             var surfaceLines = new[]
             {
-                new RingtoetsPipingSurfaceLine(),
-                new RingtoetsPipingSurfaceLine()
+                new RingtoetsPipingSurfaceLine
+                {
+                    Name = "Surfaceline 1"
+                },
+                new RingtoetsPipingSurfaceLine
+                {
+                    Name = "Surfaceline 2"
+                }
             };
             surfaceLines[0].SetGeometry(pointsOne);
             surfaceLines[1].SetGeometry(pointsTwo);
@@ -82,10 +88,15 @@
             MapFeature[] features = PipingMapDataFeaturesFactory.CreateSurfaceLineFeatures(surfaceLines);
 
             // Assert
-            Assert.AreEqual(1, features.Length);
-            Assert.AreEqual(2, features[0].MapGeometries.Count());
-            AssertEqualPointCollections(pointsOne, features[0].MapGeometries.ElementAt(0));
-            AssertEqualPointCollections(pointsTwo, features[0].MapGeometries.ElementAt(1));
+            Assert.AreEqual(surfaceLines.Length, features.Length);
+
+            for (int i = 0; i < features.Length; i++)
+            {
+                Assert.AreEqual(1, features[i].MapGeometries.Count());
+                AssertEqualPointCollections(surfaceLines[i].Points, features[i].MapGeometries.First());
+                Assert.AreEqual(1, features[i].MetaData.Keys.Count);
+                Assert.AreEqual(surfaceLines[i].Name, features[i].MetaData["Naam"]);
+            }
         }
 
         [Test]