Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsInputContext.cs
===================================================================
diff -u -rdd95a590c807772d742ebe1b7e28611fa4931863 -rd1cbcc57f088a905c4f8573cf334d77936ecd7ef
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsInputContext.cs	(.../GrassCoverErosionInwardsInputContext.cs)	(revision dd95a590c807772d742ebe1b7e28611fa4931863)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsInputContext.cs	(.../GrassCoverErosionInwardsInputContext.cs)	(revision d1cbcc57f088a905c4f8573cf334d77936ecd7ef)
@@ -42,7 +42,7 @@
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
         public GrassCoverErosionInwardsInputContext(GrassCoverErosionInwardsInput input,
-                                                    ICalculation calculation,
+                                                    GrassCoverErosionInwardsCalculation calculation,
                                                     GrassCoverErosionInwardsFailureMechanism failureMechanism,
                                                     IAssessmentSection assessmentSection)
             : base(input, failureMechanism, assessmentSection)
@@ -61,6 +61,6 @@
         /// <summary>
         /// Gets the calculation item which the context belongs to.
         /// </summary>
-        public ICalculation Calculation { get; private set; }
+        public GrassCoverErosionInwardsCalculation Calculation { get; private set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/UITypeEditors/GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs
===================================================================
diff -u -r9b3a37b954fab3dd61b73794d641d709b609dcc5 -rd1cbcc57f088a905c4f8573cf334d77936ecd7ef
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/UITypeEditors/GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs	(.../GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs)	(revision 9b3a37b954fab3dd61b73794d641d709b609dcc5)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/UITypeEditors/GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs	(.../GrassCoverErosionInwardsInputContextHydraulicBoundaryLocationEditorTest.cs)	(revision d1cbcc57f088a905c4f8573cf334d77936ecd7ef)
@@ -26,7 +26,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses;
@@ -55,14 +54,14 @@
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput();
-            var calculationMock = mockRepository.StrictMock<ICalculation>();
-            
+            var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
+
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase)
                                  .Return(hydraulicBoundaryDatabase)
                                  .Repeat.AtLeastOnce();
             var inputContext = new GrassCoverErosionInwardsInputContext(grassCoverErosionInwardsInput,
-                                                                        calculationMock,
+                                                                        grassCoverErosionInwardsCalculation,
                                                                         failureMechanism,
                                                                         assessmentSectionMock);
 
@@ -101,18 +100,18 @@
             hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-            var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput()
+            var grassCoverErosionInwardsInput = new GrassCoverErosionInwardsInput
             {
                 HydraulicBoundaryLocation = hydraulicBoundaryLocation
             };
-            var calculationMock = mockRepository.StrictMock<ICalculation>();
-            
+            var grassCoverErosionInwardsCalculation = new GrassCoverErosionInwardsCalculation();
+
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase)
                                  .Return(hydraulicBoundaryDatabase)
                                  .Repeat.AtLeastOnce();
             var inputContext = new GrassCoverErosionInwardsInputContext(grassCoverErosionInwardsInput,
-                                                                        calculationMock,
+                                                                        grassCoverErosionInwardsCalculation,
                                                                         failureMechanism,
                                                                         assessmentSectionMock);
 
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs
===================================================================
diff -u -rdd95a590c807772d742ebe1b7e28611fa4931863 -rd1cbcc57f088a905c4f8573cf334d77936ecd7ef
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs	(.../HeightStructuresInputContext.cs)	(revision dd95a590c807772d742ebe1b7e28611fa4931863)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresInputContext.cs	(.../HeightStructuresInputContext.cs)	(revision d1cbcc57f088a905c4f8573cf334d77936ecd7ef)
@@ -42,7 +42,7 @@
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
         public HeightStructuresInputContext(HeightStructuresInput input,
-                                            ICalculation calculation,
+                                            HeightStructuresCalculation calculation,
                                             HeightStructuresFailureMechanism failureMechanism,
                                             IAssessmentSection assessmentSection)
             : base(input, failureMechanism, assessmentSection)
@@ -61,6 +61,6 @@
         /// <summary>
         /// Gets the calculation item which the context belongs to.
         /// </summary>
-        public ICalculation Calculation { get; private set; }
+        public HeightStructuresCalculation Calculation { get; private set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r4ffc292ede7e5d52019d7552ff67332a78210842 -rd1cbcc57f088a905c4f8573cf334d77936ecd7ef
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 4ffc292ede7e5d52019d7552ff67332a78210842)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision d1cbcc57f088a905c4f8573cf334d77936ecd7ef)
@@ -29,7 +29,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PropertyClasses;
 using Ringtoets.HeightStructures.Data;
