Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -r83003ce3a26b35511212cc95936e8574bea66516 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 83003ce3a26b35511212cc95936e8574bea66516)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs	(.../GrassCoverErosionInwardsCalculationService.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -116,7 +116,7 @@
                                                    string hlcdDirectory, FailureMechanismSection failureMechanismSection,
                                                    string ringId, GeneralGrassCoverErosionInwardsInput generalInput)
         {
-            var targetProbabiltyCalculationParser = new TargetProbabilityCalculationParser();
+            var targetProbabiltyCalculationParser = new ReliabilityIndexCalculationParser();
 
             DikeHeightCalculationInput dikeHeightCalculationInput = CreateDikeHeightInput(calculation, assessmentSection, failureMechanismSection, generalInput);
 
@@ -144,7 +144,7 @@
             }
         }
 
-        private static void VerifyDikeHeightCalculationOutput(TargetProbabilityCalculationOutput output, string name)
+        private static void VerifyDikeHeightCalculationOutput(ReliabilityIndexCalculationOutput output, string name)
         {
             if (output == null)
             {
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ReliabilityIndexCalculationOutput.cs
===================================================================
diff -u -r8af1969d1c361e73872221f3a7acbceb099ce346 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ReliabilityIndexCalculationOutput.cs	(.../ReliabilityIndexCalculationOutput.cs)	(revision 8af1969d1c361e73872221f3a7acbceb099ce346)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ReliabilityIndexCalculationOutput.cs	(.../ReliabilityIndexCalculationOutput.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -22,8 +22,8 @@
 namespace Ringtoets.HydraRing.Calculation.Data.Output
 {
     /// <summary>
-    /// Container of all relevant output generated by Hydra-Ring calculations that
-    /// iterate towards a reliability index.
+    /// Container of all relevant output generated by a type II calculation via Hydra-Ring:
+    /// Iterate towards a reliability index.
     /// </summary>
     public class ReliabilityIndexCalculationOutput
     {
Fisheye: Tag 1fc13faf53c33c00d732ca48082a25368f72eaf5 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/TargetProbabilityCalculationOutput.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs
===================================================================
diff -u -r8af1969d1c361e73872221f3a7acbceb099ce346 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs	(.../ReliabilityIndexCalculationParser.cs)	(revision 8af1969d1c361e73872221f3a7acbceb099ce346)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs	(.../ReliabilityIndexCalculationParser.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -24,26 +24,28 @@
 using System.IO;
 using System.Linq;
 using Ringtoets.HydraRing.Calculation.Data.Output;
-using Ringtoets.HydraRing.IO;
+using Ringtoets.HydraRing.Calculation.Services;
 
 namespace Ringtoets.HydraRing.Calculation.Parsers
 {
     /// <summary>
-    /// Parser for the output of Hydra-Ring calculations that iterate towards a reliability index.
+    /// Parser for the output of a Hydra-Ring type II calculation:
+    /// Iterate towards a reliability index.
     /// </summary>
     public class ReliabilityIndexCalculationParser : IHydraRingFileParser
     {
         /// <summary>
-        /// Gets a <see cref="ReliabilityIndexCalculationOutput"/> 
-        /// corresponding to the section id if <see cref="Parse"/> executed successfully; or <c>null</c> otherwise.
+        /// Gets the output of a successful parse of the output file.
         /// </summary>
+        /// <returns>A <see cref="ReliabilityIndexCalculationOutput"/> corresponding to the section id if <see cref="Parse"/> executed
+        /// successfully; or <c>null</c> otherwise.</returns>
         public ReliabilityIndexCalculationOutput Output { get; private set; }
 
         public void Parse(string workingDirectory, int sectionId)
         {
             try
             {
-                using (var streamReader = new StreamReader(Path.Combine(workingDirectory, HydraRingFileConstants.DesignTablesFileName)))
+                using (var streamReader = new StreamReader(Path.Combine(workingDirectory, HydraRingFileName.DesignTablesFileName)))
                 {
                     var fileContents = streamReader.ReadToEnd();
                     var lines = fileContents.Split('\n');
@@ -59,9 +61,9 @@
                     }
                 }
             }
-            catch(Exception e)
+            catch
             {
-                throw new HydraRingFileParserException("", e);
+                // ignored
             }
         }
 
Fisheye: Tag 1fc13faf53c33c00d732ca48082a25368f72eaf5 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/TargetProbabilityCalculationParser.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r69ba8c3394d749398c3f07bd925d805225d7c672 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 69ba8c3394d749398c3f07bd925d805225d7c672)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -65,7 +65,7 @@
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationAlphaOutput.cs" />
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationOutput.cs" />
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationOutputBase.cs" />
-    <Compile Include="Data\Output\TargetProbabilityCalculationOutput.cs" />
+    <Compile Include="Data\Output\ReliabilityIndexCalculationOutput.cs" />
     <Compile Include="Data\Output\OvertoppingCalculationWaveHeightOutput.cs" />
     <Compile Include="IO\DesignTablesSettingsCsvReader.cs" />
     <Compile Include="IO\HydraRingSettingsCsvReader.cs" />
@@ -99,7 +99,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Data\HydraRingTimeIntegrationSchemeType.cs" />
     <Compile Include="Data\HydraRingUncertaintiesType.cs" />
-    <Compile Include="Parsers\TargetProbabilityCalculationParser.cs" />
+    <Compile Include="Parsers\ReliabilityIndexCalculationParser.cs" />
     <Compile Include="Services\HydraRingFileName.cs" />
     <Compile Include="Services\HydraRingInitializationService.cs" />
     <Compile Include="Services\HydraRingProcessFactory.cs" />
Fisheye: Tag 1fc13faf53c33c00d732ca48082a25368f72eaf5 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/TargetProbabilityCalculationOutputTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7fc83cb215cf25d15d40ffa5c164eac94cc257b2 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/ReliabilityIndexCalculationParserTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1fc13faf53c33c00d732ca48082a25368f72eaf5 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/TargetProbabilityCalculationParserTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r69ba8c3394d749398c3f07bd925d805225d7c672 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 69ba8c3394d749398c3f07bd925d805225d7c672)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -73,12 +73,12 @@
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationAlphaOutputTest.cs" />
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationOutputBaseTest.cs" />
     <Compile Include="Data\Output\ExceedanceProbabilityCalculationOutputTest.cs" />
-    <Compile Include="Data\Output\TargetProbabilityCalculationOutputTest.cs" />
+    <Compile Include="Data\Output\ReliabilityIndexCalculationOutputTest.cs" />
     <Compile Include="IO\DesignTablesSettingsCsvReaderTest.cs" />
     <Compile Include="IO\HydraRingSettingsCsvReaderTest.cs" />
     <Compile Include="Parsers\ExceedanceProbabilityCalculationParserTest.cs" />
     <Compile Include="Parsers\HydraRingOutputFileParserTest.cs" />
-    <Compile Include="Parsers\TargetProbabilityCalculationParserTest.cs" />
+    <Compile Include="Parsers\ReliabilityIndexCalculationParserTest.cs" />
     <Compile Include="Parsers\OvertoppingCalculationWaveHeightParserTest.cs" />
     <Compile Include="Services\HydraRingConfigurationServiceTest.cs" />
     <Compile Include="Data\HydraRingSectionTest.cs" />
Fisheye: Tag 1fc13faf53c33c00d732ca48082a25368f72eaf5 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/TargetProbabilityCalculationParser/empty/designTable.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1fc13faf53c33c00d732ca48082a25368f72eaf5 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/TargetProbabilityCalculationParser/exampleOutputTable/designTable.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1fc13faf53c33c00d732ca48082a25368f72eaf5 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Parsers/TargetProbabilityCalculationParser/exampleOutputTableWithWhiteLine/designTable.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationActivity.cs
===================================================================
diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationActivity.cs	(.../DesignWaterLevelCalculationActivity.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -35,7 +35,7 @@
     /// <summary>
     /// <see cref="Activity"/> for running a design water level calculation.
     /// </summary>
-    public class DesignWaterLevelCalculationActivity : HydraRingActivity<TargetProbabilityCalculationOutput>
+    public class DesignWaterLevelCalculationActivity : HydraRingActivity<ReliabilityIndexCalculationOutput>
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(DesignWaterLevelCalculationActivity));
 
@@ -88,7 +88,7 @@
             {
                 hydraulicBoundaryLocation.DesignWaterLevel = (RoundedDouble) Output.Result;
                 bool designWaterLevelCalculationConvergence =
-                    Math.Abs(Output.ActualTargetProbability - StatisticsConverter.NormToBeta(assessmentSection.FailureMechanismContribution.Norm)) <= 10e-5;
+                    Math.Abs(Output.CalculatedReliabilityIndex - StatisticsConverter.NormToBeta(assessmentSection.FailureMechanismContribution.Norm)) <= 10e-3;
                 if (!designWaterLevelCalculationConvergence)
                 {
                     log.WarnFormat(Resources.DesignWaterLevelCalculationActivity_DesignWaterLevel_calculation_for_location_0_not_converged, hydraulicBoundaryLocation.Name);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r52bdea1c12a0bd8a3aee7673de0f9b328580f475 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 52bdea1c12a0bd8a3aee7673de0f9b328580f475)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -77,13 +77,13 @@
         /// <param name="hydraulicBoundaryDatabase">The <see cref="HydraulicBoundaryDatabase"/> to base the input for the calculation upon.</param>
         /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> to perform the calculation for.</param>
         /// <param name="ringId">The id of the ring to perform the calculation for.</param>
-        /// <returns>A <see cref="TargetProbabilityCalculationOutput"/> on a successful calculation, <c>null</c> otherwise.</returns>
-        internal static TargetProbabilityCalculationOutput Calculate(IAssessmentSection assessmentSection, HydraulicBoundaryDatabase hydraulicBoundaryDatabase,
+        /// <returns>A <see cref="ReliabilityIndexCalculationOutput"/> on a successful calculation, <c>null</c> otherwise.</returns>
+        internal static ReliabilityIndexCalculationOutput Calculate(IAssessmentSection assessmentSection, HydraulicBoundaryDatabase hydraulicBoundaryDatabase,
                                                                      HydraulicBoundaryLocation hydraulicBoundaryLocation, string ringId)
         {
             var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabase.FilePath);
             var input = CreateInput(assessmentSection, hydraulicBoundaryLocation);
-            var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser();
+            var targetProbabilityCalculationParser = new ReliabilityIndexCalculationParser();
             var calculationName = string.Format(Resources.DesignWaterLevelCalculationService_Name_Assessment_level_for_location_0_, hydraulicBoundaryLocation.Name);
 
             CalculationServiceHelper.PerformCalculation(
@@ -107,7 +107,7 @@
             return targetProbabilityCalculationParser.Output;
         }
 
-        private static void VerifyOutput(TargetProbabilityCalculationOutput output, string name)
+        private static void VerifyOutput(ReliabilityIndexCalculationOutput output, string name)
         {
             if (output == null)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -35,7 +35,7 @@
     /// <summary>
     /// <see cref="Activity"/> for running a water height calculation.
     /// </summary>
-    public class WaveHeightCalculationActivity : HydraRingActivity<TargetProbabilityCalculationOutput>
+    public class WaveHeightCalculationActivity : HydraRingActivity<ReliabilityIndexCalculationOutput>
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(WaveHeightCalculationActivity));
 
@@ -88,7 +88,7 @@
             {
                 hydraulicBoundaryLocation.WaveHeight = (RoundedDouble) Output.Result;
                 bool waveHeightCalculationConvergence =
-                    Math.Abs(Output.ActualTargetProbability - StatisticsConverter.NormToBeta(assessmentSection.FailureMechanismContribution.Norm)) <= 10e-5;
+                    Math.Abs(Output.CalculatedReliabilityIndex - StatisticsConverter.NormToBeta(assessmentSection.FailureMechanismContribution.Norm)) <= 10e-3;
                 if (!waveHeightCalculationConvergence)
                 {
                     log.WarnFormat(Resources.WaveHeightCalculationActivity_WaveHeight_calculation_for_location_0_not_converged, hydraulicBoundaryLocation.Name);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r52bdea1c12a0bd8a3aee7673de0f9b328580f475 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 52bdea1c12a0bd8a3aee7673de0f9b328580f475)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -77,13 +77,13 @@
         /// <param name="hydraulicBoundaryDatabase">The <see cref="HydraulicBoundaryDatabase"/> to base the input for the calculation upon.</param>
         /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> to perform the calculation for.</param>
         /// <param name="ringId">The id of the ring to perform the calculation for.</param>
-        /// <returns>A <see cref="TargetProbabilityCalculationOutput"/> on a successful calculation, <c>null</c> otherwise.</returns>
-        internal static TargetProbabilityCalculationOutput Calculate(IAssessmentSection assessmentSection, HydraulicBoundaryDatabase hydraulicBoundaryDatabase,
+        /// <returns>A <see cref="ReliabilityIndexCalculationOutput"/> on a successful calculation, <c>null</c> otherwise.</returns>
+        internal static ReliabilityIndexCalculationOutput Calculate(IAssessmentSection assessmentSection, HydraulicBoundaryDatabase hydraulicBoundaryDatabase,
                                                                      HydraulicBoundaryLocation hydraulicBoundaryLocation, string ringId)
         {
             var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabase.FilePath);
             var input = CreateInput(assessmentSection, hydraulicBoundaryLocation);
-            var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser();
+            var targetProbabilityCalculationParser = new ReliabilityIndexCalculationParser();
             var calculationName = string.Format(Resources.WaveHeightCalculationService_Name_Wave_height_for_location_0_, hydraulicBoundaryLocation.Name);
 
             CalculationServiceHelper.PerformCalculation(
@@ -107,7 +107,7 @@
             return targetProbabilityCalculationParser.Output;
         }
 
-        private static void VerifyOutput(TargetProbabilityCalculationOutput output, string name)
+        private static void VerifyOutput(ReliabilityIndexCalculationOutput output, string name)
         {
             if (output == null)
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -246,22 +246,22 @@
             ImportHydraulicBoundaryDatabase(assessmentSectionStub);
 
             var hydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(loc => loc.Id == 1300001);
-            hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = CalculationConvergence.CalculatedConverged;
+            hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = CalculationConvergence.CalculatedNotConverged;
 
             var activity = new DesignWaterLevelCalculationActivity(assessmentSectionStub, hydraulicBoundaryLocation);
 
             activity.Run();
 
             // Precondition
             Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel);
-            Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence);
+            Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence);
 
             // Call
             activity.Finish();
 
             // Assert
             Assert.IsFalse(double.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel));
-            Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence);
+            Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence);
             mockRepository.VerifyAll();
         }
 
@@ -322,6 +322,8 @@
 
             activity.Run();
 
+            failureMechanismContribution.Norm = 29;
+
             // Precondition
             Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -r35baeb163866f62a72bccf6438ddc08b41407ecf -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 35baeb163866f62a72bccf6438ddc08b41407ecf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -99,7 +99,7 @@
 
             var hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
 
-            TargetProbabilityCalculationOutput output = null;
+            ReliabilityIndexCalculationOutput output = null;
 
             // Call
             Action call = () => output = DesignWaterLevelCalculationService.Calculate(assessmentSection,
@@ -129,7 +129,7 @@
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1);
 
-            TargetProbabilityCalculationOutput output = null;
+            ReliabilityIndexCalculationOutput output = null;
 
             // Call
             Action call = () => output = DesignWaterLevelCalculationService.Calculate(assessmentSection,
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -r3d995a76fbe93cf9801596e6b959e7f5bcde5805 -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 3d995a76fbe93cf9801596e6b959e7f5bcde5805)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -255,7 +255,7 @@
             ImportHydraulicBoundaryDatabase(assessmentSectionStub);
 
             var hydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(loc => loc.Id == 1300001);
-            hydraulicBoundaryLocation.WaveHeightCalculationConvergence = CalculationConvergence.CalculatedConverged;
+            hydraulicBoundaryLocation.WaveHeightCalculationConvergence = CalculationConvergence.CalculatedNotConverged;
             hydraulicBoundaryLocation.Attach(observerMock);
 
             var activity = new WaveHeightCalculationActivity(assessmentSectionStub, hydraulicBoundaryLocation);
@@ -264,14 +264,14 @@
 
             // Precondition
             Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight);
-            Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.WaveHeightCalculationConvergence);
+            Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.WaveHeightCalculationConvergence);
 
             // Call
             activity.Finish();
 
             // Assert
             Assert.IsFalse(double.IsNaN(hydraulicBoundaryLocation.WaveHeight));
-            Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.WaveHeightCalculationConvergence);
+            Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.WaveHeightCalculationConvergence);
             mockRepository.VerifyAll();
         }
 
@@ -340,6 +340,8 @@
 
             activity.Run();
 
+            failureMechanismContribution.Norm = 29;
+
             // Precondition
             Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.WaveHeightCalculationConvergence);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationServiceTest.cs
===================================================================
diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -r1fc13faf53c33c00d732ca48082a25368f72eaf5
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision f1bf048f691ca575f22e8807911ace0338fa425d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationServiceTest.cs	(.../WaveHeightCalculationServiceTest.cs)	(revision 1fc13faf53c33c00d732ca48082a25368f72eaf5)
@@ -99,7 +99,7 @@
 
             var hydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001);
 
-            TargetProbabilityCalculationOutput output = null;
+            ReliabilityIndexCalculationOutput output = null;
 
             // Call
             Action call = () => output = WaveHeightCalculationService.Calculate(assessmentSection,
@@ -129,7 +129,7 @@
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1);
 
-            TargetProbabilityCalculationOutput output = null;
+            ReliabilityIndexCalculationOutput output = null;
 
             // Call
             Action call = () => output = WaveHeightCalculationService.Calculate(assessmentSection,