Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r908e93cfb3170d7185edd06dfddc79158f1a2d8b
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext.cs)	(revision 908e93cfb3170d7185edd06dfddc79158f1a2d8b)
@@ -29,7 +29,8 @@
 namespace Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for <see cref="GrassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup"/>.
+    /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
+    /// in order be able to create configurable grass cover erosion outwards calculations.
     /// </summary>
     public class GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext : GrassCoverErosionOutwardsContext<CalculationGroup>,
                                                                                   ICalculationContext<CalculationGroup, GrassCoverErosionOutwardsFailureMechanism>
Index: Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionCalculationActivityFactory.cs
===================================================================
diff -u -r80df1ae01bb2f125debce54079c7bae5ce23f0fb -r908e93cfb3170d7185edd06dfddc79158f1a2d8b
--- Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionCalculationActivityFactory.cs	(.../AssessmentSectionCalculationActivityFactory.cs)	(revision 80df1ae01bb2f125debce54079c7bae5ce23f0fb)
+++ Riskeer/Integration/src/Riskeer.Integration.Service/AssessmentSectionCalculationActivityFactory.cs	(.../AssessmentSectionCalculationActivityFactory.cs)	(revision 908e93cfb3170d7185edd06dfddc79158f1a2d8b)
@@ -66,7 +66,7 @@
                                     assessmentSection.WaveImpactAsphaltCover,
                                     assessmentSection));
             activities.AddRange(GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivities(
-                                    assessmentSection.GrassCoverErosionOutwards.WaveConditionsCalculationGroup,
+                                    assessmentSection.GrassCoverErosionOutwards.CalculationsGroup,
                                     assessmentSection.GrassCoverErosionOutwards,
                                     assessmentSection));
             activities.AddRange(DuneLocationCalculationActivityFactory.CreateCalculationActivities(
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs
===================================================================
diff -u -rce0d5a12b407aa5a11f8c0930137e7404b7dad65 -r908e93cfb3170d7185edd06dfddc79158f1a2d8b
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs	(.../ReferenceLineUpdateHandlerTest.cs)	(revision ce0d5a12b407aa5a11f8c0930137e7404b7dad65)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/ReferenceLineUpdateHandlerTest.cs	(.../ReferenceLineUpdateHandlerTest.cs)	(revision 908e93cfb3170d7185edd06dfddc79158f1a2d8b)
@@ -238,8 +238,8 @@
             CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.SectionResults);
             CollectionAssert.Contains(observables, grassCoverErosionOutwardsFailureMechanism);
             CollectionAssert.Contains(observables, grassCoverErosionOutwardsFailureMechanism.SectionResults);
-            CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children);
-            CollectionAssert.Contains(observables, grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup);
+            CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.CalculationsGroup.Children);
+            CollectionAssert.Contains(observables, grassCoverErosionOutwardsFailureMechanism.CalculationsGroup);
             CollectionAssert.IsEmpty(grassCoverErosionOutwardsFailureMechanism.ForeshoreProfiles);
             CollectionAssert.Contains(observables, grassCoverErosionOutwardsFailureMechanism.ForeshoreProfiles);
 
@@ -248,8 +248,8 @@
             CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.SectionResults);
             CollectionAssert.Contains(observables, waveImpactAsphaltCoverFailureMechanism);
             CollectionAssert.Contains(observables, waveImpactAsphaltCoverFailureMechanism.SectionResults);
-            CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children);
-            CollectionAssert.Contains(observables, waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup);
+            CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.CalculationsGroup.Children);
+            CollectionAssert.Contains(observables, waveImpactAsphaltCoverFailureMechanism.CalculationsGroup);
             CollectionAssert.IsEmpty(waveImpactAsphaltCoverFailureMechanism.ForeshoreProfiles);
             CollectionAssert.Contains(observables, waveImpactAsphaltCoverFailureMechanism.ForeshoreProfiles);
 
@@ -258,8 +258,8 @@
             CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.SectionResults);
             CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism);
             CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism.SectionResults);
-            CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children);
-            CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup);
+            CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.CalculationsGroup.Children);
+            CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism.CalculationsGroup);
             CollectionAssert.IsEmpty(stabilityStoneCoverFailureMechanism.ForeshoreProfiles);
             CollectionAssert.Contains(observables, stabilityStoneCoverFailureMechanism.ForeshoreProfiles);
 
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs
===================================================================
diff -u -r9e8565e658e319bb528ba65adf0ed1fddb285953 -r908e93cfb3170d7185edd06dfddc79158f1a2d8b
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision 9e8565e658e319bb528ba65adf0ed1fddb285953)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs	(.../AssessmentSectionMergeHandlerTest.cs)	(revision 908e93cfb3170d7185edd06dfddc79158f1a2d8b)
@@ -422,21 +422,21 @@
                     HydraulicBoundaryLocation = sourceLocations[1]
                 }
             });
-            sourceAssessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Add(new StabilityStoneCoverWaveConditionsCalculation
+            sourceAssessmentSection.StabilityStoneCover.CalculationsGroup.Children.Add(new StabilityStoneCoverWaveConditionsCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = sourceLocations[0]
                 }
             });
