diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
index 870bf849561..f4ffee145ed 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiClient.mustache
@@ -36,47 +36,47 @@ namespace {{packageName}}.Client {
     /// <value>The RestClient.</value> 
     public RestClient RestClient { get; set; }
 
-    private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
+    private Dictionary<String, String> DefaultHeaderMap = new Dictionary<String, String>();
 
-    public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, FileParameter> FileParams, String[] AuthSettings) {
+    public Object CallApi(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+      Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
       var response = Task.Run(async () => {
-                            var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings);
+                            var resp = await CallApiAsync(path, method, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
                             return resp;
                             });
         return response.Result;
     }
 
-    public async Task<Object> CallApiAsync(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, FileParameter> FileParams, String[] AuthSettings) {
+    public async Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+      Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
 
-      var request = new RestRequest(Path, Method);
+      var request = new RestRequest(path, method);
 
-      UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings);
+      UpdateParamsForAuth(queryParams, headerParams, authSettings);
 
       // add default header, if any
-      foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap)
+      foreach(KeyValuePair<string, string> defaultHeader in this.DefaultHeaderMap)
         request.AddHeader(defaultHeader.Key, defaultHeader.Value);
 
       // add header parameter, if any
-      foreach(KeyValuePair<string, string> param in HeaderParams)
+      foreach(KeyValuePair<string, string> param in headerParams)
         request.AddHeader(param.Key, param.Value);
      
       // add query parameter, if any
-      foreach(KeyValuePair<string, string> param in QueryParams)
+      foreach(KeyValuePair<string, string> param in queryParams)
         request.AddQueryParameter(param.Key, param.Value);
 
       // add form parameter, if any
-      foreach(KeyValuePair<string, string> param in FormParams)
+      foreach(KeyValuePair<string, string> param in formParams)
         request.AddParameter(param.Key, param.Value);
 
       // add file parameter, if any
-      foreach(KeyValuePair<string, FileParameter> param in FileParams)
+      foreach(KeyValuePair<string, FileParameter> param in fileParams)
         request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
 
 
