Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFactory.cs
===================================================================
diff -u -rb19983374f4a64979bbb5167bcab288a921aa5e5 -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFactory.cs	(.../RingtoetsMapDataFactory.cs)	(revision b19983374f4a64979bbb5167bcab288a921aa5e5)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFactory.cs	(.../RingtoetsMapDataFactory.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -30,6 +30,7 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Forms.Properties;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
+using RingtoetsCommonUtilResources = Ringtoets.Common.Util.Properties.Resources;
 
 namespace Ringtoets.Common.Forms.Factories
 {
@@ -57,7 +58,7 @@
                                        DashStyle = LineDashStyle.Solid
                                    })
             {
-                SelectedMetaDataAttribute = Resources.MetaData_Name
+                SelectedMetaDataAttribute = RingtoetsCommonUtilResources.MetaData_Name
             };
         }
 
@@ -79,7 +80,7 @@
                                     })
             {
                 ShowLabels = true,
-                SelectedMetaDataAttribute = Resources.MetaData_Name
+                SelectedMetaDataAttribute = RingtoetsCommonUtilResources.MetaData_Name
             };
         }
 
@@ -97,7 +98,7 @@
                                        DashStyle = LineDashStyle.Dot
                                    })
             {
-                SelectedMetaDataAttribute = Resources.MetaData_Name
+                SelectedMetaDataAttribute = RingtoetsCommonUtilResources.MetaData_Name
             };
         }
 
@@ -155,7 +156,7 @@
                                        DashStyle = LineDashStyle.Solid
                                    })
             {
-                SelectedMetaDataAttribute = Resources.MetaData_Name
+                SelectedMetaDataAttribute = RingtoetsCommonUtilResources.MetaData_Name
             };
         }
 
@@ -173,7 +174,7 @@
                                        DashStyle = LineDashStyle.Solid
                                    })
             {
-                SelectedMetaDataAttribute = Resources.MetaData_Name
+                SelectedMetaDataAttribute = RingtoetsCommonUtilResources.MetaData_Name
             };
         }
 
@@ -194,7 +195,7 @@
                                         StrokeThickness = 1
                                     })
             {
-                SelectedMetaDataAttribute = Resources.MetaData_Name
+                SelectedMetaDataAttribute = RingtoetsCommonUtilResources.MetaData_Name
             };
         }
 
@@ -213,7 +214,7 @@
                                    })
             {
                 ShowLabels = true,
-                SelectedMetaDataAttribute = Resources.MetaData_Name
+                SelectedMetaDataAttribute = RingtoetsCommonUtilResources.MetaData_Name
             };
         }
 
@@ -231,7 +232,7 @@
                                        DashStyle = LineDashStyle.Solid
                                    })
             {
-                SelectedMetaDataAttribute = Resources.MetaData_Name
+                SelectedMetaDataAttribute = RingtoetsCommonUtilResources.MetaData_Name
             };
         }
 
