Index: Riskeer/Common/src/Riskeer.Common.Service/MessageProviders/WaveHeightCalculationMessageProvider.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -r88c3fe0c672c3ece8a2ce1cb9ee6a65ee8ea89e7
--- Riskeer/Common/src/Riskeer.Common.Service/MessageProviders/WaveHeightCalculationMessageProvider.cs	(.../WaveHeightCalculationMessageProvider.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Service/MessageProviders/WaveHeightCalculationMessageProvider.cs	(.../WaveHeightCalculationMessageProvider.cs)	(revision 88c3fe0c672c3ece8a2ce1cb9ee6a65ee8ea89e7)
@@ -29,49 +29,49 @@
     /// </summary>
     public class WaveHeightCalculationMessageProvider : ICalculationMessageProvider
     {
-        private readonly string categoryBoundaryName;
+        private readonly string calculationIdentifier;
 
         /// <summary>
         /// Creates a new instance of <see cref="WaveHeightCalculationMessageProvider"/>.
         /// </summary>
-        /// <param name="categoryBoundaryName">The category boundary name.</param>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="categoryBoundaryName"/> is <c>null</c> or empty.</exception>
-        public WaveHeightCalculationMessageProvider(string categoryBoundaryName)
+        /// <param name="calculationIdentifier">The calculation identifier to use in all messages.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="calculationIdentifier"/> is <c>null</c> or empty.</exception>
+        public WaveHeightCalculationMessageProvider(string calculationIdentifier)
         {
-            if (string.IsNullOrEmpty(categoryBoundaryName))
+            if (string.IsNullOrEmpty(calculationIdentifier))
             {
-                throw new ArgumentException($"'{nameof(categoryBoundaryName)}' must have a value.");
+                throw new ArgumentException($"'{nameof(calculationIdentifier)}' must have a value.");
             }
 
-            this.categoryBoundaryName = categoryBoundaryName;
+            this.calculationIdentifier = calculationIdentifier;
         }
 
         public string GetActivityDescription(string calculationSubject)
         {
-            return string.Format(Resources.WaveHeightCalculationService_Name_Calculate_wave_height_for_HydraulicBoundaryLocation_0_Category_1_,
+            return string.Format(Resources.WaveHeightCalculationService_Name_Calculate_wave_height_for_HydraulicBoundaryLocation_0_CalculationIdentifier_1_,
                                  calculationSubject,
-                                 categoryBoundaryName);
+                                 calculationIdentifier);
         }
 
         public string GetCalculationFailedMessage(string calculationSubject)
         {
-            return string.Format(Resources.WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_no_error_report,
+            return string.Format(Resources.WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_CalculationIdentifier_1_no_error_report,
                                  calculationSubject,
-                                 categoryBoundaryName);
+                                 calculationIdentifier);
         }
 
         public string GetCalculatedNotConvergedMessage(string calculationSubject)
         {
-            return string.Format(Resources.WaveHeightCalculationActivity_WaveHeightCalculation_for_HydraulicBoundaryLocation_0_Category_1_not_converged,
+            return string.Format(Resources.WaveHeightCalculationActivity_WaveHeightCalculation_for_HydraulicBoundaryLocation_0_CalculationIdentifier_1_not_converged,
                                  calculationSubject,
-                                 categoryBoundaryName);
+                                 calculationIdentifier);
         }
 
         public string GetCalculationFailedWithErrorReportMessage(string calculationSubject, string errorReport)
         {
-            return string.Format(Resources.WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_click_details_for_last_error_report_2,
+            return string.Format(Resources.WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_CalculationIdentifier_1_click_details_for_last_error_report_2,
                                  calculationSubject,
-                                 categoryBoundaryName,
+                                 calculationIdentifier,
                                  errorReport);
         }
     }
Index: Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r0e29371f953013a03185dd98f5790cd04d6fc584 -r88c3fe0c672c3ece8a2ce1cb9ee6a65ee8ea89e7
--- Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 0e29371f953013a03185dd98f5790cd04d6fc584)
+++ Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 88c3fe0c672c3ece8a2ce1cb9ee6a65ee8ea89e7)
@@ -358,10 +358,10 @@
         /// <summary>
         ///   Looks up a localized string similar to Golfhoogte berekening voor locatie &apos;{0}&apos; (Categoriegrens {1}) is niet geconvergeerd..
         /// </summary>
-        public static string WaveHeightCalculationActivity_WaveHeightCalculation_for_HydraulicBoundaryLocation_0_Category_1_not_converged {
+        public static string WaveHeightCalculationActivity_WaveHeightCalculation_for_HydraulicBoundaryLocation_0_CalculationIdentifier_1_not_converged {
             get {
                 return ResourceManager.GetString("WaveHeightCalculationActivity_WaveHeightCalculation_for_HydraulicBoundaryLocation" +
-                        "_0_Category_1_not_converged", resourceCulture);
+                        "_0_CalculationIdentifier_1_not_converged", resourceCulture);
             }
         }
         
@@ -379,30 +379,30 @@
         ///   Looks up a localized string similar to Er is een fout opgetreden tijdens de golfhoogte berekening voor locatie &apos;{0}&apos; (Categoriegrens {1}). Bekijk het foutrapport door op details te klikken.
         ///{2}.
         /// </summary>
