diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
index c9636d2ffda..f9c492a28ec 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
@@ -25,6 +25,7 @@ namespace {{packageName}}.Client
         /// <param name="tempFolderPath">Temp folder path</param>
         /// <param name="dateTimeFormat">DateTime format string</param>
         /// <param name="timeout">HTTP connection timeout (in milliseconds)</param>
+        /// <param name="userAgent">HTTP user agent</param>
         public Configuration(ApiClient apiClient = null,
                              Dictionary<String, String> defaultHeader = null,
                              string username = null,
diff --git a/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache b/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
index 3a2a93cd109..d882e33595c 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/enumClass.mustache
@@ -1,6 +1,6 @@
-public enum {{vendorExtensions.plainDatatypeWithEnum}} {
+        public enum {{vendorExtensions.plainDatatypeWithEnum}} {
             {{#allowableValues}}{{#enumVars}}
             [EnumMember(Value = "{{jsonname}}")]
             {{name}}{{^-last}},
             {{/-last}}{{#-last}}{{/-last}}{{/enumVars}}{{/allowableValues}}
-        }
\ No newline at end of file
+        }
diff --git a/modules/swagger-codegen/src/main/resources/csharp/model.mustache b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
index f1f9b7c9753..347834f329a 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/model.mustache
@@ -20,9 +20,13 @@ namespace {{packageName}}.Model
     public partial class {{classname}} : {{#parent}}{{{parent}}}, {{/parent}} IEquatable<{{classname}}>
     { {{#vars}}{{#isEnum}}
     
+        /// <summary>
+        /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
+        /// </summary>{{#description}}
+        /// <value>{{{description}}}</value>{{/description}}
         [JsonConverter(typeof(StringEnumConverter))]
-        {{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
-        {{>enumClass}}{{/items}}{{/items.isEnum}}{{/vars}}
+{{>enumClass}}{{/isEnum}}{{#items.isEnum}}{{#items}}
+{{>enumClass}}{{/items}}{{/items.isEnum}}{{/vars}}
     {{#vars}}{{#isEnum}}
         /// <summary>
         /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{{description}}}{{/description}}
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/NameTests.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/NameTests.cs
index 4937b2affa2..561197ab9f1 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/NameTests.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient.Test/NameTests.cs
@@ -60,6 +60,15 @@ namespace IO.Swagger.Test
             // TODO: unit test for the property '_Name' 
         }
         
+        /// <summary>
+        /// Test the property 'SnakeCase' 
+        /// </summary>
+        [Test]
+        public void SnakeCaseTest()
+        {
+            // TODO: unit test for the property 'SnakeCase' 
+        }
+        
 
     }
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
index 3e9ea2c036c..4d04d5770ec 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/Configuration.cs
@@ -25,6 +25,7 @@ namespace IO.Swagger.Client
         /// <param name="tempFolderPath">Temp folder path</param>
         /// <param name="dateTimeFormat">DateTime format string</param>
         /// <param name="timeout">HTTP connection timeout (in milliseconds)</param>
+        /// <param name="userAgent">HTTP user agent</param>
         public Configuration(ApiClient apiClient = null,
                              Dictionary<String, String> defaultHeader = null,
                              string username = null,
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
index 53d161c1ab6..8889cdae0a7 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
@@ -18,6 +18,10 @@ namespace IO.Swagger.Model
     public partial class InlineResponse200 :  IEquatable<InlineResponse200>
     { 
     
+        /// <summary>
+        /// pet status in the store
+        /// </summary>
+        /// <value>pet status in the store</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StatusEnum {
             
@@ -30,6 +34,7 @@ namespace IO.Swagger.Model
             [EnumMember(Value = "sold")]
             Sold
         }
+
     
         /// <summary>
         /// pet status in the store
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs
index 3c8ccadcedd..55fd01dfb97 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Name.cs
@@ -23,10 +23,12 @@ namespace IO.Swagger.Model
         /// Initializes a new instance of the <see cref="Name" />class.
         /// </summary>
         /// <param name="_Name">_Name.</param>
+        /// <param name="SnakeCase">SnakeCase.</param>
 
-        public Name(int? _Name = null)
+        public Name(int? _Name = null, int? SnakeCase = null)
         {
             this._Name = _Name;
+            this.SnakeCase = SnakeCase;
             
         }
         
@@ -37,6 +39,12 @@ namespace IO.Swagger.Model
         [DataMember(Name="name", EmitDefaultValue=false)]
         public int? _Name { get; set; }
     
+        /// <summary>
+        /// Gets or Sets SnakeCase
+        /// </summary>
+        [DataMember(Name="snake_case", EmitDefaultValue=false)]
+        public int? SnakeCase { get; set; }
+    
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -46,6 +54,7 @@ namespace IO.Swagger.Model
             var sb = new StringBuilder();
             sb.Append("class Name {\n");
             sb.Append("  _Name: ").Append(_Name).Append("\n");
+            sb.Append("  SnakeCase: ").Append(SnakeCase).Append("\n");
             
             sb.Append("}\n");
             return sb.ToString();
@@ -87,6 +96,11 @@ namespace IO.Swagger.Model
                     this._Name == other._Name ||
                     this._Name != null &&
                     this._Name.Equals(other._Name)
+                ) && 
+                (
+                    this.SnakeCase == other.SnakeCase ||
+                    this.SnakeCase != null &&
+                    this.SnakeCase.Equals(other.SnakeCase)
                 );
         }
 
@@ -105,6 +119,9 @@ namespace IO.Swagger.Model
                 if (this._Name != null)
                     hash = hash * 59 + this._Name.GetHashCode();
                 
+                if (this.SnakeCase != null)
+                    hash = hash * 59 + this.SnakeCase.GetHashCode();
+                
                 return hash;
             }
         }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
index 4fc561c6786..db712c98181 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Order.cs
@@ -18,6 +18,10 @@ namespace IO.Swagger.Model
     public partial class Order :  IEquatable<Order>
     { 
     
+        /// <summary>
+        /// Order Status
+        /// </summary>
+        /// <value>Order Status</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StatusEnum {
             
@@ -30,6 +34,7 @@ namespace IO.Swagger.Model
             [EnumMember(Value = "delivered")]
             Delivered
         }
+
     
         /// <summary>
         /// Order Status
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
index b206c3fa550..5d30c24af78 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/Pet.cs
@@ -18,6 +18,10 @@ namespace IO.Swagger.Model
     public partial class Pet :  IEquatable<Pet>
     { 
     
+        /// <summary>
+        /// pet status in the store
+        /// </summary>
+        /// <value>pet status in the store</value>
         [JsonConverter(typeof(StringEnumConverter))]
         public enum StatusEnum {
             
@@ -30,6 +34,7 @@ namespace IO.Swagger.Model
             [EnumMember(Value = "sold")]
             Sold
         }
+
     
         /// <summary>
         /// pet status in the store
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
index e92a0ffc060..c507559e57d 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
@@ -2,7 +2,7 @@
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
   <MonoDevelop.Ide.Workbench ActiveDocument="TestPet.cs">
     <Files>
-      <File FileName="TestPet.cs" Line="218" Column="47" />
+      <File FileName="TestPet.cs" Line="23" Column="17" />
       <File FileName="TestOrder.cs" Line="1" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>