diff --git a/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache b/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache
index 526efb165b..aeda83ae19 100644
--- a/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift/Podspec.mustache
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   {{#podDocumentationURL}}
   s.documentation_url = '{{podDocumentationURL}}'
   {{/podDocumentationURL}}
-  s.source_files = '{{projectName}}/Classes/Swaggers/**/*.swift'
+  s.source_files = '{{projectName}}/Classes/**/*.swift'
   {{#usePromiseKit}}
   s.dependency 'PromiseKit', '~> 3.5.3'
   {{/usePromiseKit}}
diff --git a/modules/swagger-codegen/src/main/resources/swift3/Podspec.mustache b/modules/swagger-codegen/src/main/resources/swift3/Podspec.mustache
index 97bb64e229..5625223534 100644
--- a/modules/swagger-codegen/src/main/resources/swift3/Podspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift3/Podspec.mustache
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.description = '{{podDescription}}'{{/podDescription}}{{#podScreenshots}}
   s.screenshots = {{& podScreenshots}}{{/podScreenshots}}{{#podDocumentationURL}}
   s.documentation_url = '{{podDocumentationURL}}'{{/podDocumentationURL}}
-  s.source_files = '{{projectName}}/Classes/Swaggers/**/*.swift'{{#usePromiseKit}}
+  s.source_files = '{{projectName}}/Classes/**/*.swift'{{#usePromiseKit}}
   s.dependency 'PromiseKit', '~> 4.2.2'{{/usePromiseKit}}{{#useRxSwift}}
   s.dependency 'RxSwift', '~> 3.4.1'{{/useRxSwift}}
   s.dependency 'Alamofire', '~> 4.0'
diff --git a/modules/swagger-codegen/src/main/resources/swift4/Podspec.mustache b/modules/swagger-codegen/src/main/resources/swift4/Podspec.mustache
index 173be12b43..b842f57106 100644
--- a/modules/swagger-codegen/src/main/resources/swift4/Podspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/swift4/Podspec.mustache
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.description = '{{podDescription}}'{{/podDescription}}{{#podScreenshots}}
   s.screenshots = {{& podScreenshots}}{{/podScreenshots}}{{#podDocumentationURL}}
   s.documentation_url = '{{podDocumentationURL}}'{{/podDocumentationURL}}
-  s.source_files = '{{projectName}}/Classes/Swaggers/**/*.swift'{{#usePromiseKit}}
+  s.source_files = '{{projectName}}/Classes/**/*.swift'{{#usePromiseKit}}
   s.dependency 'PromiseKit', '~> 4.2.2'{{/usePromiseKit}}{{#useRxSwift}}
   s.dependency 'RxSwift', '~> 3.4.1'{{/useRxSwift}}
   s.dependency 'Alamofire', '~> 4.5'
diff --git a/samples/client/petstore/swift/default/PetstoreClient.podspec b/samples/client/petstore/swift/default/PetstoreClient.podspec
index 5ddc2926f5..2ae7f4e47c 100644
--- a/samples/client/petstore/swift/default/PetstoreClient.podspec
+++ b/samples/client/petstore/swift/default/PetstoreClient.podspec
@@ -8,6 +8,6 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'Alamofire', '~> 3.5.1'
 end
diff --git a/samples/client/petstore/swift/promisekit/PetstoreClient.podspec b/samples/client/petstore/swift/promisekit/PetstoreClient.podspec
index b832ebd8ca..17bfa8c48a 100644
--- a/samples/client/petstore/swift/promisekit/PetstoreClient.podspec
+++ b/samples/client/petstore/swift/promisekit/PetstoreClient.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'PromiseKit', '~> 3.5.3'
   s.dependency 'Alamofire', '~> 3.5.1'
 end
diff --git a/samples/client/petstore/swift/rxswift/PetstoreClient.podspec b/samples/client/petstore/swift/rxswift/PetstoreClient.podspec
index ef091cb36a..e291647496 100644
--- a/samples/client/petstore/swift/rxswift/PetstoreClient.podspec
+++ b/samples/client/petstore/swift/rxswift/PetstoreClient.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'RxSwift', '~> 2.6.1'
   s.dependency 'Alamofire', '~> 3.5.1'
 end
diff --git a/samples/client/petstore/swift3/default/PetstoreClient.podspec b/samples/client/petstore/swift3/default/PetstoreClient.podspec
index 93a9da0c96..21af9e9df5 100644
--- a/samples/client/petstore/swift3/default/PetstoreClient.podspec
+++ b/samples/client/petstore/swift3/default/PetstoreClient.podspec
@@ -8,6 +8,6 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'Alamofire', '~> 4.0'
 end
diff --git a/samples/client/petstore/swift3/promisekit/PetstoreClient.podspec b/samples/client/petstore/swift3/promisekit/PetstoreClient.podspec
index 8a57a140e9..1fa9b6fa7d 100644
--- a/samples/client/petstore/swift3/promisekit/PetstoreClient.podspec
+++ b/samples/client/petstore/swift3/promisekit/PetstoreClient.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'PromiseKit', '~> 4.2.2'
   s.dependency 'Alamofire', '~> 4.0'
 end
diff --git a/samples/client/petstore/swift3/rxswift/PetstoreClient.podspec b/samples/client/petstore/swift3/rxswift/PetstoreClient.podspec
index 73e71afb4a..df8e34d516 100644
--- a/samples/client/petstore/swift3/rxswift/PetstoreClient.podspec
+++ b/samples/client/petstore/swift3/rxswift/PetstoreClient.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'RxSwift', '~> 3.4.1'
   s.dependency 'Alamofire', '~> 4.0'
 end
diff --git a/samples/client/petstore/swift3/unwraprequired/PetstoreClient.podspec b/samples/client/petstore/swift3/unwraprequired/PetstoreClient.podspec
index 93a9da0c96..21af9e9df5 100644
--- a/samples/client/petstore/swift3/unwraprequired/PetstoreClient.podspec
+++ b/samples/client/petstore/swift3/unwraprequired/PetstoreClient.podspec
@@ -8,6 +8,6 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'Alamofire', '~> 4.0'
 end
diff --git a/samples/client/petstore/swift4/default/.swagger-codegen/VERSION b/samples/client/petstore/swift4/default/.swagger-codegen/VERSION
index 7fea99011a..f9f7450d13 100644
--- a/samples/client/petstore/swift4/default/.swagger-codegen/VERSION
+++ b/samples/client/petstore/swift4/default/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
\ No newline at end of file
+2.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/default/PetstoreClient.podspec b/samples/client/petstore/swift4/default/PetstoreClient.podspec
index c1e940bdb8..2671cdda93 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient.podspec
+++ b/samples/client/petstore/swift4/default/PetstoreClient.podspec
@@ -8,6 +8,6 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'Alamofire', '~> 4.5'
 end
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
index 070bd8af1e..fe185e35aa 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
@@ -208,7 +208,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int32? = nil, int32: Int32? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
             completion(error);
         }
@@ -240,7 +240,7 @@ open class FakeAPI {
 
      - returns: RequestBuilder<Void> 
      */
-    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int32? = nil, int32: Int32? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
+    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
         let formParams: [String:Any?] = [
@@ -325,7 +325,7 @@ open class FakeAPI {
     /**
      * enum for parameter enumQueryInteger
      */
-    public enum EnumQueryInteger_testEnumParameters: Int32 { 
+    public enum EnumQueryInteger_testEnumParameters: Int { 
         case _1 = 1
         case numberminus2 = -2
     }
@@ -404,4 +404,47 @@ open class FakeAPI {
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false, headers: headerParameters)
     }
 
+    /**
+     test json serialization of form data
+     
+     - parameter param: (form) field1 
+     - parameter param2: (form) field2 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ error: Error?) -> Void)) {
+        testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
+            completion(error);
+        }
+    }
+
+
+    /**
+     test json serialization of form data
+     - GET /fake/jsonFormData
+     - 
+     
+     - parameter param: (form) field1 
+     - parameter param2: (form) field2 
+
+     - returns: RequestBuilder<Void> 
+     */
+    open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
+        let path = "/fake/jsonFormData"
+        let URLString = PetstoreClientAPI.basePath + path
+        let formParams: [String:Any?] = [
+            "param": param,
+            "param2": param2
+        ]
+
+        let nonNullParameters = APIHelper.rejectNil(formParams)
+        let parameters = APIHelper.convertBoolToString(nonNullParameters)
+
+        let url = NSURLComponents(string: URLString)
+
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
new file mode 100644
index 0000000000..0104074219
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
@@ -0,0 +1,54 @@
+//
+// Fake_classname_tags123API.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+import Alamofire
+
+
+
+open class Fake_classname_tags123API {
+    /**
+     To test class name in snake case
+     
+     - parameter body: (body) client model 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(response?.body, error);
+        }
+    }
+
+
+    /**
+     To test class name in snake case
+     - PATCH /fake_classname_test
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
+     - examples: [{contentType=application/json, example={
+  "client" : "aeiou"
+}}]
+     
+     - parameter body: (body) client model 
+
+     - returns: RequestBuilder<Client> 
+     */
+    open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
+        let path = "/fake_classname_test"
+        let URLString = PetstoreClientAPI.basePath + path
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+
+        let url = NSURLComponents(string: URLString)
+
+
+        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
+    }
+
+}
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
index 8ba921a9b8..756ada76c4 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
@@ -52,7 +52,7 @@ open class StoreAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(completion: @escaping ((_ data: [String:Int32]?,_ error: Error?) -> Void)) {
+    open class func getInventory(completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute { (response, error) -> Void in
             completion(response?.body, error);
         }
@@ -70,9 +70,9 @@ open class StoreAPI {
   "key" : 0
 }}]
 
-     - returns: RequestBuilder<[String:Int32]> 
+     - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int32]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters: [String:Any]? = nil
@@ -80,7 +80,7 @@ open class StoreAPI {
         let url = NSURLComponents(string: URLString)
 
 
-        let requestBuilder: RequestBuilder<[String:Int32]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
index f98a0343f5..545fd143f0 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
@@ -244,8 +244,8 @@ open class UserAPI {
      Logs user into the system
      - GET /user/login
      - 
-     - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)]
-     - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)]
+     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
+     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
      - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}]
      - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}]
      
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/CodableHelper.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/CodableHelper.swift
index 7603003824..4ae4ca267a 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/CodableHelper.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/CodableHelper.swift
@@ -35,7 +35,9 @@ open class CodableHelper {
         var returnedError: Error? = nil
 
         let encoder = JSONEncoder()
-        encoder.outputFormatting = (prettyPrint ? .prettyPrinted : .compact)
+        if prettyPrint {
+            encoder.outputFormatting = .prettyPrinted
+        }
         encoder.dataEncodingStrategy = .base64Encode
         if #available(iOS 10.0, *) {
             encoder.dateEncodingStrategy = .iso8601
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
index 8d3e08500d..b18644a34e 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
@@ -15,4 +15,10 @@ open class AdditionalPropertiesClass: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case mapProperty = "map_property"
+        case mapOfMapProperty = "map_of_map_property"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Animal.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Animal.swift
index b2079ff79c..1c0cc68a29 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Animal.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Animal.swift
@@ -15,4 +15,10 @@ open class Animal: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case className = "className"
+        case color = "color"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
index b9af1103e2..842755fb3c 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
@@ -10,10 +10,17 @@ import Foundation
 
 open class ApiResponse: Codable {
 
-    public var code: Int32?
+    public var code: Int?
     public var type: String?
     public var message: String?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case code = "code"
+        case type = "type"
+        case message = "message"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
index 7eb6b23bd2..9f7ee34099 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
@@ -14,4 +14,9 @@ open class ArrayOfArrayOfNumberOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case arrayArrayNumber = "ArrayArrayNumber"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
index ab6493cb3c..fba11ceb70 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
@@ -14,4 +14,9 @@ open class ArrayOfNumberOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case arrayNumber = "ArrayNumber"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
index bf28bb3cc9..bdf244f5e0 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
@@ -16,4 +16,11 @@ open class ArrayTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case arrayOfString = "array_of_string"
+        case arrayArrayOfInteger = "array_array_of_integer"
+        case arrayArrayOfModel = "array_array_of_model"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
index e9569b9fb0..a39eda9087 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
@@ -20,4 +20,14 @@ open class Capitalization: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case smallCamel = "smallCamel"
+        case capitalCamel = "CapitalCamel"
+        case smallSnake = "small_Snake"
+        case capitalSnake = "Capital_Snake"
+        case sCAETHFlowPoints = "SCA_ETH_Flow_Points"
+        case ATT_NAME = "ATT_NAME"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Cat.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Cat.swift
index 5ea6f4ea94..fdb090535a 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Cat.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Cat.swift
@@ -14,4 +14,9 @@ open class Cat: Animal {
 
     
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case declawed = "declawed"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Category.swift
index e21a4c54dd..684443a064 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Category.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Category.swift
@@ -15,4 +15,10 @@ open class Category: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case name = "name"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
index 8fe4a89e76..a3d86c6c6f 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
@@ -15,4 +15,9 @@ open class ClassModel: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case _class = "_class"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Client.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Client.swift
index 874bdd7cee..9d6d71b236 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Client.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Client.swift
@@ -14,4 +14,9 @@ open class Client: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case client = "client"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Dog.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Dog.swift
index 2b4c3f8a3e..ffaab37e62 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Dog.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Dog.swift
@@ -14,4 +14,9 @@ open class Dog: Animal {
 
     
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case breed = "breed"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
index d3da696d1c..9b2e72b981 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
@@ -23,4 +23,10 @@ open class EnumArrays: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case justSymbol = "just_symbol"
+        case arrayEnum = "array_enum"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
index 7e0266de3f..89dad808a5 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
@@ -15,7 +15,7 @@ open class EnumTest: Codable {
         case lower = "lower"
         case empty = ""
     }
-    public enum EnumInteger: Int32, Codable { 
+    public enum EnumInteger: Int, Codable { 
         case _1 = 1
         case numberminus1 = -1
     }
@@ -30,4 +30,12 @@ open class EnumTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case enumString = "enum_string"
+        case enumInteger = "enum_integer"
+        case enumNumber = "enum_number"
+        case outerEnum = "outerEnum"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
index 3c6ef7d3e3..d4a1e5f8e5 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
@@ -10,8 +10,8 @@ import Foundation
 
 open class FormatTest: Codable {
 
-    public var integer: Int32?
-    public var int32: Int32?
+    public var integer: Int?
+    public var int32: Int?
     public var int64: Int64?
     public var number: Double?
     public var float: Float?
@@ -26,4 +26,21 @@ open class FormatTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case integer = "integer"
+        case int32 = "int32"
+        case int64 = "int64"
+        case number = "number"
+        case float = "float"
+        case double = "double"
+        case string = "string"
+        case byte = "byte"
+        case binary = "binary"
+        case date = "date"
+        case dateTime = "dateTime"
+        case uuid = "uuid"
+        case password = "password"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
index fef361d308..f3f4f79497 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
@@ -15,4 +15,10 @@ open class HasOnlyReadOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case bar = "bar"
+        case foo = "foo"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/List.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/List.swift
index 5fab950e8e..4062dc0fef 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/List.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/List.swift
@@ -14,4 +14,9 @@ open class List: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case _123List = "123-list"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/MapTest.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
index 584b181f02..1ccfa4e4e7 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
@@ -19,4 +19,10 @@ open class MapTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case mapMapOfString = "map_map_of_string"
+        case mapOfEnumString = "map_of_enum_string"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 7fd6c6cf10..801890006a 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -16,4 +16,11 @@ open class MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case uuid = "uuid"
+        case dateTime = "dateTime"
+        case map = "map"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
index ac1ec94073..31e32d3358 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
@@ -11,9 +11,15 @@ import Foundation
 /** Model for testing model name starting with number */
 open class Model200Response: Codable {
 
-    public var name: Int32?
+    public var name: Int?
     public var _class: String?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case name = "name"
+        case _class = "class"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Name.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Name.swift
index de6751e52d..3f44a95624 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Name.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Name.swift
@@ -11,11 +11,19 @@ import Foundation
 /** Model for testing model name same as property name */
 open class Name: Codable {
 
-    public var name: Int32?
-    public var snakeCase: Int32?
+    public var name: Int?
+    public var snakeCase: Int?
     public var property: String?
-    public var _123Number: Int32?
+    public var _123Number: Int?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case name = "name"
+        case snakeCase = "snake_case"
+        case property = "property"
+        case _123Number = "123Number"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
index e4f4dc0f7c..d3663be1e7 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
@@ -14,4 +14,9 @@ open class NumberOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case justNumber = "JustNumber"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Order.swift
index f5fab2487e..e9b1a0a8c2 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Order.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Order.swift
@@ -17,7 +17,7 @@ open class Order: Codable {
     }
     public var id: Int64?
     public var petId: Int64?
-    public var quantity: Int32?
+    public var quantity: Int?
     public var shipDate: Date?
     /** Order Status */
     public var status: Status?
@@ -25,4 +25,14 @@ open class Order: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case petId = "petId"
+        case quantity = "quantity"
+        case shipDate = "shipDate"
+        case status = "status"
+        case complete = "complete"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
index 6d3b435cd1..b085a27a47 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
@@ -16,4 +16,11 @@ open class OuterComposite: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case myNumber = "my_number"
+        case myString = "my_string"
+        case myBoolean = "my_boolean"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Pet.swift
index 08128cc529..bf982f538f 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Pet.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Pet.swift
@@ -25,4 +25,14 @@ open class Pet: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case category = "category"
+        case name = "name"
+        case photoUrls = "photoUrls"
+        case tags = "tags"
+        case status = "status"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
index 0a779fdd48..5a09771ea4 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
@@ -15,4 +15,10 @@ open class ReadOnlyFirst: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case bar = "bar"
+        case baz = "baz"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Return.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Return.swift
index 629ec1fba6..22b9e0174a 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Return.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Return.swift
@@ -11,8 +11,13 @@ import Foundation
 /** Model for testing reserved words */
 open class Return: Codable {
 
-    public var _return: Int32?
+    public var _return: Int?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case _return = "return"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
index e012be66e3..8c0a8f79dc 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
@@ -14,4 +14,9 @@ open class SpecialModelName: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case specialPropertyName = "$special[property.name]"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Tag.swift
index 219dd5bade..feb6ab7c6c 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Tag.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/Tag.swift
@@ -15,4 +15,10 @@ open class Tag: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case name = "name"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/User.swift
index 2e80b7d20f..8fda8afb40 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/User.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/Swaggers/Models/User.swift
@@ -18,8 +18,20 @@ open class User: Codable {
     public var password: String?
     public var phone: String?
     /** User Status */
-    public var userStatus: Int32?
+    public var userStatus: Int?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case username = "username"
+        case firstName = "firstName"
+        case lastName = "lastName"
+        case email = "email"
+        case password = "password"
+        case phone = "phone"
+        case userStatus = "userStatus"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/.swagger-codegen/VERSION b/samples/client/petstore/swift4/promisekit/.swagger-codegen/VERSION
index 7fea99011a..f9f7450d13 100644
--- a/samples/client/petstore/swift4/promisekit/.swagger-codegen/VERSION
+++ b/samples/client/petstore/swift4/promisekit/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
\ No newline at end of file
+2.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient.podspec b/samples/client/petstore/swift4/promisekit/PetstoreClient.podspec
index 94ee3447e8..f6c991f53d 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient.podspec
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'PromiseKit', '~> 4.2.2'
   s.dependency 'Alamofire', '~> 4.5'
 end
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
index 178d91c131..0a3b76d43f 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
@@ -290,7 +290,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int32? = nil, int32: Int32? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
             completion(error);
         }
@@ -315,7 +315,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - returns: Promise<Void>
      */
-    open class func testEndpointParameters( number: Double,  double: Double,  patternWithoutDelimiter: String,  byte: Data,  integer: Int32? = nil,  int32: Int32? = nil,  int64: Int64? = nil,  float: Float? = nil,  string: String? = nil,  binary: Data? = nil,  date: Date? = nil,  dateTime: Date? = nil,  password: String? = nil,  callback: String? = nil) -> Promise<Void> {
+    open class func testEndpointParameters( number: Double,  double: Double,  patternWithoutDelimiter: String,  byte: Data,  integer: Int? = nil,  int32: Int? = nil,  int64: Int64? = nil,  float: Float? = nil,  string: String? = nil,  binary: Data? = nil,  date: Date? = nil,  dateTime: Date? = nil,  password: String? = nil,  callback: String? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { error in
             if let error = error {
@@ -352,7 +352,7 @@ open class FakeAPI {
 
      - returns: RequestBuilder<Void> 
      */
-    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int32? = nil, int32: Int32? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
+    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
         let formParams: [String:Any?] = [
@@ -437,7 +437,7 @@ open class FakeAPI {
     /**
      * enum for parameter enumQueryInteger
      */
-    public enum EnumQueryInteger_testEnumParameters: Int32 { 
+    public enum EnumQueryInteger_testEnumParameters: Int { 
         case _1 = 1
         case numberminus2 = -2
     }
@@ -540,4 +540,65 @@ open class FakeAPI {
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false, headers: headerParameters)
     }
 
+    /**
+     test json serialization of form data
+     
+     - parameter param: (form) field1 
+     - parameter param2: (form) field2 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ error: Error?) -> Void)) {
+        testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
+            completion(error);
+        }
+    }
+
+    /**
+     test json serialization of form data
+     
+     - parameter param: (form) field1 
+     - parameter param2: (form) field2 
+     - returns: Promise<Void>
+     */
+    open class func testJsonFormData( param: String,  param2: String) -> Promise<Void> {
+        let deferred = Promise<Void>.pending()
+        testJsonFormData(param: param, param2: param2) { error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill()
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     test json serialization of form data
+     - GET /fake/jsonFormData
+     - 
+     
+     - parameter param: (form) field1 
+     - parameter param2: (form) field2 
+
+     - returns: RequestBuilder<Void> 
+     */
+    open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
+        let path = "/fake/jsonFormData"
+        let URLString = PetstoreClientAPI.basePath + path
+        let formParams: [String:Any?] = [
+            "param": param,
+            "param2": param2
+        ]
+
+        let nonNullParameters = APIHelper.rejectNil(formParams)
+        let parameters = APIHelper.convertBoolToString(nonNullParameters)
+
+        let url = NSURLComponents(string: URLString)
+
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
new file mode 100644
index 0000000000..c707426990
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
@@ -0,0 +1,72 @@
+//
+// Fake_classname_tags123API.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+import Alamofire
+import PromiseKit
+
+
+
+open class Fake_classname_tags123API {
+    /**
+     To test class name in snake case
+     
+     - parameter body: (body) client model 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(response?.body, error);
+        }
+    }
+
+    /**
+     To test class name in snake case
+     
+     - parameter body: (body) client model 
+     - returns: Promise<Client>
+     */
+    open class func testClassname( body: Client) -> Promise<Client> {
+        let deferred = Promise<Client>.pending()
+        testClassname(body: body) { data, error in
+            if let error = error {
+                deferred.reject(error)
+            } else {
+                deferred.fulfill(data!)
+            }
+        }
+        return deferred.promise
+    }
+
+    /**
+     To test class name in snake case
+     - PATCH /fake_classname_test
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
+     - examples: [{contentType=application/json, example={
+  "client" : "aeiou"
+}}]
+     
+     - parameter body: (body) client model 
+
+     - returns: RequestBuilder<Client> 
+     */
+    open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
+        let path = "/fake_classname_test"
+        let URLString = PetstoreClientAPI.basePath + path
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+
+        let url = NSURLComponents(string: URLString)
+
+
+        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
+    }
+
+}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
index c32e543de3..270ed7a5ad 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
@@ -70,7 +70,7 @@ open class StoreAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(completion: @escaping ((_ data: [String:Int32]?,_ error: Error?) -> Void)) {
+    open class func getInventory(completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute { (response, error) -> Void in
             completion(response?.body, error);
         }
@@ -79,10 +79,10 @@ open class StoreAPI {
     /**
      Returns pet inventories by status
      
-     - returns: Promise<[String:Int32]>
+     - returns: Promise<[String:Int]>
      */
-    open class func getInventory() -> Promise<[String:Int32]> {
-        let deferred = Promise<[String:Int32]>.pending()
+    open class func getInventory() -> Promise<[String:Int]> {
+        let deferred = Promise<[String:Int]>.pending()
         getInventory() { data, error in
             if let error = error {
                 deferred.reject(error)
@@ -104,9 +104,9 @@ open class StoreAPI {
   "key" : 0
 }}]
 
-     - returns: RequestBuilder<[String:Int32]> 
+     - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int32]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters: [String:Any]? = nil
@@ -114,7 +114,7 @@ open class StoreAPI {
         let url = NSURLComponents(string: URLString)
 
 
-        let requestBuilder: RequestBuilder<[String:Int32]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
index 06c3957804..4a0c0b33c6 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
@@ -348,8 +348,8 @@ open class UserAPI {
      Logs user into the system
      - GET /user/login
      - 
-     - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)]
-     - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)]
+     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
+     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
      - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}]
      - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}]
      
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/CodableHelper.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/CodableHelper.swift
index 7603003824..4ae4ca267a 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/CodableHelper.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/CodableHelper.swift
@@ -35,7 +35,9 @@ open class CodableHelper {
         var returnedError: Error? = nil
 
         let encoder = JSONEncoder()
-        encoder.outputFormatting = (prettyPrint ? .prettyPrinted : .compact)
+        if prettyPrint {
+            encoder.outputFormatting = .prettyPrinted
+        }
         encoder.dataEncodingStrategy = .base64Encode
         if #available(iOS 10.0, *) {
             encoder.dateEncodingStrategy = .iso8601
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
index 8d3e08500d..b18644a34e 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
@@ -15,4 +15,10 @@ open class AdditionalPropertiesClass: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case mapProperty = "map_property"
+        case mapOfMapProperty = "map_of_map_property"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Animal.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Animal.swift
index b2079ff79c..1c0cc68a29 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Animal.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Animal.swift
@@ -15,4 +15,10 @@ open class Animal: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case className = "className"
+        case color = "color"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
index b9af1103e2..842755fb3c 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
@@ -10,10 +10,17 @@ import Foundation
 
 open class ApiResponse: Codable {
 
-    public var code: Int32?
+    public var code: Int?
     public var type: String?
     public var message: String?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case code = "code"
+        case type = "type"
+        case message = "message"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
index 7eb6b23bd2..9f7ee34099 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
@@ -14,4 +14,9 @@ open class ArrayOfArrayOfNumberOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case arrayArrayNumber = "ArrayArrayNumber"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
index ab6493cb3c..fba11ceb70 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
@@ -14,4 +14,9 @@ open class ArrayOfNumberOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case arrayNumber = "ArrayNumber"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
index bf28bb3cc9..bdf244f5e0 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
@@ -16,4 +16,11 @@ open class ArrayTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case arrayOfString = "array_of_string"
+        case arrayArrayOfInteger = "array_array_of_integer"
+        case arrayArrayOfModel = "array_array_of_model"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
index e9569b9fb0..a39eda9087 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
@@ -20,4 +20,14 @@ open class Capitalization: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case smallCamel = "smallCamel"
+        case capitalCamel = "CapitalCamel"
+        case smallSnake = "small_Snake"
+        case capitalSnake = "Capital_Snake"
+        case sCAETHFlowPoints = "SCA_ETH_Flow_Points"
+        case ATT_NAME = "ATT_NAME"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Cat.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Cat.swift
index 5ea6f4ea94..fdb090535a 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Cat.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Cat.swift
@@ -14,4 +14,9 @@ open class Cat: Animal {
 
     
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case declawed = "declawed"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift
index e21a4c54dd..684443a064 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Category.swift
@@ -15,4 +15,10 @@ open class Category: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case name = "name"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
index 8fe4a89e76..a3d86c6c6f 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
@@ -15,4 +15,9 @@ open class ClassModel: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case _class = "_class"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Client.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Client.swift
index 874bdd7cee..9d6d71b236 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Client.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Client.swift
@@ -14,4 +14,9 @@ open class Client: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case client = "client"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Dog.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Dog.swift
index 2b4c3f8a3e..ffaab37e62 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Dog.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Dog.swift
@@ -14,4 +14,9 @@ open class Dog: Animal {
 
     
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case breed = "breed"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
index d3da696d1c..9b2e72b981 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
@@ -23,4 +23,10 @@ open class EnumArrays: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case justSymbol = "just_symbol"
+        case arrayEnum = "array_enum"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
index 7e0266de3f..89dad808a5 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
@@ -15,7 +15,7 @@ open class EnumTest: Codable {
         case lower = "lower"
         case empty = ""
     }
-    public enum EnumInteger: Int32, Codable { 
+    public enum EnumInteger: Int, Codable { 
         case _1 = 1
         case numberminus1 = -1
     }
@@ -30,4 +30,12 @@ open class EnumTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case enumString = "enum_string"
+        case enumInteger = "enum_integer"
+        case enumNumber = "enum_number"
+        case outerEnum = "outerEnum"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
index 3c6ef7d3e3..d4a1e5f8e5 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
@@ -10,8 +10,8 @@ import Foundation
 
 open class FormatTest: Codable {
 
-    public var integer: Int32?
-    public var int32: Int32?
+    public var integer: Int?
+    public var int32: Int?
     public var int64: Int64?
     public var number: Double?
     public var float: Float?
@@ -26,4 +26,21 @@ open class FormatTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case integer = "integer"
+        case int32 = "int32"
+        case int64 = "int64"
+        case number = "number"
+        case float = "float"
+        case double = "double"
+        case string = "string"
+        case byte = "byte"
+        case binary = "binary"
+        case date = "date"
+        case dateTime = "dateTime"
+        case uuid = "uuid"
+        case password = "password"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
index fef361d308..f3f4f79497 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
@@ -15,4 +15,10 @@ open class HasOnlyReadOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case bar = "bar"
+        case foo = "foo"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/List.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/List.swift
index 5fab950e8e..4062dc0fef 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/List.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/List.swift
@@ -14,4 +14,9 @@ open class List: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case _123List = "123-list"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MapTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
index 584b181f02..1ccfa4e4e7 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
@@ -19,4 +19,10 @@ open class MapTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case mapMapOfString = "map_map_of_string"
+        case mapOfEnumString = "map_of_enum_string"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 7fd6c6cf10..801890006a 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -16,4 +16,11 @@ open class MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case uuid = "uuid"
+        case dateTime = "dateTime"
+        case map = "map"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
index ac1ec94073..31e32d3358 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
@@ -11,9 +11,15 @@ import Foundation
 /** Model for testing model name starting with number */
 open class Model200Response: Codable {
 
-    public var name: Int32?
+    public var name: Int?
     public var _class: String?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case name = "name"
+        case _class = "class"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Name.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Name.swift
index de6751e52d..3f44a95624 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Name.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Name.swift
@@ -11,11 +11,19 @@ import Foundation
 /** Model for testing model name same as property name */
 open class Name: Codable {
 
-    public var name: Int32?
-    public var snakeCase: Int32?
+    public var name: Int?
+    public var snakeCase: Int?
     public var property: String?
-    public var _123Number: Int32?
+    public var _123Number: Int?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case name = "name"
+        case snakeCase = "snake_case"
+        case property = "property"
+        case _123Number = "123Number"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
index e4f4dc0f7c..d3663be1e7 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
@@ -14,4 +14,9 @@ open class NumberOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case justNumber = "JustNumber"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift
index f5fab2487e..e9b1a0a8c2 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Order.swift
@@ -17,7 +17,7 @@ open class Order: Codable {
     }
     public var id: Int64?
     public var petId: Int64?
-    public var quantity: Int32?
+    public var quantity: Int?
     public var shipDate: Date?
     /** Order Status */
     public var status: Status?
@@ -25,4 +25,14 @@ open class Order: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case petId = "petId"
+        case quantity = "quantity"
+        case shipDate = "shipDate"
+        case status = "status"
+        case complete = "complete"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
index 6d3b435cd1..b085a27a47 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
@@ -16,4 +16,11 @@ open class OuterComposite: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case myNumber = "my_number"
+        case myString = "my_string"
+        case myBoolean = "my_boolean"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift
index 08128cc529..bf982f538f 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Pet.swift
@@ -25,4 +25,14 @@ open class Pet: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case category = "category"
+        case name = "name"
+        case photoUrls = "photoUrls"
+        case tags = "tags"
+        case status = "status"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
index 0a779fdd48..5a09771ea4 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
@@ -15,4 +15,10 @@ open class ReadOnlyFirst: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case bar = "bar"
+        case baz = "baz"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Return.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Return.swift
index 629ec1fba6..22b9e0174a 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Return.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Return.swift
@@ -11,8 +11,13 @@ import Foundation
 /** Model for testing reserved words */
 open class Return: Codable {
 
-    public var _return: Int32?
+    public var _return: Int?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case _return = "return"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
index e012be66e3..8c0a8f79dc 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
@@ -14,4 +14,9 @@ open class SpecialModelName: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case specialPropertyName = "$special[property.name]"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift
index 219dd5bade..feb6ab7c6c 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/Tag.swift
@@ -15,4 +15,10 @@ open class Tag: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case name = "name"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift
index 2e80b7d20f..8fda8afb40 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/Swaggers/Models/User.swift
@@ -18,8 +18,20 @@ open class User: Codable {
     public var password: String?
     public var phone: String?
     /** User Status */
-    public var userStatus: Int32?
+    public var userStatus: Int?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case username = "username"
+        case firstName = "firstName"
+        case lastName = "lastName"
+        case email = "email"
+        case password = "password"
+        case phone = "phone"
+        case userStatus = "userStatus"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/.swagger-codegen/VERSION b/samples/client/petstore/swift4/rxswift/.swagger-codegen/VERSION
index 7fea99011a..f9f7450d13 100644
--- a/samples/client/petstore/swift4/rxswift/.swagger-codegen/VERSION
+++ b/samples/client/petstore/swift4/rxswift/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
\ No newline at end of file
+2.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient.podspec b/samples/client/petstore/swift4/rxswift/PetstoreClient.podspec
index 2594d6256c..5591aa3de9 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient.podspec
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient.podspec
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.license = 'Proprietary'
   s.homepage = 'https://github.com/swagger-api/swagger-codegen'
   s.summary = 'PetstoreClient'
-  s.source_files = 'PetstoreClient/Classes/Swaggers/**/*.swift'
+  s.source_files = 'PetstoreClient/Classes/**/*.swift'
   s.dependency 'RxSwift', '~> 3.4.1'
   s.dependency 'Alamofire', '~> 4.5'
 end
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
index 708d90b914..7f722b173f 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/FakeAPI.swift
@@ -300,7 +300,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int32? = nil, int32: Int32? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
             completion(error);
         }
@@ -325,7 +325,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - returns: Observable<Void>
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int32? = nil, int32: Int32? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Observable<Void> {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
             testEndpointParameters(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback) { error in
                 if let error = error {
@@ -364,7 +364,7 @@ open class FakeAPI {
 
      - returns: RequestBuilder<Void> 
      */
-    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int32? = nil, int32: Int32? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
+    open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: Data? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
         let formParams: [String:Any?] = [
@@ -449,7 +449,7 @@ open class FakeAPI {
     /**
      * enum for parameter enumQueryInteger
      */
-    public enum EnumQueryInteger_testEnumParameters: Int32 { 
+    public enum EnumQueryInteger_testEnumParameters: Int { 
         case _1 = 1
         case numberminus2 = -2
     }
@@ -554,4 +554,67 @@ open class FakeAPI {
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false, headers: headerParameters)
     }
 
+    /**
+     test json serialization of form data
+     
+     - parameter param: (form) field1 
+     - parameter param2: (form) field2 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ error: Error?) -> Void)) {
+        testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
+            completion(error);
+        }
+    }
+
+    /**
+     test json serialization of form data
+     
+     - parameter param: (form) field1 
+     - parameter param2: (form) field2 
+     - returns: Observable<Void>
+     */
+    open class func testJsonFormData(param: String, param2: String) -> Observable<Void> {
+        return Observable.create { observer -> Disposable in
+            testJsonFormData(param: param, param2: param2) { error in
+                if let error = error {
+                    observer.on(.error(error as Error))
+                } else {
+                    observer.on(.next())
+                }
+                observer.on(.completed)
+            }
+            return Disposables.create()
+        }
+    }
+
+    /**
+     test json serialization of form data
+     - GET /fake/jsonFormData
+     - 
+     
+     - parameter param: (form) field1 
+     - parameter param2: (form) field2 
+
+     - returns: RequestBuilder<Void> 
+     */
+    open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
+        let path = "/fake/jsonFormData"
+        let URLString = PetstoreClientAPI.basePath + path
+        let formParams: [String:Any?] = [
+            "param": param,
+            "param2": param2
+        ]
+
+        let nonNullParameters = APIHelper.rejectNil(formParams)
+        let parameters = APIHelper.convertBoolToString(nonNullParameters)
+
+        let url = NSURLComponents(string: URLString)
+
+
+        let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
+
+        return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
new file mode 100644
index 0000000000..49ee1bbf26
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/Fake_classname_tags123API.swift
@@ -0,0 +1,74 @@
+//
+// Fake_classname_tags123API.swift
+//
+// Generated by swagger-codegen
+// https://github.com/swagger-api/swagger-codegen
+//
+
+import Foundation
+import Alamofire
+import RxSwift
+
+
+
+open class Fake_classname_tags123API {
+    /**
+     To test class name in snake case
+     
+     - parameter body: (body) client model 
+     - parameter completion: completion handler to receive the data and the error objects
+     */
+    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+        testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
+            completion(response?.body, error);
+        }
+    }
+
+    /**
+     To test class name in snake case
+     
+     - parameter body: (body) client model 
+     - returns: Observable<Client>
+     */
+    open class func testClassname(body: Client) -> Observable<Client> {
+        return Observable.create { observer -> Disposable in
+            testClassname(body: body) { data, error in
+                if let error = error {
+                    observer.on(.error(error as Error))
+                } else {
+                    observer.on(.next(data!))
+                }
+                observer.on(.completed)
+            }
+            return Disposables.create()
+        }
+    }
+
+    /**
+     To test class name in snake case
+     - PATCH /fake_classname_test
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
+     - examples: [{contentType=application/json, example={
+  "client" : "aeiou"
+}}]
+     
+     - parameter body: (body) client model 
+
+     - returns: RequestBuilder<Client> 
+     */
+    open class func testClassnameWithRequestBuilder(body: Client) -> RequestBuilder<Client> {
+        let path = "/fake_classname_test"
+        let URLString = PetstoreClientAPI.basePath + path
+        let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: body)
+
+        let url = NSURLComponents(string: URLString)
+
+
+        let requestBuilder: RequestBuilder<Client>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+
+        return requestBuilder.init(method: "PATCH", URLString: (url?.string ?? URLString), parameters: parameters, isBody: true)
+    }
+
+}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
index 9483e10aba..d5be21b153 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/StoreAPI.swift
@@ -72,7 +72,7 @@ open class StoreAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(completion: @escaping ((_ data: [String:Int32]?,_ error: Error?) -> Void)) {
+    open class func getInventory(completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute { (response, error) -> Void in
             completion(response?.body, error);
         }
@@ -81,9 +81,9 @@ open class StoreAPI {
     /**
      Returns pet inventories by status
      
-     - returns: Observable<[String:Int32]>
+     - returns: Observable<[String:Int]>
      */
-    open class func getInventory() -> Observable<[String:Int32]> {
+    open class func getInventory() -> Observable<[String:Int]> {
         return Observable.create { observer -> Disposable in
             getInventory() { data, error in
                 if let error = error {
@@ -108,9 +108,9 @@ open class StoreAPI {
   "key" : 0
 }}]
 
-     - returns: RequestBuilder<[String:Int32]> 
+     - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int32]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters: [String:Any]? = nil
@@ -118,7 +118,7 @@ open class StoreAPI {
         let url = NSURLComponents(string: URLString)
 
 
-        let requestBuilder: RequestBuilder<[String:Int32]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
index 2c8371f406..53cf1b3fe6 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/APIs/UserAPI.swift
@@ -360,8 +360,8 @@ open class UserAPI {
      Logs user into the system
      - GET /user/login
      - 
-     - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)]
-     - responseHeaders: [X-Rate-Limit(Int32), X-Expires-After(Date)]
+     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
+     - responseHeaders: [X-Rate-Limit(Int), X-Expires-After(Date)]
      - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}]
      - examples: [{contentType=application/xml, example=aeiou}, {contentType=application/json, example="aeiou"}]
      
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/CodableHelper.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/CodableHelper.swift
index 7603003824..4ae4ca267a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/CodableHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/CodableHelper.swift
@@ -35,7 +35,9 @@ open class CodableHelper {
         var returnedError: Error? = nil
 
         let encoder = JSONEncoder()
-        encoder.outputFormatting = (prettyPrint ? .prettyPrinted : .compact)
+        if prettyPrint {
+            encoder.outputFormatting = .prettyPrinted
+        }
         encoder.dataEncodingStrategy = .base64Encode
         if #available(iOS 10.0, *) {
             encoder.dateEncodingStrategy = .iso8601
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
index 8d3e08500d..b18644a34e 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/AdditionalPropertiesClass.swift
@@ -15,4 +15,10 @@ open class AdditionalPropertiesClass: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case mapProperty = "map_property"
+        case mapOfMapProperty = "map_of_map_property"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Animal.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Animal.swift
index b2079ff79c..1c0cc68a29 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Animal.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Animal.swift
@@ -15,4 +15,10 @@ open class Animal: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case className = "className"
+        case color = "color"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
index b9af1103e2..842755fb3c 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ApiResponse.swift
@@ -10,10 +10,17 @@ import Foundation
 
 open class ApiResponse: Codable {
 
-    public var code: Int32?
+    public var code: Int?
     public var type: String?
     public var message: String?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case code = "code"
+        case type = "type"
+        case message = "message"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
index 7eb6b23bd2..9f7ee34099 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfArrayOfNumberOnly.swift
@@ -14,4 +14,9 @@ open class ArrayOfArrayOfNumberOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case arrayArrayNumber = "ArrayArrayNumber"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
index ab6493cb3c..fba11ceb70 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayOfNumberOnly.swift
@@ -14,4 +14,9 @@ open class ArrayOfNumberOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case arrayNumber = "ArrayNumber"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
index bf28bb3cc9..bdf244f5e0 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ArrayTest.swift
@@ -16,4 +16,11 @@ open class ArrayTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case arrayOfString = "array_of_string"
+        case arrayArrayOfInteger = "array_array_of_integer"
+        case arrayArrayOfModel = "array_array_of_model"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
index e9569b9fb0..a39eda9087 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Capitalization.swift
@@ -20,4 +20,14 @@ open class Capitalization: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case smallCamel = "smallCamel"
+        case capitalCamel = "CapitalCamel"
+        case smallSnake = "small_Snake"
+        case capitalSnake = "Capital_Snake"
+        case sCAETHFlowPoints = "SCA_ETH_Flow_Points"
+        case ATT_NAME = "ATT_NAME"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Cat.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Cat.swift
index 5ea6f4ea94..fdb090535a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Cat.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Cat.swift
@@ -14,4 +14,9 @@ open class Cat: Animal {
 
     
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case declawed = "declawed"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Category.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Category.swift
index e21a4c54dd..684443a064 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Category.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Category.swift
@@ -15,4 +15,10 @@ open class Category: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case name = "name"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
index 8fe4a89e76..a3d86c6c6f 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ClassModel.swift
@@ -15,4 +15,9 @@ open class ClassModel: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case _class = "_class"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Client.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Client.swift
index 874bdd7cee..9d6d71b236 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Client.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Client.swift
@@ -14,4 +14,9 @@ open class Client: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case client = "client"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Dog.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Dog.swift
index 2b4c3f8a3e..ffaab37e62 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Dog.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Dog.swift
@@ -14,4 +14,9 @@ open class Dog: Animal {
 
     
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case breed = "breed"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
index d3da696d1c..9b2e72b981 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumArrays.swift
@@ -23,4 +23,10 @@ open class EnumArrays: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case justSymbol = "just_symbol"
+        case arrayEnum = "array_enum"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
index 7e0266de3f..89dad808a5 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/EnumTest.swift
@@ -15,7 +15,7 @@ open class EnumTest: Codable {
         case lower = "lower"
         case empty = ""
     }
-    public enum EnumInteger: Int32, Codable { 
+    public enum EnumInteger: Int, Codable { 
         case _1 = 1
         case numberminus1 = -1
     }
@@ -30,4 +30,12 @@ open class EnumTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case enumString = "enum_string"
+        case enumInteger = "enum_integer"
+        case enumNumber = "enum_number"
+        case outerEnum = "outerEnum"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
index 3c6ef7d3e3..d4a1e5f8e5 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/FormatTest.swift
@@ -10,8 +10,8 @@ import Foundation
 
 open class FormatTest: Codable {
 
-    public var integer: Int32?
-    public var int32: Int32?
+    public var integer: Int?
+    public var int32: Int?
     public var int64: Int64?
     public var number: Double?
     public var float: Float?
@@ -26,4 +26,21 @@ open class FormatTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case integer = "integer"
+        case int32 = "int32"
+        case int64 = "int64"
+        case number = "number"
+        case float = "float"
+        case double = "double"
+        case string = "string"
+        case byte = "byte"
+        case binary = "binary"
+        case date = "date"
+        case dateTime = "dateTime"
+        case uuid = "uuid"
+        case password = "password"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
index fef361d308..f3f4f79497 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/HasOnlyReadOnly.swift
@@ -15,4 +15,10 @@ open class HasOnlyReadOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case bar = "bar"
+        case foo = "foo"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/List.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/List.swift
index 5fab950e8e..4062dc0fef 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/List.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/List.swift
@@ -14,4 +14,9 @@ open class List: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case _123List = "123-list"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MapTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
index 584b181f02..1ccfa4e4e7 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MapTest.swift
@@ -19,4 +19,10 @@ open class MapTest: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case mapMapOfString = "map_map_of_string"
+        case mapOfEnumString = "map_of_enum_string"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 7fd6c6cf10..801890006a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -16,4 +16,11 @@ open class MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case uuid = "uuid"
+        case dateTime = "dateTime"
+        case map = "map"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
index ac1ec94073..31e32d3358 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Model200Response.swift
@@ -11,9 +11,15 @@ import Foundation
 /** Model for testing model name starting with number */
 open class Model200Response: Codable {
 
-    public var name: Int32?
+    public var name: Int?
     public var _class: String?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case name = "name"
+        case _class = "class"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Name.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Name.swift
index de6751e52d..3f44a95624 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Name.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Name.swift
@@ -11,11 +11,19 @@ import Foundation
 /** Model for testing model name same as property name */
 open class Name: Codable {
 
-    public var name: Int32?
-    public var snakeCase: Int32?
+    public var name: Int?
+    public var snakeCase: Int?
     public var property: String?
-    public var _123Number: Int32?
+    public var _123Number: Int?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case name = "name"
+        case snakeCase = "snake_case"
+        case property = "property"
+        case _123Number = "123Number"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
index e4f4dc0f7c..d3663be1e7 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/NumberOnly.swift
@@ -14,4 +14,9 @@ open class NumberOnly: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case justNumber = "JustNumber"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Order.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Order.swift
index f5fab2487e..e9b1a0a8c2 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Order.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Order.swift
@@ -17,7 +17,7 @@ open class Order: Codable {
     }
     public var id: Int64?
     public var petId: Int64?
-    public var quantity: Int32?
+    public var quantity: Int?
     public var shipDate: Date?
     /** Order Status */
     public var status: Status?
@@ -25,4 +25,14 @@ open class Order: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case petId = "petId"
+        case quantity = "quantity"
+        case shipDate = "shipDate"
+        case status = "status"
+        case complete = "complete"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
index 6d3b435cd1..b085a27a47 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/OuterComposite.swift
@@ -16,4 +16,11 @@ open class OuterComposite: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case myNumber = "my_number"
+        case myString = "my_string"
+        case myBoolean = "my_boolean"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Pet.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
index 08128cc529..bf982f538f 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Pet.swift
@@ -25,4 +25,14 @@ open class Pet: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case category = "category"
+        case name = "name"
+        case photoUrls = "photoUrls"
+        case tags = "tags"
+        case status = "status"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
index 0a779fdd48..5a09771ea4 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/ReadOnlyFirst.swift
@@ -15,4 +15,10 @@ open class ReadOnlyFirst: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case bar = "bar"
+        case baz = "baz"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Return.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Return.swift
index 629ec1fba6..22b9e0174a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Return.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Return.swift
@@ -11,8 +11,13 @@ import Foundation
 /** Model for testing reserved words */
 open class Return: Codable {
 
-    public var _return: Int32?
+    public var _return: Int?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case _return = "return"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
index e012be66e3..8c0a8f79dc 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/SpecialModelName.swift
@@ -14,4 +14,9 @@ open class SpecialModelName: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case specialPropertyName = "$special[property.name]"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Tag.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
index 219dd5bade..feb6ab7c6c 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/Tag.swift
@@ -15,4 +15,10 @@ open class Tag: Codable {
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case name = "name"
+    }
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/User.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/User.swift
index 2e80b7d20f..8fda8afb40 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/User.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/Swaggers/Models/User.swift
@@ -18,8 +18,20 @@ open class User: Codable {
     public var password: String?
     public var phone: String?
     /** User Status */
-    public var userStatus: Int32?
+    public var userStatus: Int?
 
     public init() {}
 
+
+    private enum CodingKeys: String, CodingKey { 
+        case id = "id"
+        case username = "username"
+        case firstName = "firstName"
+        case lastName = "lastName"
+        case email = "email"
+        case password = "password"
+        case phone = "phone"
+        case userStatus = "userStatus"
+    }
+
 }