Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r425a50160d826226ef47b6c4de8b56811c1984a7 -rcde4b8def5d5104b595c2500c0347fdf601da431
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 425a50160d826226ef47b6c4de8b56811c1984a7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision cde4b8def5d5104b595c2500c0347fdf601da431)
@@ -359,6 +359,7 @@
             // Setup
             const string databaseFilePath = "DatabaseFilePath";
             const double norm = 0.01;
+            const string categoryBoundaryName = "Category";
 
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase
@@ -393,7 +394,7 @@
 
             mockRepository.ReplayAll();
 
-            DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, "Category", testForm);
+            DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm);
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -406,6 +407,8 @@
 
             // Assert
             Assert.IsInstanceOf<DesignWaterLevelCalculationMessageProvider>(messageProviderValue);
+            Assert.AreEqual($"Toetspeil berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+                            messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual("", preprocessorDirectoryValue);
             Assert.AreEqual(norm, normValue);
@@ -473,6 +476,8 @@
 
             // Assert
             Assert.IsInstanceOf<DesignWaterLevelCalculationMessageProvider>(messageProviderValue);
+            Assert.AreEqual($"Toetspeil berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+                            messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue);
             Assert.AreEqual(norm, normValue);
@@ -488,6 +493,7 @@
             // Setup
             const string databaseFilePath = "DatabaseFilePath";
             const double norm = 0.01;
+            const string categoryBoundaryName = "Category";
 
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase
@@ -525,7 +531,7 @@
 
             mockRepository.ReplayAll();
 
-            DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, "Category", testForm);
+            DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm);
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -538,6 +544,8 @@
 
             // Assert
             Assert.IsInstanceOf<DesignWaterLevelCalculationMessageProvider>(messageProviderValue);
+            Assert.AreEqual($"Toetspeil berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+                            messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual(string.Empty, preprocessorDirectoryValue);
             Assert.AreEqual(norm, normValue);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r425a50160d826226ef47b6c4de8b56811c1984a7 -rcde4b8def5d5104b595c2500c0347fdf601da431
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 425a50160d826226ef47b6c4de8b56811c1984a7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision cde4b8def5d5104b595c2500c0347fdf601da431)
@@ -359,6 +359,7 @@
             // Setup
             const string databaseFilePath = "DatabaseFilePath";
             const double norm = 0.01;
+            const string categoryBoundaryName = "Category";
 
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase
@@ -393,7 +394,7 @@
 
             mockRepository.ReplayAll();
 
-            WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, "Category", testForm);
+            WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm);
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -406,6 +407,8 @@
 
             // Assert
             Assert.IsInstanceOf<WaveHeightCalculationMessageProvider>(messageProviderValue);
+            Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+                            messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual("", preprocessorDirectoryValue);
             Assert.AreEqual(norm, normValue);
@@ -473,6 +476,8 @@
 
             // Assert
             Assert.IsInstanceOf<WaveHeightCalculationMessageProvider>(messageProviderValue);
+            Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+                            messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue);
             Assert.AreEqual(norm, normValue);
@@ -488,6 +493,7 @@
             // Setup
             const string databaseFilePath = "DatabaseFilePath";
             const double norm = 0.01;
+            const string categoryBoundaryName = "Category";
 
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase
@@ -525,7 +531,7 @@
 
             mockRepository.ReplayAll();
 
-            WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, "Category", testForm);
+            WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm);
             DataGridView locationsDataGridView = GetLocationsDataGridView();
             DataGridViewRowCollection rows = locationsDataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -538,6 +544,8 @@
 
             // Assert
             Assert.IsInstanceOf<WaveHeightCalculationMessageProvider>(messageProviderValue);
+            Assert.AreEqual($"Golfhoogte berekenen voor locatie 'Location name' ({categoryBoundaryName})",
+                            messageProviderValue.GetActivityDescription("Location name"));
             Assert.AreEqual(databaseFilePath, hydraulicBoundaryDatabaseFilePathValue);
             Assert.AreEqual(string.Empty, preprocessorDirectoryValue);
             Assert.AreEqual(norm, normValue);