diff --git a/XmlSchemaClassGenerator/Generator.cs b/XmlSchemaClassGenerator/Generator.cs
index 6b90caf9..eadb4b53 100644
--- a/XmlSchemaClassGenerator/Generator.cs
+++ b/XmlSchemaClassGenerator/Generator.cs
@@ -22,7 +22,7 @@ public NamespaceProvider NamespaceProvider
             set { _configuration.NamespaceProvider = value; }
         }
 
-        public NamingProvider NameingProvider
+        public NamingProvider NamingProvider
         {
             get { return _configuration.NamingProvider; }
             set { _configuration.NamingProvider = value; }
diff --git a/XmlSchemaClassGenerator/NameingExtensions.cs b/XmlSchemaClassGenerator/NameingExtensions.cs
index 15833274..9a81a007 100644
--- a/XmlSchemaClassGenerator/NameingExtensions.cs
+++ b/XmlSchemaClassGenerator/NameingExtensions.cs
@@ -5,7 +5,7 @@
 
 namespace XmlSchemaClassGenerator
 {
-    public static class NameingExtensions
+    public static class NamingExtensions
     {
         private static readonly CodeDomProvider Provider = new Microsoft.CSharp.CSharpCodeProvider();
 
diff --git a/XmlSchemaClassGenerator/NamingProvider.cs b/XmlSchemaClassGenerator/NamingProvider.cs
index ca27a830..5a4ac228 100644
--- a/XmlSchemaClassGenerator/NamingProvider.cs
+++ b/XmlSchemaClassGenerator/NamingProvider.cs
@@ -1,52 +1,49 @@
 namespace XmlSchemaClassGenerator
 {
     /// <summary>
-    /// Provides options to customize elementnamens with own logik
+    /// Provides options to customize member names
     /// </summary>
     public class NamingProvider
     {
-        /// <summary>
-        /// Scheme for the naming
-        /// </summary>
         private readonly NamingScheme _namingScheme;
 
         /// <summary>
-        /// Creates the provider
+        /// Initializes a new instance of the <see cref="NamingProvider"/> class.
         /// </summary>
-        /// <param name="namingScheme">Scheme for the naming</param>
+        /// <param name="namingScheme">The naming scheme.</param>
         public NamingProvider(NamingScheme namingScheme)
         {
             _namingScheme = namingScheme;
         }
 
         /// <summary>
-        /// Creates a name for a property of a type
+        /// Creates a name for a property from an attribute name
         /// </summary>
         /// <param name="typeModelName">Name of the typeModel</param>
-        /// <param name="attributeName">Attributename in the orginal XML</param>
-        /// <returns>Name of the Property</returns>
+        /// <param name="attributeName">Attribute name</param>
+        /// <returns>Name of the property</returns>
         public virtual string PropertyNameFromAttribute(string typeModelName, string attributeName)
         {
             return PropertyNameFromElement(typeModelName, attributeName);
         }
 
         /// <summary>
-        /// Creates a name for a property of a type
+        /// Creates a name for a property from an element name
         /// </summary>
         /// <param name="typeModelName">Name of the typeModel</param>
-        /// <param name="elementName">Elementname in the orginal XML</param>
-        /// <returns>Name of the Property</returns>
+        /// <param name="elementName">Element name</param>
+        /// <returns>Name of the property</returns>
         public virtual string PropertyNameFromElement(string typeModelName, string elementName)
         {
             return typeModelName.ToTitleCase(_namingScheme) + elementName.ToTitleCase(_namingScheme);
         }
 
         /// <summary>
-        /// Creates a name for an enummember based on a value
+        /// Creates a name for an enum member based on a value
         /// </summary>
         /// <param name="enumName">Name of the enum</param>
-        /// <param name="value">Value in the original XML</param>
-        /// <returns>Name of the Enummember</returns>
+        /// <param name="value">Value name</param>
+        /// <returns>Name of the enum member</returns>
         public virtual string EnumMemberNameFromValue(string enumName, string value)
         {
             return value.ToTitleCase(_namingScheme).ToNormalizedEnumName();