Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -21,6 +21,7 @@
 
 using Core.Common.Base;
 using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -29,7 +30,7 @@
     /// <summary>
     /// Class holding information about a wave conditions calculation for the <see cref="GrassCoverErosionOutwardsFailureMechanism"/>.
     /// </summary>
-    public class GrassCoverErosionOutwardsWaveConditionsCalculation : Observable, IWaveConditionsCalculation
+    public class GrassCoverErosionOutwardsWaveConditionsCalculation : Observable, ICalculation<WaveConditionsInput>
     {
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsWaveConditionsCalculation"/>.
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContext.cs
===================================================================
diff -u -rec15ff35b39f333c422b8ca6988c34bd8573f134 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContext.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContext.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsInputContext.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContext.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.GrassCoverErosionOutwards.Data;
@@ -45,7 +46,7 @@
         /// the context belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public GrassCoverErosionOutwardsWaveConditionsInputContext(WaveConditionsInput wrappedData,
-                                                                   IWaveConditionsCalculation calculation,
+                                                                   ICalculation<WaveConditionsInput> calculation,
                                                                    GrassCoverErosionOutwardsFailureMechanism failureMechanism)
             : base(wrappedData, calculation)
         {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -22,6 +22,7 @@
 using System.Linq;
 using Core.Common.Base;
 using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -37,7 +38,7 @@
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
 
             // Assert
-            Assert.IsInstanceOf<IWaveConditionsCalculation>(calculation);
+            Assert.IsInstanceOf<ICalculation<WaveConditionsInput>>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
 
             Assert.AreEqual(RingtoetsCommonDataResources.Calculation_DefaultName, calculation.Name);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r91ff3f5d204bd88b21e62d553cfd867f1843859e -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 91ff3f5d204bd88b21e62d553cfd867f1843859e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -408,7 +408,7 @@
                 CloseForData = CloseCommentViewForData
             };
 
-            yield return new ViewInfo<WaveConditionsInputContext, IWaveConditionsCalculation, WaveConditionsInputView>
+            yield return new ViewInfo<WaveConditionsInputContext, ICalculation<WaveConditionsInput>, WaveConditionsInputView>
             {
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 GetViewName = (view, context) => RingtoetsCommonFormsResources.Calculation_Input,
@@ -984,20 +984,20 @@
 
         private static bool CloseWaveConditionsInputViewForData(WaveConditionsInputView view, object o)
         {
-            var context = o as ICalculationContext<IWaveConditionsCalculation, IFailureMechanism>;
+            var context = o as ICalculationContext<ICalculation<WaveConditionsInput>, IFailureMechanism>;
             if (context != null)
             {
                 return ReferenceEquals(view.Data, context.WrappedData);
             }
-            var calculation = o as IWaveConditionsCalculation;
+            var calculation = o as ICalculation<WaveConditionsInput>;
             if (calculation != null)
             {
                 return ReferenceEquals(view.Data, calculation);
             }
 
-            IEnumerable<IWaveConditionsCalculation> calculations = GetCalculationsFromCalculationGroupContexts(o);
+            IEnumerable<ICalculation<WaveConditionsInput>> calculations = GetCalculationsFromCalculationGroupContexts(o);
 
-            IEnumerable<IWaveConditionsCalculation> failureMechanismCalculations = GetCalculationsFromFailureMechanisms(o);
+            IEnumerable<ICalculation<WaveConditionsInput>> failureMechanismCalculations = GetCalculationsFromFailureMechanisms(o);
             if (failureMechanismCalculations != null)
             {
                 calculations = failureMechanismCalculations;
@@ -1006,9 +1006,9 @@
             return calculations != null && calculations.Any(c => ReferenceEquals(view.Data, c));
         }
 
-        private static IEnumerable<IWaveConditionsCalculation> GetCalculationsFromFailureMechanisms(object o)
+        private static IEnumerable<ICalculation<WaveConditionsInput>> GetCalculationsFromFailureMechanisms(object o)
         {
-            IEnumerable<IWaveConditionsCalculation> grassCoverErosionOutwardsCalculations = GetCalculationsFromFailureMechanism<
+            IEnumerable<ICalculation<WaveConditionsInput>> grassCoverErosionOutwardsCalculations = GetCalculationsFromFailureMechanism<
                 GrassCoverErosionOutwardsFailureMechanismContext,
                 GrassCoverErosionOutwardsFailureMechanism>(o);
 
@@ -1017,7 +1017,7 @@
                 return grassCoverErosionOutwardsCalculations;
             }
 
-            IEnumerable<IWaveConditionsCalculation> stabilityStoneCoverCalculations = GetCalculationsFromFailureMechanism<
+            IEnumerable<ICalculation<WaveConditionsInput>> stabilityStoneCoverCalculations = GetCalculationsFromFailureMechanism<
                 StabilityStoneCoverFailureMechanismContext,
                 StabilityStoneCoverFailureMechanism>(o);
 
@@ -1026,18 +1026,18 @@
                 return stabilityStoneCoverCalculations;
             }
 
-            IEnumerable<IWaveConditionsCalculation> waveImpactAsphaltCoverCalculations = GetCalculationsFromFailureMechanism<
+            IEnumerable<ICalculation<WaveConditionsInput>> waveImpactAsphaltCoverCalculations = GetCalculationsFromFailureMechanism<
                 WaveImpactAsphaltCoverFailureMechanismContext,
                 WaveImpactAsphaltCoverFailureMechanism>(o);
 
             return waveImpactAsphaltCoverCalculations;
         }
 
