Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r40c181373215ed10076631e4b7b3c63319bb5e31 -r84c99d2a4a601016ca9536ecce5aff9e4eb21d3e
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 40c181373215ed10076631e4b7b3c63319bb5e31)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 84c99d2a4a601016ca9536ecce5aff9e4eb21d3e)
@@ -1323,15 +1323,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Alle waterstanden berekenen..
-        /// </summary>
-        public static string DesignWaterLevel_Calculate_All_ToolTip {
-            get {
-                return ResourceManager.GetString("DesignWaterLevel_Calculate_All_ToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Is convergentie bereikt in de waterstand berekening?.
         /// </summary>
         public static string DesignWaterLevelCalculation_Convergence_Description {
@@ -4397,6 +4388,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Alle waterstanden berekenen..
+        /// </summary>
+        public static string WaterLevel_Calculate_All_ToolTip {
+            get {
+                return ResourceManager.GetString("WaterLevel_Calculate_All_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Waterstand [m+NAP].
         /// </summary>
         public static string WaterLevel_DisplayName {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r40c181373215ed10076631e4b7b3c63319bb5e31 -r84c99d2a4a601016ca9536ecce5aff9e4eb21d3e
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 40c181373215ed10076631e4b7b3c63319bb5e31)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 84c99d2a4a601016ca9536ecce5aff9e4eb21d3e)
@@ -163,7 +163,7 @@
   <data name="Calculate_All_ToolTip" xml:space="preserve">
     <value>Voer alle berekeningen binnen dit toetsspoor uit.</value>
   </data>
-  <data name="DesignWaterLevel_Calculate_All_ToolTip" xml:space="preserve">
+  <data name="WaterLevel_Calculate_All_ToolTip" xml:space="preserve">
     <value>Alle waterstanden berekenen.</value>
   </data>
   <data name="WaveHeight_Calculate_All_ToolTip" xml:space="preserve">
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r40c181373215ed10076631e4b7b3c63319bb5e31 -r84c99d2a4a601016ca9536ecce5aff9e4eb21d3e
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 40c181373215ed10076631e4b7b3c63319bb5e31)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 84c99d2a4a601016ca9536ecce5aff9e4eb21d3e)
@@ -607,9 +607,9 @@
                                                                                                        object parentData,
                                                                                                        TreeViewControl treeViewControl)
         {
-            var designWaterLevelItem = new StrictContextMenuItem(
+            var waterLevelCalculationItem = new StrictContextMenuItem(
                 RiskeerCommonFormsResources.Calculate_All,
-                RiskeerCommonFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
+                RiskeerCommonFormsResources.WaterLevel_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
                 (sender, args) =>
                 {
@@ -629,7 +629,7 @@
 
             SetHydraulicsMenuItemEnabledStateAndTooltip(nodeData.AssessmentSection,
                                                         nodeData.GetNormFunc(),
-                                                        designWaterLevelItem);
+                                                        waterLevelCalculationItem);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
@@ -639,7 +639,7 @@
 
             return builder.AddOpenItem()
                           .AddSeparator()
-                          .AddCustomItem(designWaterLevelItem)
+                          .AddCustomItem(waterLevelCalculationItem)
                           .AddSeparator()
                           .AddClearIllustrationPointsOfCalculationsItem(() => IllustrationPointsHelper.HasIllustrationPoints(nodeData.WrappedData), changeHandler)
                           .AddSeparator()
@@ -655,7 +655,7 @@
                                                                                                  object parentData,
                                                                                                  TreeViewControl treeViewControl)
         {
-            var waveHeightItem = new StrictContextMenuItem(
+            var waveHeightCalculationItem = new StrictContextMenuItem(
                 RiskeerCommonFormsResources.Calculate_All,
                 RiskeerCommonFormsResources.WaveHeight_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
@@ -677,7 +677,7 @@
 
             SetHydraulicsMenuItemEnabledStateAndTooltip(nodeData.AssessmentSection,
                                                         nodeData.GetNormFunc(),
-                                                        waveHeightItem);
+                                                        waveHeightCalculationItem);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
@@ -687,7 +687,7 @@
 
             return builder.AddOpenItem()
                           .AddSeparator()
-                          .AddCustomItem(waveHeightItem)
+                          .AddCustomItem(waveHeightCalculationItem)
                           .AddSeparator()
                           .AddClearIllustrationPointsOfCalculationsItem(() => IllustrationPointsHelper.HasIllustrationPoints(nodeData.WrappedData), changeHandler)
                           .AddSeparator()
@@ -1069,9 +1069,9 @@
 
             IMainWindow guiMainWindow = Gui.MainWindow;
 
-            var designWaterLevelItem = new StrictContextMenuItem(
+            var waterLevelCalculationItem = new StrictContextMenuItem(
                 RiskeerCommonFormsResources.Calculate_All,
-                RiskeerCommonFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
+                RiskeerCommonFormsResources.WaterLevel_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
                 (sender, args) =>
                 {
@@ -1081,7 +1081,7 @@
                             failureMechanism, assessmentSection));
                 });
 
-            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, designWaterLevelItem);
+            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waterLevelCalculationItem);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
@@ -1090,7 +1090,7 @@
                 () => GrassCoverErosionOutwardsDataSynchronizationService.ClearIllustrationPointResultsForDesignWaterLevelCalculations(
                     failureMechanism, assessmentSection));
 
-            return builder.AddCustomItem(designWaterLevelItem)
+            return builder.AddCustomItem(waterLevelCalculationItem)
                           .AddSeparator()
                           .AddClearIllustrationPointsOfCalculationsItem(() => DesignWaterLevelCalculationsHaveIllustrationPoints(failureMechanism, assessmentSection),
                                                                         changeHandler)
@@ -1159,7 +1159,7 @@
 
             IMainWindow guiMainWindow = Gui.MainWindow;
 
-            var waveHeightItem = new StrictContextMenuItem(
+            var waveHeightCalculationItem = new StrictContextMenuItem(
                 RiskeerCommonFormsResources.Calculate_All,
                 RiskeerCommonFormsResources.WaveHeight_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
@@ -1171,7 +1171,7 @@
                             failureMechanism, assessmentSection));
                 });
 
-            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem);
+            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightCalculationItem);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
@@ -1180,7 +1180,7 @@
                 () => GrassCoverErosionOutwardsDataSynchronizationService.ClearIllustrationPointResultsForWaveHeightCalculations(
                     failureMechanism, assessmentSection));
 
