Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -ra083279a13d4efdd702c50f37a5a8ae059e5d0ef -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a083279a13d4efdd702c50f37a5a8ae059e5d0ef)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -584,6 +584,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Categorie {0}.
+        /// </summary>
+        public static string Hydraulic_category_boundary_0_ {
+            get {
+                return ResourceManager.GetString("Hydraulic_category_boundary_0_", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Hydraulische randvoorwaarden.
         /// </summary>
         public static string HydraulicBoundaryConditions_DisplayName {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -ra083279a13d4efdd702c50f37a5a8ae059e5d0ef -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision a083279a13d4efdd702c50f37a5a8ae059e5d0ef)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -420,4 +420,7 @@
   <data name="FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName" xml:space="preserve">
     <value>Vv-&gt;VIv</value>
   </data>
+  <data name="Hydraulic_category_boundary_0_" xml:space="preserve">
+    <value>Categorie {0}</value>
+  </data>
 </root>
\ No newline at end of file
Fisheye: Tag a5115968c170dddb9ef42d207adcc4195cacc892 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Plugin/Properties/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag a5115968c170dddb9ef42d207adcc4195cacc892 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Plugin/Properties/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Plugin/Ringtoets.Common.Plugin.csproj
===================================================================
diff -u -rbab76d764d096ef9eaf56691ff4f6520985b99bf -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/Common/src/Ringtoets.Common.Plugin/Ringtoets.Common.Plugin.csproj	(.../Ringtoets.Common.Plugin.csproj)	(revision bab76d764d096ef9eaf56691ff4f6520985b99bf)
+++ Ringtoets/Common/src/Ringtoets.Common.Plugin/Ringtoets.Common.Plugin.csproj	(.../Ringtoets.Common.Plugin.csproj)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -13,11 +13,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="RingtoetsPluginHelper.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -52,10 +47,4 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
 </Project>
\ No newline at end of file
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs
===================================================================
diff -u -r3fa2200f5ad050d55eec5b00f3ef2e7084a0c223 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision 3fa2200f5ad050d55eec5b00f3ef2e7084a0c223)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs	(.../DuneErosionPlugin.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -45,7 +45,6 @@
 using Ringtoets.DuneErosion.Plugin.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using RingtoetsCommonPluginResources = Ringtoets.Common.Plugin.Properties.Resources;
 
 namespace Ringtoets.DuneErosion.Plugin
 {
@@ -105,7 +104,7 @@
 
             yield return new TreeNodeInfo<DuneLocationCalculationsContext>
             {
-                Text = context => context.CategoryBoundaryName,
+                Text = context => FormatCategoryBoundaryName(context.CategoryBoundaryName),
                 Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 ContextMenuStrip = DuneLocationCalculationsContextMenuStrip
             };
@@ -138,7 +137,8 @@
 
             yield return new ViewInfo<DuneLocationCalculationsContext, IObservableEnumerable<DuneLocationCalculation>, DuneLocationCalculationsView>
             {
-                GetViewName = (view, context) => $"{RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName} - {context.CategoryBoundaryName}",
+                GetViewName = (view, context) => $"{RingtoetsCommonDataResources.HydraulicBoundaryConditions_DisplayName} - " +
+                                                 $"{FormatCategoryBoundaryName(context.CategoryBoundaryName)}",
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 GetViewData = context => context.WrappedData,
                 CloseForData = CloseDuneLocationCalculationsViewForData,
@@ -179,6 +179,11 @@
             duneLocationCalculationGuiService = new DuneLocationCalculationGuiService(Gui.MainWindow);
         }
 
+        private static string FormatCategoryBoundaryName(string categoryBoundaryName)
+        {
+            return string.Format(RingtoetsCommonDataResources.Hydraulic_category_boundary_0_, categoryBoundaryName);
+        }
+
         #region TreeNodeInfo
 
         #region FailureMechanismContext TreeNodeInfo
@@ -282,31 +287,31 @@
                                context.FailureMechanism,
                                context.AssessmentSection,
                                () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
-                               RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificFactorizedSignalingNorm_name),
+                               RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName),
                            new DuneLocationCalculationsContext(
                                context.FailureMechanism.CalculationsForMechanismSpecificSignalingNorm,
                                context.FailureMechanism,
                                context.AssessmentSection,
                                () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
-                               RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificSignalingNorm_name),
+                               RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName),
                            new DuneLocationCalculationsContext(
                                context.FailureMechanism.CalculationsForMechanismSpecificLowerLimitNorm,
                                context.FailureMechanism,
                                context.AssessmentSection,
                                () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
-                               RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificLowerLimitNorm_name),
+                               RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName),
                            new DuneLocationCalculationsContext(
                                context.FailureMechanism.CalculationsForLowerLimitNorm,
                                context.FailureMechanism,
                                context.AssessmentSection,
                                () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
-                               RingtoetsCommonPluginResources.Hydraulic_category_boundary_lowerLimitNorm_name),
+                               RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName),
                            new DuneLocationCalculationsContext(
                                context.FailureMechanism.CalculationsForFactorizedLowerLimitNorm,
                                context.FailureMechanism,
                                context.AssessmentSection,
                                () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
-                               RingtoetsCommonPluginResources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name)
+                               RingtoetsCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName)
                        };
         }
 
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r53906164cce5013cd047b7a72f3c7179a089eef2 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsContextTreeNodeInfoTest.cs)	(revision 53906164cce5013cd047b7a72f3c7179a089eef2)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsContextTreeNodeInfoTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -111,7 +111,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            const string categoryBoundaryName = "Category Boundary Name";
+            const string categoryBoundaryName = "Boundary Name";
             var context = new DuneLocationCalculationsContext(new ObservableList<DuneLocationCalculation>(),
                                                               new DuneErosionFailureMechanism(),
                                                               assessmentSection,
@@ -122,7 +122,7 @@
             string text = info.Text(context);
 
             // Assert
-            Assert.AreEqual(categoryBoundaryName, text);
+            Assert.AreEqual("Categorie " + categoryBoundaryName, text);
         }
 
         [Test]
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd4a4f6fc0626fe052dc73d5bdba16a28a82e299d -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs)	(revision d4a4f6fc0626fe052dc73d5bdba16a28a82e299d)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -229,23 +229,23 @@
                 Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection)));
                 Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(failureMechanism, c.FailureMechanism)));
 