-        private static IEnumerable<IWaveConditionsCalculation> GetCalculationsFromFailureMechanism<TContext, TFailureMechanism>(object o)
+        private static IEnumerable<ICalculation<WaveConditionsInput>> GetCalculationsFromFailureMechanism<TContext, TFailureMechanism>(object o)
             where TContext : class, IFailureMechanismContext<TFailureMechanism>
             where TFailureMechanism : class, IFailureMechanism
         {
-            IEnumerable<IWaveConditionsCalculation> calculations = null;
+            IEnumerable<ICalculation<WaveConditionsInput>> calculations = null;
 
             var failureMechanism = o as TFailureMechanism;
 
@@ -1057,15 +1057,15 @@
 
             if (failureMechanism != null)
             {
-                calculations = (IEnumerable<IWaveConditionsCalculation>) failureMechanism.Calculations;
+                calculations = (IEnumerable<ICalculation<WaveConditionsInput>>) failureMechanism.Calculations;
             }
 
             return calculations;
         }
 
-        private static IEnumerable<IWaveConditionsCalculation> GetCalculationsFromCalculationGroupContexts(object o)
+        private static IEnumerable<ICalculation<WaveConditionsInput>> GetCalculationsFromCalculationGroupContexts(object o)
         {
-            IEnumerable<IWaveConditionsCalculation> calculations = null;
+            IEnumerable<ICalculation<WaveConditionsInput>> calculations = null;
 
             var grassCoverErosionOutwardsCalculationGroupContext = o as GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext;
             if (grassCoverErosionOutwardsCalculationGroupContext != null)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r57aa4b3ba3e2171b2f6c9a86719a26557dba29e6 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 57aa4b3ba3e2171b2f6c9a86719a26557dba29e6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs	(.../RingtoetsPluginTest.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -401,7 +401,7 @@
                 PluginTestHelper.AssertViewInfoDefined(
                     viewInfos,
                     typeof(WaveConditionsInputContext),
-                    typeof(IWaveConditionsCalculation),
+                    typeof(ICalculation<WaveConditionsInput>),
                     typeof(WaveConditionsInputView));
             }
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -rb317d05a553964e3bd44d8bf9e7564a15b598720 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision b317d05a553964e3bd44d8bf9e7564a15b598720)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -73,7 +73,7 @@
         {
             // Assert
             Assert.AreEqual(typeof(WaveConditionsInputContext), info.DataType);
-            Assert.AreEqual(typeof(IWaveConditionsCalculation), info.ViewDataType);
+            Assert.AreEqual(typeof(ICalculation<WaveConditionsInput>), info.ViewDataType);
             TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, info.Image);
         }
 
