Index: Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.Designer.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r1194d1aa29a0db3ae70d7e821c4c58f00493ca4e
--- Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 1194d1aa29a0db3ae70d7e821c4c58f00493ca4e)
@@ -100,7 +100,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to h gr.C.
+        ///   Looks up a localized string similar to h_C.
         /// </summary>
         public static string MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm {
             get {
@@ -109,7 +109,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to h gr.A+.
+        ///   Looks up a localized string similar to h_Aplus.
         /// </summary>
         public static string MetaData_WaterLevelCalculationForFactorizedSignalingNorm {
             get {
@@ -118,7 +118,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to h gr.B.
+        ///   Looks up a localized string similar to h_B.
         /// </summary>
         public static string MetaData_WaterLevelCalculationForLowerLimitNorm {
             get {
@@ -127,7 +127,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to h gr.A.
+        ///   Looks up a localized string similar to h_A.
         /// </summary>
         public static string MetaData_WaterLevelCalculationForSignalingNorm {
             get {
@@ -136,7 +136,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hs gr.C.
+        ///   Looks up a localized string similar to Hs_C.
         /// </summary>
         public static string MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm {
             get {
@@ -145,7 +145,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hs gr.A+.
+        ///   Looks up a localized string similar to Hs_Aplus.
         /// </summary>
         public static string MetaData_WaveHeightCalculationForFactorizedSignalingNorm {
             get {
@@ -154,7 +154,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hs gr.B.
+        ///   Looks up a localized string similar to Hs_B.
         /// </summary>
         public static string MetaData_WaveHeightCalculationForLowerLimitNorm {
             get {
@@ -163,7 +163,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hs gr.A.
+        ///   Looks up a localized string similar to Hs_A.
         /// </summary>
         public static string MetaData_WaveHeightCalculationForSignalingNorm {
             get {
Index: Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.resx
===================================================================
diff -u -r1d83848c09c3d45fa61802243f16aaa064841ed0 -r1194d1aa29a0db3ae70d7e821c4c58f00493ca4e
--- Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision 1d83848c09c3d45fa61802243f16aaa064841ed0)
+++ Ringtoets/Common/src/Ringtoets.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision 1194d1aa29a0db3ae70d7e821c4c58f00493ca4e)
@@ -124,28 +124,28 @@
     <value>Naam</value>
   </data>
   <data name="MetaData_WaterLevelCalculationForFactorizedLowerLimitNorm" xml:space="preserve">
-    <value>h gr.C</value>
+    <value>h_C</value>
   </data>
   <data name="MetaData_WaterLevelCalculationForFactorizedSignalingNorm" xml:space="preserve">
-    <value>h gr.A+</value>
+    <value>h_Aplus</value>
   </data>
   <data name="MetaData_WaterLevelCalculationForLowerLimitNorm" xml:space="preserve">
-    <value>h gr.B</value>
+    <value>h_B</value>
   </data>
   <data name="MetaData_WaterLevelCalculationForSignalingNorm" xml:space="preserve">
-    <value>h gr.A</value>
+    <value>h_A</value>
   </data>
   <data name="MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm" xml:space="preserve">
-    <value>Hs gr.C</value>
+    <value>Hs_C</value>
   </data>
   <data name="MetaData_WaveHeightCalculationForFactorizedSignalingNorm" xml:space="preserve">
-    <value>Hs gr.A+</value>
+    <value>Hs_Aplus</value>
   </data>
   <data name="MetaData_WaveHeightCalculationForLowerLimitNorm" xml:space="preserve">
-    <value>Hs gr.B</value>
+    <value>Hs_B</value>
   </data>
   <data name="MetaData_WaveHeightCalculationForSignalingNorm" xml:space="preserve">
-    <value>Hs gr.A</value>
+    <value>Hs_A</value>
   </data>
   <data name="RingtoetsVersionHelper_Version_0_Not_Valid" xml:space="preserve">
     <value>'{0}' is geen geldige Ringtoets versie.</value>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r1194d1aa29a0db3ae70d7e821c4c58f00493ca4e
--- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/MapFeaturesTestHelper.cs	(.../MapFeaturesTestHelper.cs)	(revision 1194d1aa29a0db3ae70d7e821c4c58f00493ca4e)
@@ -67,29 +67,29 @@
 
                 MapFeaturesMetaDataTestHelper.AssertMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, hydraulicBoundaryLocation),
-                    mapFeature, "h gr.A+");
+                    mapFeature, "h_Aplus");
                 MapFeaturesMetaDataTestHelper.AssertMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForSignalingNorm, hydraulicBoundaryLocation),
-                    mapFeature, "h gr.A");
+                    mapFeature, "h_A");
                 MapFeaturesMetaDataTestHelper.AssertMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "h gr.B");
+                    mapFeature, "h_B");
                 MapFeaturesMetaDataTestHelper.AssertMetaData(
                     GetExpectedResult(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "h gr.C");
+                    mapFeature, "h_C");
 
                 MapFeaturesMetaDataTestHelper.AssertMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, hydraulicBoundaryLocation),
-                    mapFeature, "Hs gr.A+");
+                    mapFeature, "Hs_Aplus");
                 MapFeaturesMetaDataTestHelper.AssertMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForSignalingNorm, hydraulicBoundaryLocation),
-                    mapFeature, "Hs gr.A");
+                    mapFeature, "Hs_A");
                 MapFeaturesMetaDataTestHelper.AssertMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "Hs gr.B");
