diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
index 4f7ad02b95..a200c2f7c8 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java
@@ -163,8 +163,24 @@ public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig
 
     @Override
     public String toParamName(String name) {
-        // should be the same as variable name
-        return toVarName(name);
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize(lower) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
     }
 
     @Override
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
index 4e6cc56fd1..609ea7326e 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/PetApi.cs
@@ -14,124 +14,124 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Update an existing pet 
     /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     /// <returns></returns>
-    void UpdatePet (Pet Body);
+    void UpdatePet (Pet body);
 
     /// <summary>
     /// Update an existing pet 
     /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     /// <returns></returns>
-    Task UpdatePetAsync (Pet Body);
+    Task UpdatePetAsync (Pet body);
     
     /// <summary>
     /// Add a new pet to the store 
     /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     /// <returns></returns>
-    void AddPet (Pet Body);
+    void AddPet (Pet body);
 
     /// <summary>
     /// Add a new pet to the store 
     /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     /// <returns></returns>
-    Task AddPetAsync (Pet Body);
+    Task AddPetAsync (Pet body);
     
     /// <summary>
     /// Finds Pets by status Multiple status values can be provided with comma seperated strings
     /// </summary>
-    /// <param name="Status">Status values that need to be considered for filter</param>
+    /// <param name="status">Status values that need to be considered for filter</param>
     /// <returns>List<Pet></returns>
-    List<Pet> FindPetsByStatus (List<string> Status);
+    List<Pet> FindPetsByStatus (List<string> status);
 
     /// <summary>
     /// Finds Pets by status Multiple status values can be provided with comma seperated strings
     /// </summary>
-    /// <param name="Status">Status values that need to be considered for filter</param>
+    /// <param name="status">Status values that need to be considered for filter</param>
     /// <returns>List<Pet></returns>
-    Task<List<Pet>> FindPetsByStatusAsync (List<string> Status);
+    Task<List<Pet>> FindPetsByStatusAsync (List<string> status);
     
     /// <summary>
     /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
     /// </summary>
-    /// <param name="Tags">Tags to filter by</param>
+    /// <param name="tags">Tags to filter by</param>
     /// <returns>List<Pet></returns>
-    List<Pet> FindPetsByTags (List<string> Tags);
+    List<Pet> FindPetsByTags (List<string> tags);
 
     /// <summary>
     /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
     /// </summary>
-    /// <param name="Tags">Tags to filter by</param>
+    /// <param name="tags">Tags to filter by</param>
     /// <returns>List<Pet></returns>
-    Task<List<Pet>> FindPetsByTagsAsync (List<string> Tags);
+    Task<List<Pet>> FindPetsByTagsAsync (List<string> tags);
     
     /// <summary>
     /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
     /// </summary>
-    /// <param name="PetId">ID of pet that needs to be fetched</param>
+    /// <param name="petId">ID of pet that needs to be fetched</param>
     /// <returns>Pet</returns>
-    Pet GetPetById (long? PetId);
+    Pet GetPetById (long? petId);
 
     /// <summary>
     /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
     /// </summary>
-    /// <param name="PetId">ID of pet that needs to be fetched</param>
+    /// <param name="petId">ID of pet that needs to be fetched</param>
     /// <returns>Pet</returns>
-    Task<Pet> GetPetByIdAsync (long? PetId);
+    Task<Pet> GetPetByIdAsync (long? petId);
     
     /// <summary>
     /// Updates a pet in the store with form data 
     /// </summary>
-    /// <param name="PetId">ID of pet that needs to be updated</param>
-    /// <param name="Name">Updated name of the pet</param>
-    /// <param name="Status">Updated status of the pet</param>
+    /// <param name="petId">ID of pet that needs to be updated</param>
+    /// <param name="name">Updated name of the pet</param>
+    /// <param name="status">Updated status of the pet</param>
     /// <returns></returns>
-    void UpdatePetWithForm (string PetId, string Name, string Status);
+    void UpdatePetWithForm (string petId, string name, string status);
 
     /// <summary>
     /// Updates a pet in the store with form data 
     /// </summary>
-    /// <param name="PetId">ID of pet that needs to be updated</param>
-    /// <param name="Name">Updated name of the pet</param>
-    /// <param name="Status">Updated status of the pet</param>
+    /// <param name="petId">ID of pet that needs to be updated</param>
+    /// <param name="name">Updated name of the pet</param>
+    /// <param name="status">Updated status of the pet</param>
     /// <returns></returns>
