Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoHelperServices.cs
===================================================================
diff -u -r2895 -r2898
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoHelperServices.cs	(.../DtoHelperServices.cs)	(revision 2895)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoHelperServices.cs	(.../DtoHelperServices.cs)	(revision 2898)
@@ -260,7 +260,7 @@
         /// <param name="type"></param>
         /// <param name="xsdStream"></param>
         /// <returns></returns>
-        public static IEnumerable<DtoPropertyAttriubteMapping> ToPropertyMap<T>(this T type, Stream xsdStream)
+        public static IEnumerable<DtoPropertyAttributeMapping> ToPropertyMap<T>(this T type, Stream xsdStream)
         {
             return null;
         }
@@ -272,7 +272,7 @@
         /// <param name="type"></param>
         /// <param name="xsdDocument"></param>
         /// <returns></returns>
-        public static IEnumerable<DtoPropertyAttriubteMapping> ToPropertyMap<T>(this T type, XDocument xsdDocument)
+        public static IEnumerable<DtoPropertyAttributeMapping> ToPropertyMap<T>(this T type, XDocument xsdDocument)
         {
             return null;
         }
@@ -283,7 +283,7 @@
         /// <typeparam name="T"></typeparam>
         /// <param name="src"></param>
         /// <returns></returns>
-        public static IEnumerable<DtoPropertyAttriubteMapping> ToPropertyMap<T>(this T type)
+        public static IEnumerable<DtoPropertyAttributeMapping> ToPropertyMap<T>(this T type)
         {
             foreach (PropertyInfo pInfo in type.GetType().GetProperties())
             {
@@ -299,7 +299,7 @@
 
                 if (val != null)
                 {
-                    yield return new DtoPropertyAttriubteMapping()
+                    yield return new DtoPropertyAttributeMapping()
                                      {
                                          PropertyName = pInfo.Name,
                                          AttributeName = pInfo.Name,
@@ -354,7 +354,7 @@
         /// <typeparam name="T"></typeparam>
         /// <param name="src"></param>
         /// <returns></returns>
-        public static IEnumerable<DtoPropertyAttriubteMapping> ToPropertyMap<T>(this T type, string elementName, XDocument doc)
+        public static IEnumerable<DtoPropertyAttributeMapping> ToPropertyMap<T>(this T type, string elementName, XDocument doc)
         {
             IEnumerable<AttributeInfo> refTable = GetAttributes(doc, elementName);
 
@@ -372,7 +372,7 @@
                         // ok we have a property attribute match we can now 
                         // safely create and return the mapping object
                         AttributeInfo item = q.Single();
-                        yield return new DtoPropertyAttriubteMapping()
+                        yield return new DtoPropertyAttributeMapping()
                                          {
                                              PropertyName = pInfo.Name,
                                              AttributeName = item.Name,
@@ -423,7 +423,7 @@
                         if (v != null)
                         {
                             PropertyInfo pInfo = null;
-                            DtoPropertyAttriubteMapping mapItem = null;
+                            DtoPropertyAttributeMapping mapItem = null;
                             if (hasPropertyMap)
                             {
                                 mapItem = propertyMap.GetByAttributeName(attName);
@@ -482,7 +482,7 @@
                 object val = pInfo.GetValue(src, null);
                 if (val != null)
                 {
-                    map.Add(pInfo.Name, new DtoPropertyAttriubteMapping()
+                    map.Add(pInfo.Name, new DtoPropertyAttributeMapping()
                                             {
                                                 PropertyName = pInfo.Name,
                                                 AttributeName = pInfo.Name,
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/FileIdentificationAssembler.cs
===================================================================
diff -u -r2895 -r2898
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/FileIdentificationAssembler.cs	(.../FileIdentificationAssembler.cs)	(revision 2895)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/FileIdentificationAssembler.cs	(.../FileIdentificationAssembler.cs)	(revision 2898)
@@ -33,47 +33,47 @@
         public FileIdentificationAssembler()
         {
             const string attApplication = "Application";
-            this.map.Add(attApplication, new DtoPropertyAttriubteMapping()
+            this.map.Add(attApplication, new DtoPropertyAttributeMapping()
                                              {
                                                  PropertyName = attApplication,
                                                  AttributeName = attApplication,
                                                  Importance = DtoPropertyImportance.Required
                                              });
 
             const string attVersion = "Version";
-            this.map.Add(attVersion, new DtoPropertyAttriubteMapping()
+            this.map.Add(attVersion, new DtoPropertyAttributeMapping()
                                          {
                                              PropertyName = attVersion,
                                              AttributeName = attVersion,
                                              Importance = DtoPropertyImportance.Required
                                          });
 
             const string attCreated = "Created";
-            this.map.Add(attCreated, new DtoPropertyAttriubteMapping()
+            this.map.Add(attCreated, new DtoPropertyAttributeMapping()
                                          {
                                              PropertyName = attCreated,
                                              AttributeName = attCreated,
                                              Importance = DtoPropertyImportance.Required
                                          });
 
             const string attCompany = "Company";
-            this.map.Add(attCompany, new DtoPropertyAttriubteMapping()
+            this.map.Add(attCompany, new DtoPropertyAttributeMapping()
                                          {
                                              PropertyName = attCompany,
                                              AttributeName = attCompany,
                                              Importance = DtoPropertyImportance.Required
                                          });
 
             const string attLicense = "License";
-            this.map.Add(attLicense, new DtoPropertyAttriubteMapping()
+            this.map.Add(attLicense, new DtoPropertyAttributeMapping()
                                          {
                                              PropertyName = attLicense,
                                              AttributeName = attLicense,
                                              Importance = DtoPropertyImportance.Optional
                                          });
 
             const string attDescription = "Description";
-            this.map.Add(attDescription, new DtoPropertyAttriubteMapping()
+            this.map.Add(attDescription, new DtoPropertyAttributeMapping()
                                              {
                                                  PropertyName = attDescription,
                                                  AttributeName = attDescription,
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoAssembler.cs
===================================================================
diff -u -r2895 -r2898
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoAssembler.cs	(.../DtoAssembler.cs)	(revision 2895)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoAssembler.cs	(.../DtoAssembler.cs)	(revision 2898)
@@ -84,7 +84,7 @@
         protected void InitializeMappings(string elementName, XDocument xsdReferenceDocument)
         {
             var tmp = new TDomainObject();
-            IEnumerable<DtoPropertyAttriubteMapping> tmpMap = tmp.ToPropertyMap(elementName, xsdReferenceDocument);
+            IEnumerable<DtoPropertyAttributeMapping> tmpMap = tmp.ToPropertyMap(elementName, xsdReferenceDocument);
             this.map.AddOrUpdateRange(tmpMap);
         }
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMapping.cs
===================================================================
diff -u -r2895 -r2898
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMapping.cs	(.../DtoPropertyAttributeMapping.cs)	(revision 2895)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMapping.cs	(.../DtoPropertyAttributeMapping.cs)	(revision 2898)
@@ -41,10 +41,10 @@
     }
 
     /// <summary>
-    /// Defines a mapping class which can be used in the DtoAssemler for creating 
+    /// Defines a mapping class which can be used in the DtoAssembler for creating 
     /// mappings between class properties and xml attributes    
     /// </summary>
-    public class DtoPropertyAttriubteMapping
+    public class DtoPropertyAttributeMapping
     {
         /// <summary>
         /// Holds the property to attribute translation rule
@@ -60,7 +60,7 @@
         /// <summary>
         /// Initializes a new instance of the DtoPropertyAttriubteMapping class
         /// </summary>
-        public DtoPropertyAttriubteMapping()
+        public DtoPropertyAttributeMapping()
         {
             this.Importance = DtoPropertyImportance.Optional;
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs
===================================================================
diff -u -r2895 -r2898
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 2895)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 2898)
@@ -29,12 +29,12 @@
     /// <summary>
     /// The property bag defines a dynamic property collection (dictionary)
     /// </summary>
-    public class DtoPropertyAttributeMap : IDictionary<string, DtoPropertyAttriubteMapping>
+    public class DtoPropertyAttributeMap : IDictionary<string, DtoPropertyAttributeMapping>
     {
         /// <summary>
         /// Holds the property dictionary
         /// </summary>
-        private readonly IDictionary<string, DtoPropertyAttriubteMapping> dict = new Dictionary<string, DtoPropertyAttriubteMapping>();
+        private readonly IDictionary<string, DtoPropertyAttributeMapping> dict = new Dictionary<string, DtoPropertyAttributeMapping>();
 
         #region IDictionary<string,DtoPropertyAttriubteMapping> Members
 
@@ -43,7 +43,7 @@
         /// </summary>
         /// <param name="propName">The name of the property</param>
         /// <param name="value">The value</param>
-        public void Add(string propName, DtoPropertyAttriubteMapping item)
+        public void Add(string propName, DtoPropertyAttributeMapping item)
         {
             if (item == null)
                 throw new DtoPropertyMapException("Cannot add an empty or null item to the map");
@@ -88,15 +88,15 @@
         /// <param name="propName"></param>
         /// <param name="value"></param>
         /// <returns></returns>
-        public bool TryGetValue(string propName, out DtoPropertyAttriubteMapping value)
+        public bool TryGetValue(string propName, out DtoPropertyAttributeMapping value)
         {
             return this.dict.TryGetValue(propName, out value);
         }
 
         /// <summary>
         /// 
         /// </summary>
-        public ICollection<DtoPropertyAttriubteMapping> Values
+        public ICollection<DtoPropertyAttributeMapping> Values
         {
             get { return this.dict.Values; }
         }
@@ -106,7 +106,7 @@
         /// </summary>
         /// <param name="propName"></param>
         /// <returns></returns>
-        public DtoPropertyAttriubteMapping this[string propName]
+        public DtoPropertyAttributeMapping this[string propName]
         {
             get { return this.dict[propName]; }
             set { this.dict[propName] = value; }
@@ -116,7 +116,7 @@
         /// 
         /// </summary>
         /// <param name="item"></param>
-        public void Add(KeyValuePair<string, DtoPropertyAttriubteMapping> item)
+        public void Add(KeyValuePair<string, DtoPropertyAttributeMapping> item)
         {
             this.dict.Add(item.Key, item.Value);
         }
@@ -134,19 +134,19 @@
         /// </summary>
         /// <param name="item"></param>
         /// <returns></returns>
-        public bool Contains(KeyValuePair<string, DtoPropertyAttriubteMapping> item)
+        public bool Contains(KeyValuePair<string, DtoPropertyAttributeMapping> item)
         {
-            return ((IDictionary<string, DtoPropertyAttriubteMapping>) this.dict).Contains(item);
+            return ((IDictionary<string, DtoPropertyAttributeMapping>) this.dict).Contains(item);
         }
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="array"></param>
         /// <param name="arrayIndex"></param>
-        public void CopyTo(KeyValuePair<string, DtoPropertyAttriubteMapping>[] array, int arrayIndex)
+        public void CopyTo(KeyValuePair<string, DtoPropertyAttributeMapping>[] array, int arrayIndex)
         {
-            ((IDictionary<string, DtoPropertyAttriubteMapping>) this.dict).CopyTo(array, arrayIndex);
+            ((IDictionary<string, DtoPropertyAttributeMapping>) this.dict).CopyTo(array, arrayIndex);
         }
 
         /// <summary>
@@ -170,7 +170,7 @@
         /// </summary>
         /// <param name="item"></param>
         /// <returns></returns>
-        public bool Remove(KeyValuePair<string, DtoPropertyAttriubteMapping> item)
+        public bool Remove(KeyValuePair<string, DtoPropertyAttributeMapping> item)
         {
             return this.dict.Remove(item.Key);
         }
@@ -179,7 +179,7 @@
         /// 
         /// </summary>
         /// <returns></returns>
-        public IEnumerator<KeyValuePair<string, DtoPropertyAttriubteMapping>> GetEnumerator()
+        public IEnumerator<KeyValuePair<string, DtoPropertyAttributeMapping>> GetEnumerator()
         {
             return this.dict.GetEnumerator();
         }
@@ -190,16 +190,16 @@
         /// <returns></returns>
         IEnumerator IEnumerable.GetEnumerator()
         {
-            return (IEnumerator) ((IDictionary<string, DtoPropertyAttriubteMapping>) this.dict).GetEnumerator();
+            return (IEnumerator) ((IDictionary<string, DtoPropertyAttributeMapping>) this.dict).GetEnumerator();
         }
 
         #endregion
 
         /// <summary>
         /// Adds a property attribute mapping to the dictionary
         /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
-        public void Add(DtoPropertyAttriubteMapping item)
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
+        public void Add(DtoPropertyAttributeMapping item)
         {
             if (item == null)
                 throw new ArgumentNullException("item");
@@ -210,7 +210,7 @@
         /// <summary>
         /// Adds a or updtes a property attribute mapping to the dictionary
         /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
         public void AddOrUpdate(string propName, string attrName)
         {
             this.AddOrUpdate(propName, attrName, DtoPropertyImportance.Optional);
@@ -219,14 +219,14 @@
         /// <summary>
         /// Adds a or updtes a property attribute mapping to the dictionary
         /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
         public void AddOrUpdate(string propName, string attrName, DtoPropertyImportance importance)
         {
             if (!attrName.HasValidStringValue())
                 throw new DtoPropertyMapException("attrName");
 
             this.AddOrUpdate(propName,
-                             new DtoPropertyAttriubteMapping()
+                             new DtoPropertyAttributeMapping()
                                  {
                                      PropertyName = propName,
                                      AttributeName = attrName,
@@ -238,8 +238,8 @@
         /// <summary>
         /// Adds a or updtes a property attribute mapping to the dictionary
         /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
-        public void AddOrUpdate(DtoPropertyAttriubteMapping item)
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
+        public void AddOrUpdate(DtoPropertyAttributeMapping item)
         {
             if (item == null)
                 throw new ArgumentNullException("item");
@@ -253,7 +253,7 @@
         /// </summary>
         /// <param name="propName">The name of the property</param>
         /// <param name="value">The value</param>
-        public void AddOrUpdate(string propName, DtoPropertyAttriubteMapping item)
+        public void AddOrUpdate(string propName, DtoPropertyAttributeMapping item)
         {
             if (item == null)
                 throw new ArgumentNullException("item");
@@ -275,9 +275,9 @@
         /// Adds or updates new items in the dictionary
         /// </summary>
         /// <param name="coll">The key value pair collection to handle</param>
-        public void AddOrUpdateRange(IEnumerable<DtoPropertyAttriubteMapping> coll)
+        public void AddOrUpdateRange(IEnumerable<DtoPropertyAttributeMapping> coll)
         {
-            foreach (DtoPropertyAttriubteMapping item in coll)
+            foreach (DtoPropertyAttributeMapping item in coll)
             {
                 this.AddOrUpdate(item);
             }
@@ -288,7 +288,7 @@
         /// </summary>
         /// <param name="name">The name of the property to look for</param>
         /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttriubteMapping GetByPropertyName(string name)
+        public DtoPropertyAttributeMapping GetByPropertyName(string name)
         {
             return this.GetByPropertyName(name, StringComparison.InvariantCultureIgnoreCase);
         }
@@ -299,9 +299,9 @@
         /// <param name="name">The name of the property to look for</param>        
         /// <param name="comparisonType">The string <see cref="StringComparison"/> type</param>
         /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttriubteMapping GetByPropertyName(string name, StringComparison comparisonType)
+        public DtoPropertyAttributeMapping GetByPropertyName(string name, StringComparison comparisonType)
         {
-            IEnumerable<DtoPropertyAttriubteMapping> q = from x in this.dict.Values
+            IEnumerable<DtoPropertyAttributeMapping> q = from x in this.dict.Values
                                                          where x.PropertyName.Equals(name, comparisonType)
                                                          select x;
 
@@ -316,7 +316,7 @@
         /// </summary>
         /// <param name="name">The name of the property to look for</param>
         /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttriubteMapping GetByAttributeName(string name)
+        public DtoPropertyAttributeMapping GetByAttributeName(string name)
         {
             return this.GetByAttributeName(name, StringComparison.InvariantCultureIgnoreCase);
         }
@@ -327,9 +327,9 @@
         /// <param name="name">The name of the property to look for</param>
         /// <param name="comparisonType">The string <see cref="StringComparison"/> type</param>
         /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttriubteMapping GetByAttributeName(string name, StringComparison comparisonType)
+        public DtoPropertyAttributeMapping GetByAttributeName(string name, StringComparison comparisonType)
         {
-            IEnumerable<DtoPropertyAttriubteMapping> q = from x in this.dict.Values
+            IEnumerable<DtoPropertyAttributeMapping> q = from x in this.dict.Values
                                                          where x.AttributeName.Equals(name, comparisonType)
                                                          select x;
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/XMLAttributes.cs
===================================================================
diff -u -r2897 -r2898
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/XMLAttributes.cs	(.../XMLAttributes.cs)	(revision 2897)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/XMLAttributes.cs	(.../XMLAttributes.cs)	(revision 2898)
@@ -32,20 +32,16 @@
         /// <summary>
         /// Holds the name of the xml schema
         /// </summary>
-        public const string XmlSchemaName = "DamMStabDocDefinition";
+        private const string XmlSchemaName = "DamMStabDocDefinition";
 
-        public const string XmlSchemaNameInput = "DamMStabInputDefinition";
-
         /// <summary>
         /// Holds the xsd resource path 
         /// </summary>
         public const string XsdEmbeddedResourcePath = EmbeddedResourcePath + "." + XmlSchemaName + ".xsd";
 
-        public const string XsdEmbeddedResourcePathInput = EmbeddedResourcePath + "." + XmlSchemaNameInput + ".xsd";
-
         /// <summary>
         /// Holds the xml namespace
         /// </summary>
-        public const string XmlElementNamespace = "http://deltares.nl/2008/" + XMLAttributes.XmlSchemaName;
+        public const string XmlElementNamespace = "http://deltares.nl/2008/" + XmlSchemaName;
     }
 }
\ No newline at end of file