Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs
===================================================================
diff -u -r9838d3c77d032488e2c638798ebcb6383457029c -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision 9838d3c77d032488e2c638798ebcb6383457029c)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -33,7 +33,8 @@
     /// Model containing input and output needed to perform different levels of the
     /// Grass Cover Erosion Outwards failure mechanism.
     /// </summary>
-    public class GrassCoverErosionOutwardsFailureMechanism : FailureMechanismBase<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>
+    public class GrassCoverErosionOutwardsFailureMechanism : FailureMechanismBase<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>,
+                                                             ICalculatableFailureMechanism
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="GrassCoverErosionOutwardsFailureMechanism"/> class.
@@ -42,28 +43,25 @@
             : base(Resources.GrassCoverErosionOutwardsFailureMechanism_DisplayName, Resources.GrassCoverErosionOutwardsFailureMechanism_Code)
         {
             GeneralInput = new GeneralGrassCoverErosionOutwardsInput();
-            WaveConditionsCalculationGroup = new CalculationGroup
+            CalculationsGroup = new CalculationGroup
             {
                 Name = RiskeerCommonDataResources.HydraulicBoundaryConditions_DisplayName
             };
             ForeshoreProfiles = new ForeshoreProfileCollection();
         }
 
-        public override IEnumerable<ICalculation> Calculations => WaveConditionsCalculationGroup.GetCalculations().OfType<GrassCoverErosionOutwardsWaveConditionsCalculation>();
-
         /// <summary>
         /// Gets the general grass cover erosion outwards calculation input parameters that apply to each calculation.
         /// </summary>
         public GeneralGrassCoverErosionOutwardsInput GeneralInput { get; }
 
         /// <summary>
-        /// Gets the container of all wave conditions calculations.
-        /// </summary>
-        public CalculationGroup WaveConditionsCalculationGroup { get; }
-
-        /// <summary>
         /// Gets the available foreshore profiles for this instance.
         /// </summary>
         public ForeshoreProfileCollection ForeshoreProfiles { get; }
+
+        public override IEnumerable<ICalculation> Calculations => CalculationsGroup.GetCalculations().OfType<GrassCoverErosionOutwardsWaveConditionsCalculation>();
+
+        public CalculationGroup CalculationsGroup { get; }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs
===================================================================
diff -u -re40b4b1138afe2156ccc6ecc4fde810bb8270a80 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.cs)	(revision e40b4b1138afe2156ccc6ecc4fde810bb8270a80)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsFailureMechanismView.cs	(.../GrassCoverErosionOutwardsFailureMechanismView.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -181,15 +181,15 @@
                 UpdateCalculationsMapData, pcg => pcg.Children.Concat<object>(pcg.Children.OfType<GrassCoverErosionOutwardsWaveConditionsCalculation>()
                                                                                  .Select(pc => pc.InputParameters)))
             {
-                Observable = FailureMechanism.WaveConditionsCalculationGroup
+                Observable = FailureMechanism.CalculationsGroup
             };
             calculationGroupObserver = new RecursiveObserver<CalculationGroup, CalculationGroup>(UpdateCalculationsMapData, pcg => pcg.Children)
             {
-                Observable = FailureMechanism.WaveConditionsCalculationGroup
+                Observable = FailureMechanism.CalculationsGroup
             };
             calculationObserver = new RecursiveObserver<CalculationGroup, GrassCoverErosionOutwardsWaveConditionsCalculation>(UpdateCalculationsMapData, pcg => pcg.Children)
             {
-                Observable = FailureMechanism.WaveConditionsCalculationGroup
+                Observable = FailureMechanism.CalculationsGroup
             };
             foreshoreProfileObserver = new RecursiveObserver<ForeshoreProfileCollection, ForeshoreProfile>(UpdateForeshoreProfilesMapData, coll => coll)
             {
@@ -218,7 +218,7 @@
         private void SetCalculationsMapData()
         {
             IEnumerable<GrassCoverErosionOutwardsWaveConditionsCalculation> calculations =
-                FailureMechanism.WaveConditionsCalculationGroup.GetCalculations().Cast<GrassCoverErosionOutwardsWaveConditionsCalculation>();
+                FailureMechanism.CalculationsGroup.GetCalculations().Cast<GrassCoverErosionOutwardsWaveConditionsCalculation>();
             calculationsMapData.Features = GrassCoverErosionOutwardsMapDataFeaturesFactory.CreateCalculationFeatures(calculations);
         }
 
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -re41c5d035f2641f1e1bf55b9e6f37501c8e8be95 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision e41c5d035f2641f1e1bf55b9e6f37501c8e8be95)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -325,7 +325,7 @@
             {
                 new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
                                        GetHydraulicLoadsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
-                new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+                new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                    null, failureMechanism, assessmentSection)
             };
         }