-                Assert.AreEqual("Categorie Iv->IIv", calculationsContexts[0].CategoryBoundaryName);
+                Assert.AreEqual("Iv->IIv", calculationsContexts[0].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.CalculationsForMechanismSpecificFactorizedSignalingNorm, calculationsContexts[0].WrappedData);
                 Assert.AreEqual(GetExpectedNorm(failureMechanism, signalingNorm / 30), calculationsContexts[0].GetNormFunc(), 1e-6);
 
-                Assert.AreEqual("Categorie IIv->IIIv", calculationsContexts[1].CategoryBoundaryName);
+                Assert.AreEqual("IIv->IIIv", calculationsContexts[1].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.CalculationsForMechanismSpecificSignalingNorm, calculationsContexts[1].WrappedData);
                 Assert.AreEqual(GetExpectedNorm(failureMechanism, signalingNorm), calculationsContexts[1].GetNormFunc(), 1e-6);
 
-                Assert.AreEqual("Categorie IIIv->IVv", calculationsContexts[2].CategoryBoundaryName);
+                Assert.AreEqual("IIIv->IVv", calculationsContexts[2].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm, calculationsContexts[2].WrappedData);
                 Assert.AreEqual(GetExpectedNorm(failureMechanism, lowerLimitNorm), calculationsContexts[2].GetNormFunc(), 1e-6);
 
