Index: Riskeer/Common/src/Riskeer.Common.Service/DesignWaterLevelCalculationActivity.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ra9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc
--- Riskeer/Common/src/Riskeer.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision a9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc)
@@ -43,23 +43,23 @@
         /// <param name="calculationSettings">The <see cref="HydraulicBoundaryCalculationSettings"/> with the
         /// hydraulic boundary calculation settings.</param>
         /// <param name="norm">The norm to use during the calculation.</param>
-        /// <param name="categoryBoundaryName">The category boundary name of the calculation.</param>
+        /// <param name="calculationIdentifier">The calculation identifier to use in all messages.</param>
         /// <remarks>Preprocessing is disabled when the preprocessor directory equals <see cref="string.Empty"/>.</remarks>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationCalculation"/> or
         /// <paramref name="calculationSettings"/> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="categoryBoundaryName"/> is <c>null</c> or empty.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="calculationIdentifier"/> is <c>null</c> or empty.</exception>
         public DesignWaterLevelCalculationActivity(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation,
                                                    HydraulicBoundaryCalculationSettings calculationSettings,
                                                    double norm,
-                                                   string categoryBoundaryName)
+                                                   string calculationIdentifier)
             : base(hydraulicBoundaryLocationCalculation)
         {
             if (calculationSettings == null)
             {
                 throw new ArgumentNullException(nameof(calculationSettings));
             }
 
-            messageProvider = new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName);
+            messageProvider = new DesignWaterLevelCalculationMessageProvider(calculationIdentifier);
 
             this.hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocationCalculation;
             this.calculationSettings = calculationSettings;
Index: Riskeer/Common/src/Riskeer.Common.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ra9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc
--- Riskeer/Common/src/Riskeer.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/src/Riskeer.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision a9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc)
@@ -43,22 +43,22 @@
         /// <param name="calculationSettings">The <see cref="HydraulicBoundaryCalculationSettings"/> with the
         /// hydraulic boundary calculation settings.</param>
         /// <param name="norm">The norm to use during the calculation.</param>
-        /// <param name="categoryBoundaryName">The category boundary name of the calculation.</param>
+        /// <param name="calculationIdentifier">The calculation identifier to use in all messages.</param>
         /// <remarks>Preprocessing is disabled when the preprocessor directory equals <see cref="string.Empty"/>.</remarks>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocationCalculation"/> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="categoryBoundaryName"/> is <c>null</c> or empty.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="calculationIdentifier"/> is <c>null</c> or empty.</exception>
         public WaveHeightCalculationActivity(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation,
                                              HydraulicBoundaryCalculationSettings calculationSettings,
                                              double norm,
-                                             string categoryBoundaryName)
+                                             string calculationIdentifier)
             : base(hydraulicBoundaryLocationCalculation)
         {
             if (calculationSettings == null)
             {
                 throw new ArgumentNullException(nameof(calculationSettings));
             }
 
-            messageProvider = new WaveHeightCalculationMessageProvider(categoryBoundaryName);
+            messageProvider = new WaveHeightCalculationMessageProvider(calculationIdentifier);
 
             this.hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocationCalculation;
             this.calculationSettings = calculationSettings;
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ra9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc
--- Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision a9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc)
@@ -523,12 +523,12 @@
             public TestDesignWaterLevelCalculationActivity(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation,
                                                            HydraulicBoundaryCalculationSettings calculationSettings,
                                                            double norm,
-                                                           string categoryBoundaryName,
+                                                           string calculationIdentifier,
                                                            ActivityState state)
                 : base(hydraulicBoundaryLocationCalculation,
                        calculationSettings,
                        norm,
-                       categoryBoundaryName)
+                       calculationIdentifier)
             {
                 State = state;
             }
Index: Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -r96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a -ra9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc
--- Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 96ccefa48aa5c97c949f7a7858fcb4d3dc727a3a)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision a9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc)
@@ -521,12 +521,12 @@
             public TestWaveHeightCalculationActivity(HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation,
                                                      HydraulicBoundaryCalculationSettings calculationSettings,
                                                      double norm,
-                                                     string categoryBoundaryName,
+                                                     string calculationIdentifier,
                                                      ActivityState state)
                 : base(hydraulicBoundaryLocationCalculation,
                        calculationSettings,
                        norm,
-                       categoryBoundaryName)
+                       calculationIdentifier)
             {
                 State = state;
             }