@@ -249,7 +250,7 @@
                                        DashStyle = LineDashStyle.Solid
                                    })
             {
-                SelectedMetaDataAttribute = Resources.MetaData_Name
+                SelectedMetaDataAttribute = RingtoetsCommonUtilResources.MetaData_Name
             };
         }
     }
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs
===================================================================
diff -u -r36828a0ba71303efd79ccb1123c8c427b8028b24 -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision 36828a0ba71303efd79ccb1123c8c427b8028b24)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs	(.../RingtoetsMapDataFeaturesFactory.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -36,6 +36,7 @@
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Common.Forms.Properties;
 using Ringtoets.Common.Util;
+using RingtoetsCommonUtilResources = Ringtoets.Common.Util.Properties.Resources;
 
 namespace Ringtoets.Common.Forms.Factories
 {
@@ -82,8 +83,8 @@
             if (referenceLine != null)
             {
                 MapFeature feature = CreateSingleLineMapFeature(referenceLine.Points);
-                feature.MetaData[Resources.MetaData_ID] = id;
-                feature.MetaData[Resources.MetaData_Name] = name;
+                feature.MetaData[RingtoetsCommonUtilResources.MetaData_ID] = id;
+                feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = name;
                 feature.MetaData[Resources.MetaData_Length_Rounded] = new RoundedDouble(2, referenceLine.Length);
 
                 return new[]
@@ -176,7 +177,7 @@
                 foreach (DikeProfile dikeProfile in dikeProfiles)
                 {
                     MapFeature feature = CreateSingleLineMapFeature(GetWorldPoints(dikeProfile));
-                    feature.MetaData[Resources.MetaData_Name] = dikeProfile.Name;
+                    feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = dikeProfile.Name;
 
                     mapFeatures[i] = feature;
                     i++;
@@ -207,7 +208,7 @@
                 {
                     ForeshoreProfile foreshoreProfile = foreShoreProfilesWithGeometry[i];
                     MapFeature feature = CreateSingleLineMapFeature(GetWorldPoints(foreshoreProfile));
-                    feature.MetaData[Resources.MetaData_Name] = foreshoreProfile.Name;
+                    feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = foreshoreProfile.Name;
 
                     mapFeatures[i] = feature;
                 }
@@ -235,7 +236,7 @@
                 foreach (StructureBase structure in structures)
                 {
                     MapFeature feature = RingtoetsMapDataFeaturesFactoryHelper.CreateSinglePointMapFeature(structure.Location);
-                    feature.MetaData[Resources.MetaData_Name] = structure.Name;
+                    feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = structure.Name;
 
                     mapFeatures[i] = feature;
                     i++;
@@ -294,7 +295,7 @@
                         calculationItem.HydraulicBoundaryLocation.Location
                     });
 
-                    feature.MetaData[Resources.MetaData_Name] = calculationItem.Name;
+                    feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = calculationItem.Name;
                     feature.MetaData[Resources.MetaData_Couple_distance] =
                         calculationItem.CalculationLocation.GetEuclideanDistanceTo(
                             calculationItem.HydraulicBoundaryLocation.Location);
@@ -311,8 +312,8 @@
         private static MapFeature CreateHydraulicBoundaryLocationFeature(AggregatedHydraulicBoundaryLocation location)
         {
             MapFeature feature = RingtoetsMapDataFeaturesFactoryHelper.CreateSinglePointMapFeature(location.Location);
-            feature.MetaData[Resources.MetaData_ID] = location.Id;
-            feature.MetaData[Resources.MetaData_Name] = location.Name;
+            feature.MetaData[RingtoetsCommonUtilResources.MetaData_ID] = location.Id;
+            feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = location.Name;
             feature.MetaData[Resources.MetaData_WaterLevelCalculationForFactorizedSignalingNorm] = location.WaterLevelCalculationForFactorizedSignalingNorm;
             feature.MetaData[Resources.MetaData_WaterLevelCalculationForSignalingNorm] = location.WaterLevelCalculationForSignalingNorm;
             feature.MetaData[Resources.MetaData_WaterLevelCalculationForLowerLimit] = location.WaterLevelCalculationForLowerLimitNorm;
@@ -354,7 +355,7 @@
                 })
             });
 
