Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/TargetProbabilityCalculationActivity.cs
===================================================================
diff -u -r1ed8634b879f06546f5e532048bbf6481bf39088 -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/TargetProbabilityCalculationActivity.cs	(.../TargetProbabilityCalculationActivity.cs)	(revision 1ed8634b879f06546f5e532048bbf6481bf39088)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Activities/TargetProbabilityCalculationActivity.cs	(.../TargetProbabilityCalculationActivity.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -29,7 +29,8 @@
 namespace Ringtoets.HydraRing.Calculation.Activities
 {
     /// <summary>
-    /// <see cref="Activity"/> for running a type 2 calculation via Hydra-Ring ("iterate towards a target probability, provided as reliability index").
+    /// <see cref="Activity"/> for running a type II calculation via Hydra-Ring:
+    /// Iterate towards a target probability, provided as reliability index.
     /// </summary>
     public class TargetProbabilityCalculationActivity : Activity
     {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingBreakWater.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingBreakWater.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingBreakWater.cs	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -0,0 +1,50 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.HydraRing.Calculation.Data
+{
+    /// <summary>
+    /// Container for Hydra-Ring break water related data.
+    /// </summary>
+    public class HydraRingBreakWater
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="HydraRingBreakWater"/>.
+        /// </summary>
+        /// <param name="type">The break water type.</param>
+        /// <param name="height">The break water height.</param>
+        public HydraRingBreakWater(int type, double height)
+        {
+            Type = type;
+            Height = height;
+        }
+
+        /// <summary>
+        /// Gets the type.
+        /// </summary>
+        public int Type { get; private set; }
+
+        /// <summary>
+        /// Gets the height.
+        /// </summary>
+        public double Height { get; private set; }
+    }
+}
\ No newline at end of file
Fisheye: Tag b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingBreakwater.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingProfilePoint.cs
===================================================================
diff -u -rdd33f3b9d039c570742b8233da23326538c848cf -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingProfilePoint.cs	(.../HydraRingProfilePoint.cs)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingProfilePoint.cs	(.../HydraRingProfilePoint.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -63,7 +63,7 @@
         }
 
         /// <summary>
-        /// Gets the roughness.
+        /// Gets the reduction factor.
         /// </summary>
         public virtual double Roughness
         {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs
===================================================================
diff -u -r27ab4d00d005742ce49aa4396e8c822fe040dacc -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs	(.../HydraRingTimeIntegrationSchemeType.cs)	(revision 27ab4d00d005742ce49aa4396e8c822fe040dacc)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingTimeIntegrationSchemeType.cs	(.../HydraRingTimeIntegrationSchemeType.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -30,17 +30,17 @@
     public enum HydraRingTimeIntegrationSchemeType
     {
         /// <summary>
-        /// Ferry Borges Castanheta time integration scheme
+        /// Ferry Borges Castanheta time integration scheme.
         /// </summary>
         FBC = 1,
 
         /// <summary>
-        /// Arbitrary Point in Time time integration scheme
+        /// Arbitrary Point in Time time integration scheme.
         /// </summary>
         APT = 2,
 
         /// <summary>
-        /// Numerical Time Integration time integration scheme
+        /// Numerical Time Integration time integration scheme.
         /// </summary>
         NTI = 3
     }
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ExceedanceProbabilityCalculationInput.cs
===================================================================
diff -u -r9e3b073429cfe463e3cc4345971f2079c5193618 -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ExceedanceProbabilityCalculationInput.cs	(.../ExceedanceProbabilityCalculationInput.cs)	(revision 9e3b073429cfe463e3cc4345971f2079c5193618)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ExceedanceProbabilityCalculationInput.cs	(.../ExceedanceProbabilityCalculationInput.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -28,7 +28,7 @@
     public abstract class ExceedanceProbabilityCalculationInput : HydraRingCalculationInput
     {
         /// <summary>
-        /// Creates a new instance of <see cref="ExceedanceProbabilityCalculationInput"/> class.
+        /// Creates a new instance of the <see cref="ExceedanceProbabilityCalculationInput"/> class.
         /// </summary>
         /// <param name="hydraulicBoundaryLocationId">The id of the hydraulic station to use during the calculation.</param>
         protected ExceedanceProbabilityCalculationInput(int hydraulicBoundaryLocationId) : base(hydraulicBoundaryLocationId) {}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs
===================================================================
diff -u -r8b5a6f938fe2b04cd78623649df37580e145055f -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs	(.../HydraRingCalculationInput.cs)	(revision 8b5a6f938fe2b04cd78623649df37580e145055f)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs	(.../HydraRingCalculationInput.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -106,7 +106,7 @@
         /// <summary>
         /// Gets the break waters to use during the calculation.
         /// </summary>
-        public virtual IEnumerable<HydraRingBreakwater> BreakWaters
+        public virtual IEnumerable<HydraRingBreakWater> BreakWaters
         {
             get
             {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs	(.../OvertoppingCalculationInput.cs)	(revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs	(.../OvertoppingCalculationInput.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -31,7 +31,7 @@
         private readonly HydraRingSection section;
         private readonly IEnumerable<HydraRingProfilePoint> profilePoints;
         private readonly IEnumerable<HydraRingForelandPoint> forelandPoints;
-        private readonly IEnumerable<HydraRingBreakwater> breakwaters;
+        private readonly IEnumerable<HydraRingBreakWater> breakWaters;
 
         private readonly double dikeHeight;
         private readonly double criticalOvertoppingMean;
@@ -47,13 +47,13 @@
         /// <param name="hydraRingCriticalOvertoppingStandardDeviation">The standard deviation of the critical overtopping to use during the calculation.</param>
         /// <param name="hydraRingProfilePoints">The profile points to use during the calculation.</param>
         /// <param name="hydraRingForelandPoints">The foreland points to use during the calculation.</param>
-        /// <param name="hydraRingBreakwaters">The break water to use during the calculation.</param>
+        /// <param name="hydraRingBreakWaters">The break water to use during the calculation.</param>
         public OvertoppingCalculationInput(int hydraulicBoundaryLocationId, HydraRingSection hydraRingSection,
                                            double hydraRingDikeHeight, double hydraRingCriticalOvertoppingMean,
                                            double hydraRingCriticalOvertoppingStandardDeviation,
-                                           IEnumerable<HydraRingProfilePoint> hydraRingProfilePoints,
+                                           IEnumerable<HydraRingRoughnessProfilePoint> hydraRingProfilePoints,
                                            IEnumerable<HydraRingForelandPoint> hydraRingForelandPoints,
-                                           IEnumerable<HydraRingBreakwater> hydraRingBreakwaters)
+                                           IEnumerable<HydraRingBreakWater> hydraRingBreakWaters)
             : base(hydraulicBoundaryLocationId)
         {
             section = hydraRingSection;
@@ -62,7 +62,7 @@
             criticalOvertoppingStandardDeviation = hydraRingCriticalOvertoppingStandardDeviation;
             profilePoints = hydraRingProfilePoints;
             forelandPoints = hydraRingForelandPoints;
-            breakwaters = hydraRingBreakwaters;
+            breakWaters = hydraRingBreakWaters;
         }
 
         public override HydraRingFailureMechanismType FailureMechanismType
@@ -105,11 +105,11 @@
             }
         }
 
-        public override IEnumerable<HydraRingBreakwater> BreakWaters
+        public override IEnumerable<HydraRingBreakWater> BreakWaters
         {
             get
             {
-                return breakwaters;
+                return breakWaters;
             }
         }
 
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/TargetProbabilityCalculationInput.cs
===================================================================
diff -u -rf876f859ab663d6970e7051d6f079de99f3ff7fb -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/TargetProbabilityCalculationInput.cs	(.../TargetProbabilityCalculationInput.cs)	(revision f876f859ab663d6970e7051d6f079de99f3ff7fb)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/TargetProbabilityCalculationInput.cs	(.../TargetProbabilityCalculationInput.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -24,7 +24,8 @@
 namespace Ringtoets.HydraRing.Calculation.Data.Input
 {
     /// <summary>
-    /// Container of all data necessary for performing a type 2 calculation via Hydra-Ring ("iterate towards a target probability, provided as reliability index").
+    /// Container of all data necessary for performing a type II calculation via Hydra-Ring:
+    /// Iterate towards a target probability, provided as reliability index.
     /// </summary>
     public abstract class TargetProbabilityCalculationInput : HydraRingCalculationInput
     {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/TargetProbabilityCalculationOutput.cs
===================================================================
diff -u -rf876f859ab663d6970e7051d6f079de99f3ff7fb -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/TargetProbabilityCalculationOutput.cs	(.../TargetProbabilityCalculationOutput.cs)	(revision f876f859ab663d6970e7051d6f079de99f3ff7fb)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/TargetProbabilityCalculationOutput.cs	(.../TargetProbabilityCalculationOutput.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -22,7 +22,8 @@
 namespace Ringtoets.HydraRing.Calculation.Data.Output
 {
     /// <summary>
-    /// Container of all relevant output generated by a type 2 calculation via Hydra-Ring ("iterate towards a target probability, provided as reliability index").
+    /// Container of all relevant output generated by a type II calculation via Hydra-Ring:
+    /// Iterate towards a target probability, provided as reliability index.
     /// </summary>
     public class TargetProbabilityCalculationOutput
     {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/TargetProbabilityCalculationParser.cs
===================================================================
diff -u -r9d378b8fa49ea011d8f4d229b5970f11c76f8305 -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/TargetProbabilityCalculationParser.cs	(.../TargetProbabilityCalculationParser.cs)	(revision 9d378b8fa49ea011d8f4d229b5970f11c76f8305)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/TargetProbabilityCalculationParser.cs	(.../TargetProbabilityCalculationParser.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -28,14 +28,15 @@
 namespace Ringtoets.HydraRing.Calculation.Parsers
 {
     /// <summary>
-    /// Parser for the output of a Hydra-Ring type 2 calculation ("iterate towards a target probability, provided as reliability index").
+    /// Parser for the output of a Hydra-Ring type II calculation:
+    /// Iterate towards a target probability, provided as reliability index.
     /// </summary>
     internal static class TargetProbabilityCalculationParser
     {
         /// <summary>
         /// Tries to parse a <see cref="TargetProbabilityCalculationOutput"/> object from the provided <paramref name="outputFilePath"/> for the provided <paramref name="sectionId"/>.
         /// </summary>
-        /// <param name="outputFilePath">The path to the file which contains the output of the Hydra-Ring type 2 calculation.</param>
+        /// <param name="outputFilePath">The path to the file which contains the output of the Hydra-Ring type II calculation.</param>
         /// <param name="sectionId">The section id to get the <see cref="TargetProbabilityCalculationOutput"/> object for.</param>
         /// <returns>A <see cref="TargetProbabilityCalculationOutput"/> corresponding to the section id or <c>null</c> otherwise.</returns>
         public static TargetProbabilityCalculationOutput Parse(string outputFilePath, int sectionId)
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -47,7 +47,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Data\HydraRingBreakwater.cs" />
+    <Compile Include="Data\HydraRingBreakWater.cs" />
     <Compile Include="Data\HydraRingSection.cs" />
     <Compile Include="Data\HydraRingForelandPoint.cs" />
     <Compile Include="Data\HydraRingProfilePoint.cs" />
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs
===================================================================
diff -u -ra1d0c950e24eeef7e35cf3b79e7fcd9fd7af041c -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs	(.../HydraRingCalculationService.cs)	(revision a1d0c950e24eeef7e35cf3b79e7fcd9fd7af041c)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingCalculationService.cs	(.../HydraRingCalculationService.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -37,7 +37,8 @@
         private static Process hydraRingProcess;
 
         /// <summary>
-        /// This method performs a type 2 calculation via Hydra-Ring ("iterate towards a target probability, provided as reliability index").
+        /// This method performs a type II calculation via Hydra-Ring:
+        /// Iterate towards a target probability, provided as reliability index.
         /// </summary>
         /// <param name="hlcdDirectory">The directory of the HLCD file that should be used for performing the calculation.</param>
         /// <param name="ringId">The id of the ring to perform the calculation for.</param>
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs	(.../HydraRingConfigurationService.cs)	(revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs	(.../HydraRingConfigurationService.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -154,7 +154,7 @@
             configurationDictionary["WaveReductions"] = new List<OrderedDictionary>();
             configurationDictionary["Areas"] = GetAreasConfiguration();
             configurationDictionary["Projects"] = GetProjectsConfiguration();
-            configurationDictionary["Breakwaters"] = GetSectionBreakWatersConfiguration();
+            configurationDictionary["Breakwaters"] = GetBreakWatersConfiguration();
 
             return GenerateDataBaseCreationScript(configurationDictionary);
         }
@@ -511,23 +511,23 @@
             return orderDictionaries;
         }
 
-        private IList<OrderedDictionary> GetSectionBreakWatersConfiguration()
+        private IList<OrderedDictionary> GetBreakWatersConfiguration()
         {
             var orderedDictionaries = new List<OrderedDictionary>();
             foreach (var hydraRingCalculationInput in hydraRingCalculationInputs)
             {
-                foreach (var breakwater in hydraRingCalculationInput.BreakWaters)
+                foreach (var breakWater in hydraRingCalculationInput.BreakWaters)
                 {
                     orderedDictionaries.Add(new OrderedDictionary
                     {
                         {
                             "SectionId", hydraRingCalculationInput.Section.SectionId
                         },
                         {
-                            "Type", GetHydraRingValue(breakwater.Type)
+                            "Type", GetHydraRingValue(breakWater.Type)
                         },
                         {
-                            "Height", GetHydraRingValue(breakwater.Height)
+                            "Height", GetHydraRingValue(breakWater.Height)
                         }
                     });
                 }
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingBreakWaterTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingBreakWaterTest.cs	(revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingBreakWaterTest.cs	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -0,0 +1,45 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data;
+
+namespace Ringtoets.HydraRing.Calculation.Test.Data
+{
+    [TestFixture]
+    public class HydraRingBreakWaterTest
+    {
+        [Test]
+        public void Constructor_Always_ExpectedValues()
+        {
+            // Setup
+            int type = 1;
+            double height = 100.1;
+
+            // Call
+            HydraRingBreakWater breakWater = new HydraRingBreakWater(type, height);
+
+            // Assert
+            Assert.AreEqual(type, breakWater.Type);
+            Assert.AreEqual(height, breakWater.Height);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingBreakwaterTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingForelandPointTest.cs
===================================================================
diff -u -r16353c197a25732675287dfba8679ab25731ab0c -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingForelandPointTest.cs	(.../HydraRingForelandPointTest.cs)	(revision 16353c197a25732675287dfba8679ab25731ab0c)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/HydraRingForelandPointTest.cs	(.../HydraRingForelandPointTest.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -38,7 +38,6 @@
             var hydraRingForelandPoint = new HydraRingForelandPoint(xCoordinate, zCoordinate);
 
             // Assert
-            Assert.IsNotNull(hydraRingForelandPoint);
             Assert.AreEqual(xCoordinate, hydraRingForelandPoint.X);
             Assert.AreEqual(zCoordinate, hydraRingForelandPoint.Z);
         }
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/HydraRingRoughnessProfilePointTest.cs
===================================================================
diff -u -r899b5a68c26657a3943f409b5a16d00c0844859a -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/HydraRingRoughnessProfilePointTest.cs	(.../HydraRingRoughnessProfilePointTest.cs)	(revision 899b5a68c26657a3943f409b5a16d00c0844859a)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/HydraRingRoughnessProfilePointTest.cs	(.../HydraRingRoughnessProfilePointTest.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -39,7 +39,6 @@
             HydraRingRoughnessProfilePoint hydraRingRoughnessProfilePoint = new HydraRingRoughnessProfilePoint(expectedX, expectedZ, expectedRoughness);
 
             // Assert
-            Assert.IsNotNull(hydraRingRoughnessProfilePoint);
             Assert.AreEqual(expectedX, hydraRingRoughnessProfilePoint.X);
             Assert.AreEqual(expectedZ, hydraRingRoughnessProfilePoint.Z);
             Assert.AreEqual(expectedRoughness, hydraRingRoughnessProfilePoint.Roughness);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs	(.../OvertoppingCalculationInputTest.cs)	(revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Overtopping/OvertoppingCalculationInputTest.cs	(.../OvertoppingCalculationInputTest.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -41,23 +41,23 @@
             double dikeHeight = 11.11;
             double criticalOvertoppingMean = 22.22;
             double criticalOvertoppingStandardDeviation = 33.33;
-            var expectedRingProfilePoints = new List<HydraRingProfilePoint>
+            var expectedRingProfilePoints = new List<HydraRingRoughnessProfilePoint>
             {
-                new HydraRingProfilePoint(1.1, 2.2)
+                new HydraRingRoughnessProfilePoint(1.1, 2.2, 3.3)
             };
             var expectedRingForelandPoints = new List<HydraRingForelandPoint>
             {
                 new HydraRingForelandPoint(2.2, 3.3)
             };
-            var expectedRingBreakwaters = new List<HydraRingBreakwater>
+            var expectedRingBreakWaters = new List<HydraRingBreakWater>
             {
-                new HydraRingBreakwater(2, 3.3)
+                new HydraRingBreakWater(2, 3.3)
             };
 
             // Call
             OvertoppingCalculationInput overtoppingCalculationInput = new OvertoppingCalculationInput(hydraulicBoundaryLocationId, expectedHydraRingSection, dikeHeight,
                                                                                                       criticalOvertoppingMean, criticalOvertoppingStandardDeviation,
-                                                                                                      expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakwaters);
+                                                                                                      expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWaters);
 
             // Assert
             Assert.AreEqual(expectedCalculationTypeId, overtoppingCalculationInput.CalculationTypeId);
@@ -68,7 +68,7 @@
             CheckOvertoppingVariables(GetDefaultOvertoppingVariables().ToArray(), overtoppingCalculationInput.Variables.ToArray());
             CollectionAssert.AreEqual(expectedRingProfilePoints, overtoppingCalculationInput.ProfilePoints);
             CollectionAssert.AreEqual(expectedRingForelandPoints, overtoppingCalculationInput.ForelandsPoints);
-            CollectionAssert.AreEqual(expectedRingBreakwaters, overtoppingCalculationInput.BreakWaters);
+            CollectionAssert.AreEqual(expectedRingBreakWaters, overtoppingCalculationInput.BreakWaters);
             Assert.IsNaN(overtoppingCalculationInput.Beta);
 
             var hydraRingSection = overtoppingCalculationInput.Section;
@@ -87,9 +87,9 @@
 
             // Call
             OvertoppingCalculationInput overtoppingCalculationInput = new OvertoppingCalculationInput(1, hydraRingSection, 2, 3, 4,
-                                                                                                      new List<HydraRingProfilePoint>(),
+                                                                                                      new List<HydraRingRoughnessProfilePoint>(),
                                                                                                       new List<HydraRingForelandPoint>(),
-                                                                                                      new List<HydraRingBreakwater>());
+                                                                                                      new List<HydraRingBreakWater>());
 
             // Assert
             Assert.AreEqual(expectedSubMechanismModelId, overtoppingCalculationInput.GetSubMechanismModelId(subMechanismModelId));
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs	(.../HydraRingConfigurationServiceIntegrationTest.cs)	(revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs	(.../HydraRingConfigurationServiceIntegrationTest.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -106,22 +106,22 @@
             double dikeHeight = 11.11;
             double criticalOvertoppingMean = 22.22;
             double criticalOvertoppingStandardDeviation = 33.33;
-            var profilePoints = new List<HydraRingProfilePoint>
+            var profilePoints = new List<HydraRingRoughnessProfilePoint>
             {
-                new HydraRingProfilePoint(1.1, 2.2)
+                new HydraRingRoughnessProfilePoint(1.1, 2.2, 3.3)
             };
             var forelandPoints = new List<HydraRingForelandPoint>
             {
                 new HydraRingForelandPoint(1.1, 2.2)
             };
-            var breakwater = new List<HydraRingBreakwater>
+            var breakWaters = new List<HydraRingBreakWater>
             {
-                new HydraRingBreakwater(1, 2.2)
+                new HydraRingBreakWater(1, 2.2)
             };
 
             hydraRingConfigurationService.AddHydraRingCalculationInput(new OvertoppingCalculationInput(hydraulicBoundaryLocationId, hydraRingSection,
                                                                                                        dikeHeight, criticalOvertoppingMean, criticalOvertoppingStandardDeviation
-                                                                                                       , profilePoints, forelandPoints, breakwater));
+                                                                                                       , profilePoints, forelandPoints, breakWaters));
 
             var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine +
                                          "INSERT INTO [HydraulicModels] VALUES (1, 1, 'WTI 2017');" + Environment.NewLine +
@@ -147,7 +147,7 @@
                                          "INSERT INTO [VariableDatas] VALUES (700004, 101, 1, 1, 123, 0, 2, 0.92, 0.24, NULL, NULL, 0, 0, 300);" + Environment.NewLine +
                                          Environment.NewLine +
                                          "DELETE FROM [CalculationProfiles];" + Environment.NewLine +
-                                         "INSERT INTO [CalculationProfiles] VALUES (700004, 1, 1.1, 2.2, 1);" + Environment.NewLine +
+                                         "INSERT INTO [CalculationProfiles] VALUES (700004, 1, 1.1, 2.2, 3.3);" + Environment.NewLine +
                                          Environment.NewLine +
                                          "DELETE FROM [SectionFaultTreeModels];" + Environment.NewLine +
                                          "INSERT INTO [SectionFaultTreeModels] VALUES (700004, 101, 1, 1, 1017);" + Environment.NewLine +
@@ -163,7 +163,7 @@
                                          "DELETE FROM [PresentationSections];" + Environment.NewLine +
                                          Environment.NewLine +
                                          "DELETE FROM [Profiles];" + Environment.NewLine +
-                                         "INSERT INTO [Profiles] VALUES (700004, 1, 1.1, 2.2, 1);" + Environment.NewLine +
+                                         "INSERT INTO [Profiles] VALUES (700004, 1, 1.1, 2.2, 3.3);" + Environment.NewLine +
                                          Environment.NewLine +
                                          "DELETE FROM [ForelandModels];" + Environment.NewLine +
                                          Environment.NewLine +
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -60,7 +60,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Activities\HydraRingActivityFactoryTest.cs" />
-    <Compile Include="Data\HydraRingBreakwaterTest.cs" />
+    <Compile Include="Data\HydraRingBreakWaterTest.cs" />
     <Compile Include="Data\HydraRingForelandPointTest.cs" />
     <Compile Include="Data\Input\Overtopping\HydraRingRoughnessProfilePointTest.cs" />
     <Compile Include="Data\Input\ExceedanceProbabilityCalculationInputTest.cs" />
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingCalculationServiceTest.cs
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingCalculationServiceTest.cs	(.../HydraRingCalculationServiceTest.cs)	(revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingCalculationServiceTest.cs	(.../HydraRingCalculationServiceTest.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -78,9 +78,9 @@
             var hydraRingSection = new HydraRingSection(incorrectStationId, "999", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
             var targetProbabilityCalculationInput = new OvertoppingCalculationInput(incorrectStationId, hydraRingSection,
                                                                                     1, 2, 3,
-                                                                                    new List<HydraRingProfilePoint>(),
+                                                                                    new List<HydraRingRoughnessProfilePoint>(),
                                                                                     new List<HydraRingForelandPoint>(),
-                                                                                    new List<HydraRingBreakwater>());
+                                                                                    new List<HydraRingBreakWater>());
             var outputFolder = Path.Combine(Path.GetTempPath(), "" + incorrectStationId);
             var outputFiles = new[]
             {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs
===================================================================
diff -u -r9f08122750310ba06e28e435c3c4bdf5e873d99b -rb9f6d46631bdb16c2f1e65e791dd31e9380ccd6e
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs	(.../HydraRingConfigurationServiceTest.cs)	(revision 9f08122750310ba06e28e435c3c4bdf5e873d99b)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs	(.../HydraRingConfigurationServiceTest.cs)	(revision b9f6d46631bdb16c2f1e65e791dd31e9380ccd6e)
@@ -317,12 +317,12 @@
                 }
             }
 
-            public override IEnumerable<HydraRingBreakwater> BreakWaters
+            public override IEnumerable<HydraRingBreakWater> BreakWaters
             {
                 get
                 {
-                    yield return new HydraRingBreakwater(1, 99.9);
-                    yield return new HydraRingBreakwater(3, 20.2);
+                    yield return new HydraRingBreakWater(1, 99.9);
+                    yield return new HydraRingBreakWater(3, 20.2);
                 }
             }