+                    mapFeature, "Hs_B");
                 MapFeaturesMetaDataTestHelper.AssertMetaData(
                     GetExpectedResult(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, hydraulicBoundaryLocation),
-                    mapFeature, "Hs gr.C");
+                    mapFeature, "Hs_C");
             }
         }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Util.Test/HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r1194d1aa29a0db3ae70d7e821c4c58f00493ca4e
--- Ringtoets/Common/test/Ringtoets.Common.Util.Test/HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs	(.../HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs)	(revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb)
+++ Ringtoets/Common/test/Ringtoets.Common.Util.Test/HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs	(.../HydraulicBoundaryLocationMapDataFeaturesFactoryTest.cs)	(revision 1194d1aa29a0db3ae70d7e821c4c58f00493ca4e)
@@ -52,29 +52,29 @@
             // Assert
             MapFeaturesMetaDataTestHelper.AssertMetaData(
                 location.WaterLevelCalculationForFactorizedSignalingNorm.ToString(),
-                feature, "h gr.A+");
+                feature, "h_Aplus");
             MapFeaturesMetaDataTestHelper.AssertMetaData(
                 location.WaterLevelCalculationForSignalingNorm.ToString(),
-                feature, "h gr.A");
+                feature, "h_A");
             MapFeaturesMetaDataTestHelper.AssertMetaData(
                 location.WaterLevelCalculationForLowerLimitNorm.ToString(),
-                feature, "h gr.B");
+                feature, "h_B");
             MapFeaturesMetaDataTestHelper.AssertMetaData(
                 location.WaterLevelCalculationForFactorizedLowerLimitNorm.ToString(),
-                feature, "h gr.C");
+                feature, "h_C");
 
             MapFeaturesMetaDataTestHelper.AssertMetaData(
                 location.WaveHeightCalculationForFactorizedSignalingNorm.ToString(),
-                feature, "Hs gr.A+");
+                feature, "Hs_Aplus");
             MapFeaturesMetaDataTestHelper.AssertMetaData(
                 location.WaveHeightCalculationForSignalingNorm.ToString(),
-                feature, "Hs gr.A");
+                feature, "Hs_A");
             MapFeaturesMetaDataTestHelper.AssertMetaData(
                 location.WaveHeightCalculationForLowerLimitNorm.ToString(),
-                feature, "Hs gr.B");
+                feature, "Hs_B");
             MapFeaturesMetaDataTestHelper.AssertMetaData(
                 location.WaveHeightCalculationForFactorizedLowerLimitNorm.ToString(),
-                feature, "Hs gr.C");
+                feature, "Hs_C");
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/test-data/HydraulicBoundaryLocationsExporter/ExpectedExport.dbf
===================================================================
diff -u -r1d83848c09c3d45fa61802243f16aaa064841ed0 -r1194d1aa29a0db3ae70d7e821c4c58f00493ca4e
Binary files differ
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/test-data/HydraulicBoundaryLocationsWriter/ExpectedExport.dbf
===================================================================
diff -u -r1d83848c09c3d45fa61802243f16aaa064841ed0 -r1194d1aa29a0db3ae70d7e821c4c58f00493ca4e
Binary files differ