Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs
===================================================================
diff -u -r566 -r572
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 566)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillXmlInputFromDam.cs	(.../FillXmlInputFromDam.cs)	(revision 572)
@@ -244,19 +244,19 @@
                 {
                     Name = soilProfile1D.Name,
                     BottomLevel = soilProfile1D.BottomLevel,
-                    Layers = new SoilProfile1DLayer[soilProfile1D.LayerCount]
+                    Layers1D = new SoilProfile1DLayer1D[soilProfile1D.LayerCount]
                 };
-                AddLayers(soilProfile1D, inputSoilProfile1D);
+                AddLayers1D(soilProfile1D, inputSoilProfile1D);
                 inputSoilProfiles1D[i] = inputSoilProfile1D;
             }            
         }
 
-        private static void AddLayers(SoilProfile1D soilProfile1D, Io.XmlInput.SoilProfile1D inputSoilProfile1D)
+        private static void AddLayers1D(SoilProfile1D soilProfile1D, Io.XmlInput.SoilProfile1D inputSoilProfile1D)
         {
             for (int i = 0; i < soilProfile1D.LayerCount; i++)
             {
                 var layer = soilProfile1D.Layers[i];
-                var inputLayer = new SoilProfile1DLayer
+                var inputLayer = new SoilProfile1DLayer1D
                 {
                     Name = layer.Name,
                     SoilName = layer.Soil.Name,
@@ -265,7 +265,7 @@
                     WaterpressureInterpolationModel = ConversionHelper.ConvertToInputWaterpressureInterpolationModel(
                         layer.WaterpressureInterpolationModel)
                 };
-                inputSoilProfile1D.Layers[i] = inputLayer;
+                inputSoilProfile1D.Layers1D[i] = inputLayer;
             }
         }
 
@@ -279,7 +279,7 @@
                 var inputSoilProfile2D = new Io.XmlInput.SoilProfile2D
                 {
                     Name = soilProfile2D.Name,
-                    Layers = new SoilProfile2DLayer[soilProfile2D.Surfaces.Count]
+                    Layers2D = new SoilProfile2DLayer2D[soilProfile2D.Surfaces.Count]
                 };
                 AddPreconsolidationStresses(soilProfile2D, inputSoilProfile2D);
                 AddLayers2D(soilProfile2D, inputSoilProfile2D);
@@ -315,20 +315,20 @@
                 for (int i = 0; i < soilProfile2D.Surfaces.Count; i++)
                 {
                     var layer = soilProfile2D.Surfaces[i];
-                    var inputLayer = new SoilProfile2DLayer
+                    var inputLayer = new SoilProfile2DLayer2D
                     {
                         SoilName = layer.Soil.Name,
                         IsAquifer = layer.IsAquifer,
                         WaterpressureInterpolationModel = ConversionHelper.ConvertToInputWaterpressureInterpolationModel(
                             layer.WaterpressureInterpolationModel),
-                        Surface = new SoilProfile2DLayerSurface()
+                        Surface = new SoilProfile2DLayer2DSurface()
                     };
 
                     var loop = layer.GeometrySurface.OuterLoop;
-                    inputLayer.Surface.OuterLoop = new SoilProfile2DLayerSurfaceOuterPoint[loop.Points.Count];
+                    inputLayer.Surface.OuterLoop = new SoilProfile2DLayer2DSurfaceOuterPoint[loop.Points.Count];
                     for (int j = 0; j < loop.Points.Count; j++)
                     {
-                        var point = new SoilProfile2DLayerSurfaceOuterPoint
+                        var point = new SoilProfile2DLayer2DSurfaceOuterPoint
                         {
                             X = loop.Points[j].X,
                             Z = loop.Points[j].Z
@@ -338,18 +338,18 @@
                     var innerloop = layer.GeometrySurface.InnerLoops.FirstOrDefault();
                     if (innerloop != null)
                     {
-                        inputLayer.Surface.Innerloop = new SoilProfile2DLayerSurfaceInnerPoint[innerloop.Points.Count];
+                        inputLayer.Surface.Innerloop = new SoilProfile2DLayer2DSurfaceInnerPoint[innerloop.Points.Count];
                         for (int j = 0; j < innerloop.Points.Count; j++)
                         {
-                            var point = new SoilProfile2DLayerSurfaceInnerPoint
+                            var point = new SoilProfile2DLayer2DSurfaceInnerPoint
                             {
                                 X = innerloop.Points[j].X,
                                 Z = innerloop.Points[j].Z
                             };
                             inputLayer.Surface.Innerloop[j] = point;
                         }
                     }
-                    inputSoilProfile2D.Layers[i] = inputLayer;                    
+                    inputSoilProfile2D.Layers2D[i] = inputLayer;                    
                 }
             }
         }