Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupTest.cs
===================================================================
diff -u -rfff12e249602fb700b2854c14a3b7cdd0b73c023 -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupTest.cs	(.../CalculationGroupTest.cs)	(revision fff12e249602fb700b2854c14a3b7cdd0b73c023)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Calculation/CalculationGroupTest.cs	(.../CalculationGroupTest.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -37,7 +37,7 @@
             var group = new CalculationGroup();
 
             // Assert
-            Assert.IsInstanceOf<CalculationGroup>(group);
+            Assert.IsInstanceOf<ICalculationBase>(group);
             Assert.IsInstanceOf<Observable>(group);
             Assert.IsTrue(group.IsNameEditable);
             Assert.AreEqual("Nieuwe map", group.Name);
@@ -56,8 +56,6 @@
             var group = new CalculationGroup(newName, isNameEditable);
 
             // Assert
-            Assert.IsInstanceOf<CalculationGroup>(group);
-            Assert.IsInstanceOf<Observable>(group);
             Assert.AreEqual(isNameEditable, group.IsNameEditable);
             Assert.AreEqual(newName, group.Name);
             CollectionAssert.IsEmpty(group.Children);
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/BreakWater.cs
===================================================================
diff -u -rd847955b7a8b9bd4cd80c5e10e6a055c9d5daa8b -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/BreakWater.cs	(.../BreakWater.cs)	(revision d847955b7a8b9bd4cd80c5e10e6a055c9d5daa8b)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/BreakWater.cs	(.../BreakWater.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -38,13 +38,13 @@
         }
 
         /// <summary>
-        /// Gets the type.
+        /// Gets or sets the type.
         /// </summary>
-        public BreakWaterType Type { get; private set; }
+        public BreakWaterType Type { get; set; }
 
         /// <summary>
-        /// Gets the height.
+        /// Gets or sets the height.
         /// </summary>
-        public double Height { get; private set; }
+        public double Height { get; set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs
===================================================================
diff -u -r392c4a63ebfaee062d8dc611ecf41881ac1fe3a5 -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision 392c4a63ebfaee062d8dc611ecf41881ac1fe3a5)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -91,7 +91,8 @@
         private void AddDemoInput()
         {
             // BreakWater
-            InputParameters.BreakWater = new BreakWater(BreakWaterType.Dam, 10);
+            InputParameters.BreakWater.Type = BreakWaterType.Dam;
+            InputParameters.BreakWater.Height = 10;
             InputParameters.UseBreakWater = true;
 
             // Orientation
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs
===================================================================
diff -u -r2a3b5c8305492fff0fa77b78fa3b2f5e9f8091a5 -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs	(.../GrassCoverErosionInwardsInput.cs)	(revision 2a3b5c8305492fff0fa77b78fa3b2f5e9f8091a5)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs	(.../GrassCoverErosionInwardsInput.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -38,6 +38,7 @@
         private readonly LognormalDistribution criticalFlowRate;
         private readonly GeneralGrassCoverErosionInwardsInput generalInputParameters;
         private RoundedDouble orientation;
+        private RoundedDouble dikeHeight;
 
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsInput"/>.
@@ -53,7 +54,8 @@
             this.generalInputParameters = generalInputParameters;
 
             orientation = new RoundedDouble(2);
-            DikeHeight = new RoundedDouble(2);
+            dikeHeight = new RoundedDouble(2);
+            BreakWater = new BreakWater(BreakWaterType.Caisson, 0);
             criticalFlowRate = new LognormalDistribution(2);
             DikeGeometry = Enumerable.Empty<RoughnessProfileSection>();
             ForeshoreGeometry = Enumerable.Empty<RoughnessProfileSection>();
@@ -109,17 +111,27 @@
         /// <summary>
         /// Gets or sets the dike height.
         /// </summary>
-        public RoundedDouble DikeHeight { get; set; }
+        public RoundedDouble DikeHeight
+        {
+            get
+            {
+                return dikeHeight;
+            }
+            set
+            {
+                dikeHeight = value.ToPrecision(dikeHeight.NumberOfDecimalPlaces);
+            }
+        }
 
         /// <summary>
         /// Gets or sets if <see cref="BreakWater"/> needs to be taken into account.
         /// </summary>
         public bool UseBreakWater { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="BreakWater"/>.
+        /// Gets the <see cref="BreakWater"/>.
         /// </summary>
-        public BreakWater BreakWater { get; set; }
+        public BreakWater BreakWater { get; private set; }
 
         /// <summary>
         /// Gets or set the hydraulic boundary location from which to use the assessment level.
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Ringtoets.GrassCoverErosionInwards.Data.csproj
===================================================================
diff -u -r88e4b60f9055cf9153fc5c7b618537accfc3f3fa -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Ringtoets.GrassCoverErosionInwards.Data.csproj	(.../Ringtoets.GrassCoverErosionInwards.Data.csproj)	(revision 88e4b60f9055cf9153fc5c7b618537accfc3f3fa)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Ringtoets.GrassCoverErosionInwards.Data.csproj	(.../Ringtoets.GrassCoverErosionInwards.Data.csproj)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -97,6 +97,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r7343a55e81349863d0e5d7bec5c7f0b3577adf65 -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7343a55e81349863d0e5d7bec5c7f0b3577adf65)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -63,18 +63,18 @@
         /// <summary>
         ///   Looks up a localized string similar to Is er een havendam aanwezig?.
         /// </summary>
-        public static string BreakWater_BreakWaterPresent_Discription {
+        public static string BreakWater_UseBreakWater_Discription {
             get {
-                return ResourceManager.GetString("BreakWater_BreakWaterPresent_Discription", resourceCulture);
+                return ResourceManager.GetString("BreakWater_UseBreakWater_Discription", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Aanwezig.
         /// </summary>
-        public static string BreakWater_BreakWaterPresent_DisplayName {
+        public static string BreakWater_UseBreakWater_DisplayName {
             get {
-                return ResourceManager.GetString("BreakWater_BreakWaterPresent_DisplayName", resourceCulture);
+                return ResourceManager.GetString("BreakWater_UseBreakWater_DisplayName", resourceCulture);
             }
         }
         
@@ -278,38 +278,38 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Is er een voorland aanwezig?.
+        ///   Looks up a localized string similar to Aantal coordinaten tot de teen van de dijk..
         /// </summary>
-        public static string Foreshore_ForeshorePresent_Discription {
+        public static string Foreshore_NumberOfCoordinates_Discription {
             get {
-                return ResourceManager.GetString("Foreshore_ForeshorePresent_Discription", resourceCulture);
+                return ResourceManager.GetString("Foreshore_NumberOfCoordinates_Discription", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Aanwezig.
+        ///   Looks up a localized string similar to Aantal.
         /// </summary>
-        public static string Foreshore_ForeshorePresent_DisplayName {
+        public static string Foreshore_NumberOfCoordinates_DisplayName {
             get {
-                return ResourceManager.GetString("Foreshore_ForeshorePresent_DisplayName", resourceCulture);
+                return ResourceManager.GetString("Foreshore_NumberOfCoordinates_DisplayName", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Aantal coordinaten tot de teen van de dijk..
+        ///   Looks up a localized string similar to Is er een voorland aanwezig?.
         /// </summary>
-        public static string Foreshore_NumberOfCoordinates_Discription {
+        public static string Foreshore_UseForeshore_Discription {
             get {
-                return ResourceManager.GetString("Foreshore_NumberOfCoordinates_Discription", resourceCulture);
+                return ResourceManager.GetString("Foreshore_UseForeshore_Discription", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Aantal.
+        ///   Looks up a localized string similar to Aanwezig.
         /// </summary>
-        public static string Foreshore_NumberOfCoordinates_DisplayName {
+        public static string Foreshore_UseForeshore_DisplayName {
             get {
-                return ResourceManager.GetString("Foreshore_NumberOfCoordinates_DisplayName", resourceCulture);
+                return ResourceManager.GetString("Foreshore_UseForeshore_DisplayName", resourceCulture);
             }
         }
         
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r7343a55e81349863d0e5d7bec5c7f0b3577adf65 -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 7343a55e81349863d0e5d7bec5c7f0b3577adf65)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -187,10 +187,10 @@
   <data name="BreakWaterType_DisplayName" xml:space="preserve">
     <value>Type havendam</value>
   </data>
-  <data name="BreakWater_BreakWaterPresent_Discription" xml:space="preserve">
+  <data name="BreakWater_UseBreakWater_Discription" xml:space="preserve">
     <value>Is er een havendam aanwezig?</value>
   </data>
-  <data name="BreakWater_BreakWaterPresent_DisplayName" xml:space="preserve">
+  <data name="BreakWater_UseBreakWater_DisplayName" xml:space="preserve">
     <value>Aanwezig</value>
   </data>
   <data name="DikeGeometryProperties_Description" xml:space="preserve">
@@ -223,10 +223,10 @@
   <data name="ForeshoreProperties_DisplayName" xml:space="preserve">
     <value>Voorland</value>
   </data>
-  <data name="Foreshore_ForeshorePresent_Discription" xml:space="preserve">
+  <data name="Foreshore_UseForeshore_Discription" xml:space="preserve">
     <value>Is er een voorland aanwezig?</value>
   </data>
-  <data name="Foreshore_ForeshorePresent_DisplayName" xml:space="preserve">
+  <data name="Foreshore_UseForeshore_DisplayName" xml:space="preserve">
     <value>Aanwezig</value>
   </data>
   <data name="Foreshore_NumberOfCoordinates_Discription" xml:space="preserve">
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/BreakWaterProperties.cs
===================================================================
diff -u -r88e4b60f9055cf9153fc5c7b618537accfc3f3fa -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/BreakWaterProperties.cs	(.../BreakWaterProperties.cs)	(revision 88e4b60f9055cf9153fc5c7b618537accfc3f3fa)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/BreakWaterProperties.cs	(.../BreakWaterProperties.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -39,9 +39,9 @@
     public class BreakWaterProperties : ObjectProperties<GrassCoverErosionInwardsInputContext>
     {
         [PropertyOrder(1)]
-        [ResourcesDisplayName(typeof(Resources), "BreakWater_BreakWaterPresent_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "BreakWater_BreakWaterPresent_Discription")]
-        public bool BreakWaterPresent
+        [ResourcesDisplayName(typeof(Resources), "BreakWater_UseBreakWater_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "BreakWater_UseBreakWater_Discription")]
+        public bool UseBreakWater
         {
             get
             {
@@ -62,17 +62,11 @@
         {
             get
             {
-                var breakWater = data.WrappedData.BreakWater;
-                return breakWater == null ? BreakWaterType.Caisson : breakWater.Type;
+                return data.WrappedData.BreakWater.Type;
             }
             set
             {
-                var breakWater = data.WrappedData.BreakWater;
-                if (breakWater == null)
-                {
-                    return;
-                }
-                data.WrappedData.BreakWater = new BreakWater(value, breakWater.Height);
+                data.WrappedData.BreakWater.Type = value;
                 data.WrappedData.NotifyObservers();
             }
         }
@@ -84,17 +78,11 @@
         {
             get
             {
-                var breakWater = data.WrappedData.BreakWater;
-                return breakWater == null ? string.Empty : new RoundedDouble(2, breakWater.Height).Value.ToString(CultureInfo.CurrentCulture);
+                return new RoundedDouble(2, data.WrappedData.BreakWater.Height).Value.ToString(CultureInfo.CurrentCulture);
             }
             set
             {
-                var breakWater = data.WrappedData.BreakWater;
-                if (breakWater == null)
-                {
-                    return;
-                }
-                data.WrappedData.BreakWater = new BreakWater(breakWater.Type, new RoundedDouble(2, double.Parse(value)).Value);
+                data.WrappedData.BreakWater.Height = new RoundedDouble(2, double.Parse(value)).Value;
                 data.WrappedData.NotifyObservers();
             }
         }
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/ForeshoreProperties.cs
===================================================================
diff -u -r88e4b60f9055cf9153fc5c7b618537accfc3f3fa -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/ForeshoreProperties.cs	(.../ForeshoreProperties.cs)	(revision 88e4b60f9055cf9153fc5c7b618537accfc3f3fa)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/ForeshoreProperties.cs	(.../ForeshoreProperties.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -32,13 +32,13 @@
     [TypeConverter(typeof(ExpandableObjectConverter))]
     public class ForeshoreProperties : ObjectProperties<GrassCoverErosionInwardsInputContext>
     {
-        private const int foreshorePresentPropertyIndex = 1;
+        private const int useForeshorePropertyIndex = 1;
         private const int numberOfCoordinatesPropertyIndex = 2;
 
-        [PropertyOrder(foreshorePresentPropertyIndex)]
-        [ResourcesDisplayName(typeof(Resources), "Foreshore_ForeshorePresent_DisplayName")]
-        [ResourcesDescription(typeof(Resources), "Foreshore_ForeshorePresent_Discription")]
-        public bool ForeshorePresent
+        [PropertyOrder(useForeshorePropertyIndex)]
+        [ResourcesDisplayName(typeof(Resources), "Foreshore_UseForeshore_DisplayName")]
+        [ResourcesDescription(typeof(Resources), "Foreshore_UseForeshore_Discription")]
+        public bool UseForeshore
         {
             get
             {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/BreakWaterTest.cs
===================================================================
diff -u -rd847955b7a8b9bd4cd80c5e10e6a055c9d5daa8b -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/BreakWaterTest.cs	(.../BreakWaterTest.cs)	(revision d847955b7a8b9bd4cd80c5e10e6a055c9d5daa8b)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/BreakWaterTest.cs	(.../BreakWaterTest.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -40,5 +40,37 @@
             Assert.AreEqual(type, breakWater.Type);
             Assert.AreEqual(height, breakWater.Height);
         }
+
+        [Test]
+        [TestCase(BreakWaterType.Dam)]
+        [TestCase(BreakWaterType.Wall)]
+        public void Properties_Type_ReturnsExpectedValue(BreakWaterType newType)
+        {
+            // Setup
+            BreakWaterType type = BreakWaterType.Caisson;
+            double height = 100.1;
+            BreakWater breakWater = new BreakWater(type, height);
+
+            // Call
+            breakWater.Type = newType;
+
+            // Assert
+            Assert.AreEqual(newType, breakWater.Type);
+        }
+
+        [Test]
+        public void Properties_Height_ReturnsExpectedValue()
+        {
+            // Setup
+            BreakWaterType type = BreakWaterType.Caisson;
+            double height = 100.1;
+            BreakWater breakWater = new BreakWater(type, height);
+
+            // Call
+            breakWater.Height = 10;
+
+            // Assert
+            Assert.AreEqual(10, breakWater.Height);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs
===================================================================
diff -u -r2a3b5c8305492fff0fa77b78fa3b2f5e9f8091a5 -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs	(.../GrassCoverErosionInwardsInputTest.cs)	(revision 2a3b5c8305492fff0fa77b78fa3b2f5e9f8091a5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs	(.../GrassCoverErosionInwardsInputTest.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -73,27 +73,29 @@
             var input = new GrassCoverErosionInwardsInput(generalInput);
             var orientation = new RoundedDouble(2, 1.18);
             var logNormal = new LognormalDistribution(2);
-            const bool foreshorePresent = true;
+            const bool useForeshore = true;
             var breakWater = new BreakWater(BreakWaterType.Caisson, 2.2);
-            const bool breakWaterPresent = true;
+            const bool useBreakWater = true;
             RoundedDouble dikeHeight = new RoundedDouble(input.DikeHeight.NumberOfDecimalPlaces, 1.1);
 
             // Call
             input.Orientation = orientation;
             input.CriticalFlowRate = logNormal;
             input.DikeHeight = dikeHeight;
-            input.UseForeshore = foreshorePresent;
-            input.BreakWater = breakWater;
-            input.UseBreakWater = breakWaterPresent;
+            input.UseForeshore = useForeshore;
+            input.BreakWater.Type = breakWater.Type;
+            input.BreakWater.Height = breakWater.Height;
+            input.UseBreakWater = useBreakWater;
 
             // Assert
             Assert.AreEqual(dikeHeight, input.DikeHeight);
             Assert.AreEqual(orientation, input.Orientation);
             Assert.AreEqual(logNormal.Mean, input.CriticalFlowRate.Mean);
             Assert.AreEqual(logNormal.StandardDeviation, input.CriticalFlowRate.StandardDeviation);
-            Assert.AreEqual(foreshorePresent, input.UseForeshore);
-            Assert.AreEqual(breakWater, input.BreakWater);
-            Assert.AreEqual(breakWaterPresent, input.UseBreakWater);
+            Assert.AreEqual(useForeshore, input.UseForeshore);
+            Assert.AreEqual(breakWater.Type, input.BreakWater.Type);
+            Assert.AreEqual(breakWater.Height, input.BreakWater.Height);
+            Assert.AreEqual(useBreakWater, input.UseBreakWater);
             CollectionAssert.IsEmpty(input.DikeGeometry);
             CollectionAssert.IsEmpty(input.ForeshoreGeometry);
         }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs
===================================================================
diff -u -r88e4b60f9055cf9153fc5c7b618537accfc3f3fa -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs	(.../BreakWaterPropertiesTest.cs)	(revision 88e4b60f9055cf9153fc5c7b618537accfc3f3fa)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/BreakWaterPropertiesTest.cs	(.../BreakWaterPropertiesTest.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -73,9 +73,9 @@
             properties.Data = new GrassCoverErosionInwardsInputContext(inputMock, calculationMock, failureMechanismMock, assessmentSectionMock);
 
             // Assert
-            Assert.IsFalse(properties.BreakWaterPresent);
+            Assert.IsFalse(properties.UseBreakWater);
             Assert.AreEqual(BreakWaterType.Caisson, properties.BreakWaterType);
-            Assert.AreEqual(string.Empty, properties.BreakWaterHeight);
+            Assert.AreEqual("0", properties.BreakWaterHeight);
             mockRepository.VerifyAll();
         }
 
@@ -92,10 +92,7 @@
             var calculationMock = mockRepository.StrictMock<GrassCoverErosionInwardsCalculation>(generalInput);
             mockRepository.ReplayAll();
 
-            var input = new GrassCoverErosionInwardsInput(generalInput)
-            {
-                BreakWater = new BreakWater(BreakWaterType.Caisson, 1.1)
-            };
+            var input = new GrassCoverErosionInwardsInput(generalInput);
             input.Attach(observerMock);
             var properties = new BreakWaterProperties
             {
@@ -108,7 +105,7 @@
             // Call
             properties.BreakWaterHeight = newBreakWaterHeight.ToString(CultureInfo.InvariantCulture);
             properties.BreakWaterType = newBreakWaterType;
-            properties.BreakWaterPresent = false;
+            properties.UseBreakWater = false;
 
             // Assert
             Assert.IsFalse(input.UseBreakWater);
@@ -142,11 +139,11 @@
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             Assert.AreEqual(4, dynamicProperties.Count);
 
-            PropertyDescriptor breakWaterPresentProperty = dynamicProperties[0];
-            Assert.IsNotNull(breakWaterPresentProperty);
-            Assert.IsFalse(breakWaterPresentProperty.IsReadOnly);
-            Assert.AreEqual("Aanwezig", breakWaterPresentProperty.DisplayName);
-            Assert.AreEqual("Is er een havendam aanwezig?", breakWaterPresentProperty.Description);
+            PropertyDescriptor useBreakWaterProperty = dynamicProperties[0];
+            Assert.IsNotNull(useBreakWaterProperty);
+            Assert.IsFalse(useBreakWaterProperty.IsReadOnly);
+            Assert.AreEqual("Aanwezig", useBreakWaterProperty.DisplayName);
+            Assert.AreEqual("Is er een havendam aanwezig?", useBreakWaterProperty.Description);
 
             PropertyDescriptor breakWaterTypeProperty = dynamicProperties[1];
             Assert.IsNotNull(breakWaterTypeProperty);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs
===================================================================
diff -u -r88e4b60f9055cf9153fc5c7b618537accfc3f3fa -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs	(.../ForeshorePropertiesTest.cs)	(revision 88e4b60f9055cf9153fc5c7b618537accfc3f3fa)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/ForeshorePropertiesTest.cs	(.../ForeshorePropertiesTest.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -72,7 +72,7 @@
             properties.Data = new GrassCoverErosionInwardsInputContext(inputMock, calculationMock, failureMechanismMock, assessmentSectionMock);
 
             // Assert
-            Assert.IsFalse(properties.ForeshorePresent);
+            Assert.IsFalse(properties.UseForeshore);
             Assert.AreEqual(0, properties.NumberOfCoordinates);
             mockRepository.VerifyAll();
         }
@@ -98,7 +98,7 @@
             };
 
             // Call
-            properties.ForeshorePresent = false;
+            properties.UseForeshore = false;
 
             // Assert
             Assert.IsFalse(input.UseForeshore);
@@ -131,11 +131,11 @@
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             Assert.AreEqual(3, dynamicProperties.Count);
 
-            PropertyDescriptor foreshorePresentProperty = dynamicProperties[foreshorePresentPropertyIndex];
-            Assert.IsNotNull(foreshorePresentProperty);
-            Assert.IsFalse(foreshorePresentProperty.IsReadOnly);
-            Assert.AreEqual("Aanwezig", foreshorePresentProperty.DisplayName);
-            Assert.AreEqual("Is er een voorland aanwezig?", foreshorePresentProperty.Description);
+            PropertyDescriptor useForeshoreProperty = dynamicProperties[useForeshorePropertyIndex];
+            Assert.IsNotNull(useForeshoreProperty);
+            Assert.IsFalse(useForeshoreProperty.IsReadOnly);
+            Assert.AreEqual("Aanwezig", useForeshoreProperty.DisplayName);
+            Assert.AreEqual("Is er een voorland aanwezig?", useForeshoreProperty.Description);
 
             PropertyDescriptor numberOfCoordinatesProperty = dynamicProperties[numberOfCoordinatesDikeHeightProperty];
             Assert.IsNotNull(numberOfCoordinatesProperty);
@@ -145,7 +145,7 @@
             mockRepository.VerifyAll();
         }
 
-        private const int foreshorePresentPropertyIndex = 0;
+        private const int useForeshorePropertyIndex = 0;
         private const int numberOfCoordinatesDikeHeightProperty = 1;
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r2a3b5c8305492fff0fa77b78fa3b2f5e9f8091a5 -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 2a3b5c8305492fff0fa77b78fa3b2f5e9f8091a5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -88,7 +88,7 @@
             {
                 Data = inputContext
             };
-            Assert.AreEqual(foreshoreProperties.ForeshorePresent, properties.Foreshore.ForeshorePresent);
+            Assert.AreEqual(foreshoreProperties.UseForeshore, properties.Foreshore.UseForeshore);
             Assert.AreEqual(foreshoreProperties.NumberOfCoordinates, properties.Foreshore.NumberOfCoordinates);
 
             var orientation = new RoundedDouble(2).Value.ToString(CultureInfo.InvariantCulture);
@@ -98,7 +98,7 @@
             {
                 Data = inputContext
             };
-            Assert.AreEqual(breakWaterProperties.BreakWaterPresent, properties.BreakWater.BreakWaterPresent);
+            Assert.AreEqual(breakWaterProperties.UseBreakWater, properties.BreakWater.UseBreakWater);
             Assert.AreEqual(breakWaterProperties.BreakWaterHeight, properties.BreakWater.BreakWaterHeight);
             Assert.AreEqual(breakWaterProperties.BreakWaterType, properties.BreakWater.BreakWaterType);
             VerifyRoundedDoubleString(input.CriticalFlowRate.Mean, properties.CriticalFlowRate.Mean);
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs
===================================================================
diff -u -r54c270e65b7ea51ec9855500fbc7cd9f5869fceb -r61f2445be56feb2180cb0990d8889164c17b79f0
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs	(.../HydraRingCalculationInput.cs)	(revision 54c270e65b7ea51ec9855500fbc7cd9f5869fceb)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs	(.../HydraRingCalculationInput.cs)	(revision 61f2445be56feb2180cb0990d8889164c17b79f0)
@@ -104,7 +104,7 @@
         }
 
         /// <summary>
-        /// Gets the break waters to use during the calculation.
+        /// Gets the break water to use during the calculation.
         /// </summary>
         public virtual HydraRingBreakWater BreakWater
         {