Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DAMMStabGeometry2DSectionAssembler.cs
===================================================================
diff -u -r2895 -r2897
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DAMMStabGeometry2DSectionAssembler.cs	(.../DAMMStabGeometry2DSectionAssembler.cs)	(revision 2895)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DAMMStabGeometry2DSectionAssembler.cs	(.../DAMMStabGeometry2DSectionAssembler.cs)	(revision 2897)
@@ -49,7 +49,7 @@
         /// 
         /// </summary>
         public DamMstabGeometry2DSectionAssembler() :
-            base(DamMStabAssembler.XmlElementName, DamMStabAssembler.XmlElementNamespace, DamMStabAssembler.XsdEmbeddedResourcePath)
+            base(XMLAttributes.XmlElementName, XMLAttributes.XmlElementNamespace, XMLAttributes.XsdEmbeddedResourcePath)
         {
         }
 
@@ -106,32 +106,32 @@
         /// <returns></returns>
         private static XElement GetProfileElement(SoilProfile1D profile, XNamespace tns, XNamespace tnsa)
         {
-            var profileElement = new XElement(tns + DamMStabAssembler.XmlElementProfile);
-            profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeName, profile.Name));
+            var profileElement = new XElement(tns + XMLAttributes.XmlElementProfile);
+            profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeName, profile.Name));
             // Next four attributes are fake but never used in DAM anyway so ok.
-            profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeXCoordinate, 0));
-            profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeYCoordinate, 0));
-            profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributePhreaticLevel, 0));
-            profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeHasPhreaticLevel, false));
+            profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeXCoordinate, 0));
+            profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeYCoordinate, 0));
+            profileElement.Add(new XAttribute(XMLAttributes.XmlAttributePhreaticLevel, 0));
+            profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeHasPhreaticLevel, false));
 
-            profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeBottomLevel, profile.BottomLevel));
+            profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeBottomLevel, profile.BottomLevel));
 
             if (profile.Layers.Count > 0)
             {
-                var layersElement = new XElement(tnsa + DamMStabAssembler.XmlElementLayers);
+                var layersElement = new XElement(tnsa + XMLAttributes.XmlElementLayers);
                 GetProfileLayersElement(profile, tnsa, layersElement);
                 profileElement.Add(layersElement);
             }
 
             // Bottom sand layer
             if (profile.BottomAquiferLayer != null)
-                profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeBottomSandLayerID, profile.BottomAquiferLayer.Name));
+                profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeBottomSandLayerID, profile.BottomAquiferLayer.Name));
             // In-between sand layer
             if (profile.InBetweenAquiferLayer != null)
-                profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeInBetweenSandLayerID, profile.InBetweenAquiferLayer.Name));
+                profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeInBetweenSandLayerID, profile.InBetweenAquiferLayer.Name));
             // Infiltration layer
             if (profile.InfiltrationLayer != null)
-                profileElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeInfiltrationLayerID, profile.InfiltrationLayer.Name));
+                profileElement.Add(new XAttribute(XMLAttributes.XmlAttributeInfiltrationLayerID, profile.InfiltrationLayer.Name));
             return profileElement;
         }
 
@@ -143,11 +143,11 @@
                 if (layer.Name == null)
                     layer.Name = profile.GetNewUniqueLayerName();
 
-                var layerElement = new XElement(tnsa + DamMStabAssembler.XmlElementLayer);
+                var layerElement = new XElement(tnsa + XMLAttributes.XmlElementLayer);
                 layersElement.Add(layerElement);
-                layerElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeID, String.Format("{0}", layer.Name)));
-                layerElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeSoilID, layer.Soil.Name));
-                layerElement.Add(new XAttribute(DamMStabAssembler.XmlAttributeTopLevel, layer.TopLevel));
+                layerElement.Add(new XAttribute(XMLAttributes.XmlAttributeID, String.Format("{0}", layer.Name)));
+                layerElement.Add(new XAttribute(XMLAttributes.XmlAttributeSoilID, layer.Soil.Name));
+                layerElement.Add(new XAttribute(XMLAttributes.XmlAttributeTopLevel, layer.TopLevel));
             }
         }
 
@@ -166,29 +166,29 @@
 
             // Get the dto
             XElement profileDto = (from x in dtoDocument.Descendants()
-                where x.Name.LocalName == DamMStabAssembler.XmlElementProfile
+                where x.Name.LocalName == XMLAttributes.XmlElementProfile
                 select x).FirstOrDefault();
             if (profileDto != null)
             {
                 var soilProfile = new SoilProfile1D
                 {
-                    Name = profileDto.AttributeAs<string>(DamMStabAssembler.XmlAttributeName),
-                    BottomLevel = profileDto.AttributeAs<double>(DamMStabAssembler.XmlAttributeBottomLevel)
+                    Name = profileDto.AttributeAs<string>(XMLAttributes.XmlAttributeName),
+                    BottomLevel = profileDto.AttributeAs<double>(XMLAttributes.XmlAttributeBottomLevel)
                 };
                 // Layers
                 XElement layerCollectionElement = (from element in profileDto.Descendants()
-                    where element.Name.LocalName == DamMStabAssembler.XmlElementLayers
+                    where element.Name.LocalName == XMLAttributes.XmlElementLayers
                     select element).Single();
                IEnumerable<XElement> layerElementCollection = from element in layerCollectionElement.Descendants()
-                    where element.Name.LocalName == DamMStabAssembler.XmlElementLayer
+                    where element.Name.LocalName == XMLAttributes.XmlElementLayer
                     select element;
                 foreach (XElement layerElement in layerElementCollection)
                 {
                     var soilLayer = new SoilLayer1D
                     {
                         Name = layerElement.AttributeAs<string>("ID"),
-                        SoilName = layerElement.AttributeAs<string>(DamMStabAssembler.XmlAttributeSoilID),
-                        TopLevel = layerElement.AttributeAs<double>(DamMStabAssembler.XmlAttributeTopLevel)
+                        SoilName = layerElement.AttributeAs<string>(XMLAttributes.XmlAttributeSoilID),
+                        TopLevel = layerElement.AttributeAs<double>(XMLAttributes.XmlAttributeTopLevel)
                     };
                     soilProfile.Layers.Add(soilLayer);
                 }