Index: Riskeer/Common/src/Riskeer.Common.IO/Configurations/Helpers/DistributionConversionExtensions.cs
===================================================================
diff -u -r0c01d00c000b40e935b430fcb9195e95462e76fc -r8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec
--- Riskeer/Common/src/Riskeer.Common.IO/Configurations/Helpers/DistributionConversionExtensions.cs	(.../DistributionConversionExtensions.cs)	(revision 0c01d00c000b40e935b430fcb9195e95462e76fc)
+++ Riskeer/Common/src/Riskeer.Common.IO/Configurations/Helpers/DistributionConversionExtensions.cs	(.../DistributionConversionExtensions.cs)	(revision 8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec)
@@ -276,7 +276,7 @@
             {
                 try
                 {
-                    distribution.Mean = (RoundedDouble)mean.Value;
+                    distribution.Mean = (RoundedDouble) mean.Value;
                 }
                 catch (ArgumentOutOfRangeException e)
                 {
@@ -362,7 +362,7 @@
             {
                 try
                 {
-                    distribution.StandardDeviation = (RoundedDouble)standardDeviation.Value;
+                    distribution.StandardDeviation = (RoundedDouble) standardDeviation.Value;
                 }
                 catch (ArgumentOutOfRangeException e)
                 {
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r3cc23c40d1904a58a7d4ded98d4785c70a3d6d40 -r8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 3cc23c40d1904a58a7d4ded98d4785c70a3d6d40)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec)
@@ -999,7 +999,7 @@
                                         GrassCoverErosionOutwardsWaveConditionsCalculationContext context)
         {
             ActivityProgressDialogRunner.Run(Gui.MainWindow,
-                                             GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
+                                             GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
                                                                                                                            context.FailureMechanism,
                                                                                                                            context.AssessmentSection));
         }
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsCalculationActivityFactory.cs
===================================================================
diff -u -r0c01d00c000b40e935b430fcb9195e95462e76fc -r8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsCalculationActivityFactory.cs	(.../GrassCoverErosionOutwardsCalculationActivityFactory.cs)	(revision 0c01d00c000b40e935b430fcb9195e95462e76fc)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsCalculationActivityFactory.cs	(.../GrassCoverErosionOutwardsCalculationActivityFactory.cs)	(revision 8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec)
@@ -98,7 +98,7 @@
         #region Wave Conditions
 
         /// <summary>
-        /// Creates a collection of <see cref="CalculatableActivity"/> based on the calculations in
+        /// Creates a collection of <see cref="CalculatableActivity"/> based on the wave conditions calculations in
         /// <paramref name="calculationGroup"/>.
         /// </summary>
         /// <param name="calculationGroup">The calculation group to create activities for.</param>
@@ -128,7 +128,7 @@
 
             return calculationGroup.GetCalculations()
                                    .Cast<GrassCoverErosionOutwardsWaveConditionsCalculation>()
-                                   .Select(calc => CreateCalculationActivity(calc, failureMechanism, assessmentSection))
+                                   .Select(calc => CreateWaveConditionsCalculationActivity(calc, failureMechanism, assessmentSection))
                                    .ToArray();
         }
 
@@ -141,9 +141,9 @@
         /// belongs to.</param>
         /// <returns>A <see cref="CalculatableActivity"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public static CalculatableActivity CreateCalculationActivity(GrassCoverErosionOutwardsWaveConditionsCalculation calculation,
-                                                                     GrassCoverErosionOutwardsFailureMechanism failureMechanism,
-                                                                     IAssessmentSection assessmentSection)
+        public static CalculatableActivity CreateWaveConditionsCalculationActivity(GrassCoverErosionOutwardsWaveConditionsCalculation calculation,
+                                                                                   GrassCoverErosionOutwardsFailureMechanism failureMechanism,
+                                                                                   IAssessmentSection assessmentSection)
         {
             if (calculation == null)
             {
@@ -219,41 +219,41 @@
             return CreateDesignWaterLevelCalculationActivities(failureMechanism, assessmentSection, true);
         }
 
-        private static IEnumerable<CalculatableActivity> CreateDesignWaterLevelCalculationActivities(
+        private static IEnumerable<CalculatableActivity> CreateWaveHeightCalculationActivities(
             GrassCoverErosionOutwardsFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection,
             bool includeAssessmentSectionCalculations)
         {
             var activities = new List<CalculatableActivity>();
 
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                    failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm,
+            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
+                                    failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm,
                                     assessmentSection,
                                     failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
                                     RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName));
 
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                    failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm,
+            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
+                                    failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm,
                                     assessmentSection,
                                     failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
                                     RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName));
 
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                    failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm,
+            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
+                                    failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm,
                                     assessmentSection,
                                     failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
                                     RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName));
 
             if (includeAssessmentSectionCalculations)
             {
-                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                        assessmentSection.WaterLevelCalculationsForLowerLimitNorm,
+                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
+                                        assessmentSection.WaveHeightCalculationsForLowerLimitNorm,
                                         assessmentSection,
                                         failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
                                         RiskeerCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName));
 
-                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
-                                        assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
+                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
+                                        assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
                                         assessmentSection,
                                         failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
                                         RiskeerCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName));
