Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/DesignWaterLevelCalculation.cs
===================================================================
diff -u -r0225653c669d19e281784bea8146c25bfe568a29 -rf27e8e2e7c8d056c76f2f883ae6bdf03edb740fc
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/DesignWaterLevelCalculation.cs	(.../DesignWaterLevelCalculation.cs)	(revision 0225653c669d19e281784bea8146c25bfe568a29)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/DesignWaterLevelCalculation.cs	(.../DesignWaterLevelCalculation.cs)	(revision f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc)
@@ -27,7 +27,7 @@
     /// <summary>
     /// Adapter class for a design water level calculation.
     /// </summary>
-    public class DesignWaterLevelCalculation : IHydraulicBoundaryWrapperCalculation
+    public class DesignWaterLevelCalculation : IHydraulicBoundaryCalculationWrapper
     {
         private readonly HydraulicBoundaryLocation hydraulicBoundaryLocation;
         private readonly HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation;
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IHydraulicBoundaryCalculationWrapper.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IHydraulicBoundaryCalculationWrapper.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IHydraulicBoundaryCalculationWrapper.cs	(revision f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc)
@@ -0,0 +1,49 @@
+// Copyright (C) Stichting Deltares 2017. 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.Common.Data.Hydraulics
+{
+    /// <summary>
+    /// Interface for a wrapper of an hydraulic boundary location calculation.
+    /// </summary>
+    public interface IHydraulicBoundaryCalculationWrapper
+    {
+        /// <summary>
+        /// Gets the database id of the hydraulic boundary location.
+        /// </summary>
+        long Id { get; }
+
+        /// <summary>
+        /// Gets the name of the hydraulic boundary location.
+        /// </summary>
+        string Name { get; }
+
+        /// <summary>
+        /// Gets if the illustration points should be calculated.
+        /// </summary>
+        bool CalculateIllustrationPoints { get; }
+
+        /// <summary>
+        /// Gets or sets the output of the hydraulic boundary location calculation.
+        /// </summary>
+        HydraulicBoundaryLocationOutput Output { get; set; }
+    }
+}
\ No newline at end of file
Fisheye: Tag f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IHydraulicBoundaryWrapperCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/WaveHeightCalculation.cs
===================================================================
diff -u -r0225653c669d19e281784bea8146c25bfe568a29 -rf27e8e2e7c8d056c76f2f883ae6bdf03edb740fc
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/WaveHeightCalculation.cs	(.../WaveHeightCalculation.cs)	(revision 0225653c669d19e281784bea8146c25bfe568a29)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/WaveHeightCalculation.cs	(.../WaveHeightCalculation.cs)	(revision f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc)
@@ -27,7 +27,7 @@
     /// <summary>
     /// Adapter class for a wave height calculation.
     /// </summary>
-    public class WaveHeightCalculation : IHydraulicBoundaryWrapperCalculation
+    public class WaveHeightCalculation : IHydraulicBoundaryCalculationWrapper
     {
         private readonly HydraulicBoundaryLocation hydraulicBoundaryLocation;
         private readonly HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation;
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r35525b6135cc111e4af3803f7dcce0d7528bbb16 -rf27e8e2e7c8d056c76f2f883ae6bdf03edb740fc
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 35525b6135cc111e4af3803f7dcce0d7528bbb16)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc)
@@ -116,7 +116,7 @@
         /// <item>Unable to read required data from database file.</item>
         /// </list></exception>
         /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
