Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -r16697317b00bb5ffe52baee7d9e91b42ba1cf743 -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 16697317b00bb5ffe52baee7d9e91b42ba1cf743)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9)
@@ -58,7 +58,7 @@
         private bool canceled;
         private IOvertoppingCalculator overtoppingCalculator;
         private IDikeHeightCalculator dikeHeightCalculator;
-        private IOvertoppingRateCalculator overtoppingRateCalculator;
+        private IOvertoppingSubCalculator overtoppingRateCalculator;
 
         /// <summary>
         /// Performs validation over the values on the given <paramref name="calculation"/>. Error and status information is logged during
@@ -627,7 +627,7 @@
                                                                                      double targetReliability,
                                                                                      double targetProbability)
         {
-            double overtoppingRate = overtoppingRateCalculator.OvertoppingRate;
+            double overtoppingRate = overtoppingRateCalculator.Value;
             double reliability = overtoppingRateCalculator.ReliabilityIndex;
             double probability = StatisticsConverter.ReliabilityToProbability(reliability);
 
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs
===================================================================
diff -u -r03890afdf0877e5b482d84509508cf65c1678f86 -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs	(.../HydraRingCalculatorFactory.cs)	(revision 03890afdf0877e5b482d84509508cf65c1678f86)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs	(.../HydraRingCalculatorFactory.cs)	(revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9)
@@ -59,7 +59,7 @@
             return new DikeHeightCalculator(hlcdDirectory);
         }
 
-        public IOvertoppingRateCalculator CreateOvertoppingRateCalculator(string hlcdDirectory)
+        public IOvertoppingSubCalculator CreateOvertoppingRateCalculator(string hlcdDirectory)
         {
             return new OvertoppingRateCalculator(hlcdDirectory);
         }
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs
===================================================================
diff -u -r03890afdf0877e5b482d84509508cf65c1678f86 -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs	(.../IHydraRingCalculatorFactory.cs)	(revision 03890afdf0877e5b482d84509508cf65c1678f86)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs	(.../IHydraRingCalculatorFactory.cs)	(revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9)
@@ -57,9 +57,9 @@
         /// Creates a calculator for calculating an overtopping rate.
         /// </summary>
         /// <param name="hlcdDirectory">The directory where the hydraulic database can be found.</param>
-        /// <returns>A new <see cref="IOvertoppingRateCalculator"/>.</returns>
+        /// <returns>A new <see cref="IOvertoppingSubCalculator"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hlcdDirectory"/> is <c>null</c>.</exception>
-        IOvertoppingRateCalculator CreateOvertoppingRateCalculator(string hlcdDirectory);
+        IOvertoppingSubCalculator CreateOvertoppingRateCalculator(string hlcdDirectory);
 
         /// <summary>
         /// Creates a calculator for calculating wave conditions.
Fisheye: Tag d4ab6d2f797dfb71ab463cebb3565809a6af76a9 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingRateCalculator.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingSubCalculator.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingSubCalculator.cs	(revision 0)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingSubCalculator.cs	(revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9)
@@ -0,0 +1,71 @@
+// 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 Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
+using Ringtoets.HydraRing.Calculation.Exceptions;
+
+namespace Ringtoets.HydraRing.Calculation.Calculator
+{
+    /// <summary>
+    /// Interface for a calculator which calculates an overtopping value associated to the result of iterating towards a
+    /// probability of failure given a norm.
+    /// </summary>
+    public interface IOvertoppingSubCalculator
+    {
+        /// <summary>
+        /// Gets the calculated value.
+        /// </summary>
+        double Value { get; }
+
+        /// <summary>
+        /// Gets the reliability index.
+        /// </summary>
+        double ReliabilityIndex { get; }
+
+        /// <summary>
+        /// Gets the value indicating whether the calculation converged.
+        /// </summary>
+        bool? Converged { get; }
+
+        /// <summary>
+        /// Gets the temporary output directory that is generated during the Hydra-Ring calculation.
+        /// </summary>
+        string OutputDirectory { get; }
+
+        /// <summary>
+        /// Gets the content of the last error file generated during the Hydra-Ring calculation.
+        /// </summary>
+        string LastErrorFileContent { get; }
+
+        /// <summary>
+        /// Performs the actual calculation by running the Hydra-Ring executable.
+        /// </summary>
+        /// <param name="input">The <see cref="OvertoppingRateCalculationInput"/> which contains all the necessary input
+        /// for the calculation.</param>
+        /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
+        void Calculate(OvertoppingRateCalculationInput input);
+
+        /// <summary>
+        /// Cancels any currently running Hydra-Ring calculation.
+        /// </summary>
+        void Cancel();
+    }
+}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingRateCalculator.cs
===================================================================
diff -u -r28409889b18ffaecebe9737e65410a30be956206 -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingRateCalculator.cs	(.../OvertoppingRateCalculator.cs)	(revision 28409889b18ffaecebe9737e65410a30be956206)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingRateCalculator.cs	(.../OvertoppingRateCalculator.cs)	(revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9)
@@ -31,7 +31,7 @@
     /// Calculator which calculates the overtopping rate associated to the result of iterating towards a
     /// probability of failure given a norm.
     /// </summary>
