Index: dam engine/trunk/Xsds Liquid/DamSoilProfile2D.xsd
===================================================================
diff -u -r535 -r572
--- dam engine/trunk/Xsds Liquid/DamSoilProfile2D.xsd	(.../DamSoilProfile2D.xsd)	(revision 535)
+++ dam engine/trunk/Xsds Liquid/DamSoilProfile2D.xsd	(.../DamSoilProfile2D.xsd)	(revision 572)
@@ -3,10 +3,10 @@
 <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:complexType name="SoilProfile2D">
     <xs:sequence>
-      <xs:element minOccurs="0" name="Layers">
+      <xs:element minOccurs="1" maxOccurs="1" name="Layers2D">
         <xs:complexType>
           <xs:sequence>
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="Layer">
+            <xs:element minOccurs="1" maxOccurs="unbounded" name="Layer2D">
               <xs:complexType>
                 <xs:sequence>
                   <xs:element minOccurs="1" maxOccurs="1" name="Surface">
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;                    
                 }
             }
         }
Index: dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml
===================================================================
diff -u -r566 -r572
--- dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml	(.../InputFile.xml)	(revision 566)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface.Tests/TestFiles/InputFile.xml	(.../InputFile.xml)	(revision 572)
@@ -79,24 +79,24 @@
   </Segments>
   <SoilProfiles1D>
     <SoilProfile1D Name="Profile1D 1" BottomLevel="-21.12">
-      <Layers>
-        <Layer Name="Layer1" SoilName="Soil 0" TopLevel="0" IsAquifer="false" WaterpressureInterpolationModel="0" />
-        <Layer Name="Layer2" SoilName="Soil 1" TopLevel="-1" IsAquifer="false" WaterpressureInterpolationModel="0" />
-        <Layer Name="Layer3" SoilName="Soil 2" TopLevel="-2" IsAquifer="true" WaterpressureInterpolationModel="1" />
-      </Layers>
+      <Layers1D>
+        <Layer1D Name="Layer1" SoilName="Soil 0" TopLevel="0" IsAquifer="false" WaterpressureInterpolationModel="0" />
+        <Layer1D Name="Layer2" SoilName="Soil 1" TopLevel="-1" IsAquifer="false" WaterpressureInterpolationModel="0" />
+        <Layer1D Name="Layer3" SoilName="Soil 2" TopLevel="-2" IsAquifer="true" WaterpressureInterpolationModel="1" />
+      </Layers1D>
     </SoilProfile1D>
     <SoilProfile1D Name="Profile1D 2" BottomLevel="-42.24">
-      <Layers>
-        <Layer Name="Layer1" SoilName="Soil 0" TopLevel="0" IsAquifer="false" WaterpressureInterpolationModel="0" />
-        <Layer Name="Layer2" SoilName="Soil 1" TopLevel="-1" IsAquifer="false" WaterpressureInterpolationModel="0" />
-        <Layer Name="Layer3" SoilName="Soil 2" TopLevel="-2" IsAquifer="true" WaterpressureInterpolationModel="1" />
-      </Layers>
+      <Layers1D>
+        <Layer1D Name="Layer1" SoilName="Soil 0" TopLevel="0" IsAquifer="false" WaterpressureInterpolationModel="0" />
+        <Layer1D Name="Layer2" SoilName="Soil 1" TopLevel="-1" IsAquifer="false" WaterpressureInterpolationModel="0" />
+        <Layer1D Name="Layer3" SoilName="Soil 2" TopLevel="-2" IsAquifer="true" WaterpressureInterpolationModel="1" />
+      </Layers1D>
     </SoilProfile1D>
   </SoilProfiles1D>
   <SoilProfiles2D>
     <SoilProfile2D Name="Profile2D 1">
-      <Layers>
-        <Layer SoilName="Soil 0" IsAquifer="false" WaterpressureInterpolationModel="0">
+      <Layers2D>
+        <Layer2D SoilName="Soil 0" IsAquifer="false" WaterpressureInterpolationModel="0">
           <Surface>
             <OuterLoop>
               <OuterPoint X="0" Z="0" />
@@ -109,8 +109,8 @@
               <InnerPoint X="9" Z="9" />
             </Innerloop>
           </Surface>
-        </Layer>
-        <Layer SoilName="Soil 1" IsAquifer="false" WaterpressureInterpolationModel="0">
+        </Layer2D>
+        <Layer2D SoilName="Soil 1" IsAquifer="false" WaterpressureInterpolationModel="0">
           <Surface>
             <OuterLoop>
               <OuterPoint X="0" Z="0" />
@@ -123,8 +123,8 @@
               <InnerPoint X="9" Z="9" />
             </Innerloop>
           </Surface>
-        </Layer>
-        <Layer SoilName="Soil 2" IsAquifer="true" WaterpressureInterpolationModel="1">
+        </Layer2D>
+        <Layer2D SoilName="Soil 2" IsAquifer="true" WaterpressureInterpolationModel="1">
           <Surface>
             <OuterLoop>
               <OuterPoint X="0" Z="0" />
