Index: DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs
===================================================================
diff -u -r3580 -r3585
--- DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 3580)
+++ DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs	(.../CsvExportData.cs)	(revision 3585)
@@ -291,12 +291,11 @@
         [Browsable(false)]
         public string PipingResultFile
         {
-            // Path of piping is not based on the working dir but on assembly (Assembly.GetExecutingAssembly().Location)
             get
             {
                 if (!String.IsNullOrEmpty(BaseFileName))
                 {
-                    const string txtExtension = ".prxml";
+                    const string pipingResultFileExtension = ".prxml";
                     string fullFilename = calculationSubDir;
                     if (calculationSubDir == "")
                     {
@@ -307,7 +306,7 @@
                     }
 
                     fullFilename = fullFilename + Path.DirectorySeparatorChar + BaseFileName;
-                    fullFilename = fullFilename + txtExtension;
+                    fullFilename = fullFilename + pipingResultFileExtension;
                     return fullFilename;
                 }
 
Index: DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs
===================================================================
diff -u -r3580 -r3585
--- DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 3580)
+++ DamClients/DamUI/branches/DamUI 19.1/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlOutput.cs	(.../FillDamUiFromXmlOutput.cs)	(revision 3585)
@@ -235,7 +235,7 @@
             }
             if (string.IsNullOrEmpty(desResult.BaseFileName))
             {
-                desResult.BaseFileName = designResult.LocationName + designResult.ProfileName + designResult.ScenarioName;
+                desResult.BaseFileName = "Loc(" + designResult.LocationName + ")_Prof(" + designResult.ProfileName + ")_Scen(" + designResult.ScenarioName + ")";
             }
             desResult.CreatePipingResultsFileForSurfaceLineAndProfile(desResult);
         }