Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 929)
@@ -56,7 +56,7 @@
 
             Dike dike = damProjectData.Dike;
 
-            damProjectData.WorkingDir = input.WorkingDir;
+            damProjectData.ProjectWorkingPath = input.ProjectWorkingPath;
 
             TransferAnalysisSpecification(input, damProjectData);
             TransferStabilityParameters(input, damProjectData);
@@ -428,7 +428,7 @@
                     location.StabilityOptions = new StabilityOptions
                     {
                         MapForSoilGeometries2D = inputLocation.StabilityOptions.MapForSoilgeometries2D,
-                        SoilDatabase = inputLocation.StabilityOptions.SoilDatabase,
+                        SoilDatabaseName = inputLocation.StabilityOptions.SoilDatabaseName,
                         StabilityZoneType = ConversionHelper.ConvertToZoneType(inputLocation.StabilityOptions.ZoneType)
                     };
                     if (inputLocation.StabilityOptions.ForbiddenZoneFactorSpecified)
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs	(.../TimeSerieStabilityCalculator.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Operational/TimeSerieStabilityCalculator.cs	(.../TimeSerieStabilityCalculator.cs)	(revision 929)
@@ -143,7 +143,7 @@
             {
                 throw new TimeSerieStabilityCalculatorException(String.Format("Failurmechanism '{0}' not supported in CreateStabilitySafetyFactorTimeSerie()", failureMechanismType.ToString()));
             }
-            string soilDatabasePath = location.StabilityOptions.SoilDatabase;
+            string soilDatabasePath = location.StabilityOptions.SoilDatabaseName;
 
             string serieName = TimeSerieParameters.StabilityInsideFactor.ToString();
             TimeSerie serie = TimeSerie.CreateTimeSerie(timeSerieIn, serieName);
@@ -331,11 +331,11 @@
                                 string basisFileName = "";
                                 entry.Value = CalculationHelper.DetermineSafetyFactor(stabTimeSerieEntry[entry], ref basisFileName, MStabExePath);
                                 entry.BasisFileName = Path.GetFileNameWithoutExtension(basisFileName);
-                                if (StabilityWorkingPath.Contains(DamProjectData.ProjectWorkingPath))
+                                if (StabilityWorkingPath.Contains(DamProjectData.OldProjectWorkingPath))
                                 {
-                                    // This code only works when the ProjectWorkingPath is part of the StabilityWorkingPath
+                                    // This code only works when the OldProjectWorkingPath is part of the StabilityWorkingPath
                                     // This is not the case in FewsDam.exe
-                                    var index = DamProjectData.ProjectWorkingPath.Length;
+                                    var index = DamProjectData.OldProjectWorkingPath.Length;
                                     entry.RelativeCalculationPathName = StabilityWorkingPath.Substring(index);
                                 }
                             }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs
===================================================================
diff -u -r877 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs	(.../DamRunner.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/DamRunner.cs	(.../DamRunner.cs)	(revision 929)
@@ -105,7 +105,7 @@
                             damCalculation.ProjectDataDirectory = directory + Path.DirectorySeparatorChar;
                             damCalculation.MStabExePath = StabilityCalculator.MStabExePath;
                             damCalculation.MaxCalculationCores = MaxCalculationCores;
-                            damCalculation.CalculateDamProject(damProjectData, DamProjectData.ProjectWorkingPath); //##Bka!? or damCalculation.ProjectDataDirectory
+                            damCalculation.CalculateDamProject(damProjectData, DamProjectData.OldProjectWorkingPath); //##Bka!? or damCalculation.ProjectDataDirectory
                             var output = FillOutputForMessage(damProjectData.LocationJobs);
                             ProcessResult(damProjectData, CalculationResult.Succeeded, output);
                             break;
@@ -161,7 +161,7 @@
                                     SlopeWProgramPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Slope2.exe"), 
                                     ProjectDataDirectory = directory + Path.DirectorySeparatorChar, 
                                     Progress = progressDelegate, 
-                                    CalculationBaseDirectory = DamProjectData.ProjectWorkingPath + @"\CalculationFiles\"
+                                    CalculationBaseDirectory = DamProjectData.OldProjectWorkingPath + @"\CalculationFiles\"
                                 };
 
                                 damProjectCalculator.Calculate(damProjectData, scenarios);
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r927 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 927)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapperTests.cs	(.../DamMacroStabilityInwardsKernelWrapperTests.cs)	(revision 929)
@@ -34,7 +34,6 @@
 using Deltares.DamEngine.Data.General;
 using Deltares.DamEngine.Data.General.Results;
 using Deltares.DamEngine.Data.Standard.Logging;
