Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -21,7 +21,6 @@
 
 using Core.Common.Base;
 using Ringtoets.Common.Data;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -30,7 +29,7 @@
     /// <summary>
     /// Class holding information about a wave conditions calculation for the <see cref="GrassCoverErosionOutwardsFailureMechanism"/>.
     /// </summary>
-    public class GrassCoverErosionOutwardsWaveConditionsCalculation : Observable, ICalculation
+    public class GrassCoverErosionOutwardsWaveConditionsCalculation : Observable, IWaveConditionsCalculation
     {
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionOutwardsWaveConditionsCalculation"/>.
@@ -41,13 +40,10 @@
             InputParameters = new WaveConditionsInput();
             Comments = new Comment();
         }
+        
+        public WaveConditionsInput InputParameters { get; }
 
         /// <summary>
-        /// Gets the input parameters to perform a wave conditions calculation with.
-        /// </summary>
-        public WaveConditionsInput InputParameters { get; private set; }
-
-        /// <summary>
         /// Gets or sets the output which contains the results of a wave conditions calculation.
         /// </summary>
         public GrassCoverErosionOutwardsWaveConditionsOutput Output { get; set; }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -22,7 +22,6 @@
 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;
 
@@ -38,7 +37,7 @@
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
 
             // Assert
-            Assert.IsInstanceOf<ICalculation>(calculation);
+            Assert.IsInstanceOf<IWaveConditionsCalculation>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
 
             Assert.AreEqual(RingtoetsCommonDataResources.Calculation_DefaultName, calculation.Name);
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/IWaveConditionsCalculation.cs
===================================================================
diff -u
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/IWaveConditionsCalculation.cs	(revision 0)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/IWaveConditionsCalculation.cs	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -0,0 +1,36 @@
+// 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.Common.Data.Calculation;
+
+namespace Ringtoets.Revetment.Data
+{
+    /// <summary>
+    /// Interface for wave conditions related calculation.
+    /// </summary>
+    public interface IWaveConditionsCalculation : ICalculation
+    {
+        /// <summary>
+        /// Gets the input parameters to perform a wave conditions calculation with.
+        /// </summary>
+        WaveConditionsInput InputParameters { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj
===================================================================
diff -u -r23d1e296e2da4364fbfe346e68d582dfcf966bb0 -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj	(.../Ringtoets.Revetment.Data.csproj)	(revision 23d1e296e2da4364fbfe346e68d582dfcf966bb0)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Ringtoets.Revetment.Data.csproj	(.../Ringtoets.Revetment.Data.csproj)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -40,6 +40,7 @@
       <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.IO/Importers/WaveConditionsCalculationConfigurationImporter.cs
===================================================================
diff -u
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Importers/WaveConditionsCalculationConfigurationImporter.cs	(revision 0)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Importers/WaveConditionsCalculationConfigurationImporter.cs	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -0,0 +1,66 @@
+// 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 System;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.IO.FileImporters;
+using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.IO.Readers;
+using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
+
+namespace Ringtoets.Revetment.IO.Importers
+{
+    /// <summary>
+    /// Imports a wave conditions calculation configuration from an XML file and stores it on a
+    /// <see cref="CalculationGroup"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of the calculation to import.</typeparam>
+    public class WaveConditionsCalculationConfigurationImporter<T>
+        : CalculationConfigurationImporter<WaveConditionsCalculationConfigurationReader, ReadWaveConditionsCalculation>
+        where T : IWaveConditionsCalculation, new()
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="WaveConditionsCalculationConfigurationImporter{T}"/>.
+        /// </summary>
+        /// <param name="xmlFilePath">The path to the XML file to import from.</param>
+        /// <param name="importTarget">The calculation group to update.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is
+        /// <c>null</c>.</exception>
+        public WaveConditionsCalculationConfigurationImporter(string xmlFilePath,
+                                                              CalculationGroup importTarget)
+            : base(xmlFilePath, importTarget) {}
+
+        protected override WaveConditionsCalculationConfigurationReader CreateCalculationConfigurationReader(string xmlFilePath)
+        {
+            return new WaveConditionsCalculationConfigurationReader(xmlFilePath);
+        }
+
+        protected override ICalculation ParseReadCalculation(ReadWaveConditionsCalculation readCalculation)
+        {
+            var calculation = new T
+            {
+                Name = readCalculation.Name
+            };
+
+            return calculation;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/ReadWaveConditionsCalculation.cs
===================================================================
diff -u -r3f40ee696a93367a869de85b3ed0fad2c54a23f2 -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/ReadWaveConditionsCalculation.cs	(.../ReadWaveConditionsCalculation.cs)	(revision 3f40ee696a93367a869de85b3ed0fad2c54a23f2)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/ReadWaveConditionsCalculation.cs	(.../ReadWaveConditionsCalculation.cs)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -27,7 +27,7 @@
     /// <summary>
     /// Class that represents a wave conditions calculation that is read via <see cref="WaveConditionsCalculationConfigurationReader"/>.
     /// </summary>
-    internal class ReadWaveConditionsCalculation : IReadConfigurationItem
+    public class ReadWaveConditionsCalculation : IReadConfigurationItem
     {
         /// <summary>
         /// Creates a new instance of <see cref="ReadWaveConditionsCalculation"/>.
@@ -121,7 +121,7 @@
         /// <summary>
         /// Class holding the various construction parameters for <see cref="ReadWaveConditionsCalculation"/>.
         /// </summary>
-        internal class ConstructionProperties
+        public class ConstructionProperties
         {
             /// <summary>
             /// Gets or sets the value for <see cref="ReadWaveConditionsCalculation.Name"/>.
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/WaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -r3f40ee696a93367a869de85b3ed0fad2c54a23f2 -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 3f40ee696a93367a869de85b3ed0fad2c54a23f2)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -35,7 +35,7 @@
     /// This class reads a wave conditions calculation configuration from XML and creates a collection of corresponding
     /// <see cref="IReadConfigurationItem"/>, typically containing one or more <see cref="ReadWaveConditionsCalculation"/>.
     /// </summary>
-    internal class WaveConditionsCalculationConfigurationReader : CalculationConfigurationReader<ReadWaveConditionsCalculation>
+    public class WaveConditionsCalculationConfigurationReader : CalculationConfigurationReader<ReadWaveConditionsCalculation>
     {
         private const string hydraulicBoundaryLocationSchemaName = "HrLocatieSchema.xsd";
         private const string orientationSchemaName = "OrientatieSchema.xsd";
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Ringtoets.Revetment.IO.csproj
===================================================================
diff -u -r3f40ee696a93367a869de85b3ed0fad2c54a23f2 -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Ringtoets.Revetment.IO.csproj	(.../Ringtoets.Revetment.IO.csproj)	(revision 3f40ee696a93367a869de85b3ed0fad2c54a23f2)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Ringtoets.Revetment.IO.csproj	(.../Ringtoets.Revetment.IO.csproj)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -48,6 +48,7 @@
     <Compile Include="CoverType.cs" />
     <Compile Include="ExportableWaveConditions.cs" />
     <Compile Include="ExportableWaveConditionsFactory.cs" />
+    <Compile Include="Importers\WaveConditionsCalculationConfigurationImporter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Importers/WaveConditionsCalculationConfigurationImporterTest.cs
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Importers/WaveConditionsCalculationConfigurationImporterTest.cs	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Importers/WaveConditionsCalculationConfigurationImporterTest.cs	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -0,0 +1,87 @@
+// 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 System.IO;
+using Core.Common.Base;
+using Core.Common.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.IO.FileImporters;
+using Ringtoets.Revetment.Data;
+using Ringtoets.Revetment.IO.Importers;
+using Ringtoets.Revetment.IO.Readers;
+
+namespace Ringtoets.Revetment.IO.Test.Importers
+{
+    [TestFixture]
+    public class WaveConditionsCalculationConfigurationImporterTest
+    {
+        private readonly string path = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO, "WaveConditionsCalculationConfigurationImporter");
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+                "",
+                new CalculationGroup());
+
+            // Assert
+            Assert.IsInstanceOf<CalculationConfigurationImporter<WaveConditionsCalculationConfigurationReader, ReadWaveConditionsCalculation>>(importer);
+        }
+
+        [Test]
+        public void Import_ValidConfigurationWithValidData_DataAddedToModel()
+        {
+            // Setup
+            string filePath = Path.Combine(path, "validConfigurationFullCalculation.xml");
+
+            var calculationGroup = new CalculationGroup();
+            var importer = new WaveConditionsCalculationConfigurationImporter<SimpleWaveConditionsCalculation>(
+                filePath,
+                calculationGroup);
+
+            // Call
+            bool successful = importer.Import();
+
+            // Assert
+            Assert.IsTrue(successful);
+
+            Assert.AreEqual(1, calculationGroup.Children.Count);
+            var calculation = (IWaveConditionsCalculation) calculationGroup.Children[0];
+            Assert.AreEqual("Berekening 1", calculation.Name);
+        }
+
+        private class SimpleWaveConditionsCalculation : Observable, IWaveConditionsCalculation
+        {
+            public string Name { get; set; }
+            public bool HasOutput { get; }
+            public Comment Comments { get; }
+            public void ClearOutput()
+            {
+                throw new System.NotImplementedException();
+            }
+
+            public WaveConditionsInput InputParameters { get; }
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Ringtoets.Revetment.IO.Test.csproj
===================================================================
diff -u -r96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Ringtoets.Revetment.IO.Test.csproj	(.../Ringtoets.Revetment.IO.Test.csproj)	(revision 96cd93f1a08294e5af3fec5f5ae0b59cbe914c4b)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Ringtoets.Revetment.IO.Test.csproj	(.../Ringtoets.Revetment.IO.Test.csproj)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -53,6 +53,7 @@
     <Compile Include="CoverTypeTest.cs" />
     <Compile Include="ExportableWaveConditionsFactoryTest.cs" />
     <Compile Include="ExportableWaveConditionsTest.cs" />
+    <Compile Include="Importers\WaveConditionsCalculationConfigurationImporterTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Readers\ReadWaveConditionsCalculationTest.cs" />
     <Compile Include="Readers\WaveConditionsCalculationConfigurationReaderTest.cs" />
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationImporter/validConfigurationFullCalculation.xml	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <hrlocatie>HRlocatie</hrlocatie>
+	<bovengrensbekleding>1.1</bovengrensbekleding>
+	<ondergrensbekleding>2.2</ondergrensbekleding>
+	<bovengrenswaterstanden>3.3</bovengrenswaterstanden>
+	<ondergrenswaterstanden>4.4</ondergrenswaterstanden>
+	<stapgrootte>0.5</stapgrootte>
+	<voorlandprofiel>Voorlandprofiel</voorlandprofiel>
+	<orientatie>5.5</orientatie>
+	<golfreductie>
+	  <damgebruiken>true</damgebruiken>
+	  <damtype>caisson</damtype>
+	  <damhoogte>6.6</damhoogte>
+	  <voorlandgebruiken>false</voorlandgebruiken>
+	</golfreductie>
+  </berekening>
+</configuratie>
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs	(.../StabilityStoneCoverWaveConditionsCalculation.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs	(.../StabilityStoneCoverWaveConditionsCalculation.cs)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -21,7 +21,6 @@
 
 using Core.Common.Base;
 using Ringtoets.Common.Data;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -30,7 +29,7 @@
     /// <summary>
     /// Class holding information about a wave conditions calculation for the <see cref="StabilityStoneCoverFailureMechanism"/>.
     /// </summary>
-    public class StabilityStoneCoverWaveConditionsCalculation : Observable, ICalculation
+    public class StabilityStoneCoverWaveConditionsCalculation : Observable, IWaveConditionsCalculation
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityStoneCoverWaveConditionsCalculation"/>.
@@ -41,13 +40,10 @@
             InputParameters = new WaveConditionsInput();
             Comments = new Comment();
         }
+        
+        public WaveConditionsInput InputParameters { get; }
 
         /// <summary>
-        /// Gets the input parameters to perform a wave conditions calculation with.
-        /// </summary>
-        public WaveConditionsInput InputParameters { get; private set; }
-
-        /// <summary>
         /// Gets or sets the output which contains the results of a wave conditions calculation.
         /// </summary>
         public StabilityStoneCoverWaveConditionsOutput Output { get; set; }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationTest.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationTest.cs)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -22,7 +22,6 @@
 using System.Linq;
 using Core.Common.Base;
 using NUnit.Framework;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 
 namespace Ringtoets.StabilityStoneCover.Data.Test
@@ -37,7 +36,7 @@
             var calculation = new StabilityStoneCoverWaveConditionsCalculation();
 
             // Assert
-            Assert.IsInstanceOf<ICalculation>(calculation);
+            Assert.IsInstanceOf<IWaveConditionsCalculation>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
 
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -21,7 +21,6 @@
 
 using Core.Common.Base;
 using Ringtoets.Common.Data;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
@@ -30,7 +29,7 @@
     /// <summary>
     /// Class holding information about a wave conditions calculation for the <see cref="WaveImpactAsphaltCoverFailureMechanism"/>.
     /// </summary>
-    public class WaveImpactAsphaltCoverWaveConditionsCalculation : Observable, ICalculation
+    public class WaveImpactAsphaltCoverWaveConditionsCalculation : Observable, IWaveConditionsCalculation
     {
         /// <summary>
         /// Creates a new instance of <see cref="WaveImpactAsphaltCoverWaveConditionsCalculation"/>.
@@ -42,10 +41,7 @@
             Comments = new Comment();
         }
 
-        /// <summary>
-        /// Gets the input parameters to perform a wave conditions calculation with.
-        /// </summary>
-        public WaveConditionsInput InputParameters { get; private set; }
+        public WaveConditionsInput InputParameters { get; }
 
         /// <summary>
         /// Gets or sets the output which contains the results of a wave conditions calculation.
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -r038eb94cddc025675fb784caca7acd7f4ec39b89
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs)	(revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs)	(revision 038eb94cddc025675fb784caca7acd7f4ec39b89)
@@ -22,7 +22,6 @@
 using System.Linq;
 using Core.Common.Base;
 using NUnit.Framework;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Data.Test
@@ -37,7 +36,7 @@
             var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation();
 
             // Assert
-            Assert.IsInstanceOf<ICalculation>(calculation);
+            Assert.IsInstanceOf<IWaveConditionsCalculation>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
 
             Assert.AreEqual("Nieuwe berekening", calculation.Name);