@@ -137,16 +137,16 @@
               <InnerPoint X="9" Z="9" />
             </Innerloop>
           </Surface>
-        </Layer>
-      </Layers>
+        </Layer2D>
+      </Layers2D>
       <PreconsolidationStresses>
         <PreconsolidationStress StressValue="3.33" Name="Precon 1" X="12.3" Z="-0.3" />
         <PreconsolidationStress StressValue="6.66" Name="Precon 2" X="24.6" Z="-0.6" />
       </PreconsolidationStresses>
     </SoilProfile2D>
     <SoilProfile2D Name="Profile2D 2">
-      <Layers>
-        <Layer SoilName="Soil 0" IsAquifer="false" WaterpressureInterpolationModel="0">
+      <Layers2D>
+        <Layer2D SoilName="Soil 0" IsAquifer="false" WaterpressureInterpolationModel="0">
           <Surface>
             <OuterLoop>
               <OuterPoint X="0" Z="0" />
@@ -159,8 +159,8 @@
               <InnerPoint X="9" Z="9" />
             </Innerloop>
           </Surface>
-        </Layer>
-        <Layer SoilName="Soil 1" IsAquifer="false" WaterpressureInterpolationModel="0">
+        </Layer2D>
+        <Layer2D SoilName="Soil 1" IsAquifer="false" WaterpressureInterpolationModel="0">
           <Surface>
             <OuterLoop>
               <OuterPoint X="0" Z="0" />
@@ -173,8 +173,8 @@
               <InnerPoint X="9" Z="9" />
             </Innerloop>
           </Surface>
-        </Layer>
-        <Layer SoilName="Soil 2" IsAquifer="true" WaterpressureInterpolationModel="1">
+        </Layer2D>
+        <Layer2D SoilName="Soil 2" IsAquifer="true" WaterpressureInterpolationModel="1">
           <Surface>
             <OuterLoop>
               <OuterPoint X="0" Z="0" />
@@ -187,8 +187,8 @@
               <InnerPoint X="9" Z="9" />
             </Innerloop>
           </Surface>
-        </Layer>
-      </Layers>
+        </Layer2D>
+      </Layers2D>
       <PreconsolidationStresses>
         <PreconsolidationStress StressValue="6.66" Name="Precon 1" X="24.6" Z="-0.6" />
         <PreconsolidationStress StressValue="13.32" Name="Precon 2" X="49.2" Z="-1.2" />
Index: dam engine/trunk/Xsds Liquid/DamSoilProfile1D.xsd
===================================================================
diff -u -r539 -r572
--- dam engine/trunk/Xsds Liquid/DamSoilProfile1D.xsd	(.../DamSoilProfile1D.xsd)	(revision 539)
+++ dam engine/trunk/Xsds Liquid/DamSoilProfile1D.xsd	(.../DamSoilProfile1D.xsd)	(revision 572)
@@ -3,10 +3,10 @@
 <xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:complexType name="SoilProfile1D">
     <xs:sequence>
-      <xs:element minOccurs="0" name="Layers">
+      <xs:element minOccurs="1" maxOccurs="1" name="Layers1D">
         <xs:complexType>
           <xs:sequence>
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="Layer">
+            <xs:element minOccurs="1" maxOccurs="unbounded" name="Layer1D">
               <xs:complexType>
                 <xs:attribute name="Name" type="xs:string" use="required" />
                 <xs:attribute name="SoilName" type="xs:string" use="required" />
Index: dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs
===================================================================
diff -u -r545 -r572
--- dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 545)
+++ dam engine/trunk/src/Deltares.DamEngine.Io/DamInput.cs	(.../DamInput.cs)	(revision 572)
@@ -381,20 +381,20 @@
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class SoilProfile2D {
         
-        private SoilProfile2DLayer[] layersField;
+        private SoilProfile2DLayer2D[] layers2DField;
         
         private SoilProfile2DPreconsolidationStress[] preconsolidationStressesField;
         
         private string nameField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("Layer", IsNullable=false)]