-    Task UpdatePetWithFormAsync (string PetId, string Name, string Status);
+    Task UpdatePetWithFormAsync (string petId, string name, string status);
     
     /// <summary>
     /// Deletes a pet 
     /// </summary>
-    /// <param name="ApiKey"></param>
-    /// <param name="PetId">Pet id to delete</param>
+    /// <param name="apiKey"></param>
+    /// <param name="petId">Pet id to delete</param>
     /// <returns></returns>
-    void DeletePet (string ApiKey, long? PetId);
+    void DeletePet (string apiKey, long? petId);
 
     /// <summary>
     /// Deletes a pet 
     /// </summary>
-    /// <param name="ApiKey"></param>
-    /// <param name="PetId">Pet id to delete</param>
+    /// <param name="apiKey"></param>
+    /// <param name="petId">Pet id to delete</param>
     /// <returns></returns>
-    Task DeletePetAsync (string ApiKey, long? PetId);
+    Task DeletePetAsync (string apiKey, long? petId);
     
     /// <summary>
     /// uploads an image 
     /// </summary>
-    /// <param name="PetId">ID of pet to update</param>
-    /// <param name="AdditionalMetadata">Additional data to pass to server</param>
-    /// <param name="File">file to upload</param>
+    /// <param name="petId">ID of pet to update</param>
+    /// <param name="additionalMetadata">Additional data to pass to server</param>
+    /// <param name="file">file to upload</param>
     /// <returns></returns>
-    void UploadFile (long? PetId, string AdditionalMetadata, FileStream File);
+    void UploadFile (long? petId, string additionalMetadata, FileStream file);
 
     /// <summary>
     /// uploads an image 
     /// </summary>
-    /// <param name="PetId">ID of pet to update</param>
-    /// <param name="AdditionalMetadata">Additional data to pass to server</param>
-    /// <param name="File">file to upload</param>
+    /// <param name="petId">ID of pet to update</param>
+    /// <param name="additionalMetadata">Additional data to pass to server</param>
+    /// <param name="file">file to upload</param>
     /// <returns></returns>
-    Task UploadFileAsync (long? PetId, string AdditionalMetadata, FileStream File);
+    Task UploadFileAsync (long? petId, string additionalMetadata, FileStream file);
     
   }
 
@@ -189,9 +189,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Update an existing pet 
     /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     /// <returns></returns>