@@ -68,14 +67,14 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var calculationMock = mockRepository.StrictMock<ICalculation>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
+            var calculation = new HeightStructuresCalculation();
             var input = new HeightStructuresInput();
             var properties = new HeightStructuresInputContextProperties();
 
-            var inputContext = new HeightStructuresInputContext(input, calculationMock, failureMechanism, assessmentSectionMock);
+            var inputContext = new HeightStructuresInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             // Call
             properties.Data = inputContext;
@@ -184,12 +183,12 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var calculationMock = mockRepository.StrictMock<ICalculation>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
+            var calculation = new HeightStructuresCalculation();
             var input = new HeightStructuresInput();
-            var inputContext = new HeightStructuresInputContext(input, calculationMock, failureMechanism, assessmentSectionMock);
+            var inputContext = new HeightStructuresInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             var properties = new HeightStructuresInputContextProperties
             {
@@ -210,12 +209,12 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var calculationMock = mockRepository.StrictMock<ICalculation>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
+            var calculation = new HeightStructuresCalculation();
             var input = new HeightStructuresInput();
-            var inputContext = new HeightStructuresInputContext(input, calculationMock, failureMechanism, assessmentSectionMock);
+            var inputContext = new HeightStructuresInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             var properties = new HeightStructuresInputContextProperties
             {
@@ -234,12 +233,12 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var calculationMock = mockRepository.StrictMock<ICalculation>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
+            var calculation = new HeightStructuresCalculation();
             var input = new HeightStructuresInput();
-            var inputContext = new HeightStructuresInputContext(input, calculationMock, failureMechanism, assessmentSectionMock);
+            var inputContext = new HeightStructuresInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             var properties = new HeightStructuresInputContextProperties
             {
@@ -258,12 +257,12 @@
         {
             // Setup
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            var calculationMock = mockRepository.StrictMock<ICalculation>();
             mockRepository.ReplayAll();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
+            var calculation = new HeightStructuresCalculation();
             var input = new HeightStructuresInput();
-            var inputContext = new HeightStructuresInputContext(input, calculationMock, failureMechanism, assessmentSectionMock);
+            var inputContext = new HeightStructuresInputContext(input, calculation, failureMechanism, assessmentSectionMock);
 
             // Call
             var properties = new HeightStructuresInputContextProperties
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs
===================================================================
diff -u -r9f9e6d0ed59b60fd6b686989f028fc588df8e4ea -rd1cbcc57f088a905c4f8573cf334d77936ecd7ef
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs	(.../HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs)	(revision 9f9e6d0ed59b60fd6b686989f028fc588df8e4ea)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/UITypeEditors/HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs	(.../HeightStructuresInputContextHydraulicBoundaryLocationEditorTest.cs)	(revision d1cbcc57f088a905c4f8573cf334d77936ecd7ef)
@@ -26,7 +26,6 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Common.Data.Calculation;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
 using Ringtoets.HeightStructures.Forms.PropertyClasses;
@@ -55,14 +54,14 @@
 
             var failureMechanism = new HeightStructuresFailureMechanism();
             var heightStructuresInput = new HeightStructuresInput();
-            var calculationMock = mockRepository.StrictMock<ICalculation>();
+            var heightStructuresCalculation = new HeightStructuresCalculation();
 
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase)
                                  .Return(hydraulicBoundaryDatabase)
                                  .Repeat.AtLeastOnce();
             var inputContext = new HeightStructuresInputContext(heightStructuresInput,
-                                                                calculationMock,
+                                                                heightStructuresCalculation,
                                                                 failureMechanism,
                                                                 assessmentSectionMock);
 
@@ -105,14 +104,14 @@
             {
                 HydraulicBoundaryLocation = hydraulicBoundaryLocation
             };
+            var heightStructuresCalculation = new HeightStructuresCalculation();
 
-            var calculationMock = mockRepository.StrictMock<ICalculation>();
             var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase)
                                  .Return(hydraulicBoundaryDatabase)
                                  .Repeat.AtLeastOnce();
             var inputContext = new HeightStructuresInputContext(heightStructuresInput,
-                                                                calculationMock,
+                                                                heightStructuresCalculation,
                                                                 failureMechanism,
                                                                 assessmentSectionMock);