@@ -355,7 +355,7 @@
                     ActivityProgressDialogRunner.Run(
                         Gui.MainWindow,
                         GrassCoverErosionOutwardsCalculationActivityFactory
-                            .CreateWaveConditionsCalculationActivities(context.WrappedData.WaveConditionsCalculationGroup,
+                            .CreateWaveConditionsCalculationActivities(context.WrappedData.CalculationsGroup,
                                                                        context.WrappedData,
                                                                        assessmentSection));
                 });
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs
===================================================================
diff -u -rad7f51d0688a4a422d4f8a19ad4c5d9ab773b7f6 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs	(.../GrassCoverErosionOutwardsDataSynchronizationService.cs)	(revision ad7f51d0688a4a422d4f8a19ad4c5d9ab773b7f6)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs	(.../GrassCoverErosionOutwardsDataSynchronizationService.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -102,16 +102,16 @@
             var changedObjects = new List<IObservable>();
             object[] removedObjects = failureMechanism.Sections.OfType<object>()
                                                       .Concat(failureMechanism.SectionResults)
-                                                      .Concat(failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive())
+                                                      .Concat(failureMechanism.CalculationsGroup.GetAllChildrenRecursive())
                                                       .Concat(failureMechanism.ForeshoreProfiles)
                                                       .ToArray();
 
             failureMechanism.ClearAllSections();
             changedObjects.Add(failureMechanism);
             changedObjects.Add(failureMechanism.SectionResults);
 
-            failureMechanism.WaveConditionsCalculationGroup.Children.Clear();
-            changedObjects.Add(failureMechanism.WaveConditionsCalculationGroup);
+            failureMechanism.CalculationsGroup.Children.Clear();
+            changedObjects.Add(failureMechanism.CalculationsGroup);
 
             failureMechanism.ForeshoreProfiles.Clear();
             changedObjects.Add(failureMechanism.ForeshoreProfiles);
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs
===================================================================
diff -u -r548d487e693b335827451b4f395f1b30e20b9e3e -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision 548d487e693b335827451b4f395f1b30e20b9e3e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -39,12 +39,13 @@
 
             // Assert
             Assert.IsInstanceOf<FailureMechanismBase<NonAdoptableWithProfileProbabilityFailureMechanismSectionResult>>(failureMechanism);
+            Assert.IsInstanceOf<ICalculatableFailureMechanism>(failureMechanism);
             Assert.AreEqual("Grasbekleding erosie buitentalud", failureMechanism.Name);
             Assert.AreEqual("GEBU", failureMechanism.Code);
             Assert.IsInstanceOf<GeneralGrassCoverErosionOutwardsInput>(failureMechanism.GeneralInput);
 
-            Assert.AreEqual("Hydraulische belastingen", failureMechanism.WaveConditionsCalculationGroup.Name);
-            CollectionAssert.IsEmpty(failureMechanism.WaveConditionsCalculationGroup.Children);
+            Assert.AreEqual("Hydraulische belastingen", failureMechanism.CalculationsGroup.Name);
+            CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children);
             CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles);
             CollectionAssert.IsEmpty(failureMechanism.Sections);
             CollectionAssert.IsEmpty(failureMechanism.Calculations);