-    internal class OvertoppingRateCalculator : HydraRingCalculatorBase, IOvertoppingRateCalculator
+    internal class OvertoppingRateCalculator : HydraRingCalculatorBase, IOvertoppingSubCalculator
     {
         private readonly ReliabilityIndexCalculationParser targetProbabilityParser;
         private readonly ConvergenceParser convergenceParser;
@@ -47,11 +47,11 @@
             targetProbabilityParser = new ReliabilityIndexCalculationParser();
             convergenceParser = new ConvergenceParser();
 
-            OvertoppingRate = double.NaN;
+            Value = double.NaN;
             ReliabilityIndex = double.NaN;
         }
 
-        public double OvertoppingRate { get; private set; }
+        public double Value { get; private set; }
 
         public double ReliabilityIndex { get; private set; }
 
@@ -72,7 +72,7 @@
         {
             if (targetProbabilityParser.Output != null)
             {
-                OvertoppingRate = targetProbabilityParser.Output.Result;
+                Value = targetProbabilityParser.Output.Result;
                 ReliabilityIndex = targetProbabilityParser.Output.CalculatedReliabilityIndex;
             }
 
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r692e9f44e141c19416b7b49dd450e16b6af43258 -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 692e9f44e141c19416b7b49dd450e16b6af43258)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9)
@@ -49,7 +49,7 @@
     <Compile Include="Calculator\DunesBoundaryConditionsCalculator.cs" />
     <Compile Include="Calculator\Factory\HydraRingCalculatorFactory.cs" />
     <Compile Include="Calculator\Factory\IHydraRingCalculatorFactory.cs" />
-    <Compile Include="Calculator\IOvertoppingRateCalculator.cs" />
+    <Compile Include="Calculator\IOvertoppingSubCalculator.cs" />
     <Compile Include="Calculator\IDunesBoundaryConditionsCalculator.cs" />
     <Compile Include="Calculator\IStructuresClosureCalculator.cs" />
     <Compile Include="Calculator\IStructuresStabilityPointCalculator.cs" />
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/OvertoppingRateCalculatorTest.cs
===================================================================
diff -u -r692e9f44e141c19416b7b49dd450e16b6af43258 -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/OvertoppingRateCalculatorTest.cs	(.../OvertoppingRateCalculatorTest.cs)	(revision 692e9f44e141c19416b7b49dd450e16b6af43258)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/OvertoppingRateCalculatorTest.cs	(.../OvertoppingRateCalculatorTest.cs)	(revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9)
@@ -35,7 +35,7 @@
 
             // Assert
             Assert.IsInstanceOf<HydraRingCalculatorBase>(calculator);
-            Assert.IsNaN(calculator.OvertoppingRate);
+            Assert.IsNaN(calculator.Value);
             Assert.IsNaN(calculator.ReliabilityIndex);
             Assert.IsNull(calculator.Converged);
             Assert.IsNull(calculator.OutputDirectory);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs
===================================================================
diff -u -r03890afdf0877e5b482d84509508cf65c1678f86 -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs	(.../TestHydraRingCalculatorFactory.cs)	(revision 03890afdf0877e5b482d84509508cf65c1678f86)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs	(.../TestHydraRingCalculatorFactory.cs)	(revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9)
@@ -62,7 +62,7 @@
             return DikeHeightCalculator;
         }
 
-        public IOvertoppingRateCalculator CreateOvertoppingRateCalculator(string hlcdDirectory)
+        public IOvertoppingSubCalculator CreateOvertoppingRateCalculator(string hlcdDirectory)
         {
             OvertoppingRateCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory;
             return OvertoppingRateCalculator;
@@ -144,9 +144,9 @@
         public bool? Converged { get; set; }
     }
 
-    public class TestOvertoppingRateCalculator : TestHydraRingCalculator<OvertoppingRateCalculationInput>, IOvertoppingRateCalculator
+    public class TestOvertoppingRateCalculator : TestHydraRingCalculator<OvertoppingRateCalculationInput>, IOvertoppingSubCalculator
     {
-        public double OvertoppingRate { get; set; }
+        public double Value { get; set; }
         public double ReliabilityIndex { get; set; }
         public string OutputDirectory { get; set; }
         public string LastErrorFileContent { get; set; }