-        public void Calculate(IHydraulicBoundaryWrapperCalculation designWaterLevelCalculation,
+        public void Calculate(IHydraulicBoundaryCalculationWrapper designWaterLevelCalculation,
                               string hydraulicBoundaryDatabaseFilePath,
                               string preprocessorDirectory,
                               double norm,
@@ -201,7 +201,7 @@
         /// <item>Unable to read required data from database file.</item>
         /// </list></exception>
         /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
-        private void PerformCalculation(IHydraulicBoundaryWrapperCalculation designWaterLevelCalculation,
+        private void PerformCalculation(IHydraulicBoundaryCalculationWrapper designWaterLevelCalculation,
                                         string hydraulicBoundaryDatabaseFilePath,
                                         bool usePreprocessor,
                                         double norm,
@@ -302,7 +302,7 @@
         /// <summary>
         /// Creates the input for a design water level calculation.
         /// </summary>
-        /// <param name="designWaterLevelCalculation">The <see cref="IHydraulicBoundaryWrapperCalculation"/>
+        /// <param name="designWaterLevelCalculation">The <see cref="IHydraulicBoundaryCalculationWrapper"/>
         /// to create the input from.</param>
         /// <param name="norm">The norm to use during the calculation.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The file path to the hydraulic
@@ -319,7 +319,7 @@
         /// <item>Unable to read required data from database file.</item>
         /// </list>
         /// </exception>
-        private static AssessmentLevelCalculationInput CreateInput(IHydraulicBoundaryWrapperCalculation designWaterLevelCalculation,
+        private static AssessmentLevelCalculationInput CreateInput(IHydraulicBoundaryCalculationWrapper designWaterLevelCalculation,
                                                                    double norm,
                                                                    string hydraulicBoundaryDatabaseFilePath,
                                                                    bool usePreprocessor)
Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r35525b6135cc111e4af3803f7dcce0d7528bbb16 -rf27e8e2e7c8d056c76f2f883ae6bdf03edb740fc
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 35525b6135cc111e4af3803f7dcce0d7528bbb16)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc)
@@ -116,7 +116,7 @@
         /// <item>Unable to read required data from database file.</item>
         /// </list></exception>
         /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
-        public void Calculate(IHydraulicBoundaryWrapperCalculation waveHeightCalculation,
+        public void Calculate(IHydraulicBoundaryCalculationWrapper waveHeightCalculation,
                               string hydraulicBoundaryDatabaseFilePath,
                               string preprocessorDirectory,
                               double norm,
@@ -202,7 +202,7 @@
         /// <item>Unable to read required data from database file.</item>
         /// </list></exception>
         /// <exception cref="HydraRingCalculationException">Thrown when an error occurs while performing the calculation.</exception>
-        private void PerformCalculation(IHydraulicBoundaryWrapperCalculation waveHeightCalculation,
+        private void PerformCalculation(IHydraulicBoundaryCalculationWrapper waveHeightCalculation,
                                         string hydraulicBoundaryDatabaseFilePath,
                                         bool usePreprocessor,
                                         double norm,
@@ -302,7 +302,7 @@
         /// <summary>
         /// Creates the input for an wave height calculation.
         /// </summary>
-        /// <param name="waveHeightCalculation">The <see cref="IHydraulicBoundaryWrapperCalculation"/>
+        /// <param name="waveHeightCalculation">The <see cref="IHydraulicBoundaryCalculationWrapper"/>
         /// to create the input from.</param>
         /// <param name="norm">The norm to use during the calculation.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The file path to the hydraulic
@@ -319,7 +319,7 @@
         /// <item>Unable to read required data from database file.</item>
         /// </list>
         /// </exception>
-        private static WaveHeightCalculationInput CreateInput(IHydraulicBoundaryWrapperCalculation waveHeightCalculation,
+        private static WaveHeightCalculationInput CreateInput(IHydraulicBoundaryCalculationWrapper waveHeightCalculation,
                                                               double norm,
                                                               string hydraulicBoundaryDatabaseFilePath,
                                                               bool usePreprocessor)
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/DesignWaterLevelCalculationTest.cs
===================================================================
diff -u -rb461ea57ca863fd47810d2a27f40b54c9eab2187 -rf27e8e2e7c8d056c76f2f883ae6bdf03edb740fc
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/DesignWaterLevelCalculationTest.cs	(.../DesignWaterLevelCalculationTest.cs)	(revision b461ea57ca863fd47810d2a27f40b54c9eab2187)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/DesignWaterLevelCalculationTest.cs	(.../DesignWaterLevelCalculationTest.cs)	(revision f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc)
@@ -91,7 +91,7 @@
             var calculation = new DesignWaterLevelCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.IsInstanceOf<IHydraulicBoundaryWrapperCalculation>(calculation);
+            Assert.IsInstanceOf<IHydraulicBoundaryCalculationWrapper>(calculation);
             Assert.AreEqual(hydraulicBoundaryLocation.Id, calculation.Id);
             Assert.AreSame(hydraulicBoundaryLocation.Name, calculation.Name);
             Assert.AreEqual(hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, calculation.CalculateIllustrationPoints);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/WaveHeightCalculationTest.cs
===================================================================
diff -u -rb461ea57ca863fd47810d2a27f40b54c9eab2187 -rf27e8e2e7c8d056c76f2f883ae6bdf03edb740fc
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/WaveHeightCalculationTest.cs	(.../WaveHeightCalculationTest.cs)	(revision b461ea57ca863fd47810d2a27f40b54c9eab2187)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/WaveHeightCalculationTest.cs	(.../WaveHeightCalculationTest.cs)	(revision f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc)
@@ -91,7 +91,7 @@
             var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.IsInstanceOf<IHydraulicBoundaryWrapperCalculation>(calculation);
+            Assert.IsInstanceOf<IHydraulicBoundaryCalculationWrapper>(calculation);
             Assert.AreEqual(hydraulicBoundaryLocation.Id, calculation.Id);
             Assert.AreSame(hydraulicBoundaryLocation.Name, calculation.Name);
             Assert.AreEqual(hydraulicBoundaryLocationCalculation.InputParameters.ShouldIllustrationPointsBeCalculated, calculation.CalculateIllustrationPoints);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -r409352706e7ed14c76bb43304d262fa22d148160 -rf27e8e2e7c8d056c76f2f883ae6bdf03edb740fc
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 409352706e7ed14c76bb43304d262fa22d148160)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc)
@@ -165,7 +165,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(calculateIllustrationPoints);
@@ -222,7 +222,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, preprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(false);
@@ -263,7 +263,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(readIllustrationPoints);
@@ -317,7 +317,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
@@ -370,7 +370,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Stub(c => c.Id).Return(100);
             calculation.Stub(c => c.CalculateIllustrationPoints).Return(true);
@@ -425,7 +425,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
 
@@ -465,7 +465,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
@@ -513,7 +513,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(false);
@@ -555,7 +555,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("name");
             calculation.Expect(c => c.Id).Return(0);
 
@@ -604,7 +604,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return(locationName);
             calculation.Expect(c => c.Id).Return(0);
 
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -r409352706e7ed14c76bb43304d262fa22d148160 -rf27e8e2e7c8d056c76f2f883ae6bdf03edb740fc
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 409352706e7ed14c76bb43304d262fa22d148160)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision f27e8e2e7c8d056c76f2f883ae6bdf03edb740fc)
@@ -167,7 +167,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(readIllustrationPoints);
@@ -223,7 +223,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, preprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(false);
@@ -262,7 +262,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(calculateIllustrationPoints);
@@ -312,7 +312,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
@@ -365,7 +365,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Stub(c => c.Id).Return(100);
             calculation.Stub(c => c.CalculateIllustrationPoints).Return(true);
@@ -420,7 +420,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
 
@@ -460,7 +460,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(true);
@@ -508,7 +508,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("punt_flw_ 1");
             calculation.Expect(c => c.Id).Return(100);
             calculation.Expect(c => c.CalculateIllustrationPoints).Return(false);
@@ -550,7 +550,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return("name");
             calculation.Expect(c => c.Id).Return(0);
 
@@ -599,7 +599,7 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath, validPreprocessorDirectory)).Return(calculator);
 
-            var calculation = mockRepository.Stub<IHydraulicBoundaryWrapperCalculation>();
+            var calculation = mockRepository.Stub<IHydraulicBoundaryCalculationWrapper>();
             calculation.Stub(c => c.Name).Return(locationName);
             calculation.Expect(c => c.Id).Return(0);