-            return builder.AddCustomItem(waveHeightItem)
+            return builder.AddCustomItem(waveHeightCalculationItem)
                           .AddSeparator()
                           .AddClearIllustrationPointsOfCalculationsItem(() => WaveHeightCalculationsHaveIllustrationPoints(failureMechanism, assessmentSection),
                                                                         changeHandler)
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs
===================================================================
diff -u -r40c181373215ed10076631e4b7b3c63319bb5e31 -r84c99d2a4a601016ca9536ecce5aff9e4eb21d3e
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 40c181373215ed10076631e4b7b3c63319bb5e31)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs	(.../RiskeerPlugin.cs)	(revision 84c99d2a4a601016ca9536ecce5aff9e4eb21d3e)
@@ -2109,9 +2109,9 @@
 
         private ContextMenuStrip DesignWaterLevelCalculationsContextMenuStrip(DesignWaterLevelCalculationsContext nodeData, object parentData, TreeViewControl treeViewControl)
         {
-            var designWaterLevelItem = new StrictContextMenuItem(
+            var waterLevelCalculationItem = new StrictContextMenuItem(
                 RiskeerCommonFormsResources.Calculate_All,
-                RiskeerCommonFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
+                RiskeerCommonFormsResources.WaterLevel_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
                 (sender, args) =>
                 {
@@ -2129,7 +2129,7 @@
 
             SetHydraulicsMenuItemEnabledStateAndTooltip(nodeData.AssessmentSection,
                                                         nodeData.GetNormFunc(),
-                                                        designWaterLevelItem);
+                                                        waterLevelCalculationItem);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
@@ -2139,7 +2139,7 @@
 
             return builder.AddOpenItem()
                           .AddSeparator()
-                          .AddCustomItem(designWaterLevelItem)
+                          .AddCustomItem(waterLevelCalculationItem)
                           .AddSeparator()
                           .AddClearIllustrationPointsOfCalculationsItem(() => IllustrationPointsHelper.HasIllustrationPoints(nodeData.WrappedData), changeHandler)
                           .AddSeparator()
@@ -2149,7 +2149,7 @@
 
         private ContextMenuStrip WaveHeightCalculationsContextMenuStrip(WaveHeightCalculationsContext nodeData, object parentData, TreeViewControl treeViewControl)
         {
-            var waveHeightItem = new StrictContextMenuItem(
+            var waveHeightCalculationItem = new StrictContextMenuItem(
                 RiskeerCommonFormsResources.Calculate_All,
                 RiskeerCommonFormsResources.WaveHeight_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
@@ -2169,7 +2169,7 @@
 
             SetHydraulicsMenuItemEnabledStateAndTooltip(nodeData.AssessmentSection,
                                                         nodeData.GetNormFunc(),
-                                                        waveHeightItem);
+                                                        waveHeightCalculationItem);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
@@ -2179,7 +2179,7 @@
 
             return builder.AddOpenItem()
                           .AddSeparator()
-                          .AddCustomItem(waveHeightItem)
+                          .AddCustomItem(waveHeightCalculationItem)
                           .AddSeparator()
                           .AddClearIllustrationPointsOfCalculationsItem(() => IllustrationPointsHelper.HasIllustrationPoints(nodeData.WrappedData), changeHandler)
                           .AddSeparator()
@@ -2283,9 +2283,9 @@
             IAssessmentSection assessmentSection = nodeData.AssessmentSection;
 
             IMainWindow guiMainWindow = Gui.MainWindow;
-            var designWaterLevelItem = new StrictContextMenuItem(
+            var waterLevelCalculationItem = new StrictContextMenuItem(
                 RiskeerCommonFormsResources.Calculate_All,
-                RiskeerCommonFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
+                RiskeerCommonFormsResources.WaterLevel_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
                 (sender, args) =>
                 {
@@ -2294,15 +2294,15 @@
                         AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(assessmentSection));
                 });
 
-            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, designWaterLevelItem);
+            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waterLevelCalculationItem);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
                 GetInquiryHelper(),
                 RiskeerCommonFormsResources.WaterLevelCalculations_DisplayName,
                 () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsForDesignWaterLevelCalculations(nodeData.AssessmentSection));
 
-            return builder.AddCustomItem(designWaterLevelItem)
+            return builder.AddCustomItem(waterLevelCalculationItem)
                           .AddSeparator()
                           .AddClearIllustrationPointsOfCalculationsItem(() => DesignWaterLevelCalculationsHaveIllustrationPoints(assessmentSection), changeHandler)
                           .AddSeparator()
@@ -2316,7 +2316,7 @@
             IAssessmentSection assessmentSection = nodeData.AssessmentSection;
 
             IMainWindow guiMainWindow = Gui.MainWindow;
-            var waveHeightItem = new StrictContextMenuItem(
+            var waveHeightCalculationItem = new StrictContextMenuItem(
                 RiskeerCommonFormsResources.Calculate_All,
                 RiskeerCommonFormsResources.WaveHeight_Calculate_All_ToolTip,
                 RiskeerCommonFormsResources.CalculateAllIcon,
@@ -2327,15 +2327,15 @@
                         AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(assessmentSection));
                 });
 
-            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightItem);
+            SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, waveHeightCalculationItem);
 
             var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var changeHandler = new ClearIllustrationPointsOfHydraulicBoundaryLocationCalculationCollectionChangeHandler(
                 GetInquiryHelper(),
                 RiskeerCommonFormsResources.WaveHeightCalculations_DisplayName,
                 () => RiskeerDataSynchronizationService.ClearIllustrationPointResultsForWaveHeightCalculations(nodeData.AssessmentSection));
 
-            return builder.AddCustomItem(waveHeightItem)
+            return builder.AddCustomItem(waveHeightCalculationItem)
                           .AddSeparator()
                           .AddClearIllustrationPointsOfCalculationsItem(() => WaveHeightCalculationsHaveIllustrationPoints(assessmentSection), changeHandler)
                           .AddSeparator()