Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -r886b43234056f7f3804f3544af2d3631a41a802e
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 886b43234056f7f3804f3544af2d3631a41a802e)
@@ -1504,7 +1504,7 @@
                     Assert.IsNotNull(newCalculationItem);
                     Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
                                     "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
-                    Assert.AreEqual(GetWaterLevelTypeFromNormType(normativeProbabilityType), newCalculationItem.InputParameters.WaterLevelType);
+                    Assert.AreEqual(GetWaterLevelTypeFromNormativeProbabilityType(normativeProbabilityType), newCalculationItem.InputParameters.WaterLevelType);
                 }
             }
         }
@@ -1817,7 +1817,7 @@
                 Assert.NotNull(dialog);
                 Assert.NotNull(grid);
 
-                WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType = GetWaterLevelTypeFromNormType(normType);
+                WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType = GetWaterLevelTypeFromNormativeProbabilityType(normType);
                 var firstCalculation = group.Children[2] as GrassCoverErosionOutwardsWaveConditionsCalculation;
                 Assert.IsNotNull(firstCalculation);
                 GrassCoverErosionOutwardsWaveConditionsInput firstCalculationInput = firstCalculation.InputParameters;
@@ -1942,7 +1942,7 @@
             };
         }
 
-        private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormativeProbabilityType normativeProbabilityType)
+        private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormativeProbabilityType(NormativeProbabilityType normativeProbabilityType)
         {
             switch (normativeProbabilityType)
             {
Index: Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs
===================================================================
diff -u -r90867e7b6ad6feb087aae90b940ee6e5df421bd0 -r886b43234056f7f3804f3544af2d3631a41a802e
--- Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs	(.../WaveConditionsDataSynchronizationService.cs)	(revision 90867e7b6ad6feb087aae90b940ee6e5df421bd0)
+++ Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs	(.../WaveConditionsDataSynchronizationService.cs)	(revision 886b43234056f7f3804f3544af2d3631a41a802e)
@@ -60,7 +60,7 @@
                 throw new ArgumentNullException(nameof(failureMechanism));
             }
 
-            WaveConditionsInputWaterLevelType waterLevelType = GetWaterLevelTypeFromNormType(normativeProbabilityType);
+            WaveConditionsInputWaterLevelType waterLevelType = GetWaterLevelTypeFromNormativeProbabilityType(normativeProbabilityType);
 
             var affectedItems = new List<IObservable>();
             foreach (TCalculation calculation in failureMechanism.Calculations
@@ -159,7 +159,7 @@
         /// <returns>A <see cref="WaveConditionsInputWaterLevelType"/>.</returns>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <paramref name="normativeProbabilityType"/> is invalid.</exception>
         /// <exception cref="NotSupportedException">Thrown when <paramref name="normativeProbabilityType"/> is not supported.</exception>
-        private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormativeProbabilityType normativeProbabilityType)
+        private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormativeProbabilityType(NormativeProbabilityType normativeProbabilityType)
         {
             if (!Enum.IsDefined(typeof(NormativeProbabilityType), normativeProbabilityType))
             {
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -r886b43234056f7f3804f3544af2d3631a41a802e
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverCalculationGroupContextTreeNodeInfoTest.cs)	(revision 886b43234056f7f3804f3544af2d3631a41a802e)
@@ -1456,7 +1456,7 @@
                     Assert.IsNotNull(newCalculationItem);
                     Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
                                     "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
-                    Assert.AreEqual(GetWaterLevelTypeFromNormType(normativeProbabilityType), newCalculationItem.InputParameters.WaterLevelType);
+                    Assert.AreEqual(GetWaterLevelTypeFromNormativeProbabilityType(normativeProbabilityType), newCalculationItem.InputParameters.WaterLevelType);
                 }
             }
         }
@@ -1539,7 +1539,7 @@
                 Assert.NotNull(dialog);
                 Assert.NotNull(grid);
 
-                WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType = GetWaterLevelTypeFromNormType(normType);
+                WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType = GetWaterLevelTypeFromNormativeProbabilityType(normType);
                 var firstCalculation = group.Children[2] as StabilityStoneCoverWaveConditionsCalculation;
                 Assert.IsNotNull(firstCalculation);
                 StabilityStoneCoverWaveConditionsInput firstCalculationInputParameters = firstCalculation.InputParameters;
@@ -1908,7 +1908,7 @@
             };
         }
 
-        private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormativeProbabilityType normativeProbabilityType)
+        private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormativeProbabilityType(NormativeProbabilityType normativeProbabilityType)
         {
             switch (normativeProbabilityType)
             {
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -r886b43234056f7f3804f3544af2d3631a41a802e
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverCalculationGroupContextTreeNodeInfoTest.cs)	(revision 886b43234056f7f3804f3544af2d3631a41a802e)
@@ -1482,7 +1482,7 @@
                     Assert.IsNotNull(newCalculationItem);
                     Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
                                     "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
-                    Assert.AreEqual(GetWaterLevelTypeFromNormType(normativeProbabilityType), newCalculationItem.InputParameters.WaterLevelType);
+                    Assert.AreEqual(GetWaterLevelTypeFromNormativeProbabilityType(normativeProbabilityType), newCalculationItem.InputParameters.WaterLevelType);
                 }
             }
         }
@@ -1492,7 +1492,7 @@
         {
             // Given
             var random = new Random(21);
-            var normType = random.NextEnumValue<NormativeProbabilityType>();
+            var normativeProbabilityType = random.NextEnumValue<NormativeProbabilityType>();
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -1514,7 +1514,7 @@
                 {
                     FailureMechanismContribution =
                     {
-                        NormativeProbabilityType = normType
+                        NormativeProbabilityType = normativeProbabilityType
                     }
                 };
                 assessmentSection.HydraulicBoundaryDatabase.Locations.AddRange(new[]
@@ -1563,7 +1563,7 @@
                 Assert.NotNull(dialog);
                 Assert.NotNull(grid);
 
-                WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType = GetWaterLevelTypeFromNormType(normType);
+                WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType = GetWaterLevelTypeFromNormativeProbabilityType(normativeProbabilityType);
                 var firstCalculation = group.Children[2] as WaveImpactAsphaltCoverWaveConditionsCalculation;
                 Assert.IsNotNull(firstCalculation);
                 WaveConditionsInput firstCalculationInput = firstCalculation.InputParameters;
@@ -1931,7 +1931,7 @@
             };
         }
 
-        private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormType(NormativeProbabilityType normativeProbabilityType)
+        private static WaveConditionsInputWaterLevelType GetWaterLevelTypeFromNormativeProbabilityType(NormativeProbabilityType normativeProbabilityType)
         {
             switch (normativeProbabilityType)
             {