Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -ra5c551a343fee7ea3d7e46dd36c82cf180a1b597
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision a5c551a343fee7ea3d7e46dd36c82cf180a1b597)
@@ -112,7 +112,7 @@
             {
                 WaveHeightCalculationInput calculationInput = CreateInput(waveHeightCalculation, norm, hydraulicBoundaryDatabaseFilePath);
 
-                bool calculateIllustrationPoints = waveHeightCalculation.GetCalculateIllustrationPoints();
+                bool calculateIllustrationPoints = waveHeightCalculation.CalculateIllustrationPoints;
                 if (calculateIllustrationPoints)
                 {
                     calculator.CalculateWithIllustrationPoints(calculationInput);
@@ -128,23 +128,23 @@
                 }
 
                 HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput(
-                    messageProvider, waveHeightCalculation.GetName(), calculationInput.Beta, norm, calculator.Converged);
+                    messageProvider, waveHeightCalculation.Name, calculationInput.Beta, norm, calculator.Converged);
 
                 if (calculateIllustrationPoints)
                 {
                     SetIllustrationPointsResult(hydraulicBoundaryLocationOutput, calculator.IllustrationPointsResult);
                 }
 
-                waveHeightCalculation.SetOutput(hydraulicBoundaryLocationOutput);
+                waveHeightCalculation.Output = hydraulicBoundaryLocationOutput;
             }
             catch (HydraRingCalculationException e)
             {
                 if (!canceled)
                 {
                     string lastErrorContent = calculator.LastErrorFileContent;
                     log.Error(!string.IsNullOrEmpty(lastErrorContent)
-                                  ? messageProvider.GetCalculationFailedMessage(waveHeightCalculation.GetName(), lastErrorContent)
-                                  : messageProvider.GetCalculationFailedMessage(waveHeightCalculation.GetName(), e.Message), 
+                                  ? messageProvider.GetCalculationFailedMessage(waveHeightCalculation.Name, lastErrorContent)
+                                  : messageProvider.GetCalculationFailedMessage(waveHeightCalculation.Name, e.Message), 
                                   e);
 
                     exceptionThrown = true;
@@ -157,7 +157,7 @@
                 bool errorOccurred = CalculationServiceHelper.HasErrorOccurred(canceled, exceptionThrown, lastErrorFileContent);
                 if (errorOccurred)
                 {
-                    log.Error(messageProvider.GetCalculationFailedMessage(waveHeightCalculation.GetName(), lastErrorFileContent));
+                    log.Error(messageProvider.GetCalculationFailedMessage(waveHeightCalculation.Name, lastErrorFileContent));
                 }
 
                 log.InfoFormat(Resources.WaveHeightCalculationService_Calculate_Calculation_temporary_directory_can_be_found_on_location_0, calculator.OutputDirectory);
@@ -245,7 +245,7 @@
                                                               double norm,
                                                               string hydraulicBoundaryDatabaseFilePath)
         {
-            var waveHeightCalculationInput = new WaveHeightCalculationInput(1, waveHeightCalculation.GetId(), norm);
+            var waveHeightCalculationInput = new WaveHeightCalculationInput(1, waveHeightCalculation.Id, norm);
 
             HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(waveHeightCalculationInput, hydraulicBoundaryDatabaseFilePath);