Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/HydraulicBoundaryLocationCalculationActivityFactory.cs
===================================================================
diff -u -r1a595dde70f3b4eadd73cab397c994825bdb13ab -r7dbedcc91cd2472b7d696e393d42b2a02a0597fd
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/HydraulicBoundaryLocationCalculationActivityFactory.cs	(.../HydraulicBoundaryLocationCalculationActivityFactory.cs)	(revision 1a595dde70f3b4eadd73cab397c994825bdb13ab)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/HydraulicBoundaryLocationCalculationActivityFactory.cs	(.../HydraulicBoundaryLocationCalculationActivityFactory.cs)	(revision 7dbedcc91cd2472b7d696e393d42b2a02a0597fd)
@@ -28,24 +28,25 @@
 namespace Ringtoets.Common.Forms.Helpers
 {
     /// <summary>
-    /// Factory for creating hydraulic boundary location calculation activities.
+    /// This class defines factory methods that can be used to create instances of <see cref="CalculatableActivity"/> for
+    /// hydraulic boundary location calculations.
     /// </summary>
     public static class HydraulicBoundaryLocationCalculationActivityFactory
     {
         /// <summary>
-        /// Creates a collection of <see cref="WaveHeightCalculationActivity"/> based on the
-        /// given parameters.
+        /// Creates a collection of <see cref="CalculatableActivity"/> for wave height calculations
+        /// based on the given parameters.
         /// </summary>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The path of the hydraulic boundary database file.</param>
         /// <param name="preprocessorDirectory">The preprocessor directory.</param>
         /// <param name="calculations">The collection of <see cref="HydraulicBoundaryLocationCalculation"/> to create
         /// the activities for.</param>
         /// <param name="norm">The norm to use during the calculations.</param>
         /// <param name="categoryBoundaryName">The category boundary name for the calculations.</param>
-        /// <returns>A collection of <see cref="WaveHeightCalculationActivity"/>.</returns>
+        /// <returns>A collection of <see cref="CalculatableActivity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculations"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="categoryBoundaryName"/> is <c>null</c> or empty.</exception>
-        public static IEnumerable<WaveHeightCalculationActivity> CreateWaveHeightCalculationActivities(
+        public static IEnumerable<CalculatableActivity> CreateWaveHeightCalculationActivities(
             string hydraulicBoundaryDatabaseFilePath,
             string preprocessorDirectory,
             IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
@@ -70,19 +71,19 @@
         }
 
         /// <summary>
-        /// Creates a collection of <see cref="DesignWaterLevelCalculationActivity"/> based on the
-        /// given parameters.
+        /// Creates a collection of <see cref="CalculatableActivity"/> for design water level calculations
+        /// based on the given parameters.
         /// </summary>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The path of the hydraulic boundary database file.</param>
         /// <param name="preprocessorDirectory">The preprocessor directory.</param>
         /// <param name="calculations">The collection of <see cref="HydraulicBoundaryLocationCalculation"/> to create
         /// the activities for.</param>
         /// <param name="norm">The norm to use during the calculations.</param>
         /// <param name="categoryBoundaryName">The category boundary name to use for the activities.</param>
-        /// <returns>A collection of <see cref="DesignWaterLevelCalculationActivity"/>.</returns>
+        /// <returns>A collection of <see cref="CalculatableActivity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="calculations"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="categoryBoundaryName"/> is <c>null</c> or empty.</exception>
-        public static IEnumerable<DesignWaterLevelCalculationActivity> CreateDesignWaterLevelCalculationActivities(
+        public static IEnumerable<CalculatableActivity> CreateDesignWaterLevelCalculationActivities(
             string hydraulicBoundaryDatabaseFilePath,
             string preprocessorDirectory,
             IEnumerable<HydraulicBoundaryLocationCalculation> calculations,
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -r1a595dde70f3b4eadd73cab397c994825bdb13ab -r7dbedcc91cd2472b7d696e393d42b2a02a0597fd
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision 1a595dde70f3b4eadd73cab397c994825bdb13ab)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/HydraulicBoundaryLocationCalculationActivityFactoryTest.cs	(.../HydraulicBoundaryLocationCalculationActivityFactoryTest.cs)	(revision 7dbedcc91cd2472b7d696e393d42b2a02a0597fd)
@@ -84,7 +84,7 @@
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName);
 
             // Call
-            IEnumerable<WaveHeightCalculationActivity> activities = HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
+            IEnumerable<CalculatableActivity> activities = HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
                 validFilePath,
                 validPreprocessorDirectory,
                 new[]
@@ -95,7 +95,9 @@
                 categoryBoundaryName);
 
             // Assert
-            WaveHeightCalculationActivity activity = activities.Single();
+            CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(WaveHeightCalculationActivity));
+
+            CalculatableActivity activity = activities.Single();
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 Action call = () => activity.Run();
@@ -158,7 +160,7 @@
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(locationName);
 
             // Call
-            IEnumerable<DesignWaterLevelCalculationActivity> activities = HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
+            IEnumerable<CalculatableActivity> activities = HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
                 validFilePath,
                 validPreprocessorDirectory,
                 new[]
@@ -169,7 +171,9 @@
                 categoryBoundaryName);
 
             // Assert
