Index: dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs
===================================================================
diff -u -r404 -r444
--- dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 404)
+++ dam engine/trunk/src/Deltares.DamEngine.Calculators/General/DamProjectCalculator.cs	(.../DamProjectCalculator.cs)	(revision 444)
@@ -692,10 +692,10 @@
                     DesignResult liftVanCalculationResult = (from calculationResult in upliftVanCalculationResults
                                                               where calculationResult.LocationName.Equals(bishopCalculationRecord.LocationName) &&
                                                                     calculationResult.ScenarioName.Equals(bishopCalculationRecord.ScenarioName) &&
-                                                                    calculationResult.StabilityProfileName.Equals(bishopCalculationRecord.StabilityProfileName)
+                                                                    calculationResult.ProfileName.Equals(bishopCalculationRecord.ProfileName)
                                                               select calculationResult).ToList().FirstOrDefault();
                     DesignResult normativeCalculationResult = SelectStabilityNormativeResult(bishopCalculationRecord, liftVanCalculationResult,
-                                                                                              bishopCalculationRecord.AnalysisType, bishopCalculationRecord.ProbabilisticType);
+                        DamProjectCalculationSpecification.SelectedAnalysisType);
                     // Clone this result, to make sure the original won't be changed
                     normativeCalculationResult = (DesignResult) normativeCalculationResult.Clone();
                     normativeCalculationResult.DamFailureMechanismeCalculation = bishopLiftvancalculation;
@@ -713,32 +713,18 @@
         /// <param name="resultRecord"></param>
         /// <param name="liftVanCalculationResult"></param>
         /// <returns></returns>
-        private DesignResult SelectStabilityNormativeResult(DesignResult bishopCalculationRecord, DesignResult liftVanCalculationResult, AnalysisType analysisType, ProbabilisticType probabilisticType)
+        private DesignResult SelectStabilityNormativeResult(DesignResult bishopCalculationRecord, DesignResult liftVanCalculationResult, AnalysisType analysisType)
         {
             switch (analysisType)
             {
                 case AnalysisType.NoAdaption:
-                    switch (probabilisticType)
                     {
-                        case ProbabilisticType.Deterministic:
-                            return SelectStabilityNormativeResultDeterministicNormal(liftVanCalculationResult, bishopCalculationRecord);
-                        case ProbabilisticType.Probabilistic:
-                        case ProbabilisticType.ProbabilisticFragility:
-                            return SelectStabilityNormativeResultProbabilisticNormal(liftVanCalculationResult, bishopCalculationRecord);
-                        default:
-                            throw new ArgumentOutOfRangeException("probabilisticType");
+                        return SelectStabilityNormativeResultDeterministicNormal(liftVanCalculationResult, bishopCalculationRecord);                        
                     }
                 case AnalysisType.AdaptNWO:
                 case AnalysisType.AdaptGeometry:
-                    switch (probabilisticType)
                     {
-                        case ProbabilisticType.Deterministic:
-                            return SelectStabilityNormativeResultDeterministicDesign(liftVanCalculationResult, bishopCalculationRecord);
-                        case ProbabilisticType.Probabilistic:
-                        case ProbabilisticType.ProbabilisticFragility:
-                            return SelectStabilityNormativeResultProbabilisticDesign(liftVanCalculationResult, bishopCalculationRecord);
-                        default:
-                            throw new ArgumentOutOfRangeException("probabilisticType");
+                        return SelectStabilityNormativeResultDeterministicDesign(liftVanCalculationResult, bishopCalculationRecord);                        
                     }
                 default:
                     throw new ArgumentOutOfRangeException("analysisType");
@@ -753,11 +739,11 @@
         /// <returns></returns>
         private DesignResult SelectStabilityNormativeResultDeterministicNormal(DesignResult liftVanCalculationResult, DesignResult bishopCalculationRecord)
         {
-            if ((liftVanCalculationResult != null) && (liftVanCalculationResult.StabilitySafetyFactor.HasValue))
+            if ((liftVanCalculationResult != null) && (liftVanCalculationResult.SafetyFactor.HasValue))
             {
-                if ((bishopCalculationRecord != null) && (bishopCalculationRecord.StabilitySafetyFactor.HasValue))
+                if ((bishopCalculationRecord != null) && (bishopCalculationRecord.SafetyFactor.HasValue))
                 {
-                    return (liftVanCalculationResult.StabilitySafetyFactor.Value < bishopCalculationRecord.StabilitySafetyFactor.Value
+                    return (liftVanCalculationResult.SafetyFactor.Value < bishopCalculationRecord.SafetyFactor.Value
                                 ? liftVanCalculationResult
                                 : bishopCalculationRecord);
                 }
@@ -773,34 +759,23 @@
         }
 
         /// <summary>
-        /// Select which result is the norm for stability Bishop/UpliftVan design probabilistic calculation
-        /// </summary>
-        /// <param name="liftVanCalculationResult"></param>
-        /// <param name="bishopCalculationRecord"></param>
-        /// <returns></returns>
-        private DesignResult SelectStabilityNormativeResultProbabilisticDesign(DesignResult liftVanCalculationResult, DesignResult bishopCalculationRecord)
-        {
-            throw new ApplicationException("Not implemented yet");
-        }
-
-        /// <summary>
         /// Select which result is the norm for stability Bishop/UpliftVan design deterministic calculation
         /// </summary>
         /// <param name="liftVanCalculationResult"></param>
         /// <param name="bishopCalculationRecord"></param>
         /// <returns></returns>
         private DesignResult SelectStabilityNormativeResultDeterministicDesign(DesignResult liftVanCalculationResult, DesignResult bishopCalculationRecord)
         {
-            if ((liftVanCalculationResult != null) && (liftVanCalculationResult.StabilitySafetyFactor.HasValue))
+            if ((liftVanCalculationResult != null) && (liftVanCalculationResult.SafetyFactor.HasValue))
             {
-                if ((bishopCalculationRecord != null) && (bishopCalculationRecord.StabilitySafetyFactor.HasValue))
+                if ((bishopCalculationRecord != null) && (bishopCalculationRecord.SafetyFactor.HasValue))
                 {
                     bool dla = liftVanCalculationResult.DikeLength.HasValue;
                     dla = dla && bishopCalculationRecord.DikeLength.HasValue;
                     if (dla && (Math.Abs(liftVanCalculationResult.DikeLength.Value - bishopCalculationRecord.DikeLength.Value) < GeometryPoint.Precision))
                     {
-                        return (liftVanCalculationResult.StabilitySafetyFactor <
-                                bishopCalculationRecord.StabilitySafetyFactor
+                        return (liftVanCalculationResult.SafetyFactor <
+                                bishopCalculationRecord.SafetyFactor
                                     ? liftVanCalculationResult
                                     : bishopCalculationRecord);
                     }
@@ -823,17 +798,6 @@
         }
 
         /// <summary>
-        /// Select which result is the norm for stability Bishop/UpliftVan normal probabilistic calculation
-        /// </summary>
-        /// <param name="liftVanCalculationResult"></param>
-        /// <param name="bishopCalculationRecord"></param>
-        /// <returns></returns>
-        private DesignResult SelectStabilityNormativeResultProbabilisticNormal(DesignResult liftVanCalculationResult, DesignResult bishopCalculationRecord)
-        {
-            throw new ApplicationException("Not implemented yet");
-        }
-
-        /// <summary>
         /// Create PLLines with selected model
         /// </summary>
         /// <param name="waterLevel"></param>