-using Deltares.DamEngine.TestHelpers;
 using Deltares.DamEngine.TestHelpers.Factories;
 using NUnit.Framework;
 
@@ -69,7 +68,7 @@
             scenario.Location.StabilityOptions = new StabilityOptions();
             scenario.Location.StabilityOptions.TrafficLoad = 10.0;
             scenario.Location.StabilityOptions.MapForSoilGeometries2D = TestFolder;
-            scenario.Location.StabilityOptions.SoilDatabase = soilDbName;
+            scenario.Location.StabilityOptions.SoilDatabaseName = soilDbName;
             scenario.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1;
 
             var subSoilScenario = new SoilGeometryProbability();
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 929)
@@ -1743,7 +1743,7 @@
         /// <returns></returns>
         public Soil GetDikeEmbankmentSoil()
         {
-            if ((stabilityOptions != null && String.IsNullOrEmpty(stabilityOptions.SoilDatabase)) || String.IsNullOrEmpty(DikeEmbankmentMaterial))
+            if ((stabilityOptions != null && String.IsNullOrEmpty(stabilityOptions.SoilDatabaseName)) || String.IsNullOrEmpty(DikeEmbankmentMaterial))
             {
                 return null;
             }
@@ -1759,7 +1759,7 @@
         /// <returns></returns>
         public Soil GetShoulderEmbankmentSoil()
         {
-            if ((stabilityOptions != null && String.IsNullOrEmpty(stabilityOptions.SoilDatabase)) || String.IsNullOrEmpty(ShoulderEmbankmentMaterial))
+            if ((stabilityOptions != null && String.IsNullOrEmpty(stabilityOptions.SoilDatabaseName)) || String.IsNullOrEmpty(ShoulderEmbankmentMaterial))
             {
                 return null;
             }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/ThrowHelper.cs
===================================================================
diff -u -r877 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/ThrowHelper.cs	(.../ThrowHelper.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/ThrowHelper.cs	(.../ThrowHelper.cs)	(revision 929)
@@ -190,7 +190,7 @@
         internal static void ThrowIfFileNotExist(string fileName, StringResourceNames resourceNamesName)
         {
             if (!File.Exists(fileName))
-                throw new FileNotFoundException(string.Format(GetResourceString(resourceNamesName), String.Format("{0} in {1}", (fileName ?? ""), DamProjectData.ProjectWorkingPath)));
+                throw new FileNotFoundException(string.Format(GetResourceString(resourceNamesName), String.Format("{0} in {1}", (fileName ?? ""), DamProjectData.OldProjectWorkingPath)));
         }
 
         internal static void ThrowIfDirectoryNotExist(string dirName, StringResourceNames resourceNamesName)
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 929)
@@ -48,7 +48,7 @@
             ValidateDamProjectData(damProjectData);
 
             Input input = new Input();
-            input.WorkingDir = damProjectData.WorkingDir;
+            input.ProjectWorkingPath = damProjectData.ProjectWorkingPath;
 
             TransferAnalysisSpecification(damProjectData, input);
             TransferStabilityParameters(damProjectData, input);
@@ -402,7 +402,7 @@
                     inputLocation.StabilityOptions = new LocationStabilityOptions
                     {
                         MapForSoilgeometries2D = location.StabilityOptions.MapForSoilGeometries2D,
-                        SoilDatabase = location.StabilityOptions.SoilDatabase,
+                        SoilDatabaseName = location.StabilityOptions.SoilDatabaseName,
                         ZoneType = ConversionHelper.ConvertToInputZoneType(location.StabilityOptions.StabilityZoneType),
                         ForbiddenZoneFactorSpecified = location.StabilityOptions.ForbiddenZoneFactor.HasValue
                     };
Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 929)
@@ -53,7 +53,7 @@
         
         private bool analysisTypeFieldSpecified;
         
-        private string workingDirField;
+        private string projectWorkingPathField;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlArrayItemAttribute(IsNullable=false)]
@@ -221,12 +221,12 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string WorkingDir {
+        public string ProjectWorkingPath {
             get {
-                return this.workingDirField;
+                return this.projectWorkingPathField;
             }
             set {
-                this.workingDirField = value;
+                this.projectWorkingPathField = value;
             }
         }
     }