-            feature.MetaData[Resources.MetaData_Name] = section.Name;
+            feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = section.Name;
             feature.MetaData[Resources.MetaData_Length_Rounded] = new RoundedDouble(2, section.Length);
 
             return feature;
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rc73f42107d579f53f42b523e163418e6993ae5bd -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c73f42107d579f53f42b523e163418e6993ae5bd)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -2332,15 +2332,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ID.
-        /// </summary>
-        public static string MetaData_ID {
-            get {
-                return ResourceManager.GetString("MetaData_ID", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Lengte*.
         /// </summary>
         public static string MetaData_Length_Rounded {
@@ -2350,15 +2341,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Naam.
-        /// </summary>
-        public static string MetaData_Name {
-            get {
-                return ResourceManager.GetString("MetaData_Name", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to h(C-&gt;D).
         /// </summary>
         public static string MetaData_WaterLevelCalculationForFactorizedLowerLimit {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rc73f42107d579f53f42b523e163418e6993ae5bd -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision c73f42107d579f53f42b523e163418e6993ae5bd)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -869,12 +869,6 @@
   <data name="DesignWaterLevel_DisplayName" xml:space="preserve">
     <value>Toetspeil</value>
   </data>
-  <data name="MetaData_ID" xml:space="preserve">
-    <value>ID</value>
-  </data>
-  <data name="MetaData_Name" xml:space="preserve">
-    <value>Naam</value>
-  </data>
   <data name="MetaData_Couple_distance" xml:space="preserve">
     <value>Koppelingsafstand</value>
   </data>
Index: Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.Designer.cs
===================================================================
diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision fcad48d7beb394e1ac15cfe4289a7381e05aa883)
+++ Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -40,10 +40,10 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -57,7 +57,7 @@
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ringtoets.Common.Util.Properties.Resources", typeof(Resources).Assembly);
@@ -72,7 +72,7 @@
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -82,9 +82,27 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to ID.
+        /// </summary>
+        public static string MetaData_ID {
+            get {
+                return ResourceManager.GetString("MetaData_ID", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Naam.
+        /// </summary>
+        public static string MetaData_Name {
+            get {
+                return ResourceManager.GetString("MetaData_Name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to &apos;{0}&apos; is geen geldige Ringtoets versie..
         /// </summary>
-        internal static string RingtoetsVersionHelper_Version_0_Not_Valid {
+        public static string RingtoetsVersionHelper_Version_0_Not_Valid {
             get {
                 return ResourceManager.GetString("RingtoetsVersionHelper_Version_0_Not_Valid", resourceCulture);
             }
Index: Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.resx
===================================================================
diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision fcad48d7beb394e1ac15cfe4289a7381e05aa883)
+++ Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -1,103 +1,128 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-	<!-- 
-		Microsoft ResX Schema
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
 
-		Version 1.3
-
-		The primary goals of this format is to allow a simple XML format 
-		that is mostly human readable. The generation and parsing of the 
-		various data types are done through the TypeConverter classes 
-		associated with the data types.
-
-		Example:
-
-		... ado.net/XML headers & schema ...
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
-		<resheader name="version">1.3</resheader>
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-		<data name="Name1">this is my long string</data>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-			[base64 mime encoded serialized .NET Framework object]
-		</data>
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
-		</data>
-
-		There are any number of "resheader" rows that contain simple 
-		name/value pairs.
-
-		Each data row contains a name, and value. The row also contains a 
-		type or mimetype. Type corresponds to a .NET class that support 
-		text/value conversion through the TypeConverter architecture. 
-		Classes that don't support this are serialized and stored with the 
-		mimetype set.
-
-		The mimetype is used for serialized objects, and tells the 
-		ResXResourceReader how to depersist the object. This is currently not 
-		extensible. For a given mimetype the value must be set accordingly:
-
-		Note - application/x-microsoft.net.object.binary.base64 is the format 
-		that the ResXResourceWriter will generate, however the reader can 
-		read any of the formats listed below.
-
-		mimetype: application/x-microsoft.net.object.binary.base64
-		value   : The object must be serialized with 
-			: System.Serialization.Formatters.Binary.BinaryFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.soap.base64
-		value   : The object must be serialized with 
-			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.bytearray.base64
-		value   : The object must be serialized into a byte array 
-			: using a System.ComponentModel.TypeConverter
-			: and then encoded with base64 encoding.
-	-->
-	
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="resmimetype">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="version">
-		<value>1.3</value>
-	</resheader>
-	<resheader name="reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="MetaData_ID" xml:space="preserve">
+    <value>ID</value>
+  </data>
+  <data name="MetaData_Name" xml:space="preserve">
+    <value>Naam</value>
+  </data>
   <data name="RingtoetsVersionHelper_Version_0_Not_Valid" xml:space="preserve">
     <value>'{0}' is geen geldige Ringtoets versie.</value>
   </data>
Index: Ringtoets/Common/src/Ringtoets.Common.Util/Ringtoets.Common.Util.csproj
===================================================================
diff -u -r36828a0ba71303efd79ccb1123c8c427b8028b24 -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/Common/src/Ringtoets.Common.Util/Ringtoets.Common.Util.csproj	(.../Ringtoets.Common.Util.csproj)	(revision 36828a0ba71303efd79ccb1123c8c427b8028b24)
+++ Ringtoets/Common/src/Ringtoets.Common.Util/Ringtoets.Common.Util.csproj	(.../Ringtoets.Common.Util.csproj)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -54,7 +54,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs
===================================================================
diff -u -r36828a0ba71303efd79ccb1123c8c427b8028b24 -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs	(.../DuneErosionMapDataFeaturesFactory.cs)	(revision 36828a0ba71303efd79ccb1123c8c427b8028b24)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Factories/DuneErosionMapDataFeaturesFactory.cs	(.../DuneErosionMapDataFeaturesFactory.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -28,7 +28,7 @@
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Forms.Properties;
 using RingtoetsDuneErosionDataResources = Ringtoets.DuneErosion.Data.Properties.Resources;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonUtilResources = Ringtoets.Common.Util.Properties.Resources;
 
 namespace Ringtoets.DuneErosion.Forms.Factories
 {
@@ -60,8 +60,8 @@
                 DuneLocation location = duneLocations[i];
 
                 MapFeature feature = RingtoetsMapDataFeaturesFactoryHelper.CreateSinglePointMapFeature(location.Location);
-                feature.MetaData[RingtoetsCommonFormsResources.MetaData_ID] = location.Id;
-                feature.MetaData[RingtoetsCommonFormsResources.MetaData_Name] = location.Name;
+                feature.MetaData[RingtoetsCommonUtilResources.MetaData_ID] = location.Id;
+                feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = location.Name;
                 feature.MetaData[Resources.MetaData_CoastalAreaId] = location.CoastalAreaId;
                 feature.MetaData[Resources.MetaData_Offset] = location.Offset.ToString(RingtoetsDuneErosionDataResources.DuneLocation_Offset_format,
                                                                                        CultureInfo.InvariantCulture);
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs
===================================================================
diff -u -r36828a0ba71303efd79ccb1123c8c427b8028b24 -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs)	(revision 36828a0ba71303efd79ccb1123c8c427b8028b24)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactory.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactory.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -31,7 +31,7 @@
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
 using Ringtoets.GrassCoverErosionOutwards.Util;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonUtilResources = Ringtoets.Common.Util.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Factories
 {
@@ -98,8 +98,8 @@
         private static MapFeature CreateHydraulicBoundaryLocationFeature(GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation location)
         {
             MapFeature feature = RingtoetsMapDataFeaturesFactoryHelper.CreateSinglePointMapFeature(location.Location);
-            feature.MetaData[RingtoetsCommonFormsResources.MetaData_ID] = location.Id;
-            feature.MetaData[RingtoetsCommonFormsResources.MetaData_Name] = location.Name;
+            feature.MetaData[RingtoetsCommonUtilResources.MetaData_ID] = location.Id;
+            feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = location.Name;
             feature.MetaData[Resources.MetaData_WaterLevelCalculationForMechanismSpecificFactorizedSignalingNorm] = location.WaterLevelCalculationForMechanismSpecificFactorizedSignalingNorm;
             feature.MetaData[Resources.MetaData_WaterLevelCalculationForMechanismSpecificSignalingNorm] = location.WaterLevelCalculationForMechanismSpecificSignalingNorm;
             feature.MetaData[Resources.MetaData_WaterLevelCalculationForMechanismSpecificLowerLimit] = location.WaterLevelCalculationForMechanismSpecificLowerLimitNorm;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs
===================================================================
diff -u -r9b2bb9a809f4b42bd06b910dde1f6eb8e546356f -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs	(.../MacroStabilityInwardsMapDataFeaturesFactory.cs)	(revision 9b2bb9a809f4b42bd06b910dde1f6eb8e546356f)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsMapDataFeaturesFactory.cs	(.../MacroStabilityInwardsMapDataFeaturesFactory.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -29,7 +29,7 @@
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Primitives;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonUtilResources = Ringtoets.Common.Util.Properties.Resources;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.Factories
 {
@@ -55,7 +55,7 @@
                     MacroStabilityInwardsSurfaceLine surfaceLine = surfaceLines.ElementAt(i);
 
                     MapFeature feature = RingtoetsMapDataFeaturesFactory.CreateSingleLineMapFeature(GetWorldPoints(surfaceLine));
-                    feature.MetaData[RingtoetsCommonFormsResources.MetaData_Name] = surfaceLine.Name;
+                    feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = surfaceLine.Name;
 
                     features[i] = feature;
                 }
@@ -82,7 +82,7 @@
                     MacroStabilityInwardsStochasticSoilModel stochasticSoilModel = stochasticSoilModels.ElementAt(i);
 
                     MapFeature feature = RingtoetsMapDataFeaturesFactory.CreateSingleLineMapFeature(GetWorldPoints(stochasticSoilModel));
-                    feature.MetaData[RingtoetsCommonFormsResources.MetaData_Name] = stochasticSoilModel.Name;
+                    feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = stochasticSoilModel.Name;
 
                     features[i] = feature;
                 }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj
===================================================================
diff -u -r74df3b2f37b578eb5f0d5c8d33379d965805bb8e -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.csproj)	(revision 74df3b2f37b578eb5f0d5c8d33379d965805bb8e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Ringtoets.MacroStabilityInwards.Forms.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.csproj)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -188,6 +188,11 @@
       <Name>Ringtoets.Common.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Util\Ringtoets.Common.Util.csproj">
+      <Project>{6a074d65-a81c-4c1c-8e24-f36c916e4ed7}</Project>
+      <Name>Ringtoets.Common.Util</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.Data\Ringtoets.MacroStabilityInwards.Data.csproj">
       <Project>{83d6b73e-91d5-46b0-9218-955da1f75f7c}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Data</Name>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingMapDataFeaturesFactory.cs
===================================================================
diff -u -r9b2bb9a809f4b42bd06b910dde1f6eb8e546356f -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingMapDataFeaturesFactory.cs	(.../PipingMapDataFeaturesFactory.cs)	(revision 9b2bb9a809f4b42bd06b910dde1f6eb8e546356f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingMapDataFeaturesFactory.cs	(.../PipingMapDataFeaturesFactory.cs)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -29,7 +29,7 @@
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Data.SoilProfile;
 using Ringtoets.Piping.Primitives;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonUtilResources = Ringtoets.Common.Util.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.Factories
 {
@@ -55,7 +55,7 @@
                     PipingSurfaceLine surfaceLine = surfaceLines.ElementAt(i);
 
                     MapFeature feature = RingtoetsMapDataFeaturesFactory.CreateSingleLineMapFeature(GetWorldPoints(surfaceLine));
-                    feature.MetaData[RingtoetsCommonFormsResources.MetaData_Name] = surfaceLine.Name;
+                    feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = surfaceLine.Name;
 
                     features[i] = feature;
                 }
@@ -82,7 +82,7 @@
                     PipingStochasticSoilModel stochasticSoilModel = stochasticSoilModels.ElementAt(i);
 
                     MapFeature feature = RingtoetsMapDataFeaturesFactory.CreateSingleLineMapFeature(GetWorldPoints(stochasticSoilModel));
-                    feature.MetaData[RingtoetsCommonFormsResources.MetaData_Name] = stochasticSoilModel.Name;
+                    feature.MetaData[RingtoetsCommonUtilResources.MetaData_Name] = stochasticSoilModel.Name;
 
                     features[i] = feature;
                 }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj
===================================================================
diff -u -rf665294814c085178591a35d0d811a1df72feb55 -rd77f0eae87afa15b1a5484d5ef7c54f952a04166
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision f665294814c085178591a35d0d811a1df72feb55)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision d77f0eae87afa15b1a5484d5ef7c54f952a04166)
@@ -167,6 +167,11 @@
       <Name>Ringtoets.Common.Primitives</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Util\Ringtoets.Common.Util.csproj">
+      <Project>{6a074d65-a81c-4c1c-8e24-f36c916e4ed7}</Project>
+      <Name>Ringtoets.Common.Util</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\Ringtoets.Piping.Primitives\Ringtoets.Piping.Primitives.csproj">
       <Project>{14C6F716-64E2-4BC4-A1EF-05865FCEFA4C}</Project>
       <Name>Ringtoets.Piping.Primitives</Name>