Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -rcd8ffb48abad6b4f36660f46af272b6531a87dcc -r01740ebd72eef02813c719fc61a4d36563282331
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision cd8ffb48abad6b4f36660f46af272b6531a87dcc)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 01740ebd72eef02813c719fc61a4d36563282331)
@@ -212,7 +212,7 @@
                 CreateInstance = context => new WaveHeightCalculationsView(context.WrappedData,
                                                                            context.AssessmentSection,
                                                                            context.GetNormFunc,
-                                                                           context.CategoryBoundaryName),
+                                                                           () => context.CategoryBoundaryName),
                 AfterCreate = (view, context) => view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService,
                 CloseForData = CloseHydraulicBoundaryCalculationsViewForData
             };
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs
===================================================================
diff -u -r1dd2c22368f99235c15314f434505d4b5fc27a90 -r01740ebd72eef02813c719fc61a4d36563282331
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs)	(revision 1dd2c22368f99235c15314f434505d4b5fc27a90)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs)	(revision 01740ebd72eef02813c719fc61a4d36563282331)
@@ -186,7 +186,7 @@
                 using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                  assessmentSection,
                                                                  () => 0.01,
-                                                                 "A"))
+                                                                 () => "A"))
                 {
                     info.AfterCreate(view, data);
 
@@ -217,7 +217,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSection,
                                                              () => 0.01,
-                                                             "A"))
+                                                             () => "A"))
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
                 ViewInfo info = GetInfo(plugin);
@@ -256,7 +256,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSectionA,
                                                              () => 0.01,
-                                                             "A"))
+                                                             () => "A"))
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
                 ViewInfo info = GetInfo(plugin);
@@ -293,7 +293,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSection,
                                                              () => 0.01,
-                                                             "A"))
+                                                             () => "A"))
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
                 ViewInfo info = GetInfo(plugin);
@@ -334,7 +334,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSectionA,
                                                              () => 0.01,
-                                                             "A"))
+                                                             () => "A"))
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
                 ViewInfo info = GetInfo(plugin);
@@ -366,7 +366,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSection,
                                                              () => 0.01,
-                                                             "A"))
+                                                             () => "A"))
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
                 ViewInfo info = GetInfo(plugin);
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r392f4a59075f4e790053501d3310327dd914e8ec -r01740ebd72eef02813c719fc61a4d36563282331
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 392f4a59075f4e790053501d3310327dd914e8ec)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 01740ebd72eef02813c719fc61a4d36563282331)
@@ -379,7 +379,7 @@
                 CreateInstance = context => new WaveHeightCalculationsView(context.WrappedData.HydraulicBoundaryLocationCalculations,
                                                                            context.AssessmentSection,
                                                                            () => context.WrappedData.TargetProbability,
-                                                                           noProbabilityValueDoubleConverter.ConvertToString(context.WrappedData.TargetProbability)),
+                                                                           () => noProbabilityValueDoubleConverter.ConvertToString(context.WrappedData.TargetProbability)),
                 AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
             };
 
@@ -407,7 +407,7 @@
                 CreateInstance = context => new WaveHeightCalculationsView(context.WrappedData,
                                                                            context.AssessmentSection,
                                                                            context.GetNormFunc,
-                                                                           context.CategoryBoundaryName),
+                                                                           () => context.CategoryBoundaryName),
                 AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
             };
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs
===================================================================
diff -u -r8ed5614b7eaddc3cc4b42b9bab875ef50cc9feeb -r01740ebd72eef02813c719fc61a4d36563282331
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 8ed5614b7eaddc3cc4b42b9bab875ef50cc9feeb)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs	(.../WaveHeightCalculationsForUserDefinedTargetProbabilityContextViewInfoTest.cs)	(revision 01740ebd72eef02813c719fc61a4d36563282331)
@@ -295,7 +295,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              new AssessmentSectionStub(),
                                                              () => targetProbability,
-                                                             "1/100"))
+                                                             () => "1/100"))
 
             using (var plugin = new RiskeerPlugin())
             {
@@ -324,7 +324,7 @@
             using (var view = new WaveHeightCalculationsView(context.WrappedData.HydraulicBoundaryLocationCalculations,
                                                              new AssessmentSectionStub(),
                                                              () => 0.01,
-                                                             "1/100"))
+                                                             () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 view.Data = context.WrappedData.HydraulicBoundaryLocationCalculations;
@@ -352,7 +352,7 @@
             using (var view = new WaveHeightCalculationsView(otherCalculations,
                                                              new AssessmentSectionStub(),
                                                              () => 0.01,
-                                                             "1/100"))
+                                                             () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 view.Data = otherCalculations;
@@ -376,7 +376,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSection,
                                                              () => 0.01,
-                                                             "1/100"))
+                                                             () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -399,7 +399,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSectionA,
                                                              () => 0.01,
-                                                             "1/100"))
+                                                             () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -421,7 +421,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSectionA,
                                                              () => 0.01,
-                                                             "1/100"))
+                                                             () => "1/100"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs
===================================================================
diff -u -r886b86a66f072735567285a3489923186c236c32 -r01740ebd72eef02813c719fc61a4d36563282331
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs	(.../WaveHeightCalculationsViewInfoTest.cs)	(revision 886b86a66f072735567285a3489923186c236c32)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/ViewInfos/WaveHeightCalculationsViewInfoTest.cs	(.../WaveHeightCalculationsViewInfoTest.cs)	(revision 01740ebd72eef02813c719fc61a4d36563282331)
@@ -304,7 +304,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSection,
                                                              getNormFunc,
-                                                             categoryBoundaryName))
+                                                             () => categoryBoundaryName))
 
             using (var plugin = new RiskeerPlugin())
             {
@@ -331,7 +331,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSection,
                                                              () => 0.01,
-                                                             "A"))
+                                                             () => "A"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -354,7 +354,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSectionA,
                                                              () => 0.01,
-                                                             "A"))
+                                                             () => "A"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);
@@ -376,7 +376,7 @@
             using (var view = new WaveHeightCalculationsView(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                              assessmentSectionA,
                                                              () => 0.01,
-                                                             "A"))
+                                                             () => "A"))
             using (var plugin = new RiskeerPlugin())
             {
                 ViewInfo info = GetViewInfo(plugin);