@@ -59,7 +60,7 @@
             var mocks = new MockRepository();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
             {
-                WaveConditionsCalculationGroup =
+                CalculationsGroup =
                 {
                     Children =
                     {
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs
===================================================================
diff -u -rc468a240211a66115916e1e5acb9302ddcd22cce -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision c468a240211a66115916e1e5acb9302ddcd22cce)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -190,8 +190,8 @@
                 profile2
             }, "path");
 
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationB);
+            failureMechanism.CalculationsGroup.Children.Add(calculationA);
+            failureMechanism.CalculationsGroup.Children.Add(calculationB);
 
             var referenceLine = new ReferenceLine();
             referenceLine.SetGeometry(new[]
@@ -409,7 +409,7 @@
                 }
             };
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA);
+            failureMechanism.CalculationsGroup.Children.Add(calculationA);
 
             GrassCoverErosionOutwardsFailureMechanismView view = CreateView(failureMechanism, new AssessmentSectionStub());
 
@@ -435,8 +435,8 @@
                     HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation()
                 }
             };
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationB);
-            failureMechanism.WaveConditionsCalculationGroup.NotifyObservers();
+            failureMechanism.CalculationsGroup.Children.Add(calculationB);
+            failureMechanism.CalculationsGroup.NotifyObservers();
 
             // Then
             AssertCalculationsMapData(failureMechanism.Calculations.Cast<GrassCoverErosionOutwardsWaveConditionsCalculation>(), calculationMapData);
@@ -457,7 +457,7 @@
                 }
             };
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA);
+            failureMechanism.CalculationsGroup.Children.Add(calculationA);
 
             GrassCoverErosionOutwardsFailureMechanismView view = CreateView(failureMechanism, new AssessmentSectionStub());
 
@@ -497,7 +497,7 @@
                 }
             };
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA);
+            failureMechanism.CalculationsGroup.Children.Add(calculationA);
 
             GrassCoverErosionOutwardsFailureMechanismView view = CreateView(failureMechanism, new AssessmentSectionStub());
 
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailurePathViewTest.cs
===================================================================
diff -u -rc5c44873ed7f7711408758865732490017eb030d -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailurePathViewTest.cs	(.../GrassCoverErosionOutwardsFailurePathViewTest.cs)	(revision c5c44873ed7f7711408758865732490017eb030d)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailurePathViewTest.cs	(.../GrassCoverErosionOutwardsFailurePathViewTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -164,8 +164,8 @@
                 profile2
             }, "path");
 
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationB);
+            failureMechanism.CalculationsGroup.Children.Add(calculationA);
+            failureMechanism.CalculationsGroup.Children.Add(calculationB);
 
             using (new AssemblyToolCalculatorFactoryConfig())
             {
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5e8b21352cfe76480799a139f21d2ef3c1b58ec7 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs)	(revision 5e8b21352cfe76480799a139f21d2ef3c1b58ec7)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -179,7 +179,7 @@
             Assert.AreSame(failureMechanism.CalculationsInputComments, calculationsInputComments);
 
             var calculationGroupContext = (GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) children[1];
-            Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, calculationGroupContext.WrappedData);
+            Assert.AreSame(failureMechanism.CalculationsGroup, calculationGroupContext.WrappedData);
             Assert.IsNull(calculationGroupContext.Parent);
             Assert.AreSame(failureMechanism, calculationGroupContext.FailureMechanism);
             Assert.AreSame(assessmentSection, calculationGroupContext.AssessmentSection);
@@ -228,7 +228,7 @@
         {
             // Setup
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation());
+            failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation());
 
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
@@ -319,7 +319,7 @@
                 new TestHydraulicBoundaryLocationCalculationOutput(2.0);
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
+            failureMechanism.CalculationsGroup.Children.Add(calculation);
 
             var context = new GrassCoverErosionOutwardsHydraulicLoadsContext(failureMechanism, assessmentSection);
 
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -214,13 +214,13 @@
                 Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
+            failureMechanism.CalculationsGroup.Children.Add(calculation);
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
                                                                                         parent,
                                                                                         failureMechanism,
                                                                                         assessmentSection);
 
-            var parentContext = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentContext = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                    null,
                                                                                                    failureMechanism,
                                                                                                    assessmentSection);
