Index: Core/Common/src/Core.Common.Utils/StatisticsConverter.cs
===================================================================
diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Core/Common/src/Core.Common.Utils/StatisticsConverter.cs	(.../StatisticsConverter.cs)	(revision 24da3aa72ccc0776599628c9f971081694048d9a)
+++ Core/Common/src/Core.Common.Utils/StatisticsConverter.cs	(.../StatisticsConverter.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -29,13 +29,33 @@
     public static class StatisticsConverter
     {
         /// <summary>
-        /// Calculates the probability from a norm.
+        /// Calculates the reliability from a return period.
         /// </summary>
-        /// <param name="norm">The norm to convert.</param>
+        /// <param name="returnPeriod">The return period to convert.</param>
+        /// <returns>The reliability.</returns>
+        public static double ReturnPeriodToReliability(double returnPeriod)
+        {
+            return ProbabilityToReliability(1.0/returnPeriod);
+        }
+
+        /// <summary>
+        /// Calculates the probability from a reliability.
+        /// </summary>
+        /// <param name="reliability">The reliability to convert.</param>
         /// <returns>The probability.</returns>
-        public static double NormToBeta(double norm)
+        public static double ReliabilityToProbability(double reliability)
         {
-            return -Normal.InvCDF(0.0, 1.0, 1.0/norm);
+            return Normal.CDF(0, 1, -reliability);
         }
+
+        /// <summary>
+        /// Calculates the reliability from a probability.
+        /// </summary>
+        /// <param name="probability">The probability to convert.</param>
+        /// <returns>The reliability.</returns>
+        public static double ProbabilityToReliability(double probability)
+        {
+            return Normal.InvCDF(0, 1, 1 - probability);
+        }
     }
 }