-                Assert.AreEqual("Categorie IVv->Vv", calculationsContexts[3].CategoryBoundaryName);
+                Assert.AreEqual("IVv->Vv", calculationsContexts[3].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.CalculationsForLowerLimitNorm, calculationsContexts[3].WrappedData);
                 Assert.AreEqual(failureMechanismSpecificNormFactor * lowerLimitNorm, calculationsContexts[3].GetNormFunc(), 1e-6);
 
-                Assert.AreEqual("Categorie Vv->VIv", calculationsContexts[4].CategoryBoundaryName);
+                Assert.AreEqual("Vv->VIv", calculationsContexts[4].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.CalculationsForFactorizedLowerLimitNorm, calculationsContexts[4].WrappedData);
                 Assert.AreEqual(failureMechanismSpecificNormFactor * lowerLimitNorm * 30, calculationsContexts[4].GetNormFunc(), 1e-6);
             }
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs
===================================================================
diff -u -r8fe9bd87da92837297afa5cc804ccdac8b64900d -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs	(.../DuneLocationCalculationsViewInfoTest.cs)	(revision 8fe9bd87da92837297afa5cc804ccdac8b64900d)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ViewInfos/DuneLocationCalculationsViewInfoTest.cs	(.../DuneLocationCalculationsViewInfoTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -66,7 +66,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            const string categoryBoundaryName = "Category Boundary Name";
+            const string categoryBoundaryName = "Boundary Name";
             var context = new DuneLocationCalculationsContext(new ObservableList<DuneLocationCalculation>(),
                                                               new DuneErosionFailureMechanism(),
                                                               assessmentSection,
@@ -77,7 +77,7 @@
             string viewName = info.GetViewName(null, context);
 
             // Assert
-            Assert.AreEqual($"Hydraulische randvoorwaarden - {categoryBoundaryName}", viewName);
+            Assert.AreEqual($"Hydraulische randvoorwaarden - Categorie {categoryBoundaryName}", viewName);
             mocks.VerifyAll();
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs
===================================================================
diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs)	(revision b6f3b68404cad00988843342f68022dc743e74c1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsView.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -31,6 +31,7 @@
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Views
 {
@@ -72,7 +73,7 @@
             }
 
             FailureMechanism = failureMechanism;
-            messageProvider = new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName);
+            messageProvider = new DesignWaterLevelCalculationMessageProvider(string.Format(RingtoetsCommonDataResources.Hydraulic_category_boundary_0_, categoryBoundaryName));
 
             failureMechanismObserver = new Observer(UpdateCalculateForSelectedButton)
             {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs
===================================================================
diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs)	(revision b6f3b68404cad00988843342f68022dc743e74c1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightCalculationsView.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsView.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -31,6 +31,7 @@
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Views
 {
@@ -72,7 +73,7 @@
             }
 
             FailureMechanism = failureMechanism;
-            messageProvider = new WaveHeightCalculationMessageProvider(categoryBoundaryName);
+            messageProvider = new WaveHeightCalculationMessageProvider(string.Format(RingtoetsCommonDataResources.Hydraulic_category_boundary_0_, categoryBoundaryName));
 
             failureMechanismObserver = new Observer(UpdateCalculateForSelectedButton)
             {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r540cb5503a23ea9ea7b1e633888df92fa0531151 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 540cb5503a23ea9ea7b1e633888df92fa0531151)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -61,7 +61,6 @@
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 using RingtoetsCommonIoResources = Ringtoets.Common.IO.Properties.Resources;
-using RingtoetsCommonPluginResources = Ringtoets.Common.Plugin.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin
 {
@@ -153,7 +152,7 @@
                 IObservableEnumerable<HydraulicBoundaryLocationCalculation>,
                 GrassCoverErosionOutwardsDesignWaterLevelCalculationsView>
             {
-                GetViewName = (view, context) => $"{Resources.GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext_DisplayName} - {context.CategoryBoundaryName}",
+                GetViewName = (view, context) => $"{Resources.GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext_DisplayName} - {FormatCategoryBoundaryName(context.CategoryBoundaryName)}",
                 GetViewData = context => context.WrappedData,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 CreateInstance = context => new GrassCoverErosionOutwardsDesignWaterLevelCalculationsView(context.WrappedData,
@@ -170,7 +169,7 @@
                 IObservableEnumerable<HydraulicBoundaryLocationCalculation>,
                 GrassCoverErosionOutwardsWaveHeightCalculationsView>
             {
-                GetViewName = (view, context) => $"{Resources.GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext_DisplayName} - {context.CategoryBoundaryName}",
+                GetViewName = (view, context) => $"{Resources.GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext_DisplayName} - {FormatCategoryBoundaryName(context.CategoryBoundaryName)}",
                 GetViewData = context => context.WrappedData,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightCalculationsView(context.WrappedData,
@@ -259,14 +258,14 @@
 
             yield return new TreeNodeInfo<GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext>
             {
-                Text = context => context.CategoryBoundaryName,
+                Text = context => FormatCategoryBoundaryName(context.CategoryBoundaryName),
                 Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 ContextMenuStrip = GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextMenuStrip
             };
 
             yield return new TreeNodeInfo<GrassCoverErosionOutwardsWaveHeightCalculationsContext>
             {
-                Text = context => context.CategoryBoundaryName,
+                Text = context => FormatCategoryBoundaryName(context.CategoryBoundaryName),
                 Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 ContextMenuStrip = GrassCoverErosionOutwardsWaveHeightCalculationsContextMenuStrip
             };
@@ -376,6 +375,11 @@
             hydraulicBoundaryLocationCalculationGuiService = new HydraulicBoundaryLocationCalculationGuiService(Gui.MainWindow);
         }
 
+        private static string FormatCategoryBoundaryName(string categoryBoundaryName)
+        {
+            return string.Format(RingtoetsCommonDataResources.Hydraulic_category_boundary_0_, categoryBoundaryName);
+        }
+
         #region ViewInfos
 
         #region GrassCoverErosionOutwardsFailureMechanismView ViewInfo
@@ -568,7 +572,7 @@
                         assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
                         nodeData.WrappedData,
                         nodeData.GetNormFunc(),
-                        new DesignWaterLevelCalculationMessageProvider(nodeData.CategoryBoundaryName));
+                        new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(nodeData.CategoryBoundaryName)));
                 });
 
             string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism);