@@ -250,7 +250,7 @@
                                                                                         failureMechanism,
                                                                                         assessmentSection);
 
-            var parentContext = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentContext = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                    null,
                                                                                                    failureMechanism,
                                                                                                    assessmentSection);
@@ -277,14 +277,14 @@
                 Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
-            failureMechanism.WaveConditionsCalculationGroup.Attach(observer);
+            failureMechanism.CalculationsGroup.Children.Add(calculation);
+            failureMechanism.CalculationsGroup.Attach(observer);
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
                                                                                         parent,
                                                                                         failureMechanism,
                                                                                         assessmentSection);
 
-            var parentContext = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentContext = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                    null,
                                                                                                    failureMechanism,
                                                                                                    assessmentSection);
@@ -293,7 +293,7 @@
             info.OnNodeRemoved(context, parentContext);
 
             // Assert
-            CollectionAssert.DoesNotContain(failureMechanism.WaveConditionsCalculationGroup.Children, calculation);
+            CollectionAssert.DoesNotContain(failureMechanism.CalculationsGroup.Children, calculation);
         }
 
         [Test]
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -130,7 +130,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                              null,
                                                                                              failureMechanism,
                                                                                              assessmentSection);
@@ -150,7 +150,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                              null,
                                                                                              failureMechanism,
                                                                                              assessmentSection);
@@ -170,7 +170,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            var groupContext = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var groupContext = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                   null,
                                                                                                   failureMechanism,
                                                                                                   assessmentSection);
@@ -193,10 +193,10 @@
             var calculationItem = new GrassCoverErosionOutwardsWaveConditionsCalculation();
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationItem);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(childGroup);
+            failureMechanism.CalculationsGroup.Children.Add(calculationItem);
+            failureMechanism.CalculationsGroup.Children.Add(childGroup);
 
-            var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                               null,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
@@ -205,17 +205,17 @@
             object[] children = info.ChildNodeObjects(nodeData).ToArray();
 
             // Assert
-            Assert.AreEqual(failureMechanism.WaveConditionsCalculationGroup.Children.Count, children.Length);
+            Assert.AreEqual(failureMechanism.CalculationsGroup.Children.Count, children.Length);
 
             var returnedCalculationContext = (GrassCoverErosionOutwardsWaveConditionsCalculationContext) children[0];
             Assert.AreSame(calculationItem, returnedCalculationContext.WrappedData);
-            Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationContext.Parent);
+            Assert.AreSame(failureMechanism.CalculationsGroup, returnedCalculationContext.Parent);
             Assert.AreSame(failureMechanism, returnedCalculationContext.FailureMechanism);
             Assert.AreSame(assessmentSection, returnedCalculationContext.AssessmentSection);
 
             var returnedCalculationGroupContext = (GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) children[1];
             Assert.AreSame(childGroup, returnedCalculationGroupContext.WrappedData);
-            Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, returnedCalculationGroupContext.Parent);
+            Assert.AreSame(failureMechanism.CalculationsGroup, returnedCalculationGroupContext.Parent);
             Assert.AreSame(failureMechanism, returnedCalculationGroupContext.FailureMechanism);
             Assert.AreSame(assessmentSection, returnedCalculationGroupContext.AssessmentSection);
         }
@@ -470,7 +470,7 @@
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
-            var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                               null,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
@@ -576,7 +576,7 @@
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
-            var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                               null,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
@@ -670,14 +670,14 @@
                 var group = new CalculationGroup();
 
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-                failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+                failureMechanism.CalculationsGroup.Children.Add(group);
 
                 IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
                 var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                                  failureMechanism.WaveConditionsCalculationGroup,
+                                                                                                  failureMechanism.CalculationsGroup,
                                                                                                   failureMechanism,
                                                                                                   assessmentSection);
-                var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+                var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                         null,
                                                                                                         failureMechanism,
                                                                                                         assessmentSection);
@@ -712,14 +712,14 @@
                 group.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation());
 
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-                failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+                failureMechanism.CalculationsGroup.Children.Add(group);
 
                 IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
                 var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                                  failureMechanism.WaveConditionsCalculationGroup,
