diff --git a/samples/client/others/typescript/builds/with-unique-items/models/ObjectSerializer.ts b/samples/client/others/typescript/builds/with-unique-items/models/ObjectSerializer.ts
index f10b52732140..ee369be5c2e0 100644
--- a/samples/client/others/typescript/builds/with-unique-items/models/ObjectSerializer.ts
+++ b/samples/client/others/typescript/builds/with-unique-items/models/ObjectSerializer.ts
@@ -51,7 +51,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {
diff --git a/samples/client/others/typescript/builds/with-unique-items/models/Response.ts b/samples/client/others/typescript/builds/with-unique-items/models/Response.ts
index 6a53fbd9f9d0..d3dcf4059bc1 100644
--- a/samples/client/others/typescript/builds/with-unique-items/models/Response.ts
+++ b/samples/client/others/typescript/builds/with-unique-items/models/Response.ts
@@ -22,13 +22,13 @@ export class Response {
         {
             "name": "nonUniqueArray",
             "baseName": "non-unique-array",
-            "type": "Array<string>",
+            "type": "Array<string>  ",
             "format": ""
         },
         {
             "name": "uniqueArray",
             "baseName": "unique-array",
-            "type": "Set<string>",
+            "type": "Set<string>  ",
             "format": ""
         }    ];
 
@@ -37,6 +37,7 @@ export class Response {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/ApiResponse.ts
index f4b2d010fb71..48b5493794fa 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/ApiResponse.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/ApiResponse.ts
@@ -26,19 +26,19 @@ export class ApiResponse {
         {
             "name": "code",
             "baseName": "code",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "type",
             "baseName": "type",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "message",
             "baseName": "message",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -47,6 +47,7 @@ export class ApiResponse {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/Category.ts
index 5d63fc87a998..de2e51eec81d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Category.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Category.ts
@@ -25,13 +25,13 @@ export class Category {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Category {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/ObjectSerializer.ts
index dfbb605553b0..5ab4695bcd53 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/ObjectSerializer.ts
@@ -68,7 +68,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts
index a2f84555ff1e..bdde3c21f57f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts
@@ -32,37 +32,37 @@ export class Order {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "petId",
             "baseName": "petId",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "quantity",
             "baseName": "quantity",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "shipDate",
             "baseName": "shipDate",
-            "type": "Date",
+            "type": "Date  ",
             "format": "date-time"
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "OrderStatusEnum",
+            "type": "OrderStatusEnum  ",
             "format": ""
         },
         {
             "name": "complete",
             "baseName": "complete",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         }    ];
 
@@ -71,6 +71,7 @@ export class Order {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts
index b3a7ddb9f719..2adbccd60c5c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts
@@ -34,37 +34,37 @@ export class Pet {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "category",
             "baseName": "category",
-            "type": "Category",
+            "type": "Category  ",
             "format": ""
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "photoUrls",
             "baseName": "photoUrls",
-            "type": "Array<string>",
+            "type": "Array<string>  ",
             "format": ""
         },
         {
             "name": "tags",
             "baseName": "tags",
-            "type": "Array<Tag>",
+            "type": "Array<Tag>  ",
             "format": ""
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "PetStatusEnum",
+            "type": "PetStatusEnum  ",
             "format": ""
         }    ];
 
@@ -73,6 +73,7 @@ export class Pet {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/Tag.ts
index 8c4f6967b9a1..22efbf3cbf0e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/Tag.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/Tag.ts
@@ -25,13 +25,13 @@ export class Tag {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Tag {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/browser/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/browser/models/User.ts
index 68528ad3c9e0..58fd46589ad0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/browser/models/User.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/browser/models/User.ts
@@ -34,49 +34,49 @@ export class User {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "username",
             "baseName": "username",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "firstName",
             "baseName": "firstName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "lastName",
             "baseName": "lastName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "email",
             "baseName": "email",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "password",
             "baseName": "password",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "phone",
             "baseName": "phone",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "userStatus",
             "baseName": "userStatus",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         }    ];
 
@@ -85,6 +85,7 @@ export class User {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Cat.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Cat.ts
index 2790b653b556..ab23c38acd7b 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Cat.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Cat.ts
@@ -22,13 +22,13 @@ export class Cat {
         {
             "name": "hunts",
             "baseName": "hunts",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         },
         {
             "name": "age",
             "baseName": "age",
-            "type": "number",
+            "type": "number  ",
             "format": ""
         }    ];
 
@@ -37,6 +37,7 @@ export class Cat {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/CatAllOf.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/CatAllOf.ts
index 049c937cadbc..87fd2a8ff121 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/CatAllOf.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/CatAllOf.ts
@@ -22,13 +22,13 @@ export class CatAllOf {
         {
             "name": "hunts",
             "baseName": "hunts",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         },
         {
             "name": "age",
             "baseName": "age",
-            "type": "number",
+            "type": "number  ",
             "format": ""
         }    ];
 
@@ -37,6 +37,7 @@ export class CatAllOf {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts
index dd2380572f68..ae0b4b5581fb 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts
@@ -22,13 +22,13 @@ export class Dog {
         {
             "name": "bark",
             "baseName": "bark",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         },
         {
             "name": "breed",
             "baseName": "breed",
-            "type": "DogBreedEnum",
+            "type": "DogBreedEnum  ",
             "format": ""
         }    ];
 
@@ -37,6 +37,7 @@ export class Dog {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts
index 5bc68d788891..def2cbf5aaf9 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts
@@ -22,13 +22,13 @@ export class DogAllOf {
         {
             "name": "bark",
             "baseName": "bark",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         },
         {
             "name": "breed",
             "baseName": "breed",
-            "type": "DogAllOfBreedEnum",
+            "type": "DogAllOfBreedEnum  ",
             "format": ""
         }    ];
 
@@ -37,6 +37,7 @@ export class DogAllOf {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/FilePostRequest.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/FilePostRequest.ts
index ddd7a052d56a..6bf1e6bbfc59 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/FilePostRequest.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/FilePostRequest.ts
@@ -21,7 +21,7 @@ export class FilePostRequest {
         {
             "name": "file",
             "baseName": "file",
-            "type": "any",
+            "type": "any  ",
             "format": ""
         }    ];
 
@@ -30,6 +30,7 @@ export class FilePostRequest {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts
index e726b1bbdc33..54af3ae7ea59 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts
@@ -80,7 +80,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByAge.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByAge.ts
index 6c7e3c20f0f4..5f5d4468014f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByAge.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByAge.ts
@@ -22,13 +22,13 @@ export class PetByAge {
         {
             "name": "age",
             "baseName": "age",
-            "type": "number",
+            "type": "number  ",
             "format": ""
         },
         {
             "name": "nickname",
             "baseName": "nickname",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -37,6 +37,7 @@ export class PetByAge {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts
index aef39d9d6018..72d6de4445d5 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts
@@ -22,13 +22,13 @@ export class PetByType {
         {
             "name": "petType",
             "baseName": "pet_type",
-            "type": "PetByTypePetTypeEnum",
+            "type": "PetByTypePetTypeEnum  ",
             "format": ""
         },
         {
             "name": "hunts",
             "baseName": "hunts",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         }    ];
 
@@ -37,6 +37,7 @@ export class PetByType {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts
index 12ae18d6b74e..38017bcb5d4e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts
@@ -26,25 +26,25 @@ export class PetsFilteredPatchRequest {
         {
             "name": "age",
             "baseName": "age",
-            "type": "number",
+            "type": "number  ",
             "format": ""
         },
         {
             "name": "nickname",
             "baseName": "nickname",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "petType",
             "baseName": "pet_type",
-            "type": "PetsFilteredPatchRequestPetTypeEnum",
+            "type": "PetsFilteredPatchRequestPetTypeEnum  ",
             "format": ""
         },
         {
             "name": "hunts",
             "baseName": "hunts",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         }    ];
 
@@ -53,6 +53,7 @@ export class PetsFilteredPatchRequest {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts
index c68b69a32965..16c1f35681f9 100644
--- a/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts
@@ -21,30 +21,32 @@ export class PetsPatchRequest {
     'breed'?: PetsPatchRequestBreedEnum;
 
     static readonly discriminator: string | undefined = "petType";
+    static readonly discriminatorTypeMap = {
+    }
 
     static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
         {
             "name": "hunts",
             "baseName": "hunts",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         },
         {
             "name": "age",
             "baseName": "age",
-            "type": "number",
+            "type": "number  ",
             "format": ""
         },
         {
             "name": "bark",
             "baseName": "bark",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         },
         {
             "name": "breed",
             "baseName": "breed",
-            "type": "PetsPatchRequestBreedEnum",
+            "type": "PetsPatchRequestBreedEnum  ",
             "format": ""
         }    ];
 
@@ -53,6 +55,7 @@ export class PetsPatchRequest {
     }
 
     public constructor() {
+
         this.petType = "PetsPatchRequest";
     }
 }
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/ApiResponse.ts
index f4b2d010fb71..48b5493794fa 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/ApiResponse.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/ApiResponse.ts
@@ -26,19 +26,19 @@ export class ApiResponse {
         {
             "name": "code",
             "baseName": "code",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "type",
             "baseName": "type",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "message",
             "baseName": "message",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -47,6 +47,7 @@ export class ApiResponse {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Category.ts
index 5d63fc87a998..de2e51eec81d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/Category.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Category.ts
@@ -25,13 +25,13 @@ export class Category {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Category {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
index dfbb605553b0..5ab4695bcd53 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts
@@ -68,7 +68,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
index a2f84555ff1e..bdde3c21f57f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts
@@ -32,37 +32,37 @@ export class Order {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "petId",
             "baseName": "petId",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "quantity",
             "baseName": "quantity",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "shipDate",
             "baseName": "shipDate",
-            "type": "Date",
+            "type": "Date  ",
             "format": "date-time"
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "OrderStatusEnum",
+            "type": "OrderStatusEnum  ",
             "format": ""
         },
         {
             "name": "complete",
             "baseName": "complete",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         }    ];
 
@@ -71,6 +71,7 @@ export class Order {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
index b3a7ddb9f719..2adbccd60c5c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts
@@ -34,37 +34,37 @@ export class Pet {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "category",
             "baseName": "category",
-            "type": "Category",
+            "type": "Category  ",
             "format": ""
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "photoUrls",
             "baseName": "photoUrls",
-            "type": "Array<string>",
+            "type": "Array<string>  ",
             "format": ""
         },
         {
             "name": "tags",
             "baseName": "tags",
-            "type": "Array<Tag>",
+            "type": "Array<Tag>  ",
             "format": ""
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "PetStatusEnum",
+            "type": "PetStatusEnum  ",
             "format": ""
         }    ];
 
@@ -73,6 +73,7 @@ export class Pet {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/Tag.ts
index 8c4f6967b9a1..22efbf3cbf0e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/Tag.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/Tag.ts
@@ -25,13 +25,13 @@ export class Tag {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Tag {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/default/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/default/models/User.ts
index 68528ad3c9e0..58fd46589ad0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/default/models/User.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/default/models/User.ts
@@ -34,49 +34,49 @@ export class User {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "username",
             "baseName": "username",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "firstName",
             "baseName": "firstName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "lastName",
             "baseName": "lastName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "email",
             "baseName": "email",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "password",
             "baseName": "password",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "phone",
             "baseName": "phone",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "userStatus",
             "baseName": "userStatus",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         }    ];
 
@@ -85,6 +85,7 @@ export class User {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/ApiResponse.ts
index b5cfa4948a07..c0f46652e693 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/ApiResponse.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/ApiResponse.ts
@@ -26,19 +26,19 @@ export class ApiResponse {
         {
             "name": "code",
             "baseName": "code",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "type",
             "baseName": "type",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "message",
             "baseName": "message",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -47,6 +47,7 @@ export class ApiResponse {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Category.ts
index 9c1bdd236145..99022f531151 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Category.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Category.ts
@@ -25,13 +25,13 @@ export class Category {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Category {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
index 0da0325edc80..8aebaab0575f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts
@@ -68,7 +68,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
index 644657299f36..52a9f499152f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts
@@ -32,37 +32,37 @@ export class Order {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "petId",
             "baseName": "petId",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "quantity",
             "baseName": "quantity",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "shipDate",
             "baseName": "shipDate",
-            "type": "Date",
+            "type": "Date  ",
             "format": "date-time"
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "OrderStatusEnum",
+            "type": "OrderStatusEnum  ",
             "format": ""
         },
         {
             "name": "complete",
             "baseName": "complete",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         }    ];
 
@@ -71,6 +71,7 @@ export class Order {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
index 229681feacde..32b5d5a864e5 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Pet.ts
@@ -34,37 +34,37 @@ export class Pet {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "category",
             "baseName": "category",
-            "type": "Category",
+            "type": "Category  ",
             "format": ""
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "photoUrls",
             "baseName": "photoUrls",
-            "type": "Array<string>",
+            "type": "Array<string>  ",
             "format": ""
         },
         {
             "name": "tags",
             "baseName": "tags",
-            "type": "Array<Tag>",
+            "type": "Array<Tag>  ",
             "format": ""
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "PetStatusEnum",
+            "type": "PetStatusEnum  ",
             "format": ""
         }    ];
 
@@ -73,6 +73,7 @@ export class Pet {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/Tag.ts
index dc2c98212c34..d0b3b750bbf9 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/Tag.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/Tag.ts
@@ -25,13 +25,13 @@ export class Tag {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Tag {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/deno/models/User.ts
index 76c6a9ae8692..3f6017bfd3d7 100644
--- a/samples/openapi3/client/petstore/typescript/builds/deno/models/User.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/deno/models/User.ts
@@ -34,49 +34,49 @@ export class User {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "username",
             "baseName": "username",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "firstName",
             "baseName": "firstName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "lastName",
             "baseName": "lastName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "email",
             "baseName": "email",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "password",
             "baseName": "password",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "phone",
             "baseName": "phone",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "userStatus",
             "baseName": "userStatus",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         }    ];
 
@@ -85,6 +85,7 @@ export class User {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ApiResponse.ts
index f4b2d010fb71..48b5493794fa 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ApiResponse.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ApiResponse.ts
@@ -26,19 +26,19 @@ export class ApiResponse {
         {
             "name": "code",
             "baseName": "code",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "type",
             "baseName": "type",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "message",
             "baseName": "message",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -47,6 +47,7 @@ export class ApiResponse {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Category.ts
index 5d63fc87a998..de2e51eec81d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Category.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Category.ts
@@ -25,13 +25,13 @@ export class Category {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Category {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
index dfbb605553b0..5ab4695bcd53 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts
@@ -68,7 +68,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
index a2f84555ff1e..bdde3c21f57f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Order.ts
@@ -32,37 +32,37 @@ export class Order {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "petId",
             "baseName": "petId",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "quantity",
             "baseName": "quantity",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "shipDate",
             "baseName": "shipDate",
-            "type": "Date",
+            "type": "Date  ",
             "format": "date-time"
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "OrderStatusEnum",
+            "type": "OrderStatusEnum  ",
             "format": ""
         },
         {
             "name": "complete",
             "baseName": "complete",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         }    ];
 
@@ -71,6 +71,7 @@ export class Order {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
index b3a7ddb9f719..2adbccd60c5c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Pet.ts
@@ -34,37 +34,37 @@ export class Pet {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "category",
             "baseName": "category",
-            "type": "Category",
+            "type": "Category  ",
             "format": ""
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "photoUrls",
             "baseName": "photoUrls",
-            "type": "Array<string>",
+            "type": "Array<string>  ",
             "format": ""
         },
         {
             "name": "tags",
             "baseName": "tags",
-            "type": "Array<Tag>",
+            "type": "Array<Tag>  ",
             "format": ""
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "PetStatusEnum",
+            "type": "PetStatusEnum  ",
             "format": ""
         }    ];
 
@@ -73,6 +73,7 @@ export class Pet {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Tag.ts
index 8c4f6967b9a1..22efbf3cbf0e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/Tag.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/Tag.ts
@@ -25,13 +25,13 @@ export class Tag {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Tag {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/models/User.ts
index 68528ad3c9e0..58fd46589ad0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/inversify/models/User.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/inversify/models/User.ts
@@ -34,49 +34,49 @@ export class User {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "username",
             "baseName": "username",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "firstName",
             "baseName": "firstName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "lastName",
             "baseName": "lastName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "email",
             "baseName": "email",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "password",
             "baseName": "password",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "phone",
             "baseName": "phone",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "userStatus",
             "baseName": "userStatus",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         }    ];
 
@@ -85,6 +85,7 @@ export class User {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ApiResponse.ts
index f4b2d010fb71..48b5493794fa 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ApiResponse.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ApiResponse.ts
@@ -26,19 +26,19 @@ export class ApiResponse {
         {
             "name": "code",
             "baseName": "code",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "type",
             "baseName": "type",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "message",
             "baseName": "message",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -47,6 +47,7 @@ export class ApiResponse {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Category.ts
index 5d63fc87a998..de2e51eec81d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Category.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Category.ts
@@ -25,13 +25,13 @@ export class Category {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Category {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
index dfbb605553b0..5ab4695bcd53 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts
@@ -68,7 +68,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
index a2f84555ff1e..bdde3c21f57f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Order.ts
@@ -32,37 +32,37 @@ export class Order {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "petId",
             "baseName": "petId",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "quantity",
             "baseName": "quantity",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "shipDate",
             "baseName": "shipDate",
-            "type": "Date",
+            "type": "Date  ",
             "format": "date-time"
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "OrderStatusEnum",
+            "type": "OrderStatusEnum  ",
             "format": ""
         },
         {
             "name": "complete",
             "baseName": "complete",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         }    ];
 
@@ -71,6 +71,7 @@ export class Order {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
index b3a7ddb9f719..2adbccd60c5c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Pet.ts
@@ -34,37 +34,37 @@ export class Pet {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "category",
             "baseName": "category",
-            "type": "Category",
+            "type": "Category  ",
             "format": ""
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "photoUrls",
             "baseName": "photoUrls",
-            "type": "Array<string>",
+            "type": "Array<string>  ",
             "format": ""
         },
         {
             "name": "tags",
             "baseName": "tags",
-            "type": "Array<Tag>",
+            "type": "Array<Tag>  ",
             "format": ""
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "PetStatusEnum",
+            "type": "PetStatusEnum  ",
             "format": ""
         }    ];
 
@@ -73,6 +73,7 @@ export class Pet {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Tag.ts
index 8c4f6967b9a1..22efbf3cbf0e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/Tag.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/Tag.ts
@@ -25,13 +25,13 @@ export class Tag {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Tag {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/models/User.ts
index 68528ad3c9e0..58fd46589ad0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/jquery/models/User.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/jquery/models/User.ts
@@ -34,49 +34,49 @@ export class User {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "username",
             "baseName": "username",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "firstName",
             "baseName": "firstName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "lastName",
             "baseName": "lastName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "email",
             "baseName": "email",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "password",
             "baseName": "password",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "phone",
             "baseName": "phone",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "userStatus",
             "baseName": "userStatus",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         }    ];
 
@@ -85,6 +85,7 @@ export class User {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ApiResponse.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ApiResponse.ts
index f4b2d010fb71..48b5493794fa 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ApiResponse.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ApiResponse.ts
@@ -26,19 +26,19 @@ export class ApiResponse {
         {
             "name": "code",
             "baseName": "code",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "type",
             "baseName": "type",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "message",
             "baseName": "message",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -47,6 +47,7 @@ export class ApiResponse {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Category.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Category.ts
index 5d63fc87a998..de2e51eec81d 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Category.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Category.ts
@@ -25,13 +25,13 @@ export class Category {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Category {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
index dfbb605553b0..5ab4695bcd53 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts
@@ -68,7 +68,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
index a2f84555ff1e..bdde3c21f57f 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Order.ts
@@ -32,37 +32,37 @@ export class Order {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "petId",
             "baseName": "petId",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "quantity",
             "baseName": "quantity",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         },
         {
             "name": "shipDate",
             "baseName": "shipDate",
-            "type": "Date",
+            "type": "Date  ",
             "format": "date-time"
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "OrderStatusEnum",
+            "type": "OrderStatusEnum  ",
             "format": ""
         },
         {
             "name": "complete",
             "baseName": "complete",
-            "type": "boolean",
+            "type": "boolean  ",
             "format": ""
         }    ];
 
@@ -71,6 +71,7 @@ export class Order {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
index b3a7ddb9f719..2adbccd60c5c 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Pet.ts
@@ -34,37 +34,37 @@ export class Pet {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "category",
             "baseName": "category",
-            "type": "Category",
+            "type": "Category  ",
             "format": ""
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "photoUrls",
             "baseName": "photoUrls",
-            "type": "Array<string>",
+            "type": "Array<string>  ",
             "format": ""
         },
         {
             "name": "tags",
             "baseName": "tags",
-            "type": "Array<Tag>",
+            "type": "Array<Tag>  ",
             "format": ""
         },
         {
             "name": "status",
             "baseName": "status",
-            "type": "PetStatusEnum",
+            "type": "PetStatusEnum  ",
             "format": ""
         }    ];
 
@@ -73,6 +73,7 @@ export class Pet {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Tag.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Tag.ts
index 8c4f6967b9a1..22efbf3cbf0e 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/Tag.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/Tag.ts
@@ -25,13 +25,13 @@ export class Tag {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "name",
             "baseName": "name",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         }    ];
 
@@ -40,6 +40,7 @@ export class Tag {
     }
 
     public constructor() {
+
     }
 }
 
diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/models/User.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/models/User.ts
index 68528ad3c9e0..58fd46589ad0 100644
--- a/samples/openapi3/client/petstore/typescript/builds/object_params/models/User.ts
+++ b/samples/openapi3/client/petstore/typescript/builds/object_params/models/User.ts
@@ -34,49 +34,49 @@ export class User {
         {
             "name": "id",
             "baseName": "id",
-            "type": "number",
+            "type": "number  ",
             "format": "int64"
         },
         {
             "name": "username",
             "baseName": "username",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "firstName",
             "baseName": "firstName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "lastName",
             "baseName": "lastName",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "email",
             "baseName": "email",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "password",
             "baseName": "password",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "phone",
             "baseName": "phone",
-            "type": "string",
+            "type": "string  ",
             "format": ""
         },
         {
             "name": "userStatus",
             "baseName": "userStatus",
-            "type": "number",
+            "type": "number  ",
             "format": "int32"
         }    ];
 
@@ -85,6 +85,7 @@ export class User {
     }
 
     public constructor() {
+
     }
 }