@@ -616,7 +620,7 @@
                         assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(),
                         nodeData.WrappedData,
                         nodeData.GetNormFunc(),
-                        new WaveHeightCalculationMessageProvider(nodeData.CategoryBoundaryName));
+                        new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(nodeData.CategoryBoundaryName)));
                 });
 
             string validationText = ValidateAllDataAvailableAndGetErrorMessage(nodeData.AssessmentSection, nodeData.FailureMechanism);
@@ -1005,35 +1009,35 @@
                                               preprocessorDirectory,
                                               failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
-                                              new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificFactorizedSignalingNorm_name)));
+                                              new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName))));
 
                     calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
-                                              new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificSignalingNorm_name)));
+                                              new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName))));
 
                     calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
-                                              new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificLowerLimitNorm_name)));
+                                              new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName))));
 
                     calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaterLevelCalculationsForLowerLimitNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
-                                              new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_lowerLimitNorm_name)));
+                                              new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName))));
 
                     calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
-                                              new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name)));
+                                              new DesignWaterLevelCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName))));
 
                     ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations);
                 });
@@ -1057,31 +1061,31 @@
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificFactorizedSignalingNorm_name),
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName),
                 new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(
                     context.FailureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm,
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificSignalingNorm_name),
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName),
                 new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(
                     context.FailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm,
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificLowerLimitNorm_name),
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName),
                 new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(
                     context.AssessmentSection.WaterLevelCalculationsForLowerLimitNorm,
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_lowerLimitNorm_name),
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName),
                 new GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext(
                     context.AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name)
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName)
             };
         }
 