+                                                                                                  failureMechanism.CalculationsGroup,
                                                                                                   failureMechanism,
                                                                                                   assessmentSection);
-                var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+                var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                         null,
                                                                                                         failureMechanism,
                                                                                                         assessmentSection);
@@ -754,15 +754,15 @@
                 group.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation());
 
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-                failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+                failureMechanism.CalculationsGroup.Children.Add(group);
 
                 IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath");
 
                 var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                                  failureMechanism.WaveConditionsCalculationGroup,
+                                                                                                  failureMechanism.CalculationsGroup,
                                                                                                   failureMechanism,
                                                                                                   assessmentSection);
-                var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+                var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                         null,
                                                                                                         failureMechanism,
                                                                                                         assessmentSection);
@@ -799,7 +799,7 @@
             group.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation());
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
 
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
@@ -811,10 +811,10 @@
             assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase);
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -859,13 +859,13 @@
             group.Children.Add(calculationB);
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -914,12 +914,12 @@
             group.Children.Add(calculation);
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -970,13 +970,13 @@
             group.Children.Add(calculation);
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -1027,13 +1027,13 @@
             group.Children.Add(calculation);
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -1093,17 +1093,17 @@
             group.Children.Add(calculation);
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
 
             assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true;
             assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessor = true;
             assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "InvalidPreprocessorDirectory";
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -1154,13 +1154,13 @@
             group.Children.Add(calculationB);
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -1225,16 +1225,16 @@
             var group = new CalculationGroup();
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
 
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
                 failureMechanism, mocks, validFilePath);
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -1278,13 +1278,13 @@
             group.Children.Add(calculationA);
             group.Children.Add(calculationB);
 
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -1341,13 +1341,13 @@
             calculationA.Attach(observerA);
             calculationB.Attach(observerB);
 
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+            failureMechanism.CalculationsGroup.Children.Add(group);
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -1404,13 +1404,13 @@
                 var group = new CalculationGroup();
 
                 var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-                failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
+                failureMechanism.CalculationsGroup.Children.Add(group);
 
                 var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                                  failureMechanism.WaveConditionsCalculationGroup,
+                                                                                                  failureMechanism.CalculationsGroup,
                                                                                                   failureMechanism,
                                                                                                   assessmentSection);
-                var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+                var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                         null,
                                                                                                         failureMechanism,
                                                                                                         assessmentSection);
@@ -1614,7 +1614,7 @@
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks);
 
-            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                              null,
                                                                                              failureMechanism,
                                                                                              assessmentSection);
@@ -1662,10 +1662,10 @@
             observer.Expect(o => o.UpdateObserver());
 
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Attach(observer);
+            failureMechanism.CalculationsGroup.Attach(observer);
 
             var assessmentSection = new AssessmentSectionStub();
-            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                              null,
                                                                                              failureMechanism,
                                                                                              assessmentSection);
@@ -1698,8 +1698,8 @@
                     validateMenuItem.PerformClick();
 
                     // Then
-                    Assert.AreEqual(1, failureMechanism.WaveConditionsCalculationGroup.Children.Count);
-                    Assert.IsInstanceOf<GrassCoverErosionOutwardsWaveConditionsCalculation>(failureMechanism.WaveConditionsCalculationGroup.Children[0]);
+                    Assert.AreEqual(1, failureMechanism.CalculationsGroup.Children.Count);
+                    Assert.IsInstanceOf<GrassCoverErosionOutwardsWaveConditionsCalculation>(failureMechanism.CalculationsGroup.Children[0]);
                     // Check expectancies in TearDown()
                 }
             }
@@ -1720,12 +1720,12 @@
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group,
-                                                                                              failureMechanism.WaveConditionsCalculationGroup,
+                                                                                              failureMechanism.CalculationsGroup,
                                                                                               failureMechanism,
                                                                                               assessmentSection);
 
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(group);
-            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+            failureMechanism.CalculationsGroup.Children.Add(group);
+            var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                                     null,
                                                                                                     failureMechanism,
                                                                                                     assessmentSection);
