Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r2e3c50c06378328b265871e73a111c914002dd38
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanism.cs	(.../GrassCoverErosionOutwardsFailureMechanism.cs)	(revision 2e3c50c06378328b265871e73a111c914002dd38)
@@ -57,7 +57,7 @@
             GeneralInput = new GeneralGrassCoverErosionOutwardsInput();
             WaveConditionsCalculationGroup = new CalculationGroup
             {
-                Name = RiskeerCommonDataResources.FailureMechanism_Calculations_DisplayName
+                Name = RiskeerCommonDataResources.HydraulicBoundaryConditions_DisplayName
             };
             ForeshoreProfiles = new ForeshoreProfileCollection();
         }
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -re65f20348c28437c1c69b5feebc475e01e0da9c3 -r2e3c50c06378328b265871e73a111c914002dd38
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision e65f20348c28437c1c69b5feebc475e01e0da9c3)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 2e3c50c06378328b265871e73a111c914002dd38)
@@ -342,8 +342,8 @@
             {
                 new CategoryTreeFolder(RiskeerCommonFormsResources.FailureMechanism_Inputs_DisplayName,
                                        GetHydraulicLoadsInputs(failureMechanism, assessmentSection), TreeFolderCategory.Input),
-                new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase,
-                                                                              failureMechanism, assessmentSection)
+                new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
+                                                                                   null, failureMechanism, assessmentSection)
             };
         }
 
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs
===================================================================
diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r2e3c50c06378328b265871e73a111c914002dd38
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision 87bd836d55d336e37e3d80f9a1521feb83ddc475)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismTest.cs)	(revision 2e3c50c06378328b265871e73a111c914002dd38)
@@ -48,7 +48,7 @@
             Assert.AreEqual(3, failureMechanism.Group);
             Assert.IsInstanceOf<GeneralGrassCoverErosionOutwardsInput>(failureMechanism.GeneralInput);
 
-            Assert.AreEqual("Berekeningen", failureMechanism.WaveConditionsCalculationGroup.Name);
+            Assert.AreEqual("Hydraulische belastingen", failureMechanism.WaveConditionsCalculationGroup.Name);
             CollectionAssert.IsEmpty(failureMechanism.WaveConditionsCalculationGroup.Children);
             CollectionAssert.IsEmpty(failureMechanism.ForeshoreProfiles);
             CollectionAssert.IsEmpty(failureMechanism.Sections);
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc39107003b21cf18d60d5f473f6c2ff7eef7a733 -r2e3c50c06378328b265871e73a111c914002dd38
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs)	(revision c39107003b21cf18d60d5f473f6c2ff7eef7a733)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicLoadsContextTreeNodeInfoTest.cs)	(revision 2e3c50c06378328b265871e73a111c914002dd38)
@@ -180,10 +180,11 @@
             var inputComment = (Comment) inputsFolder.Contents.ElementAt(1);
             Assert.AreSame(failureMechanism.InputComments, inputComment);
 
-            var hydraulicBoundaryDatabaseContext = (GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext) children[1];
-            Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase, hydraulicBoundaryDatabaseContext.WrappedData);
-            Assert.AreSame(failureMechanism, hydraulicBoundaryDatabaseContext.FailureMechanism);
-            Assert.AreSame(assessmentSection, hydraulicBoundaryDatabaseContext.AssessmentSection);
+            var calculationGroupContext = (GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) children[1];
+            Assert.AreSame(failureMechanism.WaveConditionsCalculationGroup, calculationGroupContext.WrappedData);
+            Assert.IsNull(calculationGroupContext.Parent);
+            Assert.AreSame(failureMechanism, calculationGroupContext.FailureMechanism);
+            Assert.AreSame(assessmentSection, calculationGroupContext.AssessmentSection);
         }
 
         [Test]
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb0899d90d287d9e53b52b7573a0c0fd66120fa16 -r2e3c50c06378328b265871e73a111c914002dd38
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision b0899d90d287d9e53b52b7573a0c0fd66120fa16)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 2e3c50c06378328b265871e73a111c914002dd38)
@@ -140,7 +140,7 @@
             string text = info.Text(context);
 
             // Assert
-            Assert.AreEqual("Berekeningen", text);
+            Assert.AreEqual("Hydraulische belastingen", text);
         }
 
         [Test]