-            DesignWaterLevelCalculationActivity activity = activities.Single();
+            CollectionAssert.AllItemsAreInstancesOfType(activities, typeof(DesignWaterLevelCalculationActivity));
+
+            CalculatableActivity activity = activities.Single();
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 Action call = () => activity.Run();
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -rcf5f7a2fbcaf236ba2d6edfc111d6f89eacbd05e -r7dbedcc91cd2472b7d696e393d42b2a02a0597fd
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision cf5f7a2fbcaf236ba2d6edfc111d6f89eacbd05e)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 7dbedcc91cd2472b7d696e393d42b2a02a0597fd)
@@ -1024,7 +1024,7 @@
                         return;
                     }
 
-                    IEnumerable<DesignWaterLevelCalculationActivity> activities =
+                    IEnumerable<CalculatableActivity> activities =
                         DesignWaterLevelCalculationsGroupContextChildNodeObjects(nodeData)
                             .Cast<GrassCoverErosionOutwardsDesignWaterLevelCalculationsContext>()
                             .SelectMany(context => HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
@@ -1105,7 +1105,7 @@
                         return;
                     }
 
-                    IEnumerable<WaveHeightCalculationActivity> activities =
+                    IEnumerable<CalculatableActivity> activities =
                         WaveHeightCalculationsGroupContextChildNodeObjects(nodeData)
                             .Cast<GrassCoverErosionOutwardsWaveHeightCalculationsContext>()
                             .SelectMany(context => HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r5c66fb80e9e112408005c4bed85752bef43d08ce -r7dbedcc91cd2472b7d696e393d42b2a02a0597fd
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 5c66fb80e9e112408005c4bed85752bef43d08ce)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 7dbedcc91cd2472b7d696e393d42b2a02a0597fd)
@@ -2089,7 +2089,7 @@
                         return;
                     }
 
-                    IEnumerable<DesignWaterLevelCalculationActivity> activities =
+                    IEnumerable<CalculatableActivity> activities =
                         DesignWaterLevelCalculationsGroupContextChildNodeObjects(nodeData)
                             .Cast<DesignWaterLevelCalculationsContext>()
                             .SelectMany(context => HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
@@ -2128,7 +2128,7 @@
                         return;
                     }
 
-                    IEnumerable<WaveHeightCalculationActivity> activities =
+                    IEnumerable<CalculatableActivity> activities =
                         WaveHeightCalculationsGroupContextChildNodeObjects(nodeData)
                             .Cast<WaveHeightCalculationsContext>()
                             .SelectMany(context => HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(