@@ -117,8 +117,8 @@
                 "CloseForData_CorrespondingToCalculationContext_ReturnTrue({0})"
             })]
         public void CloseForData_ViewCorrespondingToRemovedCalculationContext_ReturnsTrue(
-            ICalculationContext<IWaveConditionsCalculation, IFailureMechanism> context,
-            IWaveConditionsCalculation calculation)
+            ICalculationContext<ICalculation<WaveConditionsInput>, IFailureMechanism> context,
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle())
@@ -141,8 +141,8 @@
                 "CloseForData_NotCorrespondingToCalculationContext_ReturnFalse({0})"
             })]
         public void CloseForData_ViewNotCorrespondingToRemovedCalculationContext_ReturnsFalse(
-            ICalculationContext<IWaveConditionsCalculation, IFailureMechanism> context,
-            IWaveConditionsCalculation calculation)
+            ICalculationContext<ICalculation<WaveConditionsInput>, IFailureMechanism> context,
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             var calculationToRemove = new TestWaveConditionsCalculation();
@@ -207,7 +207,7 @@
             })]
         public void CloseForData_ViewCorrespondingWithRemovedCalculationGroupContext_ReturnsTrue(
             ICalculationContext<CalculationGroup, IFailureMechanism> context,
-            IWaveConditionsCalculation calculation)
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle())
@@ -231,7 +231,7 @@
             })]
         public void CloseForData_ViewNotCorrespondingWithRemovedCalculationGroupContext_ReturnsFalse(
             ICalculationContext<CalculationGroup, IFailureMechanism> context,
-            IWaveConditionsCalculation calculation)
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             var contextToRemove = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(new CalculationGroup(),
@@ -258,7 +258,7 @@
             })]
         public void CloseForData_ViewCorrespondingWithRemovedFailureMechanismContext_ReturnsTrue(
             IFailureMechanismContext<IFailureMechanism> context,
-            IWaveConditionsCalculation calculation)
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle())
@@ -282,7 +282,7 @@
             })]
         public void CloseForData_ViewNotCorrespondingWithRemovedFailureMechanismContext_ReturnsFalse(
             IFailureMechanismContext<IFailureMechanism> context,
-            IWaveConditionsCalculation calculation)
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle())
@@ -309,7 +309,7 @@
             })]
         public void CloseForData_ViewCorrespondingWithRemovedFailureMechanism_ReturnsTrue(
             IFailureMechanism failureMechanism,
-            IWaveConditionsCalculation calculation)
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle())
@@ -333,7 +333,7 @@
             })]
         public void CloseForData_ViewNotCorrespondingWithRemovedFailureMechanism_ReturnsFalse(
             IFailureMechanism failureMechanism,
-            IWaveConditionsCalculation calculation)
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle())
@@ -356,7 +356,7 @@
                 "CloseForData_CorrespondingWithAssessmentSection_ReturnTrue({0})"
             })]
         public void CloseForData_ViewCorrespondingToRemovedAssessmentSection_ReturnsTrue(AssessmentSection assessmentSection,
-                                                                                         IWaveConditionsCalculation calculation)
+                                                                                         ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle())
@@ -379,7 +379,7 @@
                 "CloseForData_NotCorrespondingWithAssessmentSection_ReturnFalse({0})"
             })]
         public void CloseForData_ViewNotCorrespondingToRemovedAssessmentSection_ReturnsFalse(AssessmentSection assessmentSection,
-                                                                                             IWaveConditionsCalculation calculation)
+                                                                                             ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             using (var view = new WaveConditionsInputView(new TestWaveConditionsInputViewStyle())
@@ -403,7 +403,7 @@
             })]
         public void CloseForData_NestedViewCorrespondingWithRemovedCalculationGroupContext_ReturnsTrue(
             ICalculationContext<CalculationGroup, IFailureMechanism> context,
-            IWaveConditionsCalculation calculation)
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             context.WrappedData.Children.RemoveAt(0);
@@ -436,7 +436,7 @@
             })]
         public void CloseForData_NestedViewNotCorrespondingWithRemovedCalculationGroupContext_ReturnsFalse(
             ICalculationContext<CalculationGroup, IFailureMechanism> context,
-            IWaveConditionsCalculation calculation)
+            ICalculation<WaveConditionsInput> calculation)
         {
             // Setup
             context.WrappedData.Children.RemoveAt(0);
Fisheye: Tag 43701b21ae485678c471bcf76ca9c374fd16b9f9 refers to a dead (removed) revision in file `Ringtoets/Revetment/src/Ringtoets.Revetment.Data/IWaveConditionsCalculation.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj
===================================================================
diff -u -r038eb94cddc025675fb784caca7acd7f4ec39b89 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj	(.../Ringtoets.Revetment.Data.csproj)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj	(.../Ringtoets.Revetment.Data.csproj)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -40,7 +40,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="GeneralWaveConditionsInput.cs" />
-    <Compile Include="IWaveConditionsCalculation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PresentationObjects/WaveConditionsInputContext.cs
===================================================================
diff -u -rec15ff35b39f333c422b8ca6988c34bd8573f134 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PresentationObjects/WaveConditionsInputContext.cs	(.../WaveConditionsInputContext.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PresentationObjects/WaveConditionsInputContext.cs	(.../WaveConditionsInputContext.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Controls.PresentationObjects;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Revetment.Data;
@@ -39,7 +40,7 @@
         /// <param name="wrappedData">The wrapped <see cref="WaveConditionsInput"/>.</param>
         /// <param name="calculation">The calculation having <paramref name="wrappedData"/> as input.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
-        protected WaveConditionsInputContext(WaveConditionsInput wrappedData, IWaveConditionsCalculation calculation)
+        protected WaveConditionsInputContext(WaveConditionsInput wrappedData, ICalculation<WaveConditionsInput> calculation)
             : base(wrappedData)
         {
             if (calculation == null)
@@ -52,7 +53,7 @@
         /// <summary>
         /// Gets the calculation containing the wrapped <see cref="WaveConditionsInput"/>.
         /// </summary>
-        public IWaveConditionsCalculation Calculation { get; private set; }
+        public ICalculation<WaveConditionsInput> Calculation { get; private set; }
 
         /// <summary>
         /// Gets the hydraulic boundary locations.
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs
===================================================================
diff -u -rb317d05a553964e3bd44d8bf9e7564a15b598720 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs	(.../WaveConditionsInputView.cs)	(revision b317d05a553964e3bd44d8bf9e7564a15b598720)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs	(.../WaveConditionsInputView.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -24,6 +24,7 @@
 using Core.Common.Base;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.Forms;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Forms.Factories;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Forms.Factories;
@@ -51,7 +52,7 @@
         private readonly ChartLineData designWaterLevelChartData;
         private readonly ChartMultipleLineData waterLevelsChartData;
 
-        private IWaveConditionsCalculation data;
+        private ICalculation<WaveConditionsInput> data;
 
         /// <summary>
         /// Creates a new instance of <see cref="WaveConditionsInputView"/>.        
@@ -101,7 +102,7 @@
             }
             set
             {
-                data = value as IWaveConditionsCalculation;
+                data = value as ICalculation<WaveConditionsInput>;
 
                 calculationObserver.Observable = data;
                 calculationInputObserver.Observable = data?.InputParameters;
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Importers/WaveConditionsCalculationConfigurationImporter.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Importers/WaveConditionsCalculationConfigurationImporter.cs	(.../WaveConditionsCalculationConfigurationImporter.cs)	(revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Importers/WaveConditionsCalculationConfigurationImporter.cs	(.../WaveConditionsCalculationConfigurationImporter.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -42,7 +42,7 @@
     /// <typeparam name="T">The type of the calculation to import.</typeparam>
     public class WaveConditionsCalculationConfigurationImporter<T>
         : CalculationConfigurationImporter<WaveConditionsCalculationConfigurationReader, ReadWaveConditionsCalculation>
-        where T : IWaveConditionsCalculation, new()
+        where T : ICalculation<WaveConditionsInput>, new()
     {
         private readonly IEnumerable<HydraulicBoundaryLocation> availableHydraulicBoundaryLocations;
         private readonly IEnumerable<ForeshoreProfile> availableForeshoreProfiles;
@@ -107,7 +107,7 @@
         /// <param name="readCalculation">The calculation read from the imported file.</param>
         /// <param name="calculation">The calculation to configure.</param>
         /// <returns><c>false</c> when one of the boundaries is invalid, <c>true</c> otherwise.</returns>
-        private bool TryReadBoundaries(ReadWaveConditionsCalculation readCalculation, IWaveConditionsCalculation calculation)
+        private bool TryReadBoundaries(ReadWaveConditionsCalculation readCalculation, ICalculation<WaveConditionsInput> calculation)
         {
             WaveConditionsInput input = calculation.InputParameters;
             return TryReadParameter(readCalculation.UpperBoundaryRevetment,
@@ -148,15 +148,15 @@
             return true;
         }
 
-        private static void ReadStepSize(ReadWaveConditionsCalculation readCalculation, IWaveConditionsCalculation calculation)
+        private static void ReadStepSize(ReadWaveConditionsCalculation readCalculation, ICalculation<WaveConditionsInput> calculation)
         {
             if (readCalculation.StepSize.HasValue)
             {
                 calculation.InputParameters.StepSize = (WaveConditionsInputStepSize) readCalculation.StepSize.Value;
             }
         }
 
-        private bool TryReadHydraulicBoundaryLocation(string locationName, IWaveConditionsCalculation calculation)
+        private bool TryReadHydraulicBoundaryLocation(string locationName, ICalculation<WaveConditionsInput> calculation)
         {
             HydraulicBoundaryLocation location;
 
@@ -169,7 +169,7 @@
             return false;
         }
 
-        private bool TryReadForeshoreProfile(string foreshoreProfileName, IWaveConditionsCalculation calculation)
+        private bool TryReadForeshoreProfile(string foreshoreProfileName, ICalculation<WaveConditionsInput> calculation)
         {
             ForeshoreProfile foreshoreProfile;
 
@@ -188,7 +188,7 @@
         /// <param name="readCalculation">The calculation read from the imported file.</param>
         /// <param name="calculation">The calculation to configure.</param>
         /// <returns><c>falce</c> when the orientation is invalid, <c>true</c> otherwise.</returns>
-        private bool TryReadOrientation(ReadWaveConditionsCalculation readCalculation, IWaveConditionsCalculation calculation)
+        private bool TryReadOrientation(ReadWaveConditionsCalculation readCalculation, ICalculation<WaveConditionsInput> calculation)
         {
             if (readCalculation.Orientation.HasValue)
             {
@@ -218,7 +218,7 @@
         /// <param name="calculation">The calculation to configure.</param>
         /// <returns><c>false</c> when there is an invalid wave reduction parameter defined,
         /// <c>true</c> otherwise.</returns>
-        private bool TryReadWaveReduction(ReadWaveConditionsCalculation readCalculation, IWaveConditionsCalculation calculation)
+        private bool TryReadWaveReduction(ReadWaveConditionsCalculation readCalculation, ICalculation<WaveConditionsInput> calculation)
         {
             if (!ValidateWaveReduction(readCalculation, calculation))
             {
@@ -254,7 +254,7 @@
         /// <param name="calculation">The calculation to configure.</param>
         /// <returns><c>false</c> when there is an invalid wave reduction parameter defined,
         /// <c>true</c> otherwise.</returns>
-        private bool ValidateWaveReduction(ReadWaveConditionsCalculation readCalculation, IWaveConditionsCalculation calculation)
+        private bool ValidateWaveReduction(ReadWaveConditionsCalculation readCalculation, ICalculation<WaveConditionsInput> calculation)
         {
             if (calculation.InputParameters.ForeshoreProfile == null)
             {
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs
===================================================================
diff -u -r6cebfd1214a436c86e4d4b4f930ae77a69b0499d -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs	(.../TestWaveConditionsCalculation.cs)	(revision 6cebfd1214a436c86e4d4b4f930ae77a69b0499d)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs	(.../TestWaveConditionsCalculation.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -20,19 +20,18 @@
 // All rights reserved.
 
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Ringtoets.Common.Data;
-using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Revetment.TestUtil
 {
     /// <summary>
-    /// Creates a simple <see cref="IWaveConditionsCalculation"/> implementation, which
-    /// can have an object set as output.
+    /// Creates a simple <see cref="ICalculation{T}"/> implementation
+    /// for wave conditions, which can have an object set as output.
     /// </summary>
-    public class TestWaveConditionsCalculation : Observable, IWaveConditionsCalculation
+    public class TestWaveConditionsCalculation : Observable, ICalculation<WaveConditionsInput>
     {
         /// <summary>
         /// Creates a new instance of <see cref="TestWaveConditionsCalculation"/>.
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil/TestWaveConditionsInputContext.cs
===================================================================
diff -u -r0c889cff16b60d497640a21c3c9a2ede888dd263 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil/TestWaveConditionsInputContext.cs	(.../TestWaveConditionsInputContext.cs)	(revision 0c889cff16b60d497640a21c3c9a2ede888dd263)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.TestUtil/TestWaveConditionsInputContext.cs	(.../TestWaveConditionsInputContext.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System.Collections.Generic;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Revetment.Data;
@@ -56,11 +57,11 @@
         /// Creates a new <see cref="TestWaveConditionsInputContext"/>.
         /// </summary>
         /// <param name="wrappedData">The wrapped <see cref="WaveConditionsInput"/>.</param>
-        /// <param name="calculation"></param>
+        /// <param name="calculation">The calculation</param>
         /// <param name="foreshoreProfiles">The foreshore profiles.</param>
         /// <param name="locations">The hydraulic boundary locations.</param>
         public TestWaveConditionsInputContext(WaveConditionsInput wrappedData,
-                                              IWaveConditionsCalculation calculation,
+                                              ICalculation<WaveConditionsInput> calculation,
                                               IEnumerable<ForeshoreProfile> foreshoreProfiles,
                                               IEnumerable<HydraulicBoundaryLocation> locations)
             : base(wrappedData, calculation)
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Importers/WaveConditionsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r022a409926423d8107a307e28e3a13a8f2a83188 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Importers/WaveConditionsCalculationConfigurationImporterTest.cs	(.../WaveConditionsCalculationConfigurationImporterTest.cs)	(revision 022a409926423d8107a307e28e3a13a8f2a83188)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Importers/WaveConditionsCalculationConfigurationImporterTest.cs	(.../WaveConditionsCalculationConfigurationImporterTest.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -254,7 +254,7 @@
             };
 
             Assert.AreEqual(1, calculationGroup.Children.Count);
-            AssertWaveConditionsCalculation(expectedCalculation, (IWaveConditionsCalculation) calculationGroup.Children[0]);
+            AssertWaveConditionsCalculation(expectedCalculation, (ICalculation<WaveConditionsInput>) calculationGroup.Children[0]);
         }
 
         [Test]
@@ -318,10 +318,10 @@
             };
 
             Assert.AreEqual(1, calculationGroup.Children.Count);
-            AssertWaveConditionsCalculation(expectedCalculation, (IWaveConditionsCalculation) calculationGroup.Children[0]);
+            AssertWaveConditionsCalculation(expectedCalculation, (ICalculation<WaveConditionsInput>) calculationGroup.Children[0]);
         }
 
-        private void AssertWaveConditionsCalculation(IWaveConditionsCalculation expectedCalculation, IWaveConditionsCalculation actualCalculation)
+        private void AssertWaveConditionsCalculation(ICalculation<WaveConditionsInput> expectedCalculation, ICalculation<WaveConditionsInput> actualCalculation)
         {
             Assert.AreEqual(expectedCalculation.Name, actualCalculation.Name);
             Assert.AreSame(expectedCalculation.InputParameters.HydraulicBoundaryLocation, actualCalculation.InputParameters.HydraulicBoundaryLocation);
@@ -338,7 +338,7 @@
             Assert.AreEqual(expectedCalculation.InputParameters.BreakWater.Type, actualCalculation.InputParameters.BreakWater.Type);
         }
 
-        private class SimpleWaveConditionsCalculation : Observable, IWaveConditionsCalculation
+        private class SimpleWaveConditionsCalculation : Observable, ICalculation<WaveConditionsInput>
         {
             public SimpleWaveConditionsCalculation()
             {
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs	(.../StabilityStoneCoverWaveConditionsCalculation.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs	(.../StabilityStoneCoverWaveConditionsCalculation.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -21,6 +21,7 @@
 
 using Core.Common.Base;
 using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -29,7 +30,7 @@
     /// <summary>
     /// Class holding information about a wave conditions calculation for the <see cref="StabilityStoneCoverFailureMechanism"/>.
     /// </summary>
-    public class StabilityStoneCoverWaveConditionsCalculation : Observable, IWaveConditionsCalculation
+    public class StabilityStoneCoverWaveConditionsCalculation : Observable, ICalculation<WaveConditionsInput>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityStoneCoverWaveConditionsCalculation"/>.
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs
===================================================================
diff -u -rec15ff35b39f333c422b8ca6988c34bd8573f134 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs	(.../StabilityStoneCoverWaveConditionsInputContext.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsInputContext.cs	(.../StabilityStoneCoverWaveConditionsInputContext.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Revetment.Data;
@@ -47,7 +48,7 @@
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public StabilityStoneCoverWaveConditionsInputContext(WaveConditionsInput wrappedData,
-                                                             IWaveConditionsCalculation calculation,
+                                                             ICalculation<WaveConditionsInput> calculation,
                                                              IEnumerable<ForeshoreProfile> foreshoreProfiles,
                                                              IAssessmentSection assessmentSection) : base(wrappedData, calculation)
         {
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -r94f2ec1496623ae488b567f883e66b4d26243441 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationTest.cs)	(revision 94f2ec1496623ae488b567f883e66b4d26243441)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationTest.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -22,6 +22,7 @@
 using System.Linq;
 using Core.Common.Base;
 using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 
 namespace Ringtoets.StabilityStoneCover.Data.Test
@@ -36,7 +37,7 @@
             var calculation = new StabilityStoneCoverWaveConditionsCalculation();
 
             // Assert
-            Assert.IsInstanceOf<IWaveConditionsCalculation>(calculation);
+            Assert.IsInstanceOf<ICalculation<WaveConditionsInput>>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
 
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -21,6 +21,7 @@
 
 using Core.Common.Base;
 using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -29,7 +30,7 @@
     /// <summary>
     /// Class holding information about a wave conditions calculation for the <see cref="WaveImpactAsphaltCoverFailureMechanism"/>.
     /// </summary>
-    public class WaveImpactAsphaltCoverWaveConditionsCalculation : Observable, IWaveConditionsCalculation
+    public class WaveImpactAsphaltCoverWaveConditionsCalculation : Observable, ICalculation<WaveConditionsInput>
     {
         /// <summary>
         /// Creates a new instance of <see cref="WaveImpactAsphaltCoverWaveConditionsCalculation"/>.
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs
===================================================================
diff -u -rec15ff35b39f333c422b8ca6988c34bd8573f134 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContext.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContext.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Revetment.Data;
@@ -46,7 +47,7 @@
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public WaveImpactAsphaltCoverWaveConditionsInputContext(WaveConditionsInput wrappedData,
-                                                                IWaveConditionsCalculation calculation,
+                                                                ICalculation<WaveConditionsInput> calculation,
                                                                 IEnumerable<ForeshoreProfile> foreshoreProfiles,
                                                                 IAssessmentSection assessmentSection)
             : base(wrappedData, calculation)
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -r08d25a2d4cd349395730ef39d3abf2cc51c30508 -r43701b21ae485678c471bcf76ca9c374fd16b9f9
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs)	(revision 08d25a2d4cd349395730ef39d3abf2cc51c30508)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs)	(revision 43701b21ae485678c471bcf76ca9c374fd16b9f9)
@@ -22,6 +22,7 @@
 using System.Linq;
 using Core.Common.Base;
 using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Data.Test
@@ -36,7 +37,7 @@
             var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation();
 
             // Assert
-            Assert.IsInstanceOf<IWaveConditionsCalculation>(calculation);
+            Assert.IsInstanceOf<ICalculation<WaveConditionsInput>>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
 
             Assert.AreEqual("Nieuwe berekening", calculation.Name);