Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r6946 -r6964
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6946)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 6964)
@@ -606,7 +606,7 @@
             DamProjectData damProjectData = CreateExampleDamProjectData();
             Scenario scenario = damProjectData.Dike.Locations[0].Scenarios[0];
             scenario.RiverLevelLow = null;
-            DamFailureMechanismeCalculationSpecification currentSpecification = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+            DamProjectCalculationSpecification currentSpecification = damProjectData.DamProjectCalculationSpecification;
             currentSpecification.FailureMechanismSystemType = failureMechanismSystemType;
 
             // When Writing Xml, Then Raise Exception With Clear Message in case of Stability Outside
@@ -899,19 +899,19 @@
             damProjectData.DamProjectType = DamProjectType.Design;
             damProjectData.DamProjectCalculationSpecification = new DamProjectCalculationSpecification();
             DamProjectCalculationSpecification.SelectedAnalysisType = expectedAnalysisType;
-            var calculationSpecification = new DamFailureMechanismeCalculationSpecification
+            var calculationSpecification = new DamProjectCalculationSpecification
             {
                 FailureMechanismSystemType = FailureMechanismSystemType.Piping,
                 CalculationModel = PipingModelType.Bligh
             };
-            damProjectData.DamProjectCalculationSpecification.DamCalculationSpecifications.Add(calculationSpecification);
+            damProjectData.DamProjectCalculationSpecification = calculationSpecification;
         }
 
         private static void FillStabilityParameters(DamProjectData damProjectData)
         {
             // Note: DamProjectCalculationSpecification created and filled by FillAnalysisSpecification
-            DamFailureMechanismeCalculationSpecification currentSpecification = 
-                damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+            DamStabilityParameters currentSpecification = 
+                damProjectData.DamProjectCalculationSpecification.DamStabilityParameters;
             currentSpecification.SearchMethod = StabilitySearchMethod.Grid;
             currentSpecification.IsUpliftVanRunOnlyWhenUpliftOccurs = false;
             currentSpecification.SlipCircleDefinition = new SlipCircleDefinition