Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs
===================================================================
diff -u -r1217 -r1246
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapper.cs)	(revision 1217)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapper.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapper.cs)	(revision 1246)
@@ -22,6 +22,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.IO;
 using System.Xml.Linq;
 using Deltares.DamEngine.Calculators.DikesDesign;
 using Deltares.DamEngine.Calculators.KernelWrappers.Common;
@@ -111,7 +112,6 @@
         public int Validate(IKernelDataInput kernelDataInput, IKernelDataOutput kernelDataOutput, out List<LogMessage> messages)
         {
             // For now, validation is not implemented so return empty list.
-            var input = (DamMacroStabilityInput)kernelDataInput;
             messages = new List<LogMessage>();
             return messages.Count;
         }
@@ -136,6 +136,8 @@
             if (results.Count > 0)
             {
                 var damMacroStabilityOutputItem = new DamMacroStabilityOutputItem();
+                var input = (DamMacroStabilityInput)kernelDataInput;
+                damMacroStabilityOutputItem.ProjectFileName = input.DGeoStabilityInputFileName;
                 // For Horizontal balance only zone 1 is used to give back the results.
                 var zone1 = new DamMacroStabilityOutputItem.ResultsSingleZone
                 {
@@ -151,6 +153,7 @@
         /// </summary>
         /// <param name="damKernelInput">The dam kernel input.</param>
         /// <param name="kernelDataOutput">The kernel data output.</param>
+        /// <param name="designScenario"></param>
         /// <param name="resultMessage">The result message.</param>
         /// <param name="designResults">The design results</param>
         /// <exception cref="NoNullAllowedException">
@@ -180,6 +183,7 @@
             if (damMacroStabilityOutput.StabilityOutputItems.Count == 1)
             {
                 var damMacroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[0];
+                designResult.BaseFileName = Path.GetFileNameWithoutExtension(damMacroStabilityOutputItem.ProjectFileName);
                 var stabilityDesignResults = new StabilityDesignResults
                 {
                     Zone1SafetyFactor = damMacroStabilityOutputItem.Zone1Results.SafetyFactor,
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs
===================================================================
diff -u -r1236 -r1246
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 1236)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityOutwards/DamMacroStabilityOutwardsKernelWrapper.cs	(.../DamMacroStabilityOutwardsKernelWrapper.cs)	(revision 1246)
@@ -155,7 +155,6 @@
         {
             DamMacroStabilityOutput damMacroStabilityOutput = (DamMacroStabilityOutput) kernelDataOutput;
             messages = new List<LogMessage>();
-
             // start calculation
             var calculator = StabilityCalculator(kernelDataInput);
             calculator.Calculate();
@@ -165,6 +164,8 @@
             if (results.Count > 0)
             {
                 var damMacroStabilityOutputItem = new DamMacroStabilityOutputItem();
+                var input = (DamMacroStabilityInput)kernelDataInput;
+                damMacroStabilityOutputItem.ProjectFileName = input.DGeoStabilityInputFileName;
                 var zone1 = new DamMacroStabilityOutputItem.ResultsSingleZone
                 {
                     SafetyFactor = results[0].Zone1.SafetyFactor,
@@ -209,8 +210,6 @@
                 damKernelInput.DamFailureMechanismeCalculationSpecification.AssessmentScenarioJobSettings,
                 out errorMessages);
             mstabXml.Save(stabilityProjectFilename + ".xml");
-            damKernelInput.DamFailureMechanismeCalculationSpecification.FailureMechanismParametersMStab.MStabParameters.ProjectFileName = 
-                kernelDataInput.FailureMechanismParametersMStab.MStabParameters.ProjectFileName;
             return mstabXml;
         }
 
@@ -274,6 +273,7 @@
             if (damMacroStabilityOutput.StabilityOutputItems.Count == 1)
             {
                 var damMacroStabilityOutputItem = damMacroStabilityOutput.StabilityOutputItems[0];
+                designResult.BaseFileName = Path.GetFileNameWithoutExtension(damMacroStabilityOutputItem.ProjectFileName);
                 var stabilityDesignResults = new StabilityDesignResults
                 {
                     Zone1SafetyFactor = damMacroStabilityOutputItem.Zone1Results.SafetyFactor,
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs
===================================================================
diff -u -r1149 -r1246
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs)	(revision 1149)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamMacroStabilityHorizontalBalance/DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs	(.../DamMacroStabilityHorizontalBalanceKernelWrapperTests.cs)	(revision 1246)
@@ -166,7 +166,8 @@
             kernelWrapper.PostProcess(damKernelInput, damMacroStabilityOutput, null, "", out results);
             Assert.AreEqual(6.757, results[0].StabilityDesignResults.SafetyFactor, cToleranceSafetyFactor);
             Assert.AreEqual("", results[0].StabilityDesignResults.ResultMessage);
-            Assert.AreEqual(CalculationResult.Succeeded, results[0].CalculationResult);            
+            Assert.AreEqual(CalculationResult.Succeeded, results[0].CalculationResult);
+            Assert.IsNotEmpty(results[0].BaseFileName);
         }
 
         [Test]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs
===================================================================
diff -u -r1236 -r1246
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 1236)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityCommon/MStabXmlDoc.cs	(.../MStabXmlDoc.cs)	(revision 1246)
@@ -228,8 +228,6 @@
             {
                 throw new Exception(Resources.MStabXmlDoc_NotAllDataAvailable);
             }
-            // Make sure projectfilename is returned
-            inputFailureMechanismParametersMStab.MStabParameters.ProjectFileName = mstabProjectFilename;
             DamMStabAssembler assembler = new DamMStabAssembler();
             XDocument mstabXml = assembler.CreateDataTransferObject(failureMechanismParametersMStab);
             return mstabXml;