Index: Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs
===================================================================
diff -u -rd1b8dd5379737316d073a9f1d81120591c8c10f5 -r9ccd84c9353a4f5188d7e475699738c03a165048
--- Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
+++ Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 9ccd84c9353a4f5188d7e475699738c03a165048)
@@ -136,7 +136,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Golfhoogten bij doelkans.
+        ///   Looks up a localized string similar to Golfhoogten bij vrije doelkans.
         /// </summary>
         public static string WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName {
             get {
Index: Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx
===================================================================
diff -u -rd1b8dd5379737316d073a9f1d81120591c8c10f5 -r9ccd84c9353a4f5188d7e475699738c03a165048
--- Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
+++ Riskeer/Common/src/Riskeer.Common.Util/Properties/Resources.resx	(.../Resources.resx)	(revision 9ccd84c9353a4f5188d7e475699738c03a165048)
@@ -133,7 +133,7 @@
     <value>Waterstanden bij vrije doelkans</value>
   </data>
   <data name="WaveHeightCalculationsForUserDefinedTargetProbabilities_DisplayName" xml:space="preserve">
-    <value>Golfhoogten bij doelkans</value>
+    <value>Golfhoogten bij vrije doelkans</value>
   </data>
   <data name="ReturnPeriodFormat" xml:space="preserve">
     <value>{0:f0}</value>
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsExporterTest.cs
===================================================================
diff -u -rd1b8dd5379737316d073a9f1d81120591c8c10f5 -r9ccd84c9353a4f5188d7e475699738c03a165048
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsExporterTest.cs	(.../HydraulicBoundaryLocationCalculationsExporterTest.cs)	(revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Exporters/HydraulicBoundaryLocationCalculationsExporterTest.cs	(.../HydraulicBoundaryLocationCalculationsExporterTest.cs)	(revision 9ccd84c9353a4f5188d7e475699738c03a165048)
@@ -207,8 +207,8 @@
                 "Waterstanden bij vaste doelkans/Waterstanden_30000 (1).shp",
                 "Waterstanden bij vrije doelkans/Waterstanden_10000.shp",
                 "Waterstanden bij vrije doelkans/Waterstanden_100000.shp",
-                "Golfhoogten bij doelkans/Golfhoogten_4000.shp",
-                "Golfhoogten bij doelkans/Golfhoogten_40000.shp"
+                "Golfhoogten bij vrije doelkans/Golfhoogten_4000.shp",
+                "Golfhoogten bij vrije doelkans/Golfhoogten_40000.shp"
             }).SetName("With UserDefinedTargetProbabilities");
 
             var assessmentSectionWithoutTargetProbabilities = new AssessmentSectionStub();
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs
===================================================================
diff -u -r4171e0f1413bbd2ba5a5402525fa98a354c9676b -r9ccd84c9353a4f5188d7e475699738c03a165048
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs)	(revision 4171e0f1413bbd2ba5a5402525fa98a354c9676b)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ExportInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextExportInfoTest.cs)	(revision 9ccd84c9353a4f5188d7e475699738c03a165048)
@@ -69,7 +69,7 @@
                 string name = info.Name(null);
 
                 // Assert
-                Assert.AreEqual("Golfhoogten bij doelkans", name);
+                Assert.AreEqual("Golfhoogten bij vrije doelkans", name);
             }
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs
===================================================================
diff -u -rd1b8dd5379737316d073a9f1d81120591c8c10f5 -r9ccd84c9353a4f5188d7e475699738c03a165048
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision d1b8dd5379737316d073a9f1d81120591c8c10f5)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs	(.../RiskeerPluginTest.cs)	(revision 9ccd84c9353a4f5188d7e475699738c03a165048)
@@ -1172,14 +1172,14 @@
 
                 // Precondition
                 Assert.IsInstanceOf<WaveHeightCalculationsView>(view);
-                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij doelkans - 1/10"));
+                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij vrije doelkans - 1/10"));
 
                 // When
                 calculationsForTargetProbability.TargetProbability = 0.01;
                 calculationsForTargetProbability.NotifyObservers();
 
                 // Then
-                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij doelkans - 1/100"));
+                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij vrije doelkans - 1/100"));
                 mocks.VerifyAll();
             }
         }
@@ -1222,14 +1222,14 @@
 
                 // Precondition
                 Assert.IsInstanceOf<WaveHeightCalculationsView>(view);
-                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij doelkans - 1/10 (1)"));
+                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij vrije doelkans - 1/10 (1)"));
 
                 // When
                 updatedCalculations.TargetProbability = 0.01;
                 updatedCalculations.NotifyObservers();
 
                 // Then
-                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij doelkans - 1/10"));
+                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij vrije doelkans - 1/10"));
                 mocks.VerifyAll();
             }
         }
@@ -1272,14 +1272,14 @@
 
                 // Precondition
                 Assert.IsInstanceOf<WaveHeightCalculationsView>(view);
-                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij doelkans - 1/10 (1)"));
+                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij vrije doelkans - 1/10 (1)"));
 
                 // When
                 assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.Remove(removedCalculations);
                 assessmentSection.WaveHeightCalculationsForUserDefinedTargetProbabilities.NotifyObservers();
 
                 // Then
-                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij doelkans - 1/10"));
+                Assert.IsTrue(AvalonDockViewHostTestHelper.IsTitleSet((AvalonDockViewHost) gui.ViewHost, view, "Golfhoogten bij vrije doelkans - 1/10"));
                 mocks.VerifyAll();
             }
         }
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rec0ab8efb8b68f383e9317609b0307e612485703 -r9ccd84c9353a4f5188d7e475699738c03a165048
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision ec0ab8efb8b68f383e9317609b0307e612485703)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 9ccd84c9353a4f5188d7e475699738c03a165048)
@@ -105,7 +105,7 @@
                 string text = info.Text(null);
 
                 // Assert
-                Assert.AreEqual("Golfhoogten bij doelkans", text);
+                Assert.AreEqual("Golfhoogten bij vrije doelkans", text);
             }
         }
 
@@ -704,7 +704,7 @@
                         contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick();
 
                         // Then
-                        const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Golfhoogten bij doelkans' wilt wissen?";
+                        const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Golfhoogten bij vrije doelkans' wilt wissen?";
                         Assert.AreEqual(expectedMessage, messageBoxText);
 
                         Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput));
@@ -767,7 +767,7 @@
                         contextMenuAdapter.Items[contextMenuClearIllustrationPointsIndex].PerformClick();
 
                         // Then
-                        const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Golfhoogten bij doelkans' wilt wissen?";
+                        const string expectedMessage = "Weet u zeker dat u alle berekende illustratiepunten bij 'Golfhoogten bij vrije doelkans' wilt wissen?";
                         Assert.AreEqual(expectedMessage, messageBoxText);
 
                         Assert.IsTrue(calculationsWithOutput.All(calc => calc.HasOutput));
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r013435ed49ecc69ce2a584e37c9d0d7039fa6a7b -r9ccd84c9353a4f5188d7e475699738c03a165048
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 013435ed49ecc69ce2a584e37c9d0d7039fa6a7b)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 9ccd84c9353a4f5188d7e475699738c03a165048)
@@ -113,7 +113,7 @@
                 string viewName = info.GetViewName(null, context);
 
                 // Assert
-                Assert.AreEqual($"Golfhoogten bij doelkans - {expectedProbabilityText}", viewName);
+                Assert.AreEqual($"Golfhoogten bij vrije doelkans - {expectedProbabilityText}", viewName);
             }
         }