\ No newline at end of file
Index: Core/Common/test/Core.Common.Utils.Test/StatisticsConverterTest.cs
===================================================================
diff -u -r2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Core/Common/test/Core.Common.Utils.Test/StatisticsConverterTest.cs	(.../StatisticsConverterTest.cs)	(revision 2eddebcc1427cfc1d806fdb8c6bce6b5f9df6bde)
+++ Core/Common/test/Core.Common.Utils.Test/StatisticsConverterTest.cs	(.../StatisticsConverterTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -27,13 +27,13 @@
     public class StatisticsConverterTest
     {
         [Test]
-        public void NormToBeta_ConvertNorm_CorrectBeta()
+        public void ReturnPeriodToReliability_ConvertReturnPeriod_CorrectReliability()
         {
             // Call
-            double normToBeta = StatisticsConverter.NormToBeta(1.1);
+            double reliability = StatisticsConverter.ReturnPeriodToReliability(1.1);
 
             // Assert
-            Assert.AreEqual(-1.335177736, normToBeta, 1.0e-6);
+            Assert.AreEqual(-1.335177736, reliability, 1.0e-6);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs
===================================================================
diff -u -r18a3f0bab0ce260604820928c136e66abca7daab -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs	(.../RingtoetsCommonDataCalculationService.cs)	(revision 18a3f0bab0ce260604820928c136e66abca7daab)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs	(.../RingtoetsCommonDataCalculationService.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -32,14 +32,14 @@
     {
         /// <summary>
         /// Determines whether the calculated output is converged,
-        /// based on the <paramref name="reliabilityIndex"/> and the <paramref name="norm"/>
+        /// based on the <paramref name="reliabilityIndex"/> and the <paramref name="returnPeriod"/>
         /// </summary>
         /// <param name="reliabilityIndex">The resultant reliability index after a calculation.</param>
-        /// <param name="norm">The norm to use during the calculation.</param>
-        /// <returns>True if the solution converged, false if otherwise</returns>
-        public static CalculationConvergence CalculationConverged(double reliabilityIndex, double norm)
+        /// <param name="returnPeriod">The return period to use during the calculation.</param>
+        /// <returns><c>True</c> if the solution converged, <c>false</c> if otherwise</returns>
+        public static CalculationConvergence CalculationConverged(double reliabilityIndex, double returnPeriod)
         {
-            return Math.Abs(reliabilityIndex - StatisticsConverter.NormToBeta(norm)) <= 1.0e-3 ?
+            return Math.Abs(reliabilityIndex - StatisticsConverter.ReturnPeriodToReliability(returnPeriod)) <= 1.0e-3 ?
                        CalculationConvergence.CalculatedConverged :
                        CalculationConvergence.CalculatedNotConverged;
         }
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -r2b26e7134b3918e67f8b23a6db3f90fad0d4f12e -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 2b26e7134b3918e67f8b23a6db3f90fad0d4f12e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -171,7 +171,7 @@
             const string activityName = "GetActivityName";
             const string calculationName = "locationName";
             const string ringId = "11-1";
-            const double norm = 30;
+            const double returnPeriod = 30;
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0)
             {
@@ -186,13 +186,13 @@
             var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
                                                                    validFilePath,
                                                                    ringId,
-                                                                   norm,
+                                                                   returnPeriod,
                                                                    calculationMessageProviderMock);
 
             using (new HydraRingCalculatorFactoryConfig())
             {
                 var testDesignWaterLevelCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator;
-                testDesignWaterLevelCalculator.ReliabilityIndex = StatisticsConverter.NormToBeta(norm);
+                testDesignWaterLevelCalculator.ReliabilityIndex = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
 
                 // Call
                 Action call = () => activity.Run();
@@ -214,7 +214,7 @@
                 Assert.AreEqual(hydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId);
                 Assert.AreEqual(testDataPath, testDesignWaterLevelCalculator.HydraulicBoundaryDatabaseDirectory);
                 Assert.AreEqual(ringId, testDesignWaterLevelCalculator.RingId);
-                Assert.AreEqual(StatisticsConverter.NormToBeta(norm), designWaterLevelCalculationInput.Beta);
+                Assert.AreEqual(StatisticsConverter.ReturnPeriodToReliability(returnPeriod), designWaterLevelCalculationInput.Beta);
             }
             Assert.AreEqual(ActivityState.Executed, activity.State);
             mockRepository.VerifyAll();
@@ -271,20 +271,20 @@
 
             string validFilePath = Path.Combine(testDataPath, validFile);
 
-            var norm = 30;
+            var returnPeriod = 30;
             double expectedDesignWaterLevel = 3.5;
 
             var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation,
                                                                    validFilePath,
                                                                    string.Empty,
-                                                                   norm,
+                                                                   returnPeriod,
                                                                    calculationMessageProviderMock);
 
             using (new HydraRingCalculatorFactoryConfig())
             {
                 var testDesignWaterLevelCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DesignWaterLevelCalculator;
                 testDesignWaterLevelCalculator.DesignWaterLevel = expectedDesignWaterLevel;
-                testDesignWaterLevelCalculator.ReliabilityIndex = StatisticsConverter.NormToBeta(norm);
+                testDesignWaterLevelCalculator.ReliabilityIndex = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
 
                 // Call
                 activity.Run();
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataCalculationServiceTest.cs
===================================================================
diff -u -r73d7f318e9a02087ac21dde7d3728d8eac27a9f5 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataCalculationServiceTest.cs	(.../RingtoetsCommonDataCalculationServiceTest.cs)	(revision 73d7f318e9a02087ac21dde7d3728d8eac27a9f5)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/RingtoetsCommonDataCalculationServiceTest.cs	(.../RingtoetsCommonDataCalculationServiceTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -33,11 +33,11 @@
         public void CalculationConverged_WithConvergedResults_CalculationConvergedTrue()
         {
             // Setup
-            double norm = 1.0e3;
-            double reliabilityIndex = StatisticsConverter.NormToBeta(norm);
+            double returnPeriod = 1.0e3;
+            double reliabilityIndex = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
 
             // Call
-            CalculationConvergence calculationConverged = RingtoetsCommonDataCalculationService.CalculationConverged(reliabilityIndex, norm);
+            CalculationConvergence calculationConverged = RingtoetsCommonDataCalculationService.CalculationConverged(reliabilityIndex, returnPeriod);
 
             // Assert
             Assert.AreEqual(CalculationConvergence.CalculatedConverged, calculationConverged);
@@ -48,10 +48,10 @@
         {
             // Setup
             var output = new ReliabilityIndexCalculationOutput(5.0e-3, 5.0e-3);
-            double norm = 1;
+            double returnPeriod = 1;
 
             // Call
-            CalculationConvergence calculationConverged = RingtoetsCommonDataCalculationService.CalculationConverged(output.CalculatedReliabilityIndex, norm);
+            CalculationConvergence calculationConverged = RingtoetsCommonDataCalculationService.CalculationConverged(output.CalculatedReliabilityIndex, returnPeriod);
 
             // Assert
             Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, calculationConverged);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -r2b26e7134b3918e67f8b23a6db3f90fad0d4f12e -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 2b26e7134b3918e67f8b23a6db3f90fad0d4f12e)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -154,7 +154,7 @@
             const string activityName = "GetActivityName";
             const string calculationName = "locationName";
             const string ringId = "11-1";
-            const double norm = 30;
+            const double returnPeriod = 30;
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0)
             {
@@ -169,12 +169,12 @@
             var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation,
                                                              validFilePath,
                                                              ringId,
-                                                             norm, calculationMessageProviderMock);
+                                                             returnPeriod, calculationMessageProviderMock);
 
             using (new HydraRingCalculatorFactoryConfig())
             {
                 var testWaveHeightCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator;
-                testWaveHeightCalculator.ReliabilityIndex = StatisticsConverter.NormToBeta(norm);
+                testWaveHeightCalculator.ReliabilityIndex = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
 
                 // Call
                 Action call = () => activity.Run();
@@ -195,7 +195,7 @@
                 Assert.AreEqual(hydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId);
                 Assert.AreEqual(testDataPath, testWaveHeightCalculator.HydraulicBoundaryDatabaseDirectory);
                 Assert.AreEqual(ringId, testWaveHeightCalculator.RingId);
-                Assert.AreEqual(StatisticsConverter.NormToBeta(norm), waveHeightCalculationInput.Beta);
+                Assert.AreEqual(StatisticsConverter.ReturnPeriodToReliability(returnPeriod), waveHeightCalculationInput.Beta);
             }
             Assert.AreEqual(ActivityState.Executed, activity.State);
             mockRepository.VerifyAll();
@@ -253,20 +253,20 @@
 
             string validFilePath = Path.Combine(testDataPath, validFile);
 
-            var norm = 30;
+            var returnPeriod = 30;
             double expectedWaveHeight = 3.5;
 
             var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation,
                                                              validFilePath,
                                                              string.Empty,
-                                                             norm,
+                                                             returnPeriod,
                                                              calculationMessageProviderMock);
 
             using (new HydraRingCalculatorFactoryConfig())
             {
                 var testWaveHeightCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveHeightCalculator;
                 testWaveHeightCalculator.WaveHeight = expectedWaveHeight;
-                testWaveHeightCalculator.ReliabilityIndex = StatisticsConverter.NormToBeta(norm);
+                testWaveHeightCalculator.ReliabilityIndex = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
 
                 // Call
                 activity.Run();
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2aa9661130f20e88c41dac921ffb780573dcf799 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 2aa9661130f20e88c41dac921ffb780573dcf799)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -390,10 +390,10 @@
                         Assert.AreEqual(assessmentSectionMock.Id, testDesignWaterLevelCalculator.RingId);
 
                         Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId);
-                        var expectedNorm = assessmentSectionMock.FailureMechanismContribution.Norm/
-                                           (failureMechanism.Contribution/100)*
-                                           failureMechanism.GeneralInput.N;
-                        Assert.AreEqual(StatisticsConverter.NormToBeta(expectedNorm), designWaterLevelCalculationInput.Beta);
+                        var expectedReturnPeriod = assessmentSectionMock.FailureMechanismContribution.Norm/
+                                                   (failureMechanism.Contribution/100)*
+                                                   failureMechanism.GeneralInput.N;
+                        Assert.AreEqual(StatisticsConverter.ReturnPeriodToReliability(expectedReturnPeriod), designWaterLevelCalculationInput.Beta);
                     }
                 }
             }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3e8359d4b2175db8257daf911c91f602dc42c676 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 3e8359d4b2175db8257daf911c91f602dc42c676)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -433,10 +433,10 @@
                         Assert.AreEqual(assessmentSectionMock.Id, testWaveHeightCalculator.RingId);
 
                         Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId);