@@ -3540,7 +3540,7 @@
         
         private string mapForSoilgeometries2DField;
         
-        private string soilDatabaseField;
+        private string soilDatabaseNameField;
         
         private int zoneTypeField;
         
@@ -3573,12 +3573,12 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlAttributeAttribute()]
-        public string SoilDatabase {
+        public string SoilDatabaseName {
             get {
-                return this.soilDatabaseField;
+                return this.soilDatabaseNameField;
             }
             set {
-                this.soilDatabaseField = value;
+                this.soilDatabaseNameField = value;
             }
         }
         
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs	(.../RWScenariosCalculation.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Assessment Regional/RWScenariosCalculation.cs	(.../RWScenariosCalculation.cs)	(revision 929)
@@ -339,7 +339,7 @@
 //                }
 //                //job.SoilGeometryProbability.SoilProfile1D.EnsureUniqueLayerIds();
 //                var calculationName = GetCalculationNameForPipingCalculator(job);
-//                calculator.FilenameCalculation = Path.Combine(Path.Combine(DamProjectData.ProjectWorkingPath, job.FailureMechanismType.ToString()), calculationName);
+//                calculator.FilenameCalculation = Path.Combine(Path.Combine(DamProjectData.OldProjectWorkingPath, job.FailureMechanismType.ToString()), calculationName);
 //                calculator.IsHydraulicShortcut = (job.HydraulicShortcutType == HydraulicShortcutType.HydraulicShortcut);
 //                double? pipingFactor = calculator.CalculatePipingFactor(job.Location, job.Location.LocalXZSurfaceLine2, job.SoilGeometryProbability.SoilProfile1D, waterLevel);
 //                job.BaseFileName = calculator.FilenameCalculation;
@@ -431,7 +431,7 @@
            // calculator.MStabExePath = this.MStabExePath;
             calculator.RegisterSendMessage(this.SendStabilityMessage);
 
-            string soilDatabaseName = job.Location.StabilityOptions.SoilDatabase;
+            string soilDatabaseName = job.Location.StabilityOptions.SoilDatabaseName;
 //            DamFailureMechanismeCalculationSpecification damCalculation =
 //                calculator.GetSpecification(this.evaluationJob.DikeName, soilDatabaseName, job.Location, new SoilGeometry(job.SoilGeometryProbability.SoilProfile1D, null),
 //                (MStabModelType)job.MstabModelOption, job.LoadSituation, job.DikeDrySensitivity, job.HydraulicShortcutType, MStabParameters);
@@ -440,7 +440,7 @@
 
 //            string inputFile = damCalculation.FailureMechanismParametersMStab.MStabParameters.ProjectFileName;
 //
-//            job.BaseFileName = inputFile.Replace(DamProject.ProjectWorkingPath, @"").Replace(".sti", "");
+//            job.BaseFileName = inputFile.Replace(DamProject.OldProjectWorkingPath, @"").Replace(".sti", "");
 
 //            calculator.Load(inputFile);
             job.CalculationResult = calculator.Run();
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs	(.../DamProjectData.cs)	(revision 929)
@@ -72,7 +72,7 @@
 
         public static string ProjectMap = "";
 
-        public static string ProjectWorkingPath 
+        public static string OldProjectWorkingPath 
         {
             get;
             set;
@@ -449,7 +449,7 @@
             get { return programType; }
         }
 
-        public string WorkingDir { get; set; } = "";
+        public string ProjectWorkingPath { get; set; } = "";
 
         /// <summary>
         /// Gets or sets the sensor data.
Index: DamEngine/trunk/Xsds Liquid/DamInput.xsd
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/Xsds Liquid/DamInput.xsd	(.../DamInput.xsd)	(revision 916)
+++ DamEngine/trunk/Xsds Liquid/DamInput.xsd	(.../DamInput.xsd)	(revision 929)
@@ -100,7 +100,7 @@
         </xs:restriction>
       </xs:simpleType>
     </xs:attribute>
-    <xs:attribute name="WorkingDir" type="xs:string" use="optional" />
+    <xs:attribute name="ProjectWorkingPath" type="xs:string" use="optional" />
   </xs:complexType>
   <xs:element name="Input" type="Input" />
 </xs:schema>
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs
===================================================================
diff -u -r927 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs	(.../MStabXmlDocTests.cs)	(revision 927)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityCommon/MStabXmlDocTests.cs	(.../MStabXmlDocTests.cs)	(revision 929)
@@ -66,7 +66,7 @@
             scenario.Location.StabilityOptions = new StabilityOptions();
             scenario.Location.StabilityOptions.TrafficLoad = 10.0;
             scenario.Location.StabilityOptions.MinimalCircleDepth = 1.0;
-            scenario.Location.StabilityOptions.SoilDatabase = soilDbName;
+            scenario.Location.StabilityOptions.SoilDatabaseName = soilDbName;
 
             var subSoilScenario = new SoilGeometryProbability();
             subSoilScenario.StiFileName = soilGeometry2DName;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Dikes Design/DesignCalculator.cs	(.../DesignCalculator.cs)	(revision 929)
@@ -67,7 +67,7 @@
 
                         // Prepare input
                         var damKernelInput = new DamKernelInput();
-                        damKernelInput.WorkingDir = damProjectData.WorkingDir;
+                        damKernelInput.WorkingDir = damProjectData.ProjectWorkingPath;
                         damKernelInput.Location = location;
                         damKernelInput.SubSoilScenario = soiProfileProbability;
                         damKernelInput.DesignScenario = location.Scenarios[designScenarioIndex];
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs
===================================================================
diff -u -r877 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs	(.../StabilityCalculator.cs)	(revision 877)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Stability/StabilityCalculator.cs	(.../StabilityCalculator.cs)	(revision 929)
@@ -208,7 +208,7 @@
         {
             if (CalculationBaseDirectory == "")
             {
-                CalculationBaseDirectory = DamProjectData.ProjectWorkingPath;
+                CalculationBaseDirectory = DamProjectData.OldProjectWorkingPath;
             }
             return Path.Combine(CalculationBaseDirectory, StabilitySubDir);
         }
Index: DamEngine/trunk/Xsds Liquid/DamLocation.xsd
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/Xsds Liquid/DamLocation.xsd	(.../DamLocation.xsd)	(revision 916)
+++ DamEngine/trunk/Xsds Liquid/DamLocation.xsd	(.../DamLocation.xsd)	(revision 929)
@@ -171,7 +171,7 @@
       <xs:element minOccurs="0" maxOccurs="1" name="StabilityOptions">
         <xs:complexType>
           <xs:attribute name="MapForSoilgeometries2D" type="xs:string" use="optional" />
-          <xs:attribute name="SoilDatabase" type="xs:string" use="optional" />
+          <xs:attribute name="SoilDatabaseName" type="xs:string" use="optional" />
           <xs:attribute name="ZoneType" use="required">
             <xs:simpleType>
               <xs:restriction base="xs:int">
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/MacroStabilityTutorialDesignInputFile.xml
===================================================================
diff -u -r920 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/MacroStabilityTutorialDesignInputFile.xml	(.../MacroStabilityTutorialDesignInputFile.xml)	(revision 920)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/MacroStabilityTutorialDesignInputFile.xml	(.../MacroStabilityTutorialDesignInputFile.xml)	(revision 929)
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="0" StabilityModelType="Bishop" AnalysisType="NoAdaption" WorkingDir="D:\src\dam\DamClients\DamUI\trunk\src\bin\Debug">
+<?xml version="1.0" encoding="utf-8"?>
+<Input xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" DamProjectType="Design" FailureMechanismSystemType="0" StabilityModelType="Bishop" AnalysisType="NoAdaption" ProjectWorkingPath="D:\src\dam\DamClients\DamUI\trunk\src\bin\Debug">
   <Locations>
     <Location SurfaceLineName="DWP_1" SegmentName="DWP_1" Name="DWP_1" DikeEmbankmentMaterial="dijksmateriaal_klei" XSoilGeometry2DOrigin="-8.42">
       <DesignOptions RedesignDikeHeight="true" RedesignDikeShoulder="true" ShoulderEmbankmentMaterial="bermmateriaal_klei" StabilityShoulderGrowSlope="0.333" StabilityShoulderGrowDeltaX="1" StabilitySlopeAdaptionDeltaX="1" SlopeAdaptionStartCotangent="3" SlopeAdaptionEndCotangent="6" SlopeAdaptionStepCotangent="0.5" NewShoulderTopSlope="0.05" UseNewDitchDefinition="false" StabilityDesignMethod="OptimizedSlopeAndShoulderAdaption" />
       <WaternetOptions PhreaticLineCreationMethod="ExpertKnowledgeRRD" PolderLevel="1.6" HeadPl2="0" DampingFactorPL3="0" DampingFactorPL4="0" PenetrationLength="0" SlopeDampingFactor="0" Pl1BelowCrestRiverside="0.5" Pl1BelowCrestPolderside="0.5" Pl1BelowShoulderCrestPolderside="0.2" Pl1BelowToeDikePolderside="0.2" IntrusionVerticalWaterPressure="Standard" />
       <DesignScenarios>
         <DesignScenario Id="1" RiverLevel="4.4" RiverLevelLow="0" DikeTableHeight="4.9" PlLineOffsetBelowDikeTopAtRiver="0.5" PlLineOffsetBelowDikeTopAtPolder="0.5" PlLineOffsetBelowShoulderBaseInside="0.2" PlLineOffsetBelowDikeToeAtPolder="0.2" HeadPl3="4.4" HeadPl4="4.4" UpliftCriterionStability="1.2" UpliftCriterionPiping="1.2" RequiredSafetyFactorStabilityInnerSlope="1.17" RequiredSafetyFactorStabilityOuterSlope="1.17" RequiredSafetyFactorPiping="1.2" />
       </DesignScenarios>
-      <StabilityOptions MapForSoilgeometries2D="DAM Tutorial Design.geometries2D.0\" SoilDatabase="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design0.soilmaterials.mdb" ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13" MinimumCircleDepth="1.5" />
+      <StabilityOptions MapForSoilgeometries2D="DAM Tutorial Design.geometries2D.0\" SoilDatabaseName="D:\src\dam\DamClients\DamUI\trunk\data\DamEngineTestProjects\DAM Tutorial Design\DAM Tutorial Design0.soilmaterials.mdb" ZoneType="0" ForbiddenZoneFactor="1" ZoneAreaRestSlopeCrestWidth="3" TrafficLoad="13" MinimumCircleDepth="1.5" />
     </Location>
   </Locations>
   <SurfaceLines>
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs	(.../CalculationHelper.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/General/CalculationHelper.cs	(.../CalculationHelper.cs)	(revision 929)
@@ -83,7 +83,7 @@
             return GetCalculationSpecification(arguments.FailureMechanismType, arguments.Location,
                                                arguments.SoilGeometry2DName, arguments.SoilProfileType,
                                                arguments.PLLines, arguments.StabilityParameters, arguments.Model,
-                                               arguments.Location.StabilityOptions.SoilDatabase, projectFileName);
+                                               arguments.Location.StabilityOptions.SoilDatabaseName, projectFileName);
         }
 
         internal static DamFailureMechanismeCalculationSpecification GetCalculationSpecification(
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs
===================================================================
diff -u -r927 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs	(.../DamMacroStabilityOutwardsKernelWrapperTests.cs)	(revision 927)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapperTests.cs	(.../DamMacroStabilityOutwardsKernelWrapperTests.cs)	(revision 929)
@@ -189,7 +189,7 @@
                 TrafficLoad = 10.0,
                 MapForSoilGeometries2D = testFolder
             };
-            scenario.Location.StabilityOptions.SoilDatabase = soilDbName;
+            scenario.Location.StabilityOptions.SoilDatabaseName = soilDbName;
             scenario.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = 1.1;
 
             var subSoilScenario = new SoilGeometryProbability
@@ -420,7 +420,7 @@
                 TrafficLoad = 10.0,
                 MapForSoilGeometries2D = testFolder
             };
