Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r6946 -r6964
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6946)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 6964)
@@ -367,9 +367,9 @@
     private static void TransferAnalysisSpecification(DamProjectData damProjectData, Input input)
     {
         input.DamProjectType = ConversionHelper.ConvertToInputDamProjectType(damProjectData.DamProjectType);
-        if (damProjectData.DamProjectCalculationSpecification.CurrentSpecification != null)
+        if (damProjectData.DamProjectCalculationSpecification.DamStabilityParameters != null)
         {
-            input.FailureMechanismSystemType = ConversionHelper.ConvertToInputFailureMechanismSystemType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType);
+            input.FailureMechanismSystemType = ConversionHelper.ConvertToInputFailureMechanismSystemType(damProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType);
 
             input.AnalysisTypeSpecified = (input.DamProjectType == InputDamProjectType.Design);
             if (input.AnalysisTypeSpecified)
@@ -380,23 +380,23 @@
             input.PipingModelTypeSpecified = input.FailureMechanismSystemType == InputFailureMechanismSystemType.Piping;
             if (input.PipingModelTypeSpecified)
             {
-                input.PipingModelType = ConversionHelper.ConvertToInputPipingModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType);
+                input.PipingModelType = ConversionHelper.ConvertToInputPipingModelType(damProjectData.DamProjectCalculationSpecification.PipingModelType);
             }
 
             input.StabilityModelTypeSpecified = input.FailureMechanismSystemType == InputFailureMechanismSystemType.StabilityInside ||
                                                 input.FailureMechanismSystemType == InputFailureMechanismSystemType.StabilityOutside;
             if (input.StabilityModelTypeSpecified)
             {
-                input.StabilityModelType = ConversionHelper.ConvertToInputStabilityModelType(damProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType);
+                input.StabilityModelType = ConversionHelper.ConvertToInputStabilityModelType(damProjectData.DamProjectCalculationSpecification.StabilityModelType);
             }
         }
     }
 
     private static void TransferStabilityParameters(DamProjectData damProjectData, Input input)
     {
-        if (damProjectData.DamProjectCalculationSpecification != null && damProjectData.DamProjectCalculationSpecification.CurrentSpecification != null)
+        if (damProjectData.DamProjectCalculationSpecification != null && damProjectData.DamProjectCalculationSpecification.DamStabilityParameters != null)
         {
-            DamFailureMechanismeCalculationSpecification curSpec = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+            DamStabilityParameters curSpec = damProjectData.DamProjectCalculationSpecification.DamStabilityParameters;
             
             input.StabilityParameters = new DamEngine.Io.XmlInput.StabilityParameters();
             input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.SearchMethod);
@@ -446,7 +446,7 @@
         Dike dike = damProjectData.Dike;
         ThrowHelper.ThrowIfArgumentNull(dike.Locations, nameof(dike.Locations), StringResourceNames.NoLocationsDefined);
         // Following situation should never occur in the UI. Tested because of the check on RiverLevelLow in the code below
-        DamFailureMechanismeCalculationSpecification currentSpecification = damProjectData.DamProjectCalculationSpecification.CurrentSpecification;
+        DamProjectCalculationSpecification currentSpecification = damProjectData.DamProjectCalculationSpecification;
         ThrowHelper.ThrowIfArgumentNull(currentSpecification, nameof(currentSpecification), StringResourceNames.NoCalculationTypeSpecified);
         foreach (Location location in selectedLocations)
         {