Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -ra939f5d389da2d8e615f504c4070c37d3988e772 -r2cded5c8895fe6f2e04b7075d5334903ca2d64da
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a939f5d389da2d8e615f504c4070c37d3988e772)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2cded5c8895fe6f2e04b7075d5334903ca2d64da)
@@ -4359,24 +4359,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Waterstanden bij norm.
-        /// </summary>
-        public static string WaterLevelCalculationsForNormTargetProbabilities_DisplayName {
-            get {
-                return ResourceManager.GetString("WaterLevelCalculationsForNormTargetProbabilities_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Waterstanden bij doelkans.
-        /// </summary>
-        public static string WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName {
-            get {
-                return ResourceManager.GetString("WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Volumiek gewicht van water..
         /// </summary>
         public static string WaterVolumetricWeight_Description {
@@ -4440,15 +4422,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Golfhoogten bij doelkans.
-        /// </summary>
-        public static string WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName {
-            get {
-                return ResourceManager.GetString("WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Locatie (RD) [m].
         /// </summary>
         public static string WorldReferencePoint_DisplayName {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -ra939f5d389da2d8e615f504c4070c37d3988e772 -r2cded5c8895fe6f2e04b7075d5334903ca2d64da
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision a939f5d389da2d8e615f504c4070c37d3988e772)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 2cded5c8895fe6f2e04b7075d5334903ca2d64da)
@@ -1404,15 +1404,6 @@
   <data name="FailureMechanismSections_SourcePath_Description" xml:space="preserve">
     <value>De locatie van het bestand waaruit de vakindeling is geïmporteerd.</value>
   </data>
-  <data name="WaterLevelCalculationsForNormTargetProbabilities_DisplayName" xml:space="preserve">
-    <value>Waterstanden bij norm</value>
-  </data>
-  <data name="WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName" xml:space="preserve">
-    <value>Waterstanden bij doelkans</value>
-  </data>
-  <data name="WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName" xml:space="preserve">
-    <value>Golfhoogten bij doelkans</value>
-  </data>
   <data name="HydraulicLoads_Calculate_All_ToolTip" xml:space="preserve">
     <value>Alle hydraulische belastingen berekenen.</value>
   </data>
Index: Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs
===================================================================
diff -u -ra939f5d389da2d8e615f504c4070c37d3988e772 -r2cded5c8895fe6f2e04b7075d5334903ca2d64da
--- Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a939f5d389da2d8e615f504c4070c37d3988e772)
+++ Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 2cded5c8895fe6f2e04b7075d5334903ca2d64da)
@@ -40,7 +40,7 @@
     // 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", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -107,5 +107,32 @@
                 return ResourceManager.GetString("RiskeerVersionHelper_Version_0_Not_Valid", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Waterstanden bij norm.
+        /// </summary>
+        public static string WaterLevelCalculationsForNormTargetProbabilities_DisplayName {
+            get {
+                return ResourceManager.GetString("WaterLevelCalculationsForNormTargetProbabilities_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Waterstanden bij doelkans.
+        /// </summary>
+        public static string WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName {
+            get {
+                return ResourceManager.GetString("WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Golfhoogten bij doelkans.
+        /// </summary>
+        public static string WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName {
+            get {
+                return ResourceManager.GetString("WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName", resourceCulture);
+            }
+        }
     }
 }
Index: Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx
===================================================================
diff -u -ra939f5d389da2d8e615f504c4070c37d3988e772 -r2cded5c8895fe6f2e04b7075d5334903ca2d64da
--- Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision a939f5d389da2d8e615f504c4070c37d3988e772)
+++ Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision 2cded5c8895fe6f2e04b7075d5334903ca2d64da)
@@ -126,4 +126,13 @@
   <data name="RiskeerVersionHelper_Version_0_Not_Valid" xml:space="preserve">
     <value>'{0}' is geen geldige Riskeer of Ringtoets projectbestand versie.</value>
   </data>
+  <data name="WaterLevelCalculationsForNormTargetProbabilities_DisplayName" xml:space="preserve">
+    <value>Waterstanden bij norm</value>
+  </data>
+  <data name="WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName" xml:space="preserve">
+    <value>Waterstanden bij doelkans</value>
+  </data>
+  <data name="WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName" xml:space="preserve">
+    <value>Golfhoogten bij doelkans</value>
+  </data>
 </root>
\ No newline at end of file
Index: Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/HydraulicBoundaryLocationCalculationsExporter.cs
===================================================================
diff -u -rf9aee5d4feb96880cc68b34823f34c78ed0d2252 -r2cded5c8895fe6f2e04b7075d5334903ca2d64da
--- Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/HydraulicBoundaryLocationCalculationsExporter.cs	(.../HydraulicBoundaryLocationCalculationsExporter.cs)	(revision f9aee5d4feb96880cc68b34823f34c78ed0d2252)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Exporters/HydraulicBoundaryLocationCalculationsExporter.cs	(.../HydraulicBoundaryLocationCalculationsExporter.cs)	(revision 2cded5c8895fe6f2e04b7075d5334903ca2d64da)
@@ -30,7 +30,7 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Integration.IO.Helpers;
-using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
+using RiskeerCommonUtilResources = Riskeer.Common.Util.Properties.Resources;
 using RiskeerCommonIOResources = Riskeer.Common.IO.Properties.Resources;
 
 namespace Riskeer.Integration.IO.Exporters
@@ -108,7 +108,7 @@
                         assessmentSection.WaterLevelCalculationsForSignalingNorm, assessmentSection.FailureMechanismContribution.SignalingNorm)
                 },
                 HydraulicBoundaryLocationCalculationsType.WaterLevel,
-                Path.Combine(tempFolderPath, RiskeerCommonFormsResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName));
+                Path.Combine(tempFolderPath, RiskeerCommonUtilResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName));
         }
 
         private bool ExportWaterLevelCalculationsForUserDefinedTargetProbabilities()
@@ -119,7 +119,7 @@
                                              tp.HydraulicBoundaryLocationCalculations, tp.TargetProbability))
                                  .ToArray(),
                 HydraulicBoundaryLocationCalculationsType.WaterLevel,
-                Path.Combine(tempFolderPath, RiskeerCommonFormsResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName));
+                Path.Combine(tempFolderPath, RiskeerCommonUtilResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName));
         }
 
         private bool ExportWaveHeightCalculationsForUserDefinedTargetProbabilities()
