Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs
===================================================================
diff -u -r41a37c93cb0b3e36ff7023c9f42b4e6225598b55 -r5d5d353c6b6bdda426324c591029b096621abaa4
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs	(.../GrassCoverErosionInwardsCalculationServiceTest.cs)	(revision 41a37c93cb0b3e36ff7023c9f42b4e6225598b55)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs	(.../GrassCoverErosionInwardsCalculationServiceTest.cs)	(revision 5d5d353c6b6bdda426324c591029b096621abaa4)
@@ -42,7 +42,7 @@
     [TestFixture]
     public class GrassCoverErosionInwardsCalculationServiceTest
     {
-        private readonly static string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
+        private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
         [Test]
         public void Validate_NoHydraulicBoundaryDatabase_LogsErrorAndReturnsFalse()
@@ -369,7 +369,7 @@
         [Test]
         [TestCase(true, false)]
         [TestCase(false, true)]
-        public void CalculateDikeHeight_CalculationValid_DikeHeightCalculated(bool useForeland, bool calculateDikeHeight)
+        public void Calculate_CalculationValid_ReturnOutput(bool useForeland, bool calculateDikeHeight)
         {
             // Setup
             var grassCoverErosionInwardsFailureMechanism = new GrassCoverErosionInwardsFailureMechanism();
@@ -397,12 +397,12 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 // Call
-                new GrassCoverErosionInwardsCalculationService().CalculateDikeHeight(calculation,
-                                                                                     assessmentSectionStub,
-                                                                                     failureMechanismSection,
-                                                                                     grassCoverErosionInwardsFailureMechanism.GeneralInput,
-                                                                                     grassCoverErosionInwardsFailureMechanism.Contribution,
-                                                                                     testDataPath);
+                new GrassCoverErosionInwardsCalculationService().Calculate(calculation,
+                                                                           assessmentSectionStub,
+                                                                           failureMechanismSection,
+                                                                           grassCoverErosionInwardsFailureMechanism.GeneralInput,
+                                                                           grassCoverErosionInwardsFailureMechanism.Contribution,
+                                                                           testDataPath);
             }
 
             // Assert
@@ -421,7 +421,7 @@
         }
 
         [Test]
-        public void CalculateDikeHeight_DikeHeightCalculationFails_DikeHeightOutputNaN()
+        public void Calculate_DikeHeightCalculationFails_OutputNaN()
         {
             // Setup
             var grassCoverErosionInwardsFailureMechanism = new GrassCoverErosionInwardsFailureMechanism();
@@ -456,12 +456,12 @@
                         var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
                         calculator.EndInFailure = true;
 
-                        new GrassCoverErosionInwardsCalculationService().CalculateDikeHeight(calculation,
-                                                                                             assessmentSectionStub,
-                                                                                             failureMechanismSection,
-                                                                                             grassCoverErosionInwardsFailureMechanism.GeneralInput,
-                                                                                             grassCoverErosionInwardsFailureMechanism.Contribution,
-                                                                                             testDataPath);
+                        new GrassCoverErosionInwardsCalculationService().Calculate(calculation,
+                                                                                   assessmentSectionStub,
+                                                                                   failureMechanismSection,
+                                                                                   grassCoverErosionInwardsFailureMechanism.GeneralInput,
+                                                                                   grassCoverErosionInwardsFailureMechanism.Contribution,
+                                                                                   testDataPath);
                     }
                 }
                 catch (HydraRingFileParserException)
@@ -488,7 +488,7 @@
         }
 
         [Test]
-        public void CalculateOvertoppingOnly_OvertoppingCalculationFails_OutputNull()
+        public void Calculate_OvertoppingOnlyAndOvertoppingCalculationFails_OutputNull()
         {
             // Setup
             var grassCoverErosionInwardsFailureMechanism = new GrassCoverErosionInwardsFailureMechanism();
@@ -519,15 +519,15 @@
                 {
                     using (new HydraRingCalculatorFactoryConfig())
                     {
-                        var calculator = ((TestHydraRingCalculatorFactory)HydraRingCalculatorFactory.Instance).OvertoppingCalculator;
+                        var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator;
                         calculator.EndInFailure = true;
 
-                        new GrassCoverErosionInwardsCalculationService().CalculateDikeHeight(calculation,
-                                                                                             assessmentSectionStub,
-                                                                                             failureMechanismSection,
-                                                                                             grassCoverErosionInwardsFailureMechanism.GeneralInput,
-                                                                                             grassCoverErosionInwardsFailureMechanism.Contribution,
-                                                                                             testDataPath);
+                        new GrassCoverErosionInwardsCalculationService().Calculate(calculation,
+                                                                                   assessmentSectionStub,
+                                                                                   failureMechanismSection,
+                                                                                   grassCoverErosionInwardsFailureMechanism.GeneralInput,
+                                                                                   grassCoverErosionInwardsFailureMechanism.Contribution,
+                                                                                   testDataPath);
                     }
                 }
                 catch (HydraRingFileParserException)
@@ -585,12 +585,12 @@
                 calculator.CalculationFinishedHandler += (s, e) => service.Cancel();
 
                 // Call
-                service.CalculateDikeHeight(calculation,
-                                            assessmentSectionStub,
-                                            failureMechanismSection,
-                                            grassCoverErosionInwardsFailureMechanism.GeneralInput,
-                                            grassCoverErosionInwardsFailureMechanism.Contribution,
-                                            testDataPath);
+                service.Calculate(calculation,
+                                  assessmentSectionStub,
+                                  failureMechanismSection,
+                                  grassCoverErosionInwardsFailureMechanism.GeneralInput,
+                                  grassCoverErosionInwardsFailureMechanism.Contribution,
+                                  testDataPath);
 
                 // Assert
                 Assert.IsTrue(calculator.IsCanceled);
@@ -645,12 +645,12 @@
                 }
 
                 // Call
-                service.CalculateDikeHeight(calculation,
-                                            assessmentSectionStub,
-                                            failureMechanismSection,
-                                            grassCoverErosionInwardsFailureMechanism.GeneralInput,
-                                            grassCoverErosionInwardsFailureMechanism.Contribution,
-                                            testDataPath);
+                service.Calculate(calculation,
+                                  assessmentSectionStub,
+                                  failureMechanismSection,
+                                  grassCoverErosionInwardsFailureMechanism.GeneralInput,
+                                  grassCoverErosionInwardsFailureMechanism.Contribution,
+                                  testDataPath);
 
                 // Assert
                 Assert.IsNull(calculation.Output);
@@ -659,8 +659,8 @@
                 {
                     Assert.IsTrue(overToppingCalculator.IsCanceled);
 
-                    // dikeheightCalculator is initialised after the overtopping calculation succesfully finishes.
-                    Assert.IsFalse(dikeHeightCalculator.IsCanceled); 
+                    // dikeheightCalculator is initialized after the overtopping calculation successfully finishes.
+                    Assert.IsFalse(dikeHeightCalculator.IsCanceled);
                 }
                 else
                 {