Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rf765cbda8002f3db4b7855ba9933899f7ebcf820
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
@@ -37,10 +37,10 @@
     internal static class WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions
     {
         /// <summary>
-        /// Reads the <see cref="GrassCoverErosionInwardsCalculationEntity"/> and use the
+        /// Reads the <see cref="WaveImpactAsphaltCoverWaveConditionsCalculationEntity"/> and use the
         /// information to update a <see cref="WaveImpactAsphaltCoverWaveConditionsCalculation"/>.
         /// </summary>
-        /// <param name="entity">The <see cref="GrassCoverErosionInwardsCalculationEntity"/>
+        /// <param name="entity">The <see cref="WaveImpactAsphaltCoverWaveConditionsCalculationEntity"/>
         /// to create <see cref="WaveImpactAsphaltCoverWaveConditionsCalculation"/> for.</param>
         /// <param name="collector">The object keeping track of read operations.</param>
         /// <returns>A new <see cref="WaveImpactAsphaltCoverWaveConditionsCalculation"/>.</returns>
Index: Ringtoets/Common/src/Ringtoets.Common.Data/StructureBase.cs
===================================================================
diff -u -r2f41eb6eb560911cd4ebe2d4d6924c26df911c40 -rf765cbda8002f3db4b7855ba9933899f7ebcf820
--- Ringtoets/Common/src/Ringtoets.Common.Data/StructureBase.cs	(.../StructureBase.cs)	(revision 2f41eb6eb560911cd4ebe2d4d6924c26df911c40)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/StructureBase.cs	(.../StructureBase.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
@@ -174,7 +174,7 @@
             public Point2D Location { internal get; set; }
 
             /// <summary>
-            /// Gets or sets the orientation of the closing structure, relative to north.
+            /// Gets or sets the orientation of the structure, relative to north.
             /// [degrees]
             /// </summary>
             public RoundedDouble StructureNormalOrientation
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.Designer.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -rf765cbda8002f3db4b7855ba9933899f7ebcf820
--- Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.Designer.cs	(.../ScenarioSelectionControl.Designer.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/ScenarioSelectionControl.Designer.cs	(.../ScenarioSelectionControl.Designer.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
@@ -50,7 +50,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl();
+            this.dataGridViewControl = new DataGridViewControl();
             this.SuspendLayout();
             // 
             // dataGridViewControl
@@ -63,13 +63,13 @@
             this.dataGridViewControl.Size = new System.Drawing.Size(368, 426);
             this.dataGridViewControl.TabIndex = 0;
             // 
-            // GrassCoverErosionInwardsScenariosView
+            // ScenarioSelectionControl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScroll = true;
             this.Controls.Add(this.dataGridViewControl);
-            this.Name = "GrassCoverErosionInwardsScenariosView";
+            this.Name = "ScenarioSelectionControl";
             this.Size = new System.Drawing.Size(368, 426);
             this.ResumeLayout(false);
 
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -rf765cbda8002f3db4b7855ba9933899f7ebcf820
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationHelper.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
@@ -52,13 +52,13 @@
             {
                 throw new ArgumentNullException(nameof(calculations));
             }
-            foreach (ICalculationBase calculation in locations.Select(location => CreateStabilityStoneCoverWaveConditionsCalculation(location, calculations)))
+            foreach (ICalculationBase calculation in locations.Select(location => CreateGrassCoverErosionOutwardsWaveConditionsCalculation(location, calculations)))
             {
                 calculations.Add(calculation);
             }
         }
 
-        private static ICalculationBase CreateStabilityStoneCoverWaveConditionsCalculation(
+        private static ICalculationBase CreateGrassCoverErosionOutwardsWaveConditionsCalculation(
             HydraulicBoundaryLocation hydraulicBoundaryLocation,
             IEnumerable<ICalculationBase> calculations)
         {
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/GeneralWaveConditionsInputPropertiesTest.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -rf765cbda8002f3db4b7855ba9933899f7ebcf820
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/GeneralWaveConditionsInputPropertiesTest.cs	(.../GeneralWaveConditionsInputPropertiesTest.cs)	(revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/GeneralWaveConditionsInputPropertiesTest.cs	(.../GeneralWaveConditionsInputPropertiesTest.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
@@ -45,7 +45,7 @@
         }
 
         [Test]
-        public void Data_SetNewStabilityStoneCoverFailureMechanismContext_ReturnCorrectPropertyValues()
+        public void Data_SetNewGeneralWaveConditionsInput_ReturnCorrectPropertyValues()
         {
             // Setup
             var properties = new GeneralWaveConditionsInputProperties();
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/ReadWaveConditionsCalculationTest.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -rf765cbda8002f3db4b7855ba9933899f7ebcf820
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/ReadWaveConditionsCalculationTest.cs	(.../ReadWaveConditionsCalculationTest.cs)	(revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/ReadWaveConditionsCalculationTest.cs	(.../ReadWaveConditionsCalculationTest.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
@@ -82,7 +82,7 @@
             const bool useForeshore = false;
 
             // Call
-            var readPipingCalculation = new ReadWaveConditionsCalculation(new ReadWaveConditionsCalculation.ConstructionProperties
+            var readWaveConditionsCalculation = new ReadWaveConditionsCalculation(new ReadWaveConditionsCalculation.ConstructionProperties
             {
                 Name = calculationName,
                 HydraulicBoundaryLocation = hydraulicBoundaryLocation,
@@ -100,19 +100,19 @@
             });
 
             // Assert
-            Assert.AreEqual(calculationName, readPipingCalculation.Name);
-            Assert.AreEqual(hydraulicBoundaryLocation, readPipingCalculation.HydraulicBoundaryLocation);
-            Assert.AreEqual(upperBoundaryRevetment, readPipingCalculation.UpperBoundaryRevetment);
-            Assert.AreEqual(lowerBoundaryRevetment, readPipingCalculation.LowerBoundaryRevetment);
-            Assert.AreEqual(upperBoundaryWaterLevels, readPipingCalculation.UpperBoundaryWaterLevels);
-            Assert.AreEqual(lowerBoundaryWaterLevels, readPipingCalculation.LowerBoundaryWaterLevels);
-            Assert.AreEqual(stepSize, readPipingCalculation.StepSize);
-            Assert.AreEqual(foreshoreProfileName, readPipingCalculation.ForeshoreProfile);
-            Assert.AreEqual(orientation, readPipingCalculation.Orientation);
-            Assert.AreEqual(useBreakWater, readPipingCalculation.UseBreakWater);
-            Assert.AreEqual(breakWaterType, readPipingCalculation.BreakWaterType);
-            Assert.AreEqual(breakWaterHeight, readPipingCalculation.BreakWaterHeight);
-            Assert.AreEqual(useForeshore, readPipingCalculation.UseForeshore);
+            Assert.AreEqual(calculationName, readWaveConditionsCalculation.Name);
+            Assert.AreEqual(hydraulicBoundaryLocation, readWaveConditionsCalculation.HydraulicBoundaryLocation);
+            Assert.AreEqual(upperBoundaryRevetment, readWaveConditionsCalculation.UpperBoundaryRevetment);
+            Assert.AreEqual(lowerBoundaryRevetment, readWaveConditionsCalculation.LowerBoundaryRevetment);
+            Assert.AreEqual(upperBoundaryWaterLevels, readWaveConditionsCalculation.UpperBoundaryWaterLevels);
+            Assert.AreEqual(lowerBoundaryWaterLevels, readWaveConditionsCalculation.LowerBoundaryWaterLevels);
+            Assert.AreEqual(stepSize, readWaveConditionsCalculation.StepSize);
+            Assert.AreEqual(foreshoreProfileName, readWaveConditionsCalculation.ForeshoreProfile);
+            Assert.AreEqual(orientation, readWaveConditionsCalculation.Orientation);
+            Assert.AreEqual(useBreakWater, readWaveConditionsCalculation.UseBreakWater);
+            Assert.AreEqual(breakWaterType, readWaveConditionsCalculation.BreakWaterType);
+            Assert.AreEqual(breakWaterHeight, readWaveConditionsCalculation.BreakWaterHeight);
+            Assert.AreEqual(useForeshore, readWaveConditionsCalculation.UseForeshore);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenariosView.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -rf765cbda8002f3db4b7855ba9933899f7ebcf820
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenariosView.cs	(.../StabilityPointStructuresScenariosView.cs)	(revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresScenariosView.cs	(.../StabilityPointStructuresScenariosView.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
@@ -33,7 +33,7 @@
 namespace Ringtoets.StabilityPointStructures.Forms.Views
 {
     /// <summary>
-    /// View for configuring scenarios for the closing structures failure mechanism.
+    /// View for configuring scenarios for the stability point structures failure mechanism.
     /// Shows a grid view where for each failure mechanism section, a calculation within the section
     /// can be selected.
     /// </summary>
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -rf765cbda8002f3db4b7855ba9933899f7ebcf820
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationHelper.cs)	(revision f765cbda8002f3db4b7855ba9933899f7ebcf820)
@@ -52,13 +52,13 @@
             {
                 throw new ArgumentNullException(nameof(calculations));
             }
-            foreach (ICalculationBase calculation in locations.Select(location => CreateStabilityStoneCoverWaveConditionsCalculation(location, calculations)))
+            foreach (ICalculationBase calculation in locations.Select(location => CreateWaveImpactAsphaltCoverWaveConditionsCalculation(location, calculations)))
             {
                 calculations.Add(calculation);
             }
         }
 
-        private static ICalculationBase CreateStabilityStoneCoverWaveConditionsCalculation(
+        private static ICalculationBase CreateWaveImpactAsphaltCoverWaveConditionsCalculation(
             HydraulicBoundaryLocation hydraulicBoundaryLocation,
             IEnumerable<ICalculationBase> calculations)
         {