@@ -130,7 +130,7 @@
                                              tp.HydraulicBoundaryLocationCalculations, tp.TargetProbability))
                                  .ToArray(),
                 HydraulicBoundaryLocationCalculationsType.WaveHeight,
-                Path.Combine(tempFolderPath, RiskeerCommonFormsResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName));
+                Path.Combine(tempFolderPath, RiskeerCommonUtilResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName));
         }
 
         private static bool ExportLocationCalculationsForTargetProbabilities(
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r364ee92c804029b22cafd4a21ec3503801409eb8 -r2cded5c8895fe6f2e04b7075d5334903ca2d64da
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 364ee92c804029b22cafd4a21ec3503801409eb8)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 2cded5c8895fe6f2e04b7075d5334903ca2d64da)
@@ -106,6 +106,7 @@
 using FontFamily = System.Windows.Media.FontFamily;
 using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources;
 using RiskeerCommonIOResources = Riskeer.Common.IO.Properties.Resources;
+using RiskeerCommonUtilResources = Riskeer.Common.Util.Properties.Resources;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 using RiskeerCommonPluginResources = Riskeer.Common.Plugin.Properties.Resources;
 using RiskeerCommonServiceResources = Riskeer.Common.Service.Properties.Resources;
@@ -350,7 +351,7 @@
 
             yield return new ViewInfo<WaterLevelCalculationsForNormTargetProbabilityContext, IObservableEnumerable<HydraulicBoundaryLocationCalculation>, DesignWaterLevelCalculationsView>
             {
-                GetViewName = (view, context) => $"{RiskeerCommonFormsResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName} - " +
+                GetViewName = (view, context) => $"{RiskeerCommonUtilResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName} - " +
                                                  $"{noProbabilityValueDoubleConverter.ConvertToString(context.GetNormFunc())}",
                 GetViewData = context => context.WrappedData,
                 Image = RiskeerCommonFormsResources.GenericInputOutputIcon,
@@ -771,7 +772,7 @@
 
             yield return new ExportInfo<WaterLevelCalculationsForNormTargetProbabilitiesGroupContext>
             {
-                Name = context => RiskeerCommonFormsResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName,
+                Name = context => RiskeerCommonUtilResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName,
                 Extension = Resources.Zip_file_filter_Extension,
                 CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationCalculationsForTargetProbabilitiesExporter(
                     new[]
@@ -790,7 +791,7 @@
 
             yield return CreateHydraulicBoundaryLocationCalculationsForTargetProbabilityGroupExportInfo
                 <WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContext>(
-                    RiskeerCommonFormsResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName,
+                    RiskeerCommonUtilResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName,
                     HydraulicBoundaryLocationCalculationsType.WaterLevel,
                     context => context.WrappedData
                                       .Select(tp => new Tuple<IEnumerable<HydraulicBoundaryLocationCalculation>, double>(
@@ -799,7 +800,7 @@
 
             yield return CreateHydraulicBoundaryLocationCalculationsForTargetProbabilityGroupExportInfo
                 <WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContext>(
-                    RiskeerCommonFormsResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName,
+                    RiskeerCommonUtilResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName,
                     HydraulicBoundaryLocationCalculationsType.WaveHeight,
                     context => context.WrappedData
                                       .Select(tp => new Tuple<IEnumerable<HydraulicBoundaryLocationCalculation>, double>(
@@ -1009,7 +1010,7 @@
 
             yield return new TreeNodeInfo<WaterLevelCalculationsForNormTargetProbabilitiesGroupContext>
             {
-                Text = context => RiskeerCommonFormsResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName,
+                Text = context => RiskeerCommonUtilResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName,
                 Image = context => RiskeerCommonFormsResources.GeneralFolderIcon,
                 ContextMenuStrip = WaterLevelCalculationsForNormTargetProbabilitiesGroupContextMenuStrip,
                 ChildNodeObjects = WaterLevelCalculationsForNormTargetProbabilitiesGroupContextChildNodes
@@ -1024,7 +1025,7 @@
 
             yield return new TreeNodeInfo<WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContext>
             {
-                Text = context => RiskeerCommonFormsResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName,
+                Text = context => RiskeerCommonUtilResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName,
                 Image = context => RiskeerCommonFormsResources.GeneralFolderIcon,
                 ContextMenuStrip = WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextMenuStrip,
                 ChildNodeObjects = WaterLevelCalculationsForUserDefinedTargetProbabilitiesGroupContextChildNodes,
@@ -1046,7 +1047,7 @@
 
             yield return new TreeNodeInfo<WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContext>
             {
-                Text = context => RiskeerCommonFormsResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName,
+                Text = context => RiskeerCommonUtilResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName,
                 Image = context => RiskeerCommonFormsResources.GeneralFolderIcon,
                 ContextMenuStrip = WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextMenuStrip,
                 ChildNodeObjects = WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextChildNodes,
@@ -1359,14 +1360,14 @@
         private static string GetWaterLevelCalculationsForUserDefinedTargetProbabilitiesViewName(
             HydraulicBoundaryLocationCalculationsForTargetProbability calculationsForUserDefinedTargetProbabilities)
         {
-            return $"{RiskeerCommonFormsResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName} - " +
+            return $"{RiskeerCommonUtilResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName} - " +
                    $"{noProbabilityValueDoubleConverter.ConvertToString(calculationsForUserDefinedTargetProbabilities.TargetProbability)}";
         }
 
         private static string GetWaveHeightCalculationsForUserDefinedTargetProbabilitiesViewName(
             HydraulicBoundaryLocationCalculationsForTargetProbability calculationsForUserDefinedTargetProbabilities)
         {
-            return $"{RiskeerCommonFormsResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName} - " +
+            return $"{RiskeerCommonUtilResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName} - " +
                    $"{noProbabilityValueDoubleConverter.ConvertToString(calculationsForUserDefinedTargetProbabilities.TargetProbability)}";
         }
 
@@ -2371,7 +2372,7 @@
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
                 GetInquiryHelper(),
-                RiskeerCommonFormsResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName,
+                RiskeerCommonUtilResources.WaterLevelCalculationsForNormTargetProbabilities_DisplayName,
                 () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsOfWaterLevelCalculationsForNormTargetProbabilities(nodeData.AssessmentSection));
 
             return builder.AddExportItem()
@@ -2471,7 +2472,7 @@
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
                 GetInquiryHelper(),
-                RiskeerCommonFormsResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName,
+                RiskeerCommonUtilResources.WaterLevelCalculationsForUserDefinedTargetProbabilities_DisplayName,
                 () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsOfWaterLevelCalculationsForUserDefinedTargetProbabilities(nodeData.AssessmentSection));
 
             return builder.AddExportItem()
@@ -2596,7 +2597,7 @@
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
                 GetInquiryHelper(),
-                RiskeerCommonFormsResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName,
+                RiskeerCommonUtilResources.WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName,
                 () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsOfWaveHeightCalculationsForUserDefinedTargetProbabilities(nodeData.AssessmentSection));
 
             return builder.AddExportItem()