@@ -262,41 +262,41 @@
             return activities;
         }
 
-        private static IEnumerable<CalculatableActivity> CreateWaveHeightCalculationActivities(
+        private static IEnumerable<CalculatableActivity> CreateDesignWaterLevelCalculationActivities(
             GrassCoverErosionOutwardsFailureMechanism failureMechanism,
             IAssessmentSection assessmentSection,
             bool includeAssessmentSectionCalculations)
         {
             var activities = new List<CalculatableActivity>();
 
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                    failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm,
+            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
+                                    failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm,
                                     assessmentSection,
                                     failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm),
                                     RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName));
 
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                    failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm,
+            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
+                                    failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm,
                                     assessmentSection,
                                     failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificSignalingNorm),
                                     RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName));
 
-            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                    failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm,
+            activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
+                                    failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm,
                                     assessmentSection,
                                     failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm),
                                     RiskeerCommonDataResources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName));
 
             if (includeAssessmentSectionCalculations)
             {
-                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                        assessmentSection.WaveHeightCalculationsForLowerLimitNorm,
+                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
+                                        assessmentSection.WaterLevelCalculationsForLowerLimitNorm,
                                         assessmentSection,
                                         failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.LowerLimitNorm),
                                         RiskeerCommonDataResources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName));
 
-                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(
-                                        assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
+                activities.AddRange(HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(
+                                        assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
                                         assessmentSection,
                                         failureMechanism.GetNorm(assessmentSection, FailureMechanismCategoryType.FactorizedLowerLimitNorm),
                                         RiskeerCommonDataResources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName));
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r0b44d282ef9c5ee6a070a631c73abdc5b2571fac -r8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 0b44d282ef9c5ee6a070a631c73abdc5b2571fac)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec)
@@ -80,9 +80,9 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             mockRepository.ReplayAll();
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -130,9 +130,9 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             mockRepository.ReplayAll();
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -177,9 +177,9 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             mockRepository.ReplayAll();
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -218,9 +218,9 @@
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             int nrOfCalculators = GetNrOfCalculators(calculation, failureMechanism, assessmentSection);
 
@@ -276,9 +276,9 @@
 
             calculation.InputParameters.BreakWater.Type = breakWaterType;
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator();
 
@@ -361,9 +361,9 @@
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
@@ -427,9 +427,9 @@
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
@@ -477,9 +477,9 @@
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             int nrOfCalculators = GetNrOfCalculators(calculation, failureMechanism, assessmentSection);
 
@@ -542,9 +542,9 @@
                              .Times(nrOfCalculators);
             mockRepository.ReplayAll();
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 // Call
@@ -577,9 +577,9 @@
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             var waveConditionsCosineCalculator = new TestWaveConditionsCosineCalculator
             {
@@ -626,9 +626,9 @@
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
             int nrOfCalculators = GetNrOfCalculators(calculation, failureMechanism, assessmentSection);
 
             var mockRepository = new MockRepository();
@@ -675,9 +675,9 @@
             assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true;
             assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = validPreprocessorDirectory;
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
             int nrOfCalculators = GetNrOfCalculators(calculation, failureMechanism, assessmentSection);
 
             var mockRepository = new MockRepository();
@@ -724,9 +724,9 @@
             assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = false;
             assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory";
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
             int nrOfCalculators = GetNrOfCalculators(calculation, failureMechanism, assessmentSection);
 
             var mockRepository = new MockRepository();
@@ -786,9 +786,9 @@
 
             calculation.Attach(observer);
 
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
                 activity.Run();
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs
===================================================================
diff -u -r0c01d00c000b40e935b430fcb9195e95462e76fc -r8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs	(.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs)	(revision 0c01d00c000b40e935b430fcb9195e95462e76fc)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs	(.../GrassCoverErosionOutwardsCalculationActivityFactoryTest.cs)	(revision 8a8ee290e7dba292f9d8ae9921f7166b6db0f4ec)
@@ -391,9 +391,9 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(null,
-                                                                                                                    new GrassCoverErosionOutwardsFailureMechanism(),
-                                                                                                                    assessmentSection);
+            TestDelegate test = () => GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(null,
+                                                                                                                                  new GrassCoverErosionOutwardsFailureMechanism(),
+                                                                                                                                  assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -410,9 +410,9 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(new GrassCoverErosionOutwardsWaveConditionsCalculation(),
-                                                                                                                    null,
-                                                                                                                    assessmentSection);
+            TestDelegate test = () => GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(new GrassCoverErosionOutwardsWaveConditionsCalculation(),
+                                                                                                                                  null,
+                                                                                                                                  assessmentSection);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -428,7 +428,7 @@
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
             // Call
-            TestDelegate test = () => GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation, failureMechanism, null);
+            TestDelegate test = () => GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation, failureMechanism, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -452,9 +452,9 @@
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation);
 
             // Call
-            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                          failureMechanism,
-                                                                                                                          assessmentSection);
+            CalculatableActivity activity = GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivity(calculation,
+                                                                                                                                        failureMechanism,
+                                                                                                                                        assessmentSection);
 
             // Assert
             Assert.IsInstanceOf<GrassCoverErosionOutwardsWaveConditionsCalculationActivity>(activity);