@@ -1114,35 +1118,35 @@
                                               preprocessorDirectory,
                                               failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
-                                              new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificFactorizedSignalingNorm_name)));
+                                              new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName))));
 
                     calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
-                                              new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificSignalingNorm_name)));
+                                              new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName))));
 
                     calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
-                                              new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificLowerLimitNorm_name)));
+                                              new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName))));
 
                     calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaveHeightCalculationsForLowerLimitNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
-                                              new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_lowerLimitNorm_name)));
+                                              new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName))));
 
                     calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
                                               failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
-                                              new WaveHeightCalculationMessageProvider(RingtoetsCommonPluginResources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name)));
+                                              new WaveHeightCalculationMessageProvider(FormatCategoryBoundaryName(RingtoetsCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName))));
 
                     ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations);
                 });
@@ -1166,31 +1170,31 @@
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificFactorizedSignalingNorm_name),
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName),
                 new GrassCoverErosionOutwardsWaveHeightCalculationsContext(
                     context.FailureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm,
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificSignalingNorm_name),
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName),
                 new GrassCoverErosionOutwardsWaveHeightCalculationsContext(
                     context.FailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm,
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_mechanismSpecificLowerLimitNorm_name),
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName),
                 new GrassCoverErosionOutwardsWaveHeightCalculationsContext(
                     context.AssessmentSection.WaveHeightCalculationsForLowerLimitNorm,
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_lowerLimitNorm_name),
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName),
                 new GrassCoverErosionOutwardsWaveHeightCalculationsContext(
                     context.AssessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
                     context.FailureMechanism,
                     context.AssessmentSection,
                     () => context.FailureMechanism.GetNorm(context.AssessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
-                    RingtoetsCommonPluginResources.Hydraulic_category_boundary_factorizedLowerLimitNorm_name)
+                    RingtoetsCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName)
             };
         }
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs)	(revision b6f3b68404cad00988843342f68022dc743e74c1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -457,7 +457,7 @@
 
             // Assert
             Assert.IsInstanceOf<DesignWaterLevelCalculationMessageProvider>(messageProviderValue);
-            Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+            Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
                             messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual("", preprocessorDirectoryValue);
@@ -526,7 +526,7 @@
 
             // Assert
             Assert.IsInstanceOf<DesignWaterLevelCalculationMessageProvider>(messageProviderValue);
-            Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+            Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
                             messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue);
@@ -594,7 +594,7 @@
 
             // Assert
             Assert.IsInstanceOf<DesignWaterLevelCalculationMessageProvider>(messageProviderValue);
-            Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+            Assert.AreEqual($"Waterstand berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
                             messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual("", preprocessorDirectoryValue);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs
===================================================================
diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs)	(revision b6f3b68404cad00988843342f68022dc743e74c1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -457,7 +457,7 @@
 
             // Assert
             Assert.IsInstanceOf<WaveHeightCalculationMessageProvider>(messageProviderValue);
-            Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+            Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
                             messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual("", preprocessorDirectoryValue);
@@ -526,7 +526,7 @@
 
             // Assert
             Assert.IsInstanceOf<WaveHeightCalculationMessageProvider>(messageProviderValue);
-            Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+            Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
                             messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue);
@@ -594,7 +594,7 @@
 
             // Assert
             Assert.IsInstanceOf<WaveHeightCalculationMessageProvider>(messageProviderValue);
-            Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+            Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' (Categorie {categoryBoundaryName})",
                             messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual("", preprocessorDirectoryValue);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs)	(revision b6f3b68404cad00988843342f68022dc743e74c1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -115,7 +115,7 @@
                 string nodeText = info.Text(context);
 
                 // Assert
-                Assert.AreEqual(categoryBoundaryName, nodeText);
+                Assert.AreEqual("Categorie " + categoryBoundaryName, nodeText);
             }
 
             mockRepository.VerifyAll();