-        public SoilProfile2DLayer[] Layers {
+        [System.Xml.Serialization.XmlArrayItemAttribute("Layer2D", IsNullable=false)]
+        public SoilProfile2DLayer2D[] Layers2D {
             get {
-                return this.layersField;
+                return this.layers2DField;
             }
             set {
-                this.layersField = value;
+                this.layers2DField = value;
             }
         }
         
@@ -427,9 +427,9 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class SoilProfile2DLayer {
+    public partial class SoilProfile2DLayer2D {
         
-        private SoilProfile2DLayerSurface surfaceField;
+        private SoilProfile2DLayer2DSurface surfaceField;
         
         private string soilNameField;
         
@@ -438,7 +438,7 @@
         private int waterpressureInterpolationModelField;
         
         /// <remarks/>
-        public SoilProfile2DLayerSurface Surface {
+        public SoilProfile2DLayer2DSurface Surface {
             get {
                 return this.surfaceField;
             }
@@ -487,15 +487,15 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class SoilProfile2DLayerSurface {
+    public partial class SoilProfile2DLayer2DSurface {
         
-        private SoilProfile2DLayerSurfaceOuterPoint[] outerLoopField;
+        private SoilProfile2DLayer2DSurfaceOuterPoint[] outerLoopField;
         
-        private SoilProfile2DLayerSurfaceInnerPoint[] innerloopField;
+        private SoilProfile2DLayer2DSurfaceInnerPoint[] innerloopField;
         
         /// <remarks/>
         [System.Xml.Serialization.XmlArrayItemAttribute("OuterPoint", IsNullable=false)]
-        public SoilProfile2DLayerSurfaceOuterPoint[] OuterLoop {
+        public SoilProfile2DLayer2DSurfaceOuterPoint[] OuterLoop {
             get {
                 return this.outerLoopField;
             }
@@ -506,7 +506,7 @@
         
         /// <remarks/>
         [System.Xml.Serialization.XmlArrayItemAttribute("InnerPoint", IsNullable=false)]
-        public SoilProfile2DLayerSurfaceInnerPoint[] Innerloop {
+        public SoilProfile2DLayer2DSurfaceInnerPoint[] Innerloop {
             get {
                 return this.innerloopField;
             }
@@ -522,7 +522,7 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class SoilProfile2DLayerSurfaceOuterPoint {
+    public partial class SoilProfile2DLayer2DSurfaceOuterPoint {
         
         private double xField;
         
@@ -557,7 +557,7 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class SoilProfile2DLayerSurfaceInnerPoint {
+    public partial class SoilProfile2DLayer2DSurfaceInnerPoint {
         
         private double xField;
         
@@ -654,20 +654,20 @@
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     public partial class SoilProfile1D {
         
-        private SoilProfile1DLayer[] layersField;
+        private SoilProfile1DLayer1D[] layers1DField;
         
         private string nameField;
         
         private double bottomLevelField;
         
         /// <remarks/>
-        [System.Xml.Serialization.XmlArrayItemAttribute("Layer", IsNullable=false)]
-        public SoilProfile1DLayer[] Layers {
+        [System.Xml.Serialization.XmlArrayItemAttribute("Layer1D", IsNullable=false)]
+        public SoilProfile1DLayer1D[] Layers1D {
             get {
-                return this.layersField;
+                return this.layers1DField;
             }
             set {
-                this.layersField = value;
+                this.layers1DField = value;
             }
         }
         
@@ -700,7 +700,7 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
-    public partial class SoilProfile1DLayer {
+    public partial class SoilProfile1DLayer1D {
         
         private string nameField;
         
Index: dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs
===================================================================
diff -u -r566 -r572
--- dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 566)
+++ dam engine/trunk/src/Deltares.DamEngine.Interface/FillDamFromXmlInput.cs	(.../FillDamFromXmlInput.cs)	(revision 572)
@@ -250,20 +250,20 @@
                     var inputSoilProfile1D = inputSoilProfiles1D[i];
                     soilProfile1D.Name = inputSoilProfile1D.Name;
                     soilProfile1D.BottomLevel = inputSoilProfile1D.BottomLevel;
-                    AddLayers(inputSoilProfile1D, soilProfile1D, soils);
+                    AddLayers1D(inputSoilProfile1D, soilProfile1D, soils);
                     dikeSoilProfiles.Add(soilProfile1D);
                 }                
             }
         }
 
-        private static void AddLayers(Io.XmlInput.SoilProfile1D inputSoilProfile1D, SoilProfile1D soilProfile1D, SoilList soils)
+        private static void AddLayers1D(Io.XmlInput.SoilProfile1D inputSoilProfile1D, SoilProfile1D soilProfile1D, SoilList soils)
         {
             if (inputSoilProfile1D != null)
             {
-                for (int i = 0; i < inputSoilProfile1D.Layers.Length; i++)
+                for (int i = 0; i < inputSoilProfile1D.Layers1D.Length; i++)
                 {
                     var layer = new SoilLayer1D();
-                    var inputLayer = inputSoilProfile1D.Layers[i];
+                    var inputLayer = inputSoilProfile1D.Layers1D[i];
                     layer.Name = inputLayer.Name;
                     layer.Soil = soils.GetSoilByName(inputLayer.SoilName);
                     layer.TopLevel = inputLayer.TopLevel;
@@ -313,13 +313,13 @@
         {
             if (inputSoilProfile2D != null)
             {
-                for (int i = 0; i < inputSoilProfile2D.Layers.Length; i++)
+                for (int i = 0; i < inputSoilProfile2D.Layers2D.Length; i++)
                 {
                     var layer = new SoilLayer2D
                     {
                         GeometrySurface = new GeometrySurface()
                     };
-                    var inputLayer = inputSoilProfile2D.Layers[i];
+                    var inputLayer = inputSoilProfile2D.Layers2D[i];
                     layer.Name = inputLayer.SoilName;
                     layer.Soil = soils.GetSoilByName(inputLayer.SoilName);
                     layer.IsAquifer = inputLayer.IsAquifer;