Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -r2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs	(.../MacroStabilityInwardsInputContextPropertyInfoTest.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsInputContextPropertyInfoTest.cs	(.../MacroStabilityInwardsInputContextPropertyInfoTest.cs)	(revision 2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1)
@@ -53,7 +53,7 @@
         }
 
         [Test]
-        public void CreateInstance_WithContextAndNormTypeSignaling_ExpectedProperties()
+        public void CreateInstance_WithContextAndNormativeProbabilityTypeSignalFloodingProbability_ExpectedProperties()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub
@@ -99,7 +99,7 @@
         }
 
         [Test]
-        public void CreateInstance_WithContextAndNormTypeLowerLimit_ExpectedProperties()
+        public void CreateInstance_WithContextAndNormativeProbabilityTypeMaximumAllowableFloodingProbability_ExpectedProperties()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -r2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs	(.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/PropertyInfos/SemiProbabilistic/SemiProbabilisticPipingInputContextPropertyInfoTest.cs	(.../SemiProbabilisticPipingInputContextPropertyInfoTest.cs)	(revision 2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1)
@@ -62,7 +62,7 @@
         }
 
         [Test]
-        public void CreateInstance_WithContextAndNormTypeSignaling_ExpectedProperties()
+        public void CreateInstance_WithContextAndNormativeProbabilityTypeSignalFloodingProbability_ExpectedProperties()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub
@@ -108,7 +108,7 @@
         }
 
         [Test]
-        public void CreateInstance_WithContextAndNormTypeLowerLimit_ExpectedProperties()
+        public void CreateInstance_WithContextAndNormativeProbabilityTypeMaximumAllowableFloodingProbability_ExpectedProperties()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -r2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs	(.../AssessmentSectionCreateExtensionsTest.cs)	(revision 2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1)
@@ -67,8 +67,8 @@
             const string testId = "testId";
             const string testName = "testName";
             const string comments = "Some text";
-            const double lowerLimitNorm = 0.05;
-            const double signalingNorm = 0.02;
+            const double maximumAllowableFloodingProbability = 0.05;
+            const double signalFloodingProbability = 0.02;
 
             var random = new Random(65);
             const string mapDataName = "map data name";
@@ -89,8 +89,8 @@
                 },
                 FailureMechanismContribution =
                 {
-                    MaximumAllowableFloodingProbability = lowerLimitNorm,
-                    SignalFloodingProbability = signalingNorm,
+                    MaximumAllowableFloodingProbability = maximumAllowableFloodingProbability,
+                    SignalFloodingProbability = signalFloodingProbability,
                     NormativeProbabilityType = normativeNorm
                 },
                 BackgroundData =
@@ -114,8 +114,8 @@
             Assert.AreEqual(testId, entity.Id);
             Assert.AreEqual(testName, entity.Name);
             Assert.AreEqual(comments, entity.Comments);
-            Assert.AreEqual(lowerLimitNorm, entity.LowerLimitNorm);
-            Assert.AreEqual(signalingNorm, entity.SignalingNorm);
+            Assert.AreEqual(maximumAllowableFloodingProbability, entity.LowerLimitNorm);
+            Assert.AreEqual(signalFloodingProbability, entity.SignalingNorm);
             Assert.AreEqual(Convert.ToByte(normativeNorm), entity.NormativeNormType);
             Assert.AreEqual(15, entity.FailureMechanismEntities.Count);
             Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.Piping));
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -r2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1)
@@ -67,17 +67,17 @@
             const string testId = "testId";
             const string testName = "testName";
             const string comments = "Some text";
-            const double lowerLimitNorm = 0.05;
-            const double signalingNorm = 0.02;
+            const double maximumAllowableFloodingProbability = 0.05;
+            const double signalFloodingProbability = 0.02;
             var normativeNorm = new Random(9).NextEnumValue<NormativeProbabilityType>();
             var entity = new AssessmentSectionEntity
             {
                 Id = testId,
                 Name = testName,
                 Composition = Convert.ToByte(assessmentSectionComposition),
                 Comments = comments,
-                LowerLimitNorm = lowerLimitNorm,
-                SignalingNorm = signalingNorm,
+                LowerLimitNorm = maximumAllowableFloodingProbability,
+                SignalingNorm = signalFloodingProbability,
                 NormativeNormType = Convert.ToByte(normativeNorm)
             };
             entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
