Index: DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs
===================================================================
diff -u -r3215 -r3217
--- DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs	(.../LayerCreator.cs)	(revision 3215)
+++ DamTools/LayerOnSlopeTool/trunk/src/Deltares.LayerOnSlopeTool.LayerCreator/LayerCreator.cs	(.../LayerCreator.cs)	(revision 3217)
@@ -105,7 +105,7 @@
                 {
                     var loweredSurfaceLine = DetermineSurfaceLineForGivenLayerData(surfaceLine, location.LayerThickness);
                     CreateGeometryWithLoweredSurfaceLine(loweredSurfaceLine, location);
-                    CreateGeometryWithOriginalSurfaceLine(surfaceLine, location);
+                    CreateGeometryWithOriginalSurfaceLine(surfaceLine, location, loweredSurfaceLine.SurfaceLineId);
                 }
                 catch (Exception e)
                 {
@@ -184,21 +184,21 @@
                 SurfaceLine = surfaceLine,
                 DikeMaterialName = location.DikeMaterial,
                 InputFilename = Path.Combine(GeometriesFolderName, location.SoilGeometryName),
-                OutputFilename = Path.Combine(OutputFolderName, "Interim" + location.SoilGeometryName)
+                OutputFilename = Path.Combine(OutputFolderName, "Interim" + location.LocationId + "_" + surfaceLine.SurfaceLineId)// SoilGeometryName)
             };
             StiFileCreator.StiFileCreator.ProcessFile(stiFileCreatorInput);
         }
 
-        private void CreateGeometryWithOriginalSurfaceLine(SurfaceLine surfaceLine, Location location)
+        private void CreateGeometryWithOriginalSurfaceLine(SurfaceLine surfaceLine, Location location, string loweredSurfaceLineId)
         {
             var stiFileCreatorInput = new StiFileCreatorInput
             {
                 // Note that for second generation the offset MUST be 0 as any offset is already taken care of in the first generation.
                 XOffset = 0,
                 SurfaceLine = surfaceLine,
                 DikeMaterialName = location.LayerMaterial,
-                InputFilename = Path.Combine(OutputFolderName, "Interim" + location.SoilGeometryName),
-                OutputFilename = Path.Combine(OutputFolderName, location.SoilGeometryName)
+                InputFilename = Path.Combine(OutputFolderName, "Interim" + location.LocationId + "_" + loweredSurfaceLineId), // SoilGeometryName),
+                OutputFilename = Path.Combine(OutputFolderName, location.LocationId + "_" + surfaceLine.SurfaceLineId) //SoilGeometryName)
             };
             StiFileCreator.StiFileCreator.ProcessFile(stiFileCreatorInput);
         }