-        public static string WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_click_details_for_last_error_report_2 {
+        public static string WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_CalculationIdentifier_1_click_details_for_last_error_report_2 {
             get {
-                return ResourceManager.GetString("WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_" +
-                        "1_click_details_for_last_error_report_2", resourceCulture);
+                return ResourceManager.GetString("WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Calculati" +
+                        "onIdentifier_1_click_details_for_last_error_report_2", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Er is een fout opgetreden tijdens de golfhoogte berekening voor locatie &apos;{0}&apos; (Categoriegrens {1}). Er is geen foutrapport beschikbaar..
         /// </summary>
-        public static string WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_no_error_report {
+        public static string WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_CalculationIdentifier_1_no_error_report {
             get {
-                return ResourceManager.GetString("WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_" +
-                        "1_no_error_report", resourceCulture);
+                return ResourceManager.GetString("WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Calculati" +
+                        "onIdentifier_1_no_error_report", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Golfhoogte berekenen voor locatie &apos;{0}&apos; (Categoriegrens {1}).
         /// </summary>
-        public static string WaveHeightCalculationService_Name_Calculate_wave_height_for_HydraulicBoundaryLocation_0_Category_1_ {
+        public static string WaveHeightCalculationService_Name_Calculate_wave_height_for_HydraulicBoundaryLocation_0_CalculationIdentifier_1_ {
             get {
                 return ResourceManager.GetString("WaveHeightCalculationService_Name_Calculate_wave_height_for_HydraulicBoundaryLoca" +
-                        "tion_0_Category_1_", resourceCulture);
+                        "tion_0_CalculationIdentifier_1_", resourceCulture);
             }
         }
     }
Index: Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.resx
===================================================================
diff -u -r0e29371f953013a03185dd98f5790cd04d6fc584 -r88c3fe0c672c3ece8a2ce1cb9ee6a65ee8ea89e7
--- Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 0e29371f953013a03185dd98f5790cd04d6fc584)
+++ Riskeer/Common/src/Riskeer.Common.Service/Properties/Resources.resx	(.../Resources.resx)	(revision 88c3fe0c672c3ece8a2ce1cb9ee6a65ee8ea89e7)
@@ -144,10 +144,10 @@
   <data name="Hydraulic_boundary_database_connection_failed_0_" xml:space="preserve">
     <value>Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. {0}</value>
   </data>
-  <data name="WaveHeightCalculationActivity_WaveHeightCalculation_for_HydraulicBoundaryLocation_0_Category_1_not_converged" xml:space="preserve">
+  <data name="WaveHeightCalculationActivity_WaveHeightCalculation_for_HydraulicBoundaryLocation_0_CalculationIdentifier_1_not_converged" xml:space="preserve">
     <value>Golfhoogte berekening voor locatie '{0}' (Categoriegrens {1}) is niet geconvergeerd.</value>
   </data>
-  <data name="WaveHeightCalculationService_Name_Calculate_wave_height_for_HydraulicBoundaryLocation_0_Category_1_" xml:space="preserve">
+  <data name="WaveHeightCalculationService_Name_Calculate_wave_height_for_HydraulicBoundaryLocation_0_CalculationIdentifier_1_" xml:space="preserve">
     <value>Golfhoogte berekenen voor locatie '{0}' (Categoriegrens {1})</value>
   </data>
   <data name="Validation_Invalid_BreakWaterHeight_value" xml:space="preserve">
@@ -181,7 +181,7 @@
     <value>Er is een fout opgetreden tijdens de waterstand berekening voor locatie '{0}' (Categoriegrens {1}). Bekijk het foutrapport door op details te klikken.
 {2}</value>
   </data>
-  <data name="WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_click_details_for_last_error_report_2" xml:space="preserve">
+  <data name="WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_CalculationIdentifier_1_click_details_for_last_error_report_2" xml:space="preserve">
     <value>Er is een fout opgetreden tijdens de golfhoogte berekening voor locatie '{0}' (Categoriegrens {1}). Bekijk het foutrapport door op details te klikken.
 {2}</value>
   </data>
@@ -200,7 +200,7 @@
   <data name="DesignWaterLevelCalculationService_Calculate_Error_in_DesignWaterLevelCalculation_0_CalculationIdentifier_1_no_error_report" xml:space="preserve">
     <value>Er is een fout opgetreden tijdens de waterstand berekening voor locatie '{0}' (Categoriegrens {1}). Er is geen foutrapport beschikbaar.</value>
   </data>
-  <data name="WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_Category_1_no_error_report" xml:space="preserve">
+  <data name="WaveHeightCalculationService_Calculate_Error_in_WaveHeightCalculation_0_CalculationIdentifier_1_no_error_report" xml:space="preserve">
     <value>Er is een fout opgetreden tijdens de golfhoogte berekening voor locatie '{0}' (Categoriegrens {1}). Er is geen foutrapport beschikbaar.</value>
   </data>
   <data name="CalculationService_Error_in_reading_illustrationPoints_for_CalculationName_0_with_ErrorMessage_1" xml:space="preserve">