-                        var expectedNorm = assessmentSectionMock.FailureMechanismContribution.Norm/
-                                           (failureMechanism.Contribution/100)*
-                                           failureMechanism.GeneralInput.N;
-                        Assert.AreEqual(StatisticsConverter.NormToBeta(expectedNorm), waveHeightCalculationInput.Beta);
+                        var expectedReturnPeriod = assessmentSectionMock.FailureMechanismContribution.Norm/
+                                                   (failureMechanism.Contribution/100)*
+                                                   failureMechanism.GeneralInput.N;
+                        Assert.AreEqual(StatisticsConverter.ReturnPeriodToReliability(expectedReturnPeriod), waveHeightCalculationInput.Beta);
                     }
                 }
             }
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ReliabilityIndexCalculationInput.cs
===================================================================
diff -u -rd49770201655964042adccca08d2e9fb2217723d -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ReliabilityIndexCalculationInput.cs	(.../ReliabilityIndexCalculationInput.cs)	(revision d49770201655964042adccca08d2e9fb2217723d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ReliabilityIndexCalculationInput.cs	(.../ReliabilityIndexCalculationInput.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -39,7 +39,7 @@
         /// <remarks>As a part of the constructor, the <paramref name="norm"/> is automatically converted into a reliability index.</remarks>
         protected ReliabilityIndexCalculationInput(long hydraulicBoundaryLocationId, double norm) : base(hydraulicBoundaryLocationId)
         {
-            beta = StatisticsConverter.NormToBeta(norm);
+            beta = StatisticsConverter.ReturnPeriodToReliability(norm);
         }
 
         public override int CalculationTypeId
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs
===================================================================
diff -u -rd49770201655964042adccca08d2e9fb2217723d -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs	(.../WaveConditionsCalculationInput.cs)	(revision d49770201655964042adccca08d2e9fb2217723d)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs	(.../WaveConditionsCalculationInput.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -61,7 +61,7 @@
                                                  double b)
             : base(hydraulicBoundaryLocationId)
         {
-            beta = StatisticsConverter.NormToBeta(norm);
+            beta = StatisticsConverter.ReturnPeriodToReliability(norm);
             this.forelandPoints = forelandPoints;
             this.breakWater = breakWater;
             this.waterLevel = waterLevel;
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs
===================================================================
diff -u -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs	(.../AssessmentLevelCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs	(.../AssessmentLevelCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -35,15 +35,15 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            const int norm = 10000;
+            const int returnPeriod = 10000;
             const int sectionId = 1;
             const long hydraulicBoundaryLocationId = 1234;
 
             // Call
-            var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(sectionId, hydraulicBoundaryLocationId, norm);
+            var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(sectionId, hydraulicBoundaryLocationId, returnPeriod);
 
             // Assert
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.IsInstanceOf<ReliabilityIndexCalculationInput>(assessmentLevelCalculationInput);
             Assert.AreEqual(HydraRingFailureMechanismType.AssessmentLevel, assessmentLevelCalculationInput.FailureMechanismType);
             Assert.AreEqual(9, assessmentLevelCalculationInput.CalculationTypeId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs
===================================================================
diff -u -ra6cc123a10630d78e283e2fab0f491804b6047e6 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs	(.../DikeHeightCalculationInputTest.cs)	(revision a6cc123a10630d78e283e2fab0f491804b6047e6)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs	(.../DikeHeightCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -37,7 +37,7 @@
         public void Constructor_Always_ExpectedValues()
         {
             // Setup
-            var norm = 10000;
+            var returnPeriod = 10000;
             int hydraulicBoundaryLocationId = 1000;
             HydraRingSection section = new HydraRingSection(1, double.NaN, double.NaN);
 
@@ -64,7 +64,7 @@
             var expectedRingBreakWater = new HydraRingBreakWater(2, 3.3);
 
             // Call
-            var input = new DikeHeightCalculationInput(hydraulicBoundaryLocationId, norm, section,
+            var input = new DikeHeightCalculationInput(hydraulicBoundaryLocationId, returnPeriod, section,
                                                        expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater,
                                                        modelFactorCriticalOvertopping,
                                                        factorFbMean, factorFbStandardDeviation,
@@ -75,7 +75,7 @@
                                                        exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation);
 
             // Assert
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.IsInstanceOf<HydraulicLoadsCalculationInput>(input);
             Assert.AreEqual(9, input.CalculationTypeId);
             Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs
===================================================================
diff -u -r358617765018dbf1cbae1396dbb71bca6f9177b4 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs	(.../DunesBoundaryConditionsCalculationInputTest.cs)	(revision 358617765018dbf1cbae1396dbb71bca6f9177b4)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DunesBoundaryConditionsCalculationInputTest.cs	(.../DunesBoundaryConditionsCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -23,7 +23,6 @@
 using Core.Common.Utils;
 using NUnit.Framework;
 using Ringtoets.HydraRing.Calculation.Data;
-using Ringtoets.HydraRing.Calculation.Data.Input;
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 
 namespace Ringtoets.HydraRing.Calculation.Test.Data.Input.Hydraulics
@@ -35,15 +34,15 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            const int norm = 10000;
+            const int returnPeriod = 10000;
             const int sectionId = 1;
             const long hydraulicBoundaryLocationId = 1234;
 
             // Call
-            var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(sectionId, hydraulicBoundaryLocationId, norm);
+            var dunesBoundaryConditionsCalculationInput = new DunesBoundaryConditionsCalculationInput(sectionId, hydraulicBoundaryLocationId, returnPeriod);
 
             // Assert
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.IsInstanceOf<AssessmentLevelCalculationInput>(dunesBoundaryConditionsCalculationInput);
             Assert.AreEqual(HydraRingFailureMechanismType.DunesBoundaryConditions, dunesBoundaryConditionsCalculationInput.FailureMechanismType);
             Assert.AreEqual(2, dunesBoundaryConditionsCalculationInput.CalculationTypeId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs
===================================================================
diff -u -ra6cc123a10630d78e283e2fab0f491804b6047e6 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs	(.../HydraulicLoadsCalculationInputTest.cs)	(revision a6cc123a10630d78e283e2fab0f491804b6047e6)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs	(.../HydraulicLoadsCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -38,7 +38,7 @@
         public void Constructor_Always_ExpectedValues()
         {
             // Setup
-            var norm = 10000;
+            var returnPeriod = 10000;
             int hydraulicBoundaryLocationId = 1000;
             HydraRingSection section = new HydraRingSection(1, double.NaN, double.NaN);
 
@@ -63,7 +63,7 @@
             var expectedRingBreakWater = new HydraRingBreakWater(2, 3.3);
 
             // Call
-            var input = new HydraulicLoadsCalculationInputImplementation(hydraulicBoundaryLocationId, norm, section,
+            var input = new HydraulicLoadsCalculationInputImplementation(hydraulicBoundaryLocationId, returnPeriod, section,
                                                                          expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater,
                                                                          modelFactorCriticalOvertopping,
                                                                          factorFbMean, factorFbStandardDeviation,
@@ -73,7 +73,7 @@
                                                                          exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation);
 
             // Assert
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.IsInstanceOf<ReliabilityIndexCalculationInput>(input);
             Assert.AreEqual(9, input.CalculationTypeId);
             Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs
===================================================================
diff -u -ra6cc123a10630d78e283e2fab0f491804b6047e6 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs	(.../OvertoppingRateCalculationInputTest.cs)	(revision a6cc123a10630d78e283e2fab0f491804b6047e6)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/OvertoppingRateCalculationInputTest.cs	(.../OvertoppingRateCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -37,7 +37,7 @@
         public void Constructor_Always_ExpectedValues()
         {
             // Setup
-            var norm = 10000;
+            var returnPeriod = 10000;
             int hydraulicBoundaryLocationId = 1000;
             HydraRingSection section = new HydraRingSection(1, double.NaN, double.NaN);
 
@@ -63,7 +63,7 @@
             var expectedRingBreakWater = new HydraRingBreakWater(2, 3.3);
 
             // Call
-            var input = new OvertoppingRateCalculationInput(hydraulicBoundaryLocationId, norm, section,
+            var input = new OvertoppingRateCalculationInput(hydraulicBoundaryLocationId, returnPeriod, section,
                                                             expectedRingProfilePoints, expectedRingForelandPoints, expectedRingBreakWater,
                                                             dikeHeight,
                                                             modelFactorCriticalOvertopping,
@@ -74,7 +74,7 @@
                                                             exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation);
 
             // Assert
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.IsInstanceOf<HydraulicLoadsCalculationInput>(input);
             Assert.AreEqual(9, input.CalculationTypeId);
             Assert.AreEqual(hydraulicBoundaryLocationId, input.HydraulicBoundaryLocationId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs
===================================================================
diff -u -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs	(.../WaveHeightCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs	(.../WaveHeightCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -35,15 +35,15 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            const int norm = 10000;
+            const int returnPeriod = 10000;
             const int sectionId = 1;
             const long hydraulicBoundaryLocationId = 1234;
 
             // Call
-            var waveHeightCalculationInput = new WaveHeightCalculationInput(sectionId, hydraulicBoundaryLocationId, norm);
+            var waveHeightCalculationInput = new WaveHeightCalculationInput(sectionId, hydraulicBoundaryLocationId, returnPeriod);
 
             // Assert
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.IsInstanceOf<ReliabilityIndexCalculationInput>(waveHeightCalculationInput);
             Assert.AreEqual(HydraRingFailureMechanismType.WaveHeight, waveHeightCalculationInput.FailureMechanismType);
             Assert.AreEqual(9, waveHeightCalculationInput.CalculationTypeId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs
===================================================================
diff -u -rbdb1cb6468a9ce503797eedf563ba53b84e1a46c -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs	(.../ReliabilityIndexCalculationInputTest.cs)	(revision bdb1cb6468a9ce503797eedf563ba53b84e1a46c)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs	(.../ReliabilityIndexCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -35,14 +35,14 @@
         [TestCase(-50, 1)]
         [TestCase(0, -90)]
         [TestCase(200000, double.NaN)]
-        public void Constructed_UsingDifferentNormAndLocationId_ReturnDifferentBetaAndDefaultValues(int locationId, double norm)
+        public void Constructed_UsingDifferentReturnPeriodAndLocationId_ReturnDifferentBetaAndDefaultValues(int locationId, double returnPeriod)
         {
             // Call
-            var reliabilityIndexCalculationInput = new SimpleReliabilityIndexCalculationInput(locationId, norm);
+            var reliabilityIndexCalculationInput = new SimpleReliabilityIndexCalculationInput(locationId, returnPeriod);
 
             // Assert
             Assert.IsInstanceOf<HydraRingCalculationInput>(reliabilityIndexCalculationInput);
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.AreEqual(locationId, reliabilityIndexCalculationInput.HydraulicBoundaryLocationId);
             Assert.AreEqual(9, reliabilityIndexCalculationInput.CalculationTypeId);
             CollectionAssert.IsEmpty(reliabilityIndexCalculationInput.Variables);
@@ -54,8 +54,8 @@
 
         private class SimpleReliabilityIndexCalculationInput : ReliabilityIndexCalculationInput
         {
-            public SimpleReliabilityIndexCalculationInput(int i, double norm)
-                : base(i, norm) {}
+            public SimpleReliabilityIndexCalculationInput(int i, double returnPeriod)
+                : base(i, returnPeriod) {}
 
             public override HydraRingFailureMechanismType FailureMechanismType
             {
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs
===================================================================
diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs	(.../WaveConditionsCalculationInputTest.cs)	(revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs	(.../WaveConditionsCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -40,7 +40,7 @@
             const int sectionId = 111;
             const double sectionNormal = 90;
             const int hydraulicBoundaryLocationId = 222;
-            const int norm = 333;
+            const int returnPeriod = 333;
             var forelandPoints = Enumerable.Empty<HydraRingForelandPoint>();
             var breakWater = new HydraRingBreakWater(1, 4.4);
             const double waterLevel = 5.5;
@@ -51,15 +51,15 @@
             var waveConditionsCalculationInput = new WaveConditionsCalculationInputImplementation(sectionId,
                                                                                                   sectionNormal,
                                                                                                   hydraulicBoundaryLocationId,
-                                                                                                  norm,
+                                                                                                  returnPeriod,
                                                                                                   forelandPoints,
                                                                                                   breakWater,
                                                                                                   waterLevel,
                                                                                                   a,
                                                                                                   b);
 
             // Assert
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.IsInstanceOf<HydraRingCalculationInput>(waveConditionsCalculationInput);
             Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsCalculationInput.FailureMechanismType);
             Assert.AreEqual(8, waveConditionsCalculationInput.CalculationTypeId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs
===================================================================
diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs	(.../WaveConditionsCosineCalculationInputTest.cs)	(revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs	(.../WaveConditionsCosineCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -39,7 +39,7 @@
             const int sectionId = 111;
             const double sectionNormal = 90;
             const int hydraulicBoundaryLocationId = 222;
-            const int norm = 333;
+            const int returnPeriod = 333;
             var forelandPoints = Enumerable.Empty<HydraRingForelandPoint>();
             var breakWater = new HydraRingBreakWater(1, 4.4);
 
@@ -52,7 +52,7 @@
             var waveConditionsCosineCalculationInput = new WaveConditionsCosineCalculationInput(sectionId,
                                                                                                 sectionNormal,
                                                                                                 hydraulicBoundaryLocationId,
-                                                                                                norm,
+                                                                                                returnPeriod,
                                                                                                 forelandPoints,
                                                                                                 breakWater,
                                                                                                 waterLevel,
@@ -61,7 +61,7 @@
                                                                                                 c);
 
             // Assert
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.IsInstanceOf<WaveConditionsCalculationInput>(waveConditionsCosineCalculationInput);
             Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsCosineCalculationInput.FailureMechanismType);
             Assert.AreEqual(8, waveConditionsCosineCalculationInput.CalculationTypeId);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs
===================================================================
diff -u -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 -r2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs	(.../WaveConditionsTrapezoidCalculationInputTest.cs)	(revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs	(.../WaveConditionsTrapezoidCalculationInputTest.cs)	(revision 2569ef40c2487543d0d1ccb4f0e55801c1c5fd8b)
@@ -39,7 +39,7 @@
             const int sectionId = 111;
             const double sectionNormal = 90;
             const int hydraulicBoundaryLocationId = 222;
-            const int norm = 333;
+            const int returnPeriod = 333;
             var forelandPoints = Enumerable.Empty<HydraRingForelandPoint>();
             var breakWater = new HydraRingBreakWater(1, 4.4);
             const double waterLevel = 5.5;
@@ -52,7 +52,7 @@
             var waveConditionsTrapezoidCalculationInput = new WaveConditionsTrapezoidCalculationInput(sectionId,
                                                                                                       sectionNormal,
                                                                                                       hydraulicBoundaryLocationId,
-                                                                                                      norm,
+                                                                                                      returnPeriod,
                                                                                                       forelandPoints,
                                                                                                       breakWater,
                                                                                                       waterLevel,
@@ -62,7 +62,7 @@
                                                                                                       beta2);
 
             // Assert
-            double expectedBeta = StatisticsConverter.NormToBeta(norm);
+            double expectedBeta = StatisticsConverter.ReturnPeriodToReliability(returnPeriod);
             Assert.IsInstanceOf<WaveConditionsCalculationInput>(waveConditionsTrapezoidCalculationInput);
             Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsTrapezoidCalculationInput.FailureMechanismType);
             Assert.AreEqual(8, waveConditionsTrapezoidCalculationInput.CalculationTypeId);