@@ -618,14 +618,14 @@
                         {
                             string[] msgs = messages.ToArray();
                             Assert.AreEqual(8, msgs.Length);
-                            Assert.AreEqual($"Waterstand berekenen voor locatie '{hydraulicBoundaryLocation.Name}' ({categoryBoundaryName}) is gestart.", msgs[0]);
+                            Assert.AreEqual($"Waterstand berekenen voor locatie '{hydraulicBoundaryLocation.Name}' (Categorie {categoryBoundaryName}) is gestart.", msgs[0]);
                             CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]);
                             CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
                             CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]);
-                            Assert.AreEqual($"Waterstand berekening voor locatie '{hydraulicBoundaryLocation.Name}' ({categoryBoundaryName}) is niet geconvergeerd.", msgs[4]);
+                            Assert.AreEqual($"Waterstand berekening voor locatie '{hydraulicBoundaryLocation.Name}' (Categorie {categoryBoundaryName}) is niet geconvergeerd.", msgs[4]);
                             StringAssert.StartsWith("Waterstand berekening is uitgevoerd op de tijdelijke locatie", msgs[5]);
                             CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]);
-                            Assert.AreEqual($"Waterstand berekenen voor locatie '{hydraulicBoundaryLocation.Name}' ({categoryBoundaryName}) is gelukt.", msgs[7]);
+                            Assert.AreEqual($"Waterstand berekenen voor locatie '{hydraulicBoundaryLocation.Name}' (Categorie {categoryBoundaryName}) is gelukt.", msgs[7]);
                         });
 
                         HydraulicBoundaryLocationCalculationOutput output = hydraulicBoundaryLocationCalculation.Output;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbcab4543e8b75f5d00850c4e7780097cfabf67da -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs)	(revision bcab4543e8b75f5d00850c4e7780097cfabf67da)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -410,23 +410,23 @@
                 Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection)));
                 Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(failureMechanism, c.FailureMechanism)));
 
-                Assert.AreEqual("Categorie Iv->IIv", calculationsContexts[0].CategoryBoundaryName);
+                Assert.AreEqual("Iv->IIv", calculationsContexts[0].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm, calculationsContexts[0].WrappedData);
                 Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm / 30), calculationsContexts[0].GetNormFunc(), 1e-6);
 
-                Assert.AreEqual("Categorie IIv->IIIv", calculationsContexts[1].CategoryBoundaryName);
+                Assert.AreEqual("IIv->IIIv", calculationsContexts[1].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm, calculationsContexts[1].WrappedData);
                 Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm), calculationsContexts[1].GetNormFunc());
 
-                Assert.AreEqual("Categorie IIIv->IVv", calculationsContexts[2].CategoryBoundaryName);
+                Assert.AreEqual("IIIv->IVv", calculationsContexts[2].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm, calculationsContexts[2].WrappedData);
                 Assert.AreEqual(GetExpectedNorm(failureMechanism, () => lowerLimitNorm), calculationsContexts[2].GetNormFunc());
 
-                Assert.AreEqual("Categorie IVv->Vv", calculationsContexts[3].CategoryBoundaryName);
+                Assert.AreEqual("IVv->Vv", calculationsContexts[3].CategoryBoundaryName);
                 Assert.AreSame(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, calculationsContexts[3].WrappedData);
                 Assert.AreEqual(lowerLimitNorm, calculationsContexts[3].GetNormFunc());
 
-                Assert.AreEqual("Categorie Vv->VIv", calculationsContexts[4].CategoryBoundaryName);
+                Assert.AreEqual("Vv->VIv", calculationsContexts[4].CategoryBoundaryName);
                 Assert.AreSame(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, calculationsContexts[4].WrappedData);
                 Assert.AreEqual(lowerLimitNorm * 30, calculationsContexts[4].GetNormFunc());
             }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4e784c0362ff37e3ea834228f15a5ce3fac8e079 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs)	(revision 4e784c0362ff37e3ea834228f15a5ce3fac8e079)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -111,7 +111,7 @@
                 string nodeText = info.Text(context);
 
                 // Assert