@@ -1738,7 +1738,7 @@
             info.OnNodeRemoved(nodeData, parentNodeData);
 
             // Assert
-            CollectionAssert.DoesNotContain(failureMechanism.WaveConditionsCalculationGroup.Children, group);
+            CollectionAssert.DoesNotContain(failureMechanism.CalculationsGroup.Children, group);
         }
 
         [Test]
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -r013435ed49ecc69ce2a584e37c9d0d7039fa6a7b -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs)	(revision 013435ed49ecc69ce2a584e37c9d0d7039fa6a7b)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ViewInfos/GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputViewInfoTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -196,11 +196,11 @@
                 new AssessmentSectionStub());
         }
 
-        protected override IFailureMechanism GetFailureMechanismWithCalculation()
+        protected override ICalculatableFailureMechanism GetFailureMechanismWithCalculation()
         {
             return new GrassCoverErosionOutwardsFailureMechanism
             {
-                WaveConditionsCalculationGroup =
+                CalculationsGroup =
                 {
                     Children =
                     {
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -rad7f51d0688a4a422d4f8a19ad4c5d9ab773b7f6 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision ad7f51d0688a4a422d4f8a19ad4c5d9ab773b7f6)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -128,7 +128,7 @@
 
             object[] expectedRemovedObjects = failureMechanism.Sections.OfType<object>()
                                                               .Concat(failureMechanism.SectionResults)
-                                                              .Concat(failureMechanism.WaveConditionsCalculationGroup.GetAllChildrenRecursive())
+                                                              .Concat(failureMechanism.CalculationsGroup.GetAllChildrenRecursive())
                                                               .Concat(failureMechanism.ForeshoreProfiles)
                                                               .ToArray();
 
@@ -138,14 +138,14 @@
             // Assert
             CollectionAssert.IsEmpty(failureMechanism.Sections);
             CollectionAssert.IsEmpty(failureMechanism.SectionResults);
-            CollectionAssert.IsEmpty(failureMechanism.WaveConditionsCalculationGroup.Children);
+            CollectionAssert.IsEmpty(failureMechanism.CalculationsGroup.Children);
             CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles);
 
             IObservable[] array = results.ChangedObjects.ToArray();
             Assert.AreEqual(4, array.Length);
             CollectionAssert.Contains(array, failureMechanism);
             CollectionAssert.Contains(array, failureMechanism.SectionResults);
-            CollectionAssert.Contains(array, failureMechanism.WaveConditionsCalculationGroup);
+            CollectionAssert.Contains(array, failureMechanism.CalculationsGroup);
             CollectionAssert.Contains(array, failureMechanism.ForeshoreProfiles);
 
             CollectionAssert.AreEquivalent(expectedRemovedObjects, results.RemovedObjects);
@@ -215,11 +215,11 @@
                 }
             };
 
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutput);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithHydraulicBoundaryLocation);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup
+            failureMechanism.CalculationsGroup.Children.Add(calculation);
+            failureMechanism.CalculationsGroup.Children.Add(calculationWithOutput);
+            failureMechanism.CalculationsGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation);
+            failureMechanism.CalculationsGroup.Children.Add(calculationWithHydraulicBoundaryLocation);
+            failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup
             {
                 Children =
                 {
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r8858dcdf5d4cec2dfa3492666a001146a7e6d849 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs	(.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs)	(revision 8858dcdf5d4cec2dfa3492666a001146a7e6d849)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs	(.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -48,7 +48,7 @@
             AddEntitiesForSectionResults(mechanism.SectionResults, registry);
             AddEntitiesForFailureMechanismMeta(mechanism, entity);
             AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry);
-            entity.CalculationGroupEntity = mechanism.WaveConditionsCalculationGroup.Create(registry, 0);
+            entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0);
 
             return entity;
         }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -rd9ce7218c61d2ecb9dba1d9305ef9ab3d5e22d22 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision d9ce7218c61d2ecb9dba1d9305ef9ab3d5e22d22)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs	(.../FailureMechanismEntityReadExtensions.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -585,7 +585,7 @@
                                   metaEntity.ForeshoreProfileCollectionSourcePath,
                                   collector);
 