-            sourceAssessmentSection.WaveImpactAsphaltCover.WaveConditionsCalculationGroup.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation
+            sourceAssessmentSection.WaveImpactAsphaltCover.CalculationsGroup.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = sourceLocations[1]
                 }
             });
-            sourceAssessmentSection.GrassCoverErosionOutwards.WaveConditionsCalculationGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation
+            sourceAssessmentSection.GrassCoverErosionOutwards.CalculationsGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 InputParameters =
                 {
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r908e93cfb3170d7185edd06dfddc79158f1a2d8b
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 908e93cfb3170d7185edd06dfddc79158f1a2d8b)
@@ -359,7 +359,7 @@
         private static void AddStabilityStoneCoverCalculation(AssessmentSection assessmentSection,
                                                               HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            assessmentSection.StabilityStoneCover.WaveConditionsCalculationGroup.Children.Add(new StabilityStoneCoverWaveConditionsCalculation
+            assessmentSection.StabilityStoneCover.CalculationsGroup.Children.Add(new StabilityStoneCoverWaveConditionsCalculation
             {
                 InputParameters =
                 {
@@ -379,7 +379,7 @@
         private static void AddWaveImpactAsphaltCoverCalculation(AssessmentSection assessmentSection,
                                                                  HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            assessmentSection.WaveImpactAsphaltCover.WaveConditionsCalculationGroup.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation
+            assessmentSection.WaveImpactAsphaltCover.CalculationsGroup.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation
             {
                 InputParameters =
                 {
@@ -399,7 +399,7 @@
         private static void AddGrassCoverErosionOutwardsCalculation(AssessmentSection assessmentSection,
                                                                     HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
-            assessmentSection.GrassCoverErosionOutwards.WaveConditionsCalculationGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation
+            assessmentSection.GrassCoverErosionOutwards.CalculationsGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 InputParameters =
                 {
Index: Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r908e93cfb3170d7185edd06dfddc79158f1a2d8b
--- Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs	(.../ForeshoreProfileUpdateDataStrategyIntegrationTest.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs	(.../ForeshoreProfileUpdateDataStrategyIntegrationTest.cs)	(revision 908e93cfb3170d7185edd06dfddc79158f1a2d8b)
@@ -257,7 +257,7 @@
                     new TestWaveConditionsOutput()
                 })
             };
-            waveImpactAsphaltCoverFailureMechanism.WaveConditionsCalculationGroup.Children.Add(unaffectedCalculation);
+            waveImpactAsphaltCoverFailureMechanism.CalculationsGroup.Children.Add(unaffectedCalculation);
             return waveImpactAsphaltCoverFailureMechanism;
         }
 
@@ -278,7 +278,7 @@
                 },
                 Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
-            grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children.Add(unaffectedCalculation);
+            grassCoverErosionOutwardsFailureMechanism.CalculationsGroup.Children.Add(unaffectedCalculation);
             return grassCoverErosionOutwardsFailureMechanism;
         }
 
@@ -299,7 +299,7 @@
                 },
                 Output = StabilityStoneCoverWaveConditionsOutputTestFactory.Create()
             };
-            stabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup.Children.Add(unaffectedCalculation);
+            stabilityStoneCoverFailureMechanism.CalculationsGroup.Children.Add(unaffectedCalculation);
             return stabilityStoneCoverFailureMechanism;
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -rce73d815b0583615c74550ba004fd553202b43fe -r908e93cfb3170d7185edd06dfddc79158f1a2d8b
--- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision ce73d815b0583615c74550ba004fd553202b43fe)
+++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 908e93cfb3170d7185edd06dfddc79158f1a2d8b)
@@ -824,12 +824,12 @@
                 }
             };
 
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithForeshoreProfile);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocationAndForeshoreProfile);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithHydraulicBoundaryLocation);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup
+            failureMechanism.CalculationsGroup.Children.Add(calculation);
+            failureMechanism.CalculationsGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation);
+            failureMechanism.CalculationsGroup.Children.Add(calculationWithForeshoreProfile);
+            failureMechanism.CalculationsGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocationAndForeshoreProfile);
+            failureMechanism.CalculationsGroup.Children.Add(calculationWithHydraulicBoundaryLocation);
+            failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup
             {
                 Children =
                 {
Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContext.cs
===================================================================
diff -u -r2ef21b0f4d85a5c9689720d539254a1d5c907be7 -r908e93cfb3170d7185edd06dfddc79158f1a2d8b
--- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContext.cs)	(revision 2ef21b0f4d85a5c9689720d539254a1d5c907be7)
+++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContext.cs)	(revision 908e93cfb3170d7185edd06dfddc79158f1a2d8b)
@@ -29,7 +29,8 @@
 namespace Riskeer.StabilityStoneCover.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for <see cref="StabilityStoneCoverFailureMechanism.WaveConditionsCalculationGroup"/>.
+    /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
+    /// in order be able to create configurable stability stone cover calculations.
     /// </summary>
     public class StabilityStoneCoverWaveConditionsCalculationGroupContext : StabilityStoneCoverContext<CalculationGroup>,
                                                                             ICalculationContext<CalculationGroup, StabilityStoneCoverFailureMechanism>