Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r7f8860b7aa23930fb9f49e9a28d8ebb709395cb5
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 7f8860b7aa23930fb9f49e9a28d8ebb709395cb5)
@@ -785,7 +785,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileDisabledAndToolTipSet()
+        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileEnabledAndToolTipSet()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -794,7 +794,7 @@
             var foreshoreProfileInput = new TestForeshoreProfile();
             var calculation = new StructuresCalculation<ClosingStructuresInput>();
             calculation.InputParameters.ForeshoreProfile = foreshoreProfileInput;
-            TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+            TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
             var nodeData = new ClosingStructuresCalculationContext(calculation,
                                                                    failureMechanism,
@@ -856,7 +856,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
@@ -930,7 +930,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestForeshoreProfileTest.cs
===================================================================
diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r7f8860b7aa23930fb9f49e9a28d8ebb709395cb5
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestForeshoreProfileTest.cs	(.../TestForeshoreProfileTest.cs)	(revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestForeshoreProfileTest.cs	(.../TestForeshoreProfileTest.cs)	(revision 7f8860b7aa23930fb9f49e9a28d8ebb709395cb5)
@@ -196,10 +196,10 @@
         }
 
         [Test]
-        public void ChangeForeshoreProfile_ForeshoreProfileNull_ThrowsArgumentNullException()
+        public void ChangeBreakWaterProperties_ForeshoreProfileNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => TestForeshoreProfile.ModifyForeshoreProfileProperties(null);
+            TestDelegate call = () => TestForeshoreProfile.ChangeBreakWaterProperties(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -209,7 +209,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void ChangeForeshoreProfile_ForeshoreProfileHasBreakWater_ChangesProperties(bool hasBreakWater)
+        public void ChangeBreakWaterProperties_ForeshoreProfileHasBreakWater_ChangesProperties(bool hasBreakWater)
         {
             // Setup
             TestForeshoreProfile profile = hasBreakWater
@@ -219,7 +219,7 @@
                                                : new TestForeshoreProfile("WithoutBreakWater");
 
             // Call
-            TestForeshoreProfile.ModifyForeshoreProfileProperties(profile);
+            TestForeshoreProfile.ChangeBreakWaterProperties(profile);
 
             // Assert
             if (hasBreakWater)
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs
===================================================================
diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r7f8860b7aa23930fb9f49e9a28d8ebb709395cb5
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs	(.../TestForeshoreProfile.cs)	(revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs	(.../TestForeshoreProfile.cs)	(revision 7f8860b7aa23930fb9f49e9a28d8ebb709395cb5)
@@ -130,14 +130,14 @@
                    }) {}
 
         /// <summary>
-        /// Modifies some properties of the current instance of the foreshore profile 
-        /// to different values.
+        /// Modifies <see cref="BreakWater"/> properties of the current instance 
+        /// of the foreshore profile to different values.
         /// </summary>
-        /// <param name="foreshoreProfile">The current instance of which the properties which 
+        /// <param name="foreshoreProfile">The current instance of which the properties 
         /// need to be modified.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="foreshoreProfile"/>
         /// is <c>null</c>.</exception>
-        public static void ModifyForeshoreProfileProperties(TestForeshoreProfile foreshoreProfile)
+        public static void ChangeBreakWaterProperties(TestForeshoreProfile foreshoreProfile)
         {
             if (foreshoreProfile == null)
             {
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs
===================================================================
diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r7f8860b7aa23930fb9f49e9a28d8ebb709395cb5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs	(.../RingtoetsContextMenuItemFactoryTest.cs)	(revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuItemFactoryTest.cs	(.../RingtoetsContextMenuItemFactoryTest.cs)	(revision 7f8860b7aa23930fb9f49e9a28d8ebb709395cb5)
@@ -607,7 +607,7 @@
             var input = mocks.StrictMock<ICalculationInputWithForeshoreProfile>();
             input.Expect(ci => ci.ForeshoreProfile).Return(null);
 
-            calculation.Expect(c => c.InputParameters).Return(input).Repeat.Any();
+            calculation.Stub(c => c.InputParameters).Return(input);
             var inquiryHelper = mocks.StrictMock<IInquiryHelper>();
             mocks.ReplayAll();
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r7f8860b7aa23930fb9f49e9a28d8ebb709395cb5
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 7f8860b7aa23930fb9f49e9a28d8ebb709395cb5)
@@ -834,7 +834,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileDisabledAndToolTipSet()
+        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileEnabledAndToolTipSet()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -843,7 +843,7 @@
             var foreshoreProfileInput = new TestForeshoreProfile();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
             calculation.InputParameters.ForeshoreProfile = foreshoreProfileInput;
-            TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+            TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
                                                                                          failureMechanism,
@@ -907,7 +907,7 @@
 
                 plugin.Gui = guiStub;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
@@ -982,7 +982,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r7f8860b7aa23930fb9f49e9a28d8ebb709395cb5
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 7f8860b7aa23930fb9f49e9a28d8ebb709395cb5)
@@ -939,7 +939,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileDisabledAndToolTipSet()
+        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileEnabledAndToolTipSet()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -948,7 +948,7 @@
             var foreshoreProfileInput = new TestForeshoreProfile();
             var calculation = new StructuresCalculation<HeightStructuresInput>();
             calculation.InputParameters.ForeshoreProfile = foreshoreProfileInput;
-            TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+            TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
             var nodeData = new HeightStructuresCalculationContext(calculation,
                                                                   failureMechanism,
@@ -1012,7 +1012,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
@@ -1087,7 +1087,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r7f8860b7aa23930fb9f49e9a28d8ebb709395cb5
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 7f8860b7aa23930fb9f49e9a28d8ebb709395cb5)
@@ -762,7 +762,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileDisabledAndToolTipSet()
+        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileEnabledAndToolTipSet()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -771,7 +771,7 @@
             var foreshoreProfileInput = new TestForeshoreProfile();
             var calculation = new StructuresCalculation<StabilityPointStructuresInput>();
             calculation.InputParameters.ForeshoreProfile = foreshoreProfileInput;
-            TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+            TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
             var nodeData = new StabilityPointStructuresCalculationContext(calculation,
                                                                           failureMechanism,
@@ -835,7 +835,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
@@ -910,7 +910,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r7f8860b7aa23930fb9f49e9a28d8ebb709395cb5
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 7f8860b7aa23930fb9f49e9a28d8ebb709395cb5)
@@ -801,7 +801,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileDisabledAndToolTipSet()
+        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileEnabledAndToolTipSet()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -810,7 +810,7 @@
             var foreshoreProfileInput = new TestForeshoreProfile();
             var calculation = new StabilityStoneCoverWaveConditionsCalculation();
             calculation.InputParameters.ForeshoreProfile = foreshoreProfileInput;
-            TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+            TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
             var nodeData = new StabilityStoneCoverWaveConditionsCalculationContext(calculation,
                                                                                    failureMechanism,
@@ -874,7 +874,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
@@ -949,7 +949,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r25b0a55f2aeac2edab0cd8b002309a63971e1db4 -r7f8860b7aa23930fb9f49e9a28d8ebb709395cb5
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 25b0a55f2aeac2edab0cd8b002309a63971e1db4)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 7f8860b7aa23930fb9f49e9a28d8ebb709395cb5)
@@ -759,7 +759,7 @@
         }
 
         [Test]
-        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileDisabledAndToolTipSet()
+        public void ContextMenuStrip_CalculationWithForeshoreProfileAndInputOutSync_ContextMenuItemUpdateForeshoreProfileEnabledAndToolTipSet()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -768,7 +768,7 @@
             var foreshoreProfileInput = new TestForeshoreProfile();
             var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation();
             calculation.InputParameters.ForeshoreProfile = foreshoreProfileInput;
-            TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+            TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
             var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(calculation,
                                                                                       failureMechanism,
@@ -832,7 +832,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
@@ -907,7 +907,7 @@
 
                 plugin.Gui = gui;
 
-                TestForeshoreProfile.ModifyForeshoreProfileProperties(foreshoreProfileInput);
+                TestForeshoreProfile.ChangeBreakWaterProperties(foreshoreProfileInput);
 
                 // Precondition
                 Assert.IsFalse(calculation.InputParameters.IsForeshoreProfileInputSynchronized);