-            ReadGrassCoverErosionOutwardsWaveConditionsRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.WaveConditionsCalculationGroup, collector);
+            ReadGrassCoverErosionOutwardsWaveConditionsRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.CalculationsGroup, collector);
         }
 
         private static void ReadGeneralGrassCoverErosionOutwardsCalculationInput(this FailureMechanismEntity entity,
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r034eb23a81ab16ac89cf642d0aefab0f25112822 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 034eb23a81ab16ac89cf642d0aefab0f25112822)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -217,11 +217,11 @@
         {
             // Setup
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup
+            failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup
             {
                 Name = "A"
             });
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup
+            failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup
             {
                 Name = "B"
             });
@@ -233,7 +233,7 @@
 
             // Assert
             Assert.IsNotNull(entity);
-            Assert.AreEqual(failureMechanism.WaveConditionsCalculationGroup.Name, entity.CalculationGroupEntity.Name);
+            Assert.AreEqual(failureMechanism.CalculationsGroup.Name, entity.CalculationGroupEntity.Name);
             Assert.AreEqual(0, entity.CalculationGroupEntity.Order);
 
             CalculationGroupEntity[] childGroupEntities = entity.CalculationGroupEntity.CalculationGroupEntity1
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r09651a80693da0708c1a2e745387645aa367d6d2 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 09651a80693da0708c1a2e745387645aa367d6d2)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -1742,7 +1742,7 @@
         {
             Assert.AreEqual(expectedFailureMechanism.GeneralInput.N, actualFailureMechanism.GeneralInput.N);
             AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles);
-            AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup);
+            AssertCalculationGroup(expectedFailureMechanism.CalculationsGroup, actualFailureMechanism.CalculationsGroup);
         }
 
         private static void AssertGrassCoverErosionOutwardsWaveConditionsCalculation(GrassCoverErosionOutwardsWaveConditionsCalculation expectedCalculation,
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r6a1e3c8c1d0ba628c20545c609497674039e11eb -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision 6a1e3c8c1d0ba628c20545c609497674039e11eb)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs	(.../FailureMechanismEntityReadExtensionsTest.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -1804,12 +1804,12 @@
             entity.ReadAsGrassCoverErosionOutwardsFailureMechanism(failureMechanism, collector);
 
             // Assert
-            Assert.AreEqual(2, failureMechanism.WaveConditionsCalculationGroup.Children.Count);
+            Assert.AreEqual(2, failureMechanism.CalculationsGroup.Children.Count);
 
-            ICalculationBase child1 = failureMechanism.WaveConditionsCalculationGroup.Children[0];
+            ICalculationBase child1 = failureMechanism.CalculationsGroup.Children[0];
             Assert.AreEqual("Child1", child1.Name);
 
-            ICalculationBase child2 = failureMechanism.WaveConditionsCalculationGroup.Children[1];
+            ICalculationBase child2 = failureMechanism.CalculationsGroup.Children[1];
             Assert.AreEqual("Child2", child2.Name);
         }
 
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r6044ea132c4c7e98cb6e08bad7e939a9fa460459 -r9e166d21af80d81af53fbc4a1cabfcc18f6f0f11
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 6044ea132c4c7e98cb6e08bad7e939a9fa460459)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 9e166d21af80d81af53fbc4a1cabfcc18f6f0f11)
@@ -988,7 +988,7 @@
             failureMechanism.GeneralInput.N = (RoundedDouble) 15.0;
             ForeshoreProfile foreshoreProfile = failureMechanism.ForeshoreProfiles[0];
             HydraulicBoundaryLocation hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup
+            failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup
             {
                 Name = "GCEO A",
                 Children =
@@ -1052,11 +1052,11 @@
                     }
                 }
             });
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup
+            failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup
             {
                 Name = "GCEO B"
             });
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(
+            failureMechanism.CalculationsGroup.Children.Add(
                 new GrassCoverErosionOutwardsWaveConditionsCalculation
                 {
                     Name = "Calculation 3",