Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -re25695acf2407be4ea1a9ea6c1791aba5c0ca81f -reebbc3b7f6370ec49ab77281034fab75b676c66f
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision e25695acf2407be4ea1a9ea6c1791aba5c0ca81f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision eebbc3b7f6370ec49ab77281034fab75b676c66f)
@@ -1963,28 +1963,28 @@
                     string hydraulicBoundaryDatabaseFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath;
                     string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory();
                     var calculations = new List<DesignWaterLevelCalculationActivity>();
-                    calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
+                    calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm,
                                               assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm),
                                               new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName)));
 
-                    calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
+                    calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaterLevelCalculationsForSignalingNorm,
                                               assessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm),
                                               new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName)));
 
-                    calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
+                    calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaterLevelCalculationsForLowerLimitNorm,
                                               assessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm),
                                               new DesignWaterLevelCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName)));
 
-                    calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateDesignWaterLevelCalculationActivities(
+                    calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
@@ -2022,28 +2022,28 @@
                     string hydraulicBoundaryDatabaseFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath;
                     string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory();
                     var calculations = new List<WaveHeightCalculationActivity>();
-                    calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
+                    calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm,
                                               assessmentSection.GetNorm(AssessmentSectionCategoryType.FactorizedSignalingNorm),
                                               new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName)));
 
-                    calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
+                    calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaveHeightCalculationsForSignalingNorm,
                                               assessmentSection.GetNorm(AssessmentSectionCategoryType.SignalingNorm),
                                               new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_SignalingNorm_DisplayName)));
 
-                    calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
+                    calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaveHeightCalculationsForLowerLimitNorm,
                                               assessmentSection.GetNorm(AssessmentSectionCategoryType.LowerLimitNorm),
                                               new WaveHeightCalculationMessageProvider(RingtoetsCommonDataResources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName)));
 
-                    calculations.AddRange(HydraulicBoundaryCalculationActivityHelper.CreateWaveHeightCalculationActivities(
+                    calculations.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
                                               hydraulicBoundaryDatabaseFilePath,
                                               preprocessorDirectory,
                                               assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,