-      if (PostBody != null) {
-        request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter
+      if (postBody != null) {
+        request.AddParameter("application/json", postBody, ParameterType.RequestBody); // http body (model) parameter
       }
 
       return (Object) await RestClient.ExecuteTaskAsync(request);
@@ -90,7 +90,7 @@ namespace {{packageName}}.Client {
     /// <param name="value"> Header field value
     /// <returns></returns>
     public void AddDefaultHeader(string key, string value) {
-       defaultHeaderMap.Add(key, value);
+       DefaultHeaderMap.Add(key, value);
     }
 
     /// <summary>
@@ -98,7 +98,7 @@ namespace {{packageName}}.Client {
     /// </summary>
     /// <returns>Dictionary of default header</returns>
     public Dictionary<String, String> GetDefaultHeader() {
-       return defaultHeaderMap;
+       return DefaultHeaderMap;
     }
 
     /// <summary>
@@ -224,16 +224,16 @@ namespace {{packageName}}.Client {
     /// <param name="QueryParams">Query parameters</param>
     /// <param name="HeaderParams">Header parameters</param>
     /// <param name="AuthSettings">Authentication settings</param>
-    public void UpdateParamsForAuth(Dictionary<String, String> QueryParams, Dictionary<String, String> HeaderParams, string[] AuthSettings) {
-      if (AuthSettings == null || AuthSettings.Length == 0)
+    public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings) {
+      if (authSettings == null || authSettings.Length == 0)
         return;
   
-      foreach (string auth in AuthSettings) {
+      foreach (string auth in authSettings) {
         // determine which one to use
         switch(auth) {
           {{#authMethods}}
           case "{{name}}":
-            {{#isApiKey}}{{#isKeyInHeader}}HeaderParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}QueryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}HeaderParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}
+            {{#isApiKey}}{{#isKeyInHeader}}headerParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInHeader}}{{#isKeyInQuery}}queryParams["{{keyParamName}}"] = GetApiKeyWithPrefix("{{keyParamName}}");{{/isKeyInQuery}}{{/isApiKey}}{{#isBasic}}headerParams["Authorization"] = "Basic " + Base64Encode(Configuration.Username + ":" + Configuration.Password);{{/isBasic}}
             {{#isOAuth}}//TODO support oauth{{/isOAuth}}
             break;
           {{/authMethods}}
diff --git a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
index 65c6193b84f..364e2e99912 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/ApiException.mustache
@@ -5,37 +5,43 @@ namespace {{packageName}}.Client {
   /// API Exception
   /// </summary>
   public class ApiException : Exception {
-    /// <summary>
-    /// Gets or sets the error code (HTTP status code)
-    /// </summary>
-    /// <value>The error code (HTTP status code).</value>
-    public int ErrorCode { get; set; }
+      /// <summary>
+      /// Gets or sets the error code (HTTP status code)
+      /// </summary>
+      /// <value>The error code (HTTP status code).</value>
+      public int ErrorCode { get; set; }
 
-    /// <summary>
-    /// Gets or sets the error content (body json object)
-    /// </summary>
-    /// <value>The error content (Http response body).</value>
-    public dynamic ErrorContent { get; private set; }
+      /// <summary>
+      /// Gets or sets the error content (body json object)
+      /// </summary>
+      /// <value>The error content (Http response body).</value>
+      public dynamic ErrorContent { get; private set; }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiException() {}
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="basePath">The base path.</param>
+      public ApiException() {}
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="errorCode">HTTP status code.</param>
-    /// <param name="message">Error message.</param>
-    public ApiException(int errorCode, string message) : base(message) {
-      this.ErrorCode = errorCode;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      public ApiException(int errorCode, string message) : base(message) {
+          this.ErrorCode = errorCode;
+      }
 
-    public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
-       this.ErrorCode = errorCode;
-       this.ErrorContent = errorContent;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      /// <param name="errorContent">Error content.</param>
+      public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
+          this.ErrorCode = errorCode;
+          this.ErrorContent = errorContent;
+      }
 
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
index dcede1b4ca5..81c31a9ce55 100644
--- a/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/csharp/Configuration.mustache
@@ -7,92 +7,92 @@ using System.Net;
 using System.Text;
 
 namespace {{packageName}}.Client {
-  /// <summary>
-  /// Represents a set of configuration settings
-  /// </summary>
-  public class Configuration{
-
     /// <summary>
-    /// Version of the package
+    /// Represents a set of configuration settings
     /// </summary>
-    public const string Version = "{{packageVersion}}";
-
-    /// <summary>
-    /// Gets or sets the default API client for making HTTP calls.
-    /// </summary>
-    /// <value>The API client.</value>
-    public static ApiClient DefaultApiClient = new ApiClient();
-
-    /// <summary>
-    /// Gets or sets the username (HTTP basic authentication)
-    /// </summary>
-    /// <value>The username.</value>
-    public static String Username { get; set; }
-
-    /// <summary>
-    /// Gets or sets the password (HTTP basic authentication)
-    /// </summary>
-    /// <value>The password.</value>
-    public static String Password { get; set; }
-
-    /// <summary>
-    /// Gets or sets the API key based on the authentication name 
-    /// </summary>
-    /// <value>The API key.</value>
-    public static Dictionary<String, String> ApiKey = new Dictionary<String, String>();
-
-    /// <summary>
-    /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name 
-    /// </summary>
-    /// <value>The prefix of the API key.</value>
-    public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
-
-    private static string _tempFolderPath = Path.GetTempPath();
-
-    /// <summary>
-    /// Gets or sets the temporary folder path to store the files downloaded from the server
-    /// </summary>
-    /// <value>Folder path</value>
-    public static String TempFolderPath {
-        get {
-            return _tempFolderPath;
-        }
-
-        set {
-            if (String.IsNullOrEmpty(value)) {
-                _tempFolderPath = value;
-                return;
+    public class Configuration{
+  
+        /// <summary>
+        /// Version of the package
+        /// </summary>
+        public const string Version = "{{packageVersion}}";
+  
+        /// <summary>
+        /// Gets or sets the default API client for making HTTP calls.
+        /// </summary>
+        /// <value>The API client.</value>
+        public static ApiClient DefaultApiClient = new ApiClient();
+  
+        /// <summary>
+        /// Gets or sets the username (HTTP basic authentication)
+        /// </summary>
+        /// <value>The username.</value>
+        public static String Username { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the password (HTTP basic authentication)
+        /// </summary>
+        /// <value>The password.</value>
+        public static String Password { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name 
+        /// </summary>
+        /// <value>The API key.</value>
+        public static Dictionary<String, String> ApiKey = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name 
+        /// </summary>
+        /// <value>The prefix of the API key.</value>
+        public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
+  
+        private static string _tempFolderPath = Path.GetTempPath();
+  
+        /// <summary>
+        /// Gets or sets the temporary folder path to store the files downloaded from the server
+        /// </summary>
+        /// <value>Folder path</value>
+        public static String TempFolderPath {
+            get {
+                return _tempFolderPath;
             }
   
-            // create the directory if it does not exist
-            if (!Directory.Exists(value)) {
-                Directory.CreateDirectory(value);
-            }
-  
-            // check if the path contains directory separator at the end
-            if (value[value.Length - 1] == Path.DirectorySeparatorChar) {
-                _tempFolderPath = value;
-            } else {
-                _tempFolderPath = value  + Path.DirectorySeparatorChar;
+            set {
+                if (String.IsNullOrEmpty(value)) {
+                    _tempFolderPath = value;
+                    return;
+                }
+      
+                // create the directory if it does not exist
+                if (!Directory.Exists(value)) {
+                    Directory.CreateDirectory(value);
+                }
+      
+                // check if the path contains directory separator at the end
+                if (value[value.Length - 1] == Path.DirectorySeparatorChar) {
+                    _tempFolderPath = value;
+                } else {
+                    _tempFolderPath = value  + Path.DirectorySeparatorChar;
+                }
             }
         }
+  
+        /// <summary>
+        /// Return a string contain essential information for debugging
+        /// </summary>
+        /// <value>Folder path</value>
+        public static String ToDebugReport() {
+            String report = "C# SDK ({{invokerPackage}}) Debug Report:\n";
+            report += "    OS: " + Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + Assembly
+                     .GetExecutingAssembly()
+                     .GetReferencedAssemblies()
+                     .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
+            report += "    Swagger Spec Version: {{version}}\n";
+            report += "    SDK Package Version: {{version}}\n";
+  
+            return report;
+        }
     }
-
-    /// <summary>
-    /// Return a string contain essential information for debugging
-    /// </summary>
-    /// <value>Folder path</value>
-    public static String ToDebugReport() {
-        String report = "C# SDK ({{invokerPackage}}) Debug Report:\n";
-        report += "    OS: " + Environment.OSVersion + "\n";
-        report += "    .NET Framework Version: " + Assembly
-                 .GetExecutingAssembly()
-                 .GetReferencedAssemblies()
-                 .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
-        report += "    Swagger Spec Version: {{version}}\n";
-        report += "    SDK Package Version: {{version}}\n";
-
-        return report;
-    }
-  }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
index 04228fad38c..4940687de3d 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiClient.cs
@@ -36,47 +36,47 @@ namespace IO.Swagger.Client {
     /// <value>The RestClient.</value> 
     public RestClient RestClient { get; set; }
 
-    private Dictionary<String, String> defaultHeaderMap = new Dictionary<String, String>();
+    private Dictionary<String, String> DefaultHeaderMap = new Dictionary<String, String>();
 
-    public Object CallApi(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, FileParameter> FileParams, String[] AuthSettings) {
+    public Object CallApi(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+      Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
       var response = Task.Run(async () => {
-                            var resp = await CallApiAsync(Path, Method, QueryParams, PostBody, HeaderParams, FormParams, FileParams, AuthSettings);
+                            var resp = await CallApiAsync(path, method, queryParams, postBody, headerParams, formParams, fileParams, authSettings);
                             return resp;
                             });
         return response.Result;
     }
 
-    public async Task<Object> CallApiAsync(String Path, RestSharp.Method Method, Dictionary<String, String> QueryParams, String PostBody,
-      Dictionary<String, String> HeaderParams, Dictionary<String, String> FormParams, Dictionary<String, FileParameter> FileParams, String[] AuthSettings) {
+    public async Task<Object> CallApiAsync(String path, RestSharp.Method method, Dictionary<String, String> queryParams, String postBody,
+      Dictionary<String, String> headerParams, Dictionary<String, String> formParams, Dictionary<String, FileParameter> fileParams, String[] authSettings) {
 
-      var request = new RestRequest(Path, Method);
+      var request = new RestRequest(path, method);
 
-      UpdateParamsForAuth(QueryParams, HeaderParams, AuthSettings);
+      UpdateParamsForAuth(queryParams, headerParams, authSettings);
 
       // add default header, if any
-      foreach(KeyValuePair<string, string> defaultHeader in this.defaultHeaderMap)
+      foreach(KeyValuePair<string, string> defaultHeader in this.DefaultHeaderMap)
         request.AddHeader(defaultHeader.Key, defaultHeader.Value);
 
       // add header parameter, if any
-      foreach(KeyValuePair<string, string> param in HeaderParams)
+      foreach(KeyValuePair<string, string> param in headerParams)
         request.AddHeader(param.Key, param.Value);
      
       // add query parameter, if any
-      foreach(KeyValuePair<string, string> param in QueryParams)
+      foreach(KeyValuePair<string, string> param in queryParams)
         request.AddQueryParameter(param.Key, param.Value);
 
       // add form parameter, if any
-      foreach(KeyValuePair<string, string> param in FormParams)
+      foreach(KeyValuePair<string, string> param in formParams)
         request.AddParameter(param.Key, param.Value);
 
       // add file parameter, if any
-      foreach(KeyValuePair<string, FileParameter> param in FileParams)
+      foreach(KeyValuePair<string, FileParameter> param in fileParams)
         request.AddFile(param.Value.Name, param.Value.Writer, param.Value.FileName, param.Value.ContentType);
 
 
-      if (PostBody != null) {
-        request.AddParameter("application/json", PostBody, ParameterType.RequestBody); // http body (model) parameter
+      if (postBody != null) {
+        request.AddParameter("application/json", postBody, ParameterType.RequestBody); // http body (model) parameter
       }
 
       return (Object) await RestClient.ExecuteTaskAsync(request);
@@ -90,7 +90,7 @@ namespace IO.Swagger.Client {
     /// <param name="value"> Header field value
     /// <returns></returns>
     public void AddDefaultHeader(string key, string value) {
-       defaultHeaderMap.Add(key, value);
+       DefaultHeaderMap.Add(key, value);
     }
 
     /// <summary>
@@ -98,7 +98,7 @@ namespace IO.Swagger.Client {
     /// </summary>
     /// <returns>Dictionary of default header</returns>
     public Dictionary<String, String> GetDefaultHeader() {
-       return defaultHeaderMap;
+       return DefaultHeaderMap;
     }
 
     /// <summary>
@@ -224,16 +224,16 @@ namespace IO.Swagger.Client {
     /// <param name="QueryParams">Query parameters</param>
     /// <param name="HeaderParams">Header parameters</param>
     /// <param name="AuthSettings">Authentication settings</param>
-    public void UpdateParamsForAuth(Dictionary<String, String> QueryParams, Dictionary<String, String> HeaderParams, string[] AuthSettings) {
-      if (AuthSettings == null || AuthSettings.Length == 0)
+    public void UpdateParamsForAuth(Dictionary<String, String> queryParams, Dictionary<String, String> headerParams, string[] authSettings) {
+      if (authSettings == null || authSettings.Length == 0)
         return;
   
-      foreach (string auth in AuthSettings) {
+      foreach (string auth in authSettings) {
         // determine which one to use
         switch(auth) {
           
           case "api_key":
-            HeaderParams["api_key"] = GetApiKeyWithPrefix("api_key");
+            headerParams["api_key"] = GetApiKeyWithPrefix("api_key");
             
             break;
           
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs
index f9cf380e683..20df8115c79 100644
--- a/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs
+++ b/samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Client/ApiException.cs
@@ -5,37 +5,43 @@ namespace IO.Swagger.Client {
   /// API Exception
   /// </summary>
   public class ApiException : Exception {
-    /// <summary>
-    /// Gets or sets the error code (HTTP status code)
-    /// </summary>
-    /// <value>The error code (HTTP status code).</value>
-    public int ErrorCode { get; set; }
+      /// <summary>
+      /// Gets or sets the error code (HTTP status code)
+      /// </summary>
+      /// <value>The error code (HTTP status code).</value>
+      public int ErrorCode { get; set; }
 
-    /// <summary>
-    /// Gets or sets the error content (body json object)
-    /// </summary>
-    /// <value>The error content (Http response body).</value>
-    public dynamic ErrorContent { get; private set; }
+      /// <summary>
+      /// Gets or sets the error content (body json object)
+      /// </summary>
+      /// <value>The error content (Http response body).</value>
+      public dynamic ErrorContent { get; private set; }
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="basePath">The base path.</param>
-    public ApiException() {}
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="basePath">The base path.</param>
+      public ApiException() {}
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ApiException"/> class.
-    /// </summary>
-    /// <param name="errorCode">HTTP status code.</param>
-    /// <param name="message">Error message.</param>
-    public ApiException(int errorCode, string message) : base(message) {
-      this.ErrorCode = errorCode;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      public ApiException(int errorCode, string message) : base(message) {
+          this.ErrorCode = errorCode;
+      }
 
-    public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
-       this.ErrorCode = errorCode;
-       this.ErrorContent = errorContent;
-    }
+      /// <summary>
+      /// Initializes a new instance of the <see cref="ApiException"/> class.
+      /// </summary>
+      /// <param name="errorCode">HTTP status code.</param>
+      /// <param name="message">Error message.</param>
+      /// <param name="errorContent">Error content.</param>
+      public ApiException(int errorCode, string message, dynamic errorContent = null) : base(message) {
+          this.ErrorCode = errorCode;
+          this.ErrorContent = errorContent;
+      }
 
   }
 
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 7dd139d6542..56ce39eadbe 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
@@ -7,92 +7,92 @@ using System.Net;
 using System.Text;
 
 namespace IO.Swagger.Client {
-  /// <summary>
-  /// Represents a set of configuration settings
-  /// </summary>
-  public class Configuration{
-
     /// <summary>
-    /// Version of the package
+    /// Represents a set of configuration settings
     /// </summary>
-    public const string Version = "1.0.0";
-
-    /// <summary>
-    /// Gets or sets the default API client for making HTTP calls.
-    /// </summary>
-    /// <value>The API client.</value>
-    public static ApiClient DefaultApiClient = new ApiClient();
-
-    /// <summary>
-    /// Gets or sets the username (HTTP basic authentication)
-    /// </summary>
-    /// <value>The username.</value>
-    public static String Username { get; set; }
-
-    /// <summary>
-    /// Gets or sets the password (HTTP basic authentication)
-    /// </summary>
-    /// <value>The password.</value>
-    public static String Password { get; set; }
-
-    /// <summary>
-    /// Gets or sets the API key based on the authentication name 
-    /// </summary>
-    /// <value>The API key.</value>
-    public static Dictionary<String, String> ApiKey = new Dictionary<String, String>();
-
-    /// <summary>
-    /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name 
-    /// </summary>
-    /// <value>The prefix of the API key.</value>
-    public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
-
-    private static string _tempFolderPath = Path.GetTempPath();
-
-    /// <summary>
-    /// Gets or sets the temporary folder path to store the files downloaded from the server
-    /// </summary>
-    /// <value>Folder path</value>
-    public static String TempFolderPath {
-        get {
-            return _tempFolderPath;
-        }
-
-        set {
-            if (String.IsNullOrEmpty(value)) {
-                _tempFolderPath = value;
-                return;
+    public class Configuration{
+  
+        /// <summary>
+        /// Version of the package
+        /// </summary>
+        public const string Version = "1.0.0";
+  
+        /// <summary>
+        /// Gets or sets the default API client for making HTTP calls.
+        /// </summary>
+        /// <value>The API client.</value>
+        public static ApiClient DefaultApiClient = new ApiClient();
+  
+        /// <summary>
+        /// Gets or sets the username (HTTP basic authentication)
+        /// </summary>
+        /// <value>The username.</value>
+        public static String Username { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the password (HTTP basic authentication)
+        /// </summary>
+        /// <value>The password.</value>
+        public static String Password { get; set; }
+  
+        /// <summary>
+        /// Gets or sets the API key based on the authentication name 
+        /// </summary>
+        /// <value>The API key.</value>
+        public static Dictionary<String, String> ApiKey = new Dictionary<String, String>();
+  
+        /// <summary>
+        /// Gets or sets the prefix (e.g. Token) of the API key based on the authentication name 
+        /// </summary>
+        /// <value>The prefix of the API key.</value>
+        public static Dictionary<String, String> ApiKeyPrefix = new Dictionary<String, String>();
+  
+        private static string _tempFolderPath = Path.GetTempPath();
+  
+        /// <summary>
+        /// Gets or sets the temporary folder path to store the files downloaded from the server
+        /// </summary>
+        /// <value>Folder path</value>
+        public static String TempFolderPath {
+            get {
+                return _tempFolderPath;
             }
   
-            // create the directory if it does not exist
-            if (!Directory.Exists(value)) {
-                Directory.CreateDirectory(value);
-            }
-  
-            // check if the path contains directory separator at the end
-            if (value[value.Length - 1] == Path.DirectorySeparatorChar) {
-                _tempFolderPath = value;
-            } else {
-                _tempFolderPath = value  + Path.DirectorySeparatorChar;
+            set {
+                if (String.IsNullOrEmpty(value)) {
+                    _tempFolderPath = value;
+                    return;
+                }
+      
+                // create the directory if it does not exist
+                if (!Directory.Exists(value)) {
+                    Directory.CreateDirectory(value);
+                }
+      
+                // check if the path contains directory separator at the end
+                if (value[value.Length - 1] == Path.DirectorySeparatorChar) {
+                    _tempFolderPath = value;
+                } else {
+                    _tempFolderPath = value  + Path.DirectorySeparatorChar;
+                }
             }
         }
+  
+        /// <summary>
+        /// Return a string contain essential information for debugging
+        /// </summary>
+        /// <value>Folder path</value>
+        public static String ToDebugReport() {
+            String report = "C# SDK () Debug Report:\n";
+            report += "    OS: " + Environment.OSVersion + "\n";
+            report += "    .NET Framework Version: " + Assembly
+                     .GetExecutingAssembly()
+                     .GetReferencedAssemblies()
+                     .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
+            report += "    Swagger Spec Version: 1.0.0\n";
+            report += "    SDK Package Version: 1.0.0\n";
+  
+            return report;
+        }
     }
-
-    /// <summary>
-    /// Return a string contain essential information for debugging
-    /// </summary>
-    /// <value>Folder path</value>
-    public static String ToDebugReport() {
-        String report = "C# SDK () Debug Report:\n";
-        report += "    OS: " + Environment.OSVersion + "\n";
-        report += "    .NET Framework Version: " + Assembly
-                 .GetExecutingAssembly()
-                 .GetReferencedAssemblies()
-                 .Where(x => x.Name == "System.Core").First().Version.ToString()  + "\n";
-        report += "    Swagger Spec Version: 1.0.0\n";
-        report += "    SDK Package Version: 1.0.0\n";
-
-        return report;
-    }
-  }
 }
diff --git a/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll b/samples/client/petstore/csharp/SwaggerClientTest/bin/Debug/SwaggerClientTest.dll
index b7164e27ba6..ad431df2414 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 1faa990e204..e5bbf0a9ef2 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 b7164e27ba6..ad431df2414 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 1faa990e204..e5bbf0a9ef2 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