Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/IPipingCalculationItemExtensionsTest.cs
===================================================================
diff -u -rde18e9d8a0324e9345f412eb6c1ffeed4f86f2fb -rc7c07db38829afdc5965c331844e1d39123944ff
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/IPipingCalculationItemExtensionsTest.cs	(.../IPipingCalculationItemExtensionsTest.cs)	(revision de18e9d8a0324e9345f412eb6c1ffeed4f86f2fb)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/IPipingCalculationItemExtensionsTest.cs	(.../IPipingCalculationItemExtensionsTest.cs)	(revision c7c07db38829afdc5965c331844e1d39123944ff)
@@ -1,4 +1,25 @@
-using System.Collections.Generic;
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
 using System.Linq;
 
 using NUnit.Framework;
@@ -12,10 +33,10 @@
         public void GetPipingCalculations_FromPipingCalculation_ReturnThatCalculationInstance()
         {
             // Setup
-            IPipingCalculationItem calculation = new PipingCalculation(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
+            IPipingCalculationItem calculation = new PipingCalculationScenario(new GeneralPipingInput(), new SemiProbabilisticPipingInput());
 
             // Call
-            IEnumerable<PipingCalculation> result = calculation.GetPipingCalculations();
+            IEnumerable<PipingCalculationScenario> result = calculation.GetPipingCalculations();
 
             // Assert
             CollectionAssert.AreEqual(new[]{calculation}, result);
@@ -46,7 +67,7 @@
             IPipingCalculationItem groupsWithoutChildren = rootGroup;
 
             // Call
-            IEnumerable<PipingCalculation> result = groupsWithoutChildren.GetPipingCalculations();
+            IEnumerable<PipingCalculationScenario> result = groupsWithoutChildren.GetPipingCalculations();
 
             // Assert
             CollectionAssert.IsEmpty(result);
@@ -58,10 +79,10 @@
             // Setup
             var generalPipingInput = new GeneralPipingInput();
             var semiProbabilisticInput = new SemiProbabilisticPipingInput();
-            var calculation1 = new PipingCalculation(generalPipingInput, semiProbabilisticInput);
-            var calculation2 = new PipingCalculation(generalPipingInput, semiProbabilisticInput);
-            var calculation3 = new PipingCalculation(generalPipingInput, semiProbabilisticInput);
-            var calculation4 = new PipingCalculation(generalPipingInput, semiProbabilisticInput);
+            var calculation1 = new PipingCalculationScenario(generalPipingInput, semiProbabilisticInput);
+            var calculation2 = new PipingCalculationScenario(generalPipingInput, semiProbabilisticInput);
+            var calculation3 = new PipingCalculationScenario(generalPipingInput, semiProbabilisticInput);
+            var calculation4 = new PipingCalculationScenario(generalPipingInput, semiProbabilisticInput);
 
             var subsubGroup = new PipingCalculationGroup();
             subsubGroup.Children.Add(calculation4);
@@ -81,7 +102,7 @@
             IPipingCalculationItem groupWithoutChildren = rootGroup;
 
             // Call
-            IEnumerable<PipingCalculation> result = groupWithoutChildren.GetPipingCalculations();
+            IEnumerable<PipingCalculationScenario> result = groupWithoutChildren.GetPipingCalculations();
 
             // Assert
             var itemsThatShouldBeFound = new[]
@@ -101,7 +122,7 @@
             IEnumerable<IPipingCalculationItem> emptyEnumerable = Enumerable.Empty<IPipingCalculationItem>();
 
             // Call
-            IEnumerable<PipingCalculation> result = emptyEnumerable.GetPipingCalculations();
+            IEnumerable<PipingCalculationScenario> result = emptyEnumerable.GetPipingCalculations();
 
             // Assert
             CollectionAssert.IsEmpty(result);
@@ -113,12 +134,12 @@
             // Setup
             var generalInputParameters = new GeneralPipingInput();
             var semiProbabilisticInput = new SemiProbabilisticPipingInput();
-            var calculation1 = new PipingCalculation(generalInputParameters, semiProbabilisticInput);
-            var calculation2 = new PipingCalculation(generalInputParameters, semiProbabilisticInput);
+            var calculation1 = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInput);
+            var calculation2 = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInput);
             IEnumerable<IPipingCalculationItem> calculationArray = new[] { calculation1, calculation2 };
 
             // Call
-            IEnumerable<PipingCalculation> result = calculationArray.GetPipingCalculations();
+            IEnumerable<PipingCalculationScenario> result = calculationArray.GetPipingCalculations();
 
             // Assert
             CollectionAssert.AreEquivalent(calculationArray, result);
@@ -133,7 +154,7 @@
             IEnumerable<IPipingCalculationItem> emptyEnumerable = new[] { emptyGroup1, emptyGroup2 };
 
             // Call
-            IEnumerable<PipingCalculation> result = emptyEnumerable.GetPipingCalculations();
+            IEnumerable<PipingCalculationScenario> result = emptyEnumerable.GetPipingCalculations();
 
             // Assert
             CollectionAssert.IsEmpty(result);
@@ -145,11 +166,11 @@
             // Setup
             var generalInputParameters = new GeneralPipingInput();
             var semiProbabilisticInput = new SemiProbabilisticPipingInput();
-            var rootcalculation = new PipingCalculation(generalInputParameters, semiProbabilisticInput);
-            var calculation1 = new PipingCalculation(generalInputParameters, semiProbabilisticInput);
-            var calculation2 = new PipingCalculation(generalInputParameters, semiProbabilisticInput);
-            var calculation3 = new PipingCalculation(generalInputParameters, semiProbabilisticInput);
-            var calculation4 = new PipingCalculation(generalInputParameters, semiProbabilisticInput);
+            var rootcalculation = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInput);
+            var calculation1 = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInput);
+            var calculation2 = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInput);
+            var calculation3 = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInput);
+            var calculation4 = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInput);
 
             var subsubGroup = new PipingCalculationGroup();
             subsubGroup.Children.Add(calculation4);
@@ -171,7 +192,7 @@
             IEnumerable<IPipingCalculationItem> mixedArray = new IPipingCalculationItem[] { emptyRootGroup, rootGroup, rootcalculation };
 
             // Call
-            IEnumerable<PipingCalculation> result = mixedArray.GetPipingCalculations();
+            IEnumerable<PipingCalculationScenario> result = mixedArray.GetPipingCalculations();
 
             // Assert
             var expectedCalculationItems = new[]