-            scenario.Location.StabilityOptions.SoilDatabase = soilDbName;
+            scenario.Location.StabilityOptions.SoilDatabaseName = soilDbName;
             scenario.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1;
 
             var subSoilScenario = new SoilGeometryProbability
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs	(.../MacroStabilityTests.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/MacroStabilityTests.cs	(.../MacroStabilityTests.cs)	(revision 929)
@@ -52,9 +52,9 @@
             }
             const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
-            inputString = ChangeValueInXml(inputString, "WorkingDir", workingDir);
+            inputString = ChangeValueInXml(inputString, "ProjectWorkingPath", workingDir);
             inputString = ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DAM Tutorial Design.geometries2D.0\");
-            inputString = ChangeValueInXml(inputString, "SoilDatabase", @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb");
+            inputString = ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb");
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
 
@@ -78,9 +78,9 @@
             const string fileName = @"TestFiles\MacroStabilityTutorialDesignInputFile.xml";
             string inputString = File.ReadAllText(fileName);
             inputString = ChangeInputModel(inputString, InputStabilityModelType.UpliftVan);
-            inputString = ChangeValueInXml(inputString, "WorkingDir", workingDir);
+            inputString = ChangeValueInXml(inputString, "ProjectWorkingPath", workingDir);
             inputString = ChangeValueInXml(inputString, "MapForSoilgeometries2D", @"TestFiles\DAM Tutorial Design.geometries2D.0\");
-            inputString = ChangeValueInXml(inputString, "SoilDatabase", @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb");
+            inputString = ChangeValueInXml(inputString, "SoilDatabaseName", @"TestFiles\DAM Tutorial Design0.soilmaterials.mdb");
             EngineInterface engineInterface = new EngineInterface(inputString);
             Assert.IsNotNull(engineInterface.DamProjectData);
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs	(.../StabilityOptions.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityOptions.cs	(.../StabilityOptions.cs)	(revision 929)
@@ -48,7 +48,7 @@
         /// <value>
         /// The name of the soil database.
         /// </value>
-        public string SoilDatabase { get; set; } = "";
+        public string SoilDatabaseName { get; set; } = "";
 
         /// <summary>
         /// Gets or sets the type of the stability zone.
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r916 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 916)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 929)
@@ -93,7 +93,7 @@
         private DamProjectData CreateExampleDamProjectData()
         {
             var damProjectData = new DamProjectData();
-            damProjectData.WorkingDir = @"D:\TestDir";
+            damProjectData.ProjectWorkingPath = @"D:\TestDir";
 
             FillAnalysisSpecification(damProjectData);
             FillStabilityParameters(damProjectData);
@@ -237,6 +237,7 @@
             {
                 var location = new Data.General.Location();
                 location.Name = "Location " + (i + 1).ToString();
+                location.XSoilGeometry2DOrigin = 1.23;
                 location.ModelParametersForPLLines.PLLineCreationMethod = (PLLineCreationMethod) i;
                 location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType) i;
                 location.PolderLevel = 1.0 * i + 0.11;
@@ -273,7 +274,8 @@
                     ForbiddenZoneFactor = 1.23,
                     ZoneAreaRestSlopeCrestWidth = 8.23,
                     TrafficLoad = 11.11,
-                    MinimalCircleDepth = 1.21
+                    MinimalCircleDepth = 1.21,
+                    SoilDatabaseName = "test.mdb",
                 };
                 location.RedesignDikeHeight = false;
                 location.RedesignDikeShoulder = false;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
===================================================================
diff -u -r927 -r929
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 927)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 929)
@@ -210,7 +210,7 @@
             }
 
             failureMechanismParametersMStab.MStabParameters.ProjectFileName = mstabProjectFilename;
-            failureMechanismParametersMStab.MStabParameters.SoilDatabaseName = scenario.Location.StabilityOptions.SoilDatabase;
+            failureMechanismParametersMStab.MStabParameters.SoilDatabaseName = scenario.Location.StabilityOptions.SoilDatabaseName;
 
             if (!failureMechanismParametersMStab.IsComplete)
             {