-    public void UpdatePet (Pet Body) {
+    public void UpdatePet (Pet body) {
 
       
 
@@ -208,7 +208,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -227,9 +227,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Update an existing pet 
     /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     /// <returns></returns>
-    public async Task UpdatePetAsync (Pet Body) {
+    public async Task UpdatePetAsync (Pet body) {
 
       
 
@@ -246,7 +246,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -264,9 +264,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Add a new pet to the store 
     /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     /// <returns></returns>
-    public void AddPet (Pet Body) {
+    public void AddPet (Pet body) {
 
       
 
@@ -283,7 +283,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -302,9 +302,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Add a new pet to the store 
     /// </summary>
-    /// <param name="Body">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     /// <returns></returns>
-    public async Task AddPetAsync (Pet Body) {
+    public async Task AddPetAsync (Pet body) {
 
       
 
@@ -321,7 +321,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -339,9 +339,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Finds Pets by status Multiple status values can be provided with comma seperated strings
     /// </summary>
-    /// <param name="Status">Status values that need to be considered for filter</param>
+    /// <param name="status">Status values that need to be considered for filter</param>
     /// <returns>List<Pet></returns>
-    public List<Pet> FindPetsByStatus (List<string> Status) {
+    public List<Pet> FindPetsByStatus (List<string> status) {
 
       
 
@@ -355,7 +355,7 @@ namespace IO.Swagger.Api {
       var fileParams = new Dictionary<String, String>();
       String postBody = null;
 
-       if (Status != null) queryParams.Add("status", ApiClient.ParameterToString(Status)); // query parameter
+       if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
       
       
       
@@ -376,9 +376,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Finds Pets by status Multiple status values can be provided with comma seperated strings
     /// </summary>
-    /// <param name="Status">Status values that need to be considered for filter</param>
+    /// <param name="status">Status values that need to be considered for filter</param>
     /// <returns>List<Pet></returns>
-    public async Task<List<Pet>> FindPetsByStatusAsync (List<string> Status) {
+    public async Task<List<Pet>> FindPetsByStatusAsync (List<string> status) {
 
       
 
@@ -392,7 +392,7 @@ namespace IO.Swagger.Api {
       var fileParams = new Dictionary<String, String>();
       String postBody = null;
 
-       if (Status != null) queryParams.Add("status", ApiClient.ParameterToString(Status)); // query parameter
+       if (status != null) queryParams.Add("status", ApiClient.ParameterToString(status)); // query parameter
       
       
       
@@ -412,9 +412,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
     /// </summary>
-    /// <param name="Tags">Tags to filter by</param>
+    /// <param name="tags">Tags to filter by</param>
     /// <returns>List<Pet></returns>
-    public List<Pet> FindPetsByTags (List<string> Tags) {
+    public List<Pet> FindPetsByTags (List<string> tags) {
 
       
 
@@ -428,7 +428,7 @@ namespace IO.Swagger.Api {
       var fileParams = new Dictionary<String, String>();
       String postBody = null;
 
-       if (Tags != null) queryParams.Add("tags", ApiClient.ParameterToString(Tags)); // query parameter
+       if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
       
       
       
@@ -449,9 +449,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
     /// </summary>
-    /// <param name="Tags">Tags to filter by</param>
+    /// <param name="tags">Tags to filter by</param>
     /// <returns>List<Pet></returns>
-    public async Task<List<Pet>> FindPetsByTagsAsync (List<string> Tags) {
+    public async Task<List<Pet>> FindPetsByTagsAsync (List<string> tags) {
 
       
 
@@ -465,7 +465,7 @@ namespace IO.Swagger.Api {
       var fileParams = new Dictionary<String, String>();
       String postBody = null;
 
-       if (Tags != null) queryParams.Add("tags", ApiClient.ParameterToString(Tags)); // query parameter
+       if (tags != null) queryParams.Add("tags", ApiClient.ParameterToString(tags)); // query parameter
       
       
       
@@ -485,18 +485,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
     /// </summary>
-    /// <param name="PetId">ID of pet that needs to be fetched</param>
+    /// <param name="petId">ID of pet that needs to be fetched</param>
     /// <returns>Pet</returns>
-    public Pet GetPetById (long? PetId) {
+    public Pet GetPetById (long? petId) {
 
       
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling GetPetById");
+      // verify the required parameter 'petId' is set
+      if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
       
 
       var path = "/pet/{petId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(PetId));
+      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -525,18 +525,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Find pet by ID Returns a pet when ID &lt; 10.  ID &gt; 10 or nonintegers will simulate API error conditions
     /// </summary>
-    /// <param name="PetId">ID of pet that needs to be fetched</param>
+    /// <param name="petId">ID of pet that needs to be fetched</param>
     /// <returns>Pet</returns>
-    public async Task<Pet> GetPetByIdAsync (long? PetId) {
+    public async Task<Pet> GetPetByIdAsync (long? petId) {
 
       
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling GetPetById");
+          // verify the required parameter 'petId' is set
+          if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling GetPetById");
       
 
       var path = "/pet/{petId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(PetId));
+      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -564,20 +564,20 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Updates a pet in the store with form data 
     /// </summary>
-    /// <param name="PetId">ID of pet that needs to be updated</param>
-    /// <param name="Name">Updated name of the pet</param>
-    /// <param name="Status">Updated status of the pet</param>
+    /// <param name="petId">ID of pet that needs to be updated</param>
+    /// <param name="name">Updated name of the pet</param>
+    /// <param name="status">Updated status of the pet</param>
     /// <returns></returns>
-    public void UpdatePetWithForm (string PetId, string Name, string Status) {
+    public void UpdatePetWithForm (string petId, string name, string status) {
 
       
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UpdatePetWithForm");
+      // verify the required parameter 'petId' is set
+      if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
       
 
       var path = "/pet/{petId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(PetId));
+      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -588,8 +588,8 @@ namespace IO.Swagger.Api {
 
       
       
-      if (Name != null) formParams.Add("name", ApiClient.ParameterToString(Name)); // form parameter
-      if (Status != null) formParams.Add("status", ApiClient.ParameterToString(Status)); // form parameter
+      if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
+      if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
       
       
 
@@ -609,20 +609,20 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Updates a pet in the store with form data 
     /// </summary>
-    /// <param name="PetId">ID of pet that needs to be updated</param>
-    /// <param name="Name">Updated name of the pet</param>
-    /// <param name="Status">Updated status of the pet</param>
+    /// <param name="petId">ID of pet that needs to be updated</param>
+    /// <param name="name">Updated name of the pet</param>
+    /// <param name="status">Updated status of the pet</param>
     /// <returns></returns>
-    public async Task UpdatePetWithFormAsync (string PetId, string Name, string Status) {
+    public async Task UpdatePetWithFormAsync (string petId, string name, string status) {
 
       
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UpdatePetWithForm");
+          // verify the required parameter 'petId' is set
+          if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UpdatePetWithForm");
       
 
       var path = "/pet/{petId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(PetId));
+      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -633,8 +633,8 @@ namespace IO.Swagger.Api {
 
       
       
-      if (Name != null) formParams.Add("name", ApiClient.ParameterToString(Name)); // form parameter
-      if (Status != null) formParams.Add("status", ApiClient.ParameterToString(Status)); // form parameter
+      if (name != null) formParams.Add("name", ApiClient.ParameterToString(name)); // form parameter
+      if (status != null) formParams.Add("status", ApiClient.ParameterToString(status)); // form parameter
       
       
 
@@ -653,19 +653,19 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Deletes a pet 
     /// </summary>
-    /// <param name="ApiKey"></param>
-    /// <param name="PetId">Pet id to delete</param>
+    /// <param name="apiKey"></param>
+    /// <param name="petId">Pet id to delete</param>
     /// <returns></returns>
-    public void DeletePet (string ApiKey, long? PetId) {
+    public void DeletePet (string apiKey, long? petId) {
 
       
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet");
+      // verify the required parameter 'petId' is set
+      if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
       
 
       var path = "/pet/{petId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(PetId));
+      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -675,7 +675,7 @@ namespace IO.Swagger.Api {
       String postBody = null;
 
       
-       if (ApiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(ApiKey)); // header parameter
+       if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
       
       
       
@@ -696,19 +696,19 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Deletes a pet 
     /// </summary>
-    /// <param name="ApiKey"></param>
-    /// <param name="PetId">Pet id to delete</param>
+    /// <param name="apiKey"></param>
+    /// <param name="petId">Pet id to delete</param>
     /// <returns></returns>
-    public async Task DeletePetAsync (string ApiKey, long? PetId) {
+    public async Task DeletePetAsync (string apiKey, long? petId) {
 
       
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet");
+          // verify the required parameter 'petId' is set
+          if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling DeletePet");
       
 
       var path = "/pet/{petId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(PetId));
+      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -718,7 +718,7 @@ namespace IO.Swagger.Api {
       String postBody = null;
 
       
-       if (ApiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(ApiKey)); // header parameter
+       if (apiKey != null) headerParams.Add("api_key", ApiClient.ParameterToString(apiKey)); // header parameter
       
       
       
@@ -738,20 +738,20 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// uploads an image 
     /// </summary>
-    /// <param name="PetId">ID of pet to update</param>
-    /// <param name="AdditionalMetadata">Additional data to pass to server</param>
-    /// <param name="File">file to upload</param>
+    /// <param name="petId">ID of pet to update</param>
+    /// <param name="additionalMetadata">Additional data to pass to server</param>
+    /// <param name="file">file to upload</param>
     /// <returns></returns>
-    public void UploadFile (long? PetId, string AdditionalMetadata, FileStream File) {
+    public void UploadFile (long? petId, string additionalMetadata, FileStream file) {
 
       
-      // verify the required parameter 'PetId' is set
-      if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile");
+      // verify the required parameter 'petId' is set
+      if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
       
 
       var path = "/pet/{petId}/uploadImage";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(PetId));
+      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -762,8 +762,8 @@ namespace IO.Swagger.Api {
 
       
       
-      if (AdditionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(AdditionalMetadata)); // form parameter
-      if (File != null) fileParams.Add("file", ApiClient.ParameterToString(File));
+      if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
+      if (file != null) fileParams.Add("file", ApiClient.ParameterToString(file));
       
       
 
@@ -783,20 +783,20 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// uploads an image 
     /// </summary>
-    /// <param name="PetId">ID of pet to update</param>
-    /// <param name="AdditionalMetadata">Additional data to pass to server</param>
-    /// <param name="File">file to upload</param>
+    /// <param name="petId">ID of pet to update</param>
+    /// <param name="additionalMetadata">Additional data to pass to server</param>
+    /// <param name="file">file to upload</param>
     /// <returns></returns>
-    public async Task UploadFileAsync (long? PetId, string AdditionalMetadata, FileStream File) {
+    public async Task UploadFileAsync (long? petId, string additionalMetadata, FileStream file) {
 
       
-          // verify the required parameter 'PetId' is set
-          if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile");
+          // verify the required parameter 'petId' is set
+          if (petId == null) throw new ApiException(400, "Missing required parameter 'petId' when calling UploadFile");
       
 
       var path = "/pet/{petId}/uploadImage";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(PetId));
+      path = path.Replace("{" + "petId" + "}", ApiClient.ParameterToString(petId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -807,8 +807,8 @@ namespace IO.Swagger.Api {
 
       
       
-      if (AdditionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(AdditionalMetadata)); // form parameter
-      if (File != null) fileParams.Add("file", ApiClient.ParameterToString(File));
+      if (additionalMetadata != null) formParams.Add("additionalMetadata", ApiClient.ParameterToString(additionalMetadata)); // form parameter
+      if (file != null) fileParams.Add("file", ApiClient.ParameterToString(file));
       
       
 
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
index 294910b453..67276bbce8 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/StoreApi.cs
@@ -26,44 +26,44 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Place an order for a pet 
     /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
+    /// <param name="body">order placed for purchasing the pet</param>
     /// <returns>Order</returns>
-    Order PlaceOrder (Order Body);
+    Order PlaceOrder (Order body);
 
     /// <summary>
     /// Place an order for a pet 
     /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
+    /// <param name="body">order placed for purchasing the pet</param>
     /// <returns>Order</returns>
-    Task<Order> PlaceOrderAsync (Order Body);
+    Task<Order> PlaceOrderAsync (Order body);
     
     /// <summary>
     /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
     /// </summary>
-    /// <param name="OrderId">ID of pet that needs to be fetched</param>
+    /// <param name="orderId">ID of pet that needs to be fetched</param>
     /// <returns>Order</returns>
-    Order GetOrderById (string OrderId);
+    Order GetOrderById (string orderId);
 
     /// <summary>
     /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
     /// </summary>
-    /// <param name="OrderId">ID of pet that needs to be fetched</param>
+    /// <param name="orderId">ID of pet that needs to be fetched</param>
     /// <returns>Order</returns>
-    Task<Order> GetOrderByIdAsync (string OrderId);
+    Task<Order> GetOrderByIdAsync (string orderId);
     
     /// <summary>
     /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
     /// </summary>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
+    /// <param name="orderId">ID of the order that needs to be deleted</param>
     /// <returns></returns>
-    void DeleteOrder (string OrderId);
+    void DeleteOrder (string orderId);
 
     /// <summary>
     /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
     /// </summary>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
+    /// <param name="orderId">ID of the order that needs to be deleted</param>
     /// <returns></returns>
-    Task DeleteOrderAsync (string OrderId);
+    Task DeleteOrderAsync (string orderId);
     
   }
 
@@ -190,9 +190,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Place an order for a pet 
     /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
+    /// <param name="body">order placed for purchasing the pet</param>
     /// <returns>Order</returns>
-    public Order PlaceOrder (Order Body) {
+    public Order PlaceOrder (Order body) {
 
       
 
@@ -209,7 +209,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -227,9 +227,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Place an order for a pet 
     /// </summary>
-    /// <param name="Body">order placed for purchasing the pet</param>
+    /// <param name="body">order placed for purchasing the pet</param>
     /// <returns>Order</returns>
-    public async Task<Order> PlaceOrderAsync (Order Body) {
+    public async Task<Order> PlaceOrderAsync (Order body) {
 
       
 
@@ -246,7 +246,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -263,18 +263,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
     /// </summary>
-    /// <param name="OrderId">ID of pet that needs to be fetched</param>
+    /// <param name="orderId">ID of pet that needs to be fetched</param>
     /// <returns>Order</returns>
-    public Order GetOrderById (string OrderId) {
+    public Order GetOrderById (string orderId) {
 
       
-      // verify the required parameter 'OrderId' is set
-      if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling GetOrderById");
+      // verify the required parameter 'orderId' is set
+      if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
       
 
       var path = "/store/order/{orderId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(OrderId));
+      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -303,18 +303,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Find purchase order by ID For valid response try integer IDs with value &lt;= 5 or &gt; 10. Other values will generated exceptions
     /// </summary>
-    /// <param name="OrderId">ID of pet that needs to be fetched</param>
+    /// <param name="orderId">ID of pet that needs to be fetched</param>
     /// <returns>Order</returns>
-    public async Task<Order> GetOrderByIdAsync (string OrderId) {
+    public async Task<Order> GetOrderByIdAsync (string orderId) {
 
       
-          // verify the required parameter 'OrderId' is set
-          if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling GetOrderById");
+          // verify the required parameter 'orderId' is set
+          if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling GetOrderById");
       
 
       var path = "/store/order/{orderId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(OrderId));
+      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -342,18 +342,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
     /// </summary>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
+    /// <param name="orderId">ID of the order that needs to be deleted</param>
     /// <returns></returns>
-    public void DeleteOrder (string OrderId) {
+    public void DeleteOrder (string orderId) {
 
       
-      // verify the required parameter 'OrderId' is set
-      if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder");
+      // verify the required parameter 'orderId' is set
+      if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
       
 
       var path = "/store/order/{orderId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(OrderId));
+      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -383,18 +383,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Delete purchase order by ID For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
     /// </summary>
-    /// <param name="OrderId">ID of the order that needs to be deleted</param>
+    /// <param name="orderId">ID of the order that needs to be deleted</param>
     /// <returns></returns>
-    public async Task DeleteOrderAsync (string OrderId) {
+    public async Task DeleteOrderAsync (string orderId) {
 
       
-          // verify the required parameter 'OrderId' is set
-          if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder");
+          // verify the required parameter 'orderId' is set
+          if (orderId == null) throw new ApiException(400, "Missing required parameter 'orderId' when calling DeleteOrder");
       
 
       var path = "/store/order/{orderId}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(OrderId));
+      path = path.Replace("{" + "orderId" + "}", ApiClient.ParameterToString(orderId));
       
 
       var queryParams = new Dictionary<String, String>();
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
index 65aaf490d9..2d87996dd9 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Api/UserApi.cs
@@ -14,60 +14,60 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Create user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Body">Created user object</param>
+    /// <param name="body">Created user object</param>
     /// <returns></returns>
-    void CreateUser (User Body);
+    void CreateUser (User body);
 
     /// <summary>
     /// Create user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Body">Created user object</param>
+    /// <param name="body">Created user object</param>
     /// <returns></returns>
-    Task CreateUserAsync (User Body);
+    Task CreateUserAsync (User body);
     
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
-    /// <param name="Body">List of user object</param>
+    /// <param name="body">List of user object</param>
     /// <returns></returns>
-    void CreateUsersWithArrayInput (List<User> Body);
+    void CreateUsersWithArrayInput (List<User> body);
 
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
-    /// <param name="Body">List of user object</param>
+    /// <param name="body">List of user object</param>
     /// <returns></returns>
-    Task CreateUsersWithArrayInputAsync (List<User> Body);
+    Task CreateUsersWithArrayInputAsync (List<User> body);
     
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
-    /// <param name="Body">List of user object</param>
+    /// <param name="body">List of user object</param>
     /// <returns></returns>
-    void CreateUsersWithListInput (List<User> Body);
+    void CreateUsersWithListInput (List<User> body);
 
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
-    /// <param name="Body">List of user object</param>
+    /// <param name="body">List of user object</param>
     /// <returns></returns>
-    Task CreateUsersWithListInputAsync (List<User> Body);
+    Task CreateUsersWithListInputAsync (List<User> body);
     
     /// <summary>
     /// Logs user into the system 
     /// </summary>
-    /// <param name="Username">The user name for login</param>
-    /// <param name="Password">The password for login in clear text</param>
+    /// <param name="username">The user name for login</param>
+    /// <param name="password">The password for login in clear text</param>
     /// <returns>string</returns>
-    string LoginUser (string Username, string Password);
+    string LoginUser (string username, string password);
 
     /// <summary>
     /// Logs user into the system 
     /// </summary>
-    /// <param name="Username">The user name for login</param>
-    /// <param name="Password">The password for login in clear text</param>
+    /// <param name="username">The user name for login</param>
+    /// <param name="password">The password for login in clear text</param>
     /// <returns>string</returns>
-    Task<string> LoginUserAsync (string Username, string Password);
+    Task<string> LoginUserAsync (string username, string password);
     
     /// <summary>
     /// Logs out current logged in user session 
@@ -84,46 +84,46 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Get user by user name 
     /// </summary>
-    /// <param name="Username">The name that needs to be fetched. Use user1 for testing. </param>
+    /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
     /// <returns>User</returns>
-    User GetUserByName (string Username);
+    User GetUserByName (string username);
 
     /// <summary>
     /// Get user by user name 
     /// </summary>
-    /// <param name="Username">The name that needs to be fetched. Use user1 for testing. </param>
+    /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
     /// <returns>User</returns>
-    Task<User> GetUserByNameAsync (string Username);
+    Task<User> GetUserByNameAsync (string username);
     
     /// <summary>
     /// Updated user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Username">name that need to be deleted</param>
-    /// <param name="Body">Updated user object</param>
+    /// <param name="username">name that need to be deleted</param>
+    /// <param name="body">Updated user object</param>
     /// <returns></returns>
-    void UpdateUser (string Username, User Body);
+    void UpdateUser (string username, User body);
 
     /// <summary>
     /// Updated user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Username">name that need to be deleted</param>
-    /// <param name="Body">Updated user object</param>
+    /// <param name="username">name that need to be deleted</param>
+    /// <param name="body">Updated user object</param>
     /// <returns></returns>
-    Task UpdateUserAsync (string Username, User Body);
+    Task UpdateUserAsync (string username, User body);
     
     /// <summary>
     /// Delete user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
+    /// <param name="username">The name that needs to be deleted</param>
     /// <returns></returns>
-    void DeleteUser (string Username);
+    void DeleteUser (string username);
 
     /// <summary>
     /// Delete user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
+    /// <param name="username">The name that needs to be deleted</param>
     /// <returns></returns>
-    Task DeleteUserAsync (string Username);
+    Task DeleteUserAsync (string username);
     
   }
 
@@ -181,9 +181,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Create user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Body">Created user object</param>
+    /// <param name="body">Created user object</param>
     /// <returns></returns>
-    public void CreateUser (User Body) {
+    public void CreateUser (User body) {
 
       
 
@@ -200,7 +200,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -219,9 +219,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Create user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Body">Created user object</param>
+    /// <param name="body">Created user object</param>
     /// <returns></returns>
-    public async Task CreateUserAsync (User Body) {
+    public async Task CreateUserAsync (User body) {
 
       
 
@@ -238,7 +238,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -256,9 +256,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
-    /// <param name="Body">List of user object</param>
+    /// <param name="body">List of user object</param>
     /// <returns></returns>
-    public void CreateUsersWithArrayInput (List<User> Body) {
+    public void CreateUsersWithArrayInput (List<User> body) {
 
       
 
@@ -275,7 +275,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -294,9 +294,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
-    /// <param name="Body">List of user object</param>
+    /// <param name="body">List of user object</param>
     /// <returns></returns>
-    public async Task CreateUsersWithArrayInputAsync (List<User> Body) {
+    public async Task CreateUsersWithArrayInputAsync (List<User> body) {
 
       
 
@@ -313,7 +313,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -331,9 +331,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
-    /// <param name="Body">List of user object</param>
+    /// <param name="body">List of user object</param>
     /// <returns></returns>
-    public void CreateUsersWithListInput (List<User> Body) {
+    public void CreateUsersWithListInput (List<User> body) {
 
       
 
@@ -350,7 +350,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -369,9 +369,9 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Creates list of users with given input array 
     /// </summary>
-    /// <param name="Body">List of user object</param>
+    /// <param name="body">List of user object</param>
     /// <returns></returns>
-    public async Task CreateUsersWithListInputAsync (List<User> Body) {
+    public async Task CreateUsersWithListInputAsync (List<User> body) {
 
       
 
@@ -388,7 +388,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -406,10 +406,10 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Logs user into the system 
     /// </summary>
-    /// <param name="Username">The user name for login</param>
-    /// <param name="Password">The password for login in clear text</param>
+    /// <param name="username">The user name for login</param>
+    /// <param name="password">The password for login in clear text</param>
     /// <returns>string</returns>
-    public string LoginUser (string Username, string Password) {
+    public string LoginUser (string username, string password) {
 
       
 
@@ -423,8 +423,8 @@ namespace IO.Swagger.Api {
       var fileParams = new Dictionary<String, String>();
       String postBody = null;
 
-       if (Username != null) queryParams.Add("username", ApiClient.ParameterToString(Username)); // query parameter
-       if (Password != null) queryParams.Add("password", ApiClient.ParameterToString(Password)); // query parameter
+       if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
+       if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
       
       
       
@@ -445,10 +445,10 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Logs user into the system 
     /// </summary>
-    /// <param name="Username">The user name for login</param>
-    /// <param name="Password">The password for login in clear text</param>
+    /// <param name="username">The user name for login</param>
+    /// <param name="password">The password for login in clear text</param>
     /// <returns>string</returns>
-    public async Task<string> LoginUserAsync (string Username, string Password) {
+    public async Task<string> LoginUserAsync (string username, string password) {
 
       
 
@@ -462,8 +462,8 @@ namespace IO.Swagger.Api {
       var fileParams = new Dictionary<String, String>();
       String postBody = null;
 
-       if (Username != null) queryParams.Add("username", ApiClient.ParameterToString(Username)); // query parameter
-       if (Password != null) queryParams.Add("password", ApiClient.ParameterToString(Password)); // query parameter
+       if (username != null) queryParams.Add("username", ApiClient.ParameterToString(username)); // query parameter
+       if (password != null) queryParams.Add("password", ApiClient.ParameterToString(password)); // query parameter
       
       
       
@@ -554,18 +554,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Get user by user name 
     /// </summary>
-    /// <param name="Username">The name that needs to be fetched. Use user1 for testing. </param>
+    /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
     /// <returns>User</returns>
-    public User GetUserByName (string Username) {
+    public User GetUserByName (string username) {
 
       
-      // verify the required parameter 'Username' is set
-      if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling GetUserByName");
+      // verify the required parameter 'username' is set
+      if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
       
 
       var path = "/user/{username}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(Username));
+      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -594,18 +594,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Get user by user name 
     /// </summary>
-    /// <param name="Username">The name that needs to be fetched. Use user1 for testing. </param>
+    /// <param name="username">The name that needs to be fetched. Use user1 for testing. </param>
     /// <returns>User</returns>
-    public async Task<User> GetUserByNameAsync (string Username) {
+    public async Task<User> GetUserByNameAsync (string username) {
 
       
-          // verify the required parameter 'Username' is set
-          if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling GetUserByName");
+          // verify the required parameter 'username' is set
+          if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling GetUserByName");
       
 
       var path = "/user/{username}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(Username));
+      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -633,19 +633,19 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Updated user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Username">name that need to be deleted</param>
-    /// <param name="Body">Updated user object</param>
+    /// <param name="username">name that need to be deleted</param>
+    /// <param name="body">Updated user object</param>
     /// <returns></returns>
-    public void UpdateUser (string Username, User Body) {
+    public void UpdateUser (string username, User body) {
 
       
-      // verify the required parameter 'Username' is set
-      if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling UpdateUser");
+      // verify the required parameter 'username' is set
+      if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
       
 
       var path = "/user/{username}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(Username));
+      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -657,7 +657,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -676,19 +676,19 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Updated user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Username">name that need to be deleted</param>
-    /// <param name="Body">Updated user object</param>
+    /// <param name="username">name that need to be deleted</param>
+    /// <param name="body">Updated user object</param>
     /// <returns></returns>
-    public async Task UpdateUserAsync (string Username, User Body) {
+    public async Task UpdateUserAsync (string username, User body) {
 
       
-          // verify the required parameter 'Username' is set
-          if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling UpdateUser");
+          // verify the required parameter 'username' is set
+          if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling UpdateUser");
       
 
       var path = "/user/{username}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(Username));
+      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -700,7 +700,7 @@ namespace IO.Swagger.Api {
       
       
       
-      postBody = ApiClient.Serialize(Body); // http body (model) parameter
+      postBody = ApiClient.Serialize(body); // http body (model) parameter
       
 
       // authentication setting, if any
@@ -718,18 +718,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Delete user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
+    /// <param name="username">The name that needs to be deleted</param>
     /// <returns></returns>
-    public void DeleteUser (string Username) {
+    public void DeleteUser (string username) {
 
       
-      // verify the required parameter 'Username' is set
-      if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser");
+      // verify the required parameter 'username' is set
+      if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
       
 
       var path = "/user/{username}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(Username));
+      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
       
 
       var queryParams = new Dictionary<String, String>();
@@ -759,18 +759,18 @@ namespace IO.Swagger.Api {
     /// <summary>
     /// Delete user This can only be done by the logged in user.
     /// </summary>
-    /// <param name="Username">The name that needs to be deleted</param>
+    /// <param name="username">The name that needs to be deleted</param>
     /// <returns></returns>
-    public async Task DeleteUserAsync (string Username) {
+    public async Task DeleteUserAsync (string username) {
 
       
-          // verify the required parameter 'Username' is set
-          if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser");
+          // verify the required parameter 'username' is set
+          if (username == null) throw new ApiException(400, "Missing required parameter 'username' when calling DeleteUser");
       
 
       var path = "/user/{username}";
       path = path.Replace("{format}", "json");
-      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(Username));
+      path = path.Replace("{" + "username" + "}", ApiClient.ParameterToString(username));
       
 
       var queryParams = new Dictionary<String, String>();
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
index e13ef14ee6..60d81e320b 100755
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb
index 970220989a..53958fc7ab 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb and b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll.mdb differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll
index e13ef14ee6..60d81e320b 100755
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll and b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll differ
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb
index 970220989a..53958fc7ab 100644
Binary files a/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb and b/samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.dll.mdb differ