-                Assert.AreEqual(categoryBoundaryName, nodeText);
+                Assert.AreEqual("Categorie " + categoryBoundaryName, nodeText);
             }
 
             mockRepository.VerifyAll();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbcab4543e8b75f5d00850c4e7780097cfabf67da -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision bcab4543e8b75f5d00850c4e7780097cfabf67da)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -410,23 +410,23 @@
                 Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(assessmentSection, c.AssessmentSection)));
                 Assert.IsTrue(calculationsContexts.All(c => ReferenceEquals(failureMechanism, c.FailureMechanism)));
 
-                Assert.AreEqual("Categorie Iv->IIv", calculationsContexts[0].CategoryBoundaryName);
+                Assert.AreEqual("Iv->IIv", calculationsContexts[0].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm, calculationsContexts[0].WrappedData);
                 Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm / 30), calculationsContexts[0].GetNormFunc(), 1e-6);
 
-                Assert.AreEqual("Categorie IIv->IIIv", calculationsContexts[1].CategoryBoundaryName);
+                Assert.AreEqual("IIv->IIIv", calculationsContexts[1].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm, calculationsContexts[1].WrappedData);
                 Assert.AreEqual(GetExpectedNorm(failureMechanism, () => signalingNorm), calculationsContexts[1].GetNormFunc());
 
-                Assert.AreEqual("Categorie IIIv->IVv", calculationsContexts[2].CategoryBoundaryName);
+                Assert.AreEqual("IIIv->IVv", calculationsContexts[2].CategoryBoundaryName);
                 Assert.AreSame(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm, calculationsContexts[2].WrappedData);
                 Assert.AreEqual(GetExpectedNorm(failureMechanism, () => lowerLimitNorm), calculationsContexts[2].GetNormFunc());
 
-                Assert.AreEqual("Categorie IVv->Vv", calculationsContexts[3].CategoryBoundaryName);
+                Assert.AreEqual("IVv->Vv", calculationsContexts[3].CategoryBoundaryName);
                 Assert.AreSame(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, calculationsContexts[3].WrappedData);
                 Assert.AreEqual(lowerLimitNorm, calculationsContexts[3].GetNormFunc());
 
-                Assert.AreEqual("Categorie Vv->VIv", calculationsContexts[4].CategoryBoundaryName);
+                Assert.AreEqual("Vv->VIv", calculationsContexts[4].CategoryBoundaryName);
                 Assert.AreSame(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, calculationsContexts[4].WrappedData);
                 Assert.AreEqual(lowerLimitNorm * 30, calculationsContexts[4].GetNormFunc());
             }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs
===================================================================
diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs)	(revision b6f3b68404cad00988843342f68022dc743e74c1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsViewInfoTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -165,7 +165,7 @@
                 string name = info.GetViewName(null, context);
 
                 // Assert
-                Assert.AreEqual($"Waterstanden - {categoryBoundaryName}", name);
+                Assert.AreEqual($"Waterstanden - Categorie {categoryBoundaryName}", name);
                 mocks.VerifyAll();
             }
         }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs
===================================================================
diff -u -rb6f3b68404cad00988843342f68022dc743e74c1 -ra5115968c170dddb9ef42d207adcc4195cacc892
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs)	(revision b6f3b68404cad00988843342f68022dc743e74c1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsViewInfoTest.cs)	(revision a5115968c170dddb9ef42d207adcc4195cacc892)
@@ -161,7 +161,7 @@
                 string name = info.GetViewName(null, context);
 
                 // Assert
-                Assert.AreEqual($"Golfhoogtes - {categoryBoundaryName}", name);
+                Assert.AreEqual($"Golfhoogtes - Categorie {categoryBoundaryName}", name);
             }
         }