Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs
===================================================================
diff -u -r715999e4f5efc2e78494f1b38532975ac02bcd77 -r4e1b387ced02a257b1564847a85f67ea591032b7
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 715999e4f5efc2e78494f1b38532975ac02bcd77)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs	(.../PipingCalculationServiceTest.cs)	(revision 4e1b387ced02a257b1564847a85f67ea591032b7)
@@ -69,7 +69,7 @@
         public void Validate_Always_LogStartAndEndOfValidatingInputs()
         {
             // Call
-            Action call = () => PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -89,7 +89,7 @@
             invalidPipingCalculation.Output = output;
 
             // Call
-            bool isValid = PipingCalculationService.Validate(invalidPipingCalculation, GetCalculatedTestAssessmentLevel());
+            bool isValid = PipingCalculationService.Validate(invalidPipingCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             Assert.IsFalse(isValid);
@@ -104,7 +104,7 @@
 
             // Call
             var isValid = false;
-            Action call = () => isValid = PipingCalculationService.Validate(calculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(calculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -158,7 +158,7 @@
 
             // Call
             var isValid = false;
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -181,7 +181,7 @@
 
             // Call
             var isValid = false;
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -203,7 +203,7 @@
 
             // Call
             var isValid = false;
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -227,7 +227,7 @@
 
             // Call
             var isValid = false;
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -257,7 +257,7 @@
 
             // Call
             var isValid = false;
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -281,7 +281,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -336,7 +336,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -370,7 +370,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -417,7 +417,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -467,7 +467,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -540,7 +540,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -605,7 +605,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -663,7 +663,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -728,7 +728,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -797,7 +797,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -852,7 +852,7 @@
             var isValid = false;
 
             // Call
-            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => isValid = PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -919,7 +919,7 @@
             testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile);
 
             // Call
-            Action call = () => PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+            Action call = () => PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             TestHelper.AssertLogMessages(call, messages =>
@@ -952,10 +952,10 @@
             Action call = () =>
             {
                 // Precondition
-                Assert.IsTrue(PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()));
+                Assert.IsTrue(PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel()));
 
                 // Call
-                PipingCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel());
+                PipingCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel());
             };
 
             // Assert
@@ -974,10 +974,10 @@
         {
             // Precondition
             Assert.IsNull(testCalculation.Output);
-            Assert.IsTrue(PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()));
+            Assert.IsTrue(PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel()));
 
             // Call
-            PipingCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel());
+            PipingCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             PipingOutput pipingOutput = testCalculation.Output;
@@ -1000,10 +1000,10 @@
             testCalculation.Output = output;
 
             // Precondition
-            Assert.IsTrue(PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel()));
+            Assert.IsTrue(PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel()));
 
             // Call
-            PipingCalculationService.Calculate(testCalculation, GetCalculatedTestAssessmentLevel());
+            PipingCalculationService.Calculate(testCalculation, GetTestNormativeAssessmentLevel());
 
             // Assert
             Assert.AreNotSame(output, testCalculation.Output);
@@ -1014,20 +1014,20 @@
         public void Validate_CompleteInput_InputSetOnSubCalculators(bool useAssessmentLevelManualInput)
         {
             // Setup
-            RoundedDouble calculatedAssessmentLevel = GetCalculatedTestAssessmentLevel();
+            RoundedDouble normativeAssessmentLevel = GetTestNormativeAssessmentLevel();
             PipingInput input = testCalculation.InputParameters;
 
             input.UseAssessmentLevelManualInput = useAssessmentLevelManualInput;
 
             using (new PipingSubCalculatorFactoryConfig())
             {
                 // Call
-                PipingCalculationService.Validate(testCalculation, GetCalculatedTestAssessmentLevel());
+                PipingCalculationService.Validate(testCalculation, GetTestNormativeAssessmentLevel());
 
                 // Assert
                 RoundedDouble expectedAssessmentLevel = useAssessmentLevelManualInput
                                                             ? input.AssessmentLevel
-                                                            : calculatedAssessmentLevel;
+                                                            : normativeAssessmentLevel;
                 AssertSubCalculatorInputs(input, expectedAssessmentLevel);
             }
         }
@@ -1037,20 +1037,20 @@
         public void Calculate_CompleteInput_InputSetOnSubCalculators(bool useAssessmentLevelManualInput)
         {
             // Setup
-            RoundedDouble calculatedAssessmentLevel = GetCalculatedTestAssessmentLevel();
+            RoundedDouble normativeAssessmentLevel = GetTestNormativeAssessmentLevel();
             PipingInput input = testCalculation.InputParameters;
 
             input.UseAssessmentLevelManualInput = useAssessmentLevelManualInput;
 
             using (new PipingSubCalculatorFactoryConfig())
             {
                 // Call
-                PipingCalculationService.Calculate(testCalculation, calculatedAssessmentLevel);
+                PipingCalculationService.Calculate(testCalculation, normativeAssessmentLevel);
 
                 // Assert
                 RoundedDouble expectedAssessmentLevel = useAssessmentLevelManualInput
                                                             ? input.AssessmentLevel
-                                                            : calculatedAssessmentLevel;
+                                                            : normativeAssessmentLevel;
                 AssertSubCalculatorInputs(input, expectedAssessmentLevel);
             }
         }
@@ -1115,7 +1115,7 @@
             Assert.AreEqual(input.Gravity, sellmeijerCalculator.Gravity);
         }
 
-        private static RoundedDouble GetCalculatedTestAssessmentLevel()
+        private static RoundedDouble GetTestNormativeAssessmentLevel()
         {
             return (RoundedDouble) 1.1;
         }