@@ -93,8 +93,8 @@
             Assert.AreEqual(testName, section.Name);
             Assert.AreEqual(comments, section.Comments.Body);
 
-            Assert.AreEqual(lowerLimitNorm, section.FailureMechanismContribution.MaximumAllowableFloodingProbability);
-            Assert.AreEqual(signalingNorm, section.FailureMechanismContribution.SignalFloodingProbability);
+            Assert.AreEqual(maximumAllowableFloodingProbability, section.FailureMechanismContribution.MaximumAllowableFloodingProbability);
+            Assert.AreEqual(signalFloodingProbability, section.FailureMechanismContribution.SignalFloodingProbability);
             Assert.AreEqual(normativeNorm, section.FailureMechanismContribution.NormativeProbabilityType);
 
             Assert.AreEqual(assessmentSectionComposition, section.Composition);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r552512346182908793906e5195f4aec36bc5039b -r2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 552512346182908793906e5195f4aec36bc5039b)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 2715e4acb30b6d06ba8bb61cb3d92990ae6fc1c1)
@@ -322,13 +322,13 @@
                                                             HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             var random = new Random(21);
-            HydraulicBoundaryLocationCalculation signalingNormCalculation = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability
-                                                                                             .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation));
-            ConfigureDesignWaterLevelCalculation(signalingNormCalculation, random.NextBoolean());
+            HydraulicBoundaryLocationCalculation signalFloodingProbabilityCalculation = assessmentSection.WaterLevelCalculationsForSignalFloodingProbability
+                                                                                                         .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation));
+            ConfigureDesignWaterLevelCalculation(signalFloodingProbabilityCalculation, random.NextBoolean());
 
-            HydraulicBoundaryLocationCalculation lowerLimitNormCalculation = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability
-                                                                                              .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation));
-            ConfigureDesignWaterLevelCalculation(lowerLimitNormCalculation, random.NextBoolean());
+            HydraulicBoundaryLocationCalculation maximumAllowableFloodingProbabilityCalculation = assessmentSection.WaterLevelCalculationsForMaximumAllowableFloodingProbability
+                                                                                                                   .Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation));
+            ConfigureDesignWaterLevelCalculation(maximumAllowableFloodingProbabilityCalculation, random.NextBoolean());
 
             foreach (HydraulicBoundaryLocationCalculation calculation in assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities
                                                                                           .Select(c => c.HydraulicBoundaryLocationCalculations.Single(calc => ReferenceEquals(calc.HydraulicBoundaryLocation, hydraulicBoundaryLocation))))
@@ -1660,11 +1660,11 @@
                 new Point3D(5.8, 6.0, -2.3), // Dike toe at river
                 new Point3D(5.6, 6.0, 3.4),
                 new Point3D(4.2, 6.0, 3.5),
-                new Point3D(4.0, 6.0, 0.5),  // Dike toe at polder
-                new Point3D(3.8, 6.0, 0.5),  // Ditch dike side
-                new Point3D(3.6, 6.0, 0.2),  // Bottom ditch dike side
+                new Point3D(4.0, 6.0, 0.5), // Dike toe at polder
+                new Point3D(3.8, 6.0, 0.5), // Ditch dike side
+                new Point3D(3.6, 6.0, 0.2), // Bottom ditch dike side
                 new Point3D(3.4, 6.0, 0.25), // Bottom ditch polder side
-                new Point3D(3.2, 6.0, 0.5),  // Ditch polder side
+                new Point3D(3.2, 6.0, 0.5), // Ditch polder side
                 new Point3D(3.0, 6.0, 0.5)
             };
             surfaceLine.SetGeometry(geometryPoints);