diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
index d786fa6b1465..9130a8e5332b 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
@@ -47,7 +47,7 @@ export class BaseAPI {
             // do not handle correctly sometimes.
             url += '?' + querystring(context.query);
         }
-        const body = (context.body instanceof FormData || context.body instanceof Body)
+        const body = (context.body instanceof FormData || context.body instanceof Blob)
 	    ? context.body
 	    : JSON.stringify(context.body);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts
index 1fcb27ef1c5e..4185547227aa 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts
@@ -23,7 +23,7 @@ import {
 } from '../models';
 
 export interface AddPetRequest {
-    body: Pet;
+    pet: Pet;
 }
 
 export interface DeletePetRequest {
@@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest {
 
 export interface FindPetsByTagsRequest {
     tags: Array<string>;
+    maxCount?: number;
 }
 
 export interface GetPetByIdRequest {
@@ -44,7 +45,7 @@ export interface GetPetByIdRequest {
 }
 
 export interface UpdatePetRequest {
-    body: Pet;
+    pet: Pet;
 }
 
 export interface UpdatePetWithFormRequest {
@@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI {
      * Add a new pet to the store
      */
     async addPetRaw(requestParameters: AddPetRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
+        if (requestParameters.pet === null || requestParameters.pet === undefined) {
+            throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: PetToJSON(requestParameters.body),
+            body: PetToJSON(requestParameters.pet),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI {
         if (this.configuration && this.configuration.accessToken) {
             // oauth required
             if (typeof this.configuration.accessToken === 'function') {
-                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
             } else {
                 headerParameters["Authorization"] = this.configuration.accessToken;
             }
@@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
         }
 
+        if (requestParameters.maxCount !== undefined) {
+            queryParameters['maxCount'] = requestParameters.maxCount;
+        }
+
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.accessToken) {
             // oauth required
             if (typeof this.configuration.accessToken === 'function') {
-                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
             } else {
                 headerParameters["Authorization"] = this.configuration.accessToken;
             }
@@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI {
      * Update an existing pet
      */
     async updatePetRaw(requestParameters: UpdatePetRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
+        if (requestParameters.pet === null || requestParameters.pet === undefined) {
+            throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI {
             method: 'PUT',
             headers: headerParameters,
             query: queryParameters,
-            body: PetToJSON(requestParameters.body),
+            body: PetToJSON(requestParameters.pet),
         });
 
         return new runtime.VoidApiResponse(response);
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
index 4b645dea987e..6ea93eb0757b 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
@@ -28,7 +28,7 @@ export interface GetOrderByIdRequest {
 }
 
 export interface PlaceOrderRequest {
-    body: Order;
+    order: Order;
 }
 
 /**
@@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI {
      * Place an order for a pet
      */
     async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise<runtime.ApiResponse<Order>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
+        if (requestParameters.order === null || requestParameters.order === undefined) {
+            throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: OrderToJSON(requestParameters.body),
+            body: OrderToJSON(requestParameters.order),
         });
 
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts
index 4126b817ee94..e4daeb849130 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts
@@ -20,15 +20,15 @@ import {
 } from '../models';
 
 export interface CreateUserRequest {
-    body: User;
+    user: User;
 }
 
 export interface CreateUsersWithArrayInputRequest {
-    body: Array<User>;
+    user: Array<User>;
 }
 
 export interface CreateUsersWithListInputRequest {
-    body: Array<User>;
+    user: Array<User>;
 }
 
 export interface DeleteUserRequest {
@@ -46,7 +46,7 @@ export interface LoginUserRequest {
 
 export interface UpdateUserRequest {
     username: string;
-    body: User;
+    user: User;
 }
 
 /**
@@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI {
      * Create user
      */
     async createUserRaw(requestParameters: CreateUserRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: UserToJSON(requestParameters.body),
+            body: UserToJSON(requestParameters.user),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI {
      * Creates list of users with given input array
      */
     async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: requestParameters.body.map(UserToJSON),
+            body: requestParameters.user.map(UserToJSON),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI {
      * Creates list of users with given input array
      */
     async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: requestParameters.body.map(UserToJSON),
+            body: requestParameters.user.map(UserToJSON),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
         }
 
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'PUT',
             headers: headerParameters,
             query: queryParameters,
-            body: UserToJSON(requestParameters.body),
+            body: UserToJSON(requestParameters.user),
         });
 
         return new runtime.VoidApiResponse(response);
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts
index b07ddc8446a0..5eefa748f29f 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts
@@ -1,4 +1,6 @@
 export * from './Category';
+export * from './InlineObject';
+export * from './InlineObject1';
 export * from './ModelApiResponse';
 export * from './Order';
 export * from './Pet';
diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
index 30278cad8aa4..5d5f1ed75ead 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
@@ -58,7 +58,7 @@ export class BaseAPI {
             // do not handle correctly sometimes.
             url += '?' + querystring(context.query);
         }
-        const body = (context.body instanceof FormData || context.body instanceof Body)
+        const body = (context.body instanceof FormData || context.body instanceof Blob)
 	    ? context.body
 	    : JSON.stringify(context.body);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts
index 1fcb27ef1c5e..4185547227aa 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts
@@ -23,7 +23,7 @@ import {
 } from '../models';
 
 export interface AddPetRequest {
-    body: Pet;
+    pet: Pet;
 }
 
 export interface DeletePetRequest {
@@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest {
 
 export interface FindPetsByTagsRequest {
     tags: Array<string>;
+    maxCount?: number;
 }
 
 export interface GetPetByIdRequest {
@@ -44,7 +45,7 @@ export interface GetPetByIdRequest {
 }
 
 export interface UpdatePetRequest {
-    body: Pet;
+    pet: Pet;
 }
 
 export interface UpdatePetWithFormRequest {
@@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI {
      * Add a new pet to the store
      */
     async addPetRaw(requestParameters: AddPetRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
+        if (requestParameters.pet === null || requestParameters.pet === undefined) {
+            throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: PetToJSON(requestParameters.body),
+            body: PetToJSON(requestParameters.pet),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI {
         if (this.configuration && this.configuration.accessToken) {
             // oauth required
             if (typeof this.configuration.accessToken === 'function') {
-                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
             } else {
                 headerParameters["Authorization"] = this.configuration.accessToken;
             }
@@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
         }
 
+        if (requestParameters.maxCount !== undefined) {
+            queryParameters['maxCount'] = requestParameters.maxCount;
+        }
+
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.accessToken) {
             // oauth required
             if (typeof this.configuration.accessToken === 'function') {
-                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
             } else {
                 headerParameters["Authorization"] = this.configuration.accessToken;
             }
@@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI {
      * Update an existing pet
      */
     async updatePetRaw(requestParameters: UpdatePetRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
+        if (requestParameters.pet === null || requestParameters.pet === undefined) {
+            throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI {
             method: 'PUT',
             headers: headerParameters,
             query: queryParameters,
-            body: PetToJSON(requestParameters.body),
+            body: PetToJSON(requestParameters.pet),
         });
 
         return new runtime.VoidApiResponse(response);
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts
index 4b645dea987e..6ea93eb0757b 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts
@@ -28,7 +28,7 @@ export interface GetOrderByIdRequest {
 }
 
 export interface PlaceOrderRequest {
-    body: Order;
+    order: Order;
 }
 
 /**
@@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI {
      * Place an order for a pet
      */
     async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise<runtime.ApiResponse<Order>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
+        if (requestParameters.order === null || requestParameters.order === undefined) {
+            throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: OrderToJSON(requestParameters.body),
+            body: OrderToJSON(requestParameters.order),
         });
 
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts
index 4126b817ee94..e4daeb849130 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts
@@ -20,15 +20,15 @@ import {
 } from '../models';
 
 export interface CreateUserRequest {
-    body: User;
+    user: User;
 }
 
 export interface CreateUsersWithArrayInputRequest {
-    body: Array<User>;
+    user: Array<User>;
 }
 
 export interface CreateUsersWithListInputRequest {
-    body: Array<User>;
+    user: Array<User>;
 }
 
 export interface DeleteUserRequest {
@@ -46,7 +46,7 @@ export interface LoginUserRequest {
 
 export interface UpdateUserRequest {
     username: string;
-    body: User;
+    user: User;
 }
 
 /**
@@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI {
      * Create user
      */
     async createUserRaw(requestParameters: CreateUserRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: UserToJSON(requestParameters.body),
+            body: UserToJSON(requestParameters.user),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI {
      * Creates list of users with given input array
      */
     async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: requestParameters.body.map(UserToJSON),
+            body: requestParameters.user.map(UserToJSON),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI {
      * Creates list of users with given input array
      */
     async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: requestParameters.body.map(UserToJSON),
+            body: requestParameters.user.map(UserToJSON),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
         }
 
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'PUT',
             headers: headerParameters,
             query: queryParameters,
-            body: UserToJSON(requestParameters.body),
+            body: UserToJSON(requestParameters.user),
         });
 
         return new runtime.VoidApiResponse(response);
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts
index b07ddc8446a0..5eefa748f29f 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts
@@ -1,4 +1,6 @@
 export * from './Category';
+export * from './InlineObject';
+export * from './InlineObject1';
 export * from './ModelApiResponse';
 export * from './Order';
 export * from './Pet';
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts
index 30278cad8aa4..5d5f1ed75ead 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts
@@ -58,7 +58,7 @@ export class BaseAPI {
             // do not handle correctly sometimes.
             url += '?' + querystring(context.query);
         }
-        const body = (context.body instanceof FormData || context.body instanceof Body)
+        const body = (context.body instanceof FormData || context.body instanceof Blob)
 	    ? context.body
 	    : JSON.stringify(context.body);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts
index 1fcb27ef1c5e..4185547227aa 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts
@@ -23,7 +23,7 @@ import {
 } from '../models';
 
 export interface AddPetRequest {
-    body: Pet;
+    pet: Pet;
 }
 
 export interface DeletePetRequest {
@@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest {
 
 export interface FindPetsByTagsRequest {
     tags: Array<string>;
+    maxCount?: number;
 }
 
 export interface GetPetByIdRequest {
@@ -44,7 +45,7 @@ export interface GetPetByIdRequest {
 }
 
 export interface UpdatePetRequest {
-    body: Pet;
+    pet: Pet;
 }
 
 export interface UpdatePetWithFormRequest {
@@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI {
      * Add a new pet to the store
      */
     async addPetRaw(requestParameters: AddPetRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
+        if (requestParameters.pet === null || requestParameters.pet === undefined) {
+            throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: PetToJSON(requestParameters.body),
+            body: PetToJSON(requestParameters.pet),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI {
         if (this.configuration && this.configuration.accessToken) {
             // oauth required
             if (typeof this.configuration.accessToken === 'function') {
-                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
             } else {
                 headerParameters["Authorization"] = this.configuration.accessToken;
             }
@@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
         }
 
+        if (requestParameters.maxCount !== undefined) {
+            queryParameters['maxCount'] = requestParameters.maxCount;
+        }
+
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.accessToken) {
             // oauth required
             if (typeof this.configuration.accessToken === 'function') {
-                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
             } else {
                 headerParameters["Authorization"] = this.configuration.accessToken;
             }
@@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI {
      * Update an existing pet
      */
     async updatePetRaw(requestParameters: UpdatePetRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
+        if (requestParameters.pet === null || requestParameters.pet === undefined) {
+            throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI {
             method: 'PUT',
             headers: headerParameters,
             query: queryParameters,
-            body: PetToJSON(requestParameters.body),
+            body: PetToJSON(requestParameters.pet),
         });
 
         return new runtime.VoidApiResponse(response);
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
index 4b645dea987e..6ea93eb0757b 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
@@ -28,7 +28,7 @@ export interface GetOrderByIdRequest {
 }
 
 export interface PlaceOrderRequest {
-    body: Order;
+    order: Order;
 }
 
 /**
@@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI {
      * Place an order for a pet
      */
     async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise<runtime.ApiResponse<Order>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
+        if (requestParameters.order === null || requestParameters.order === undefined) {
+            throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: OrderToJSON(requestParameters.body),
+            body: OrderToJSON(requestParameters.order),
         });
 
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts
index 4126b817ee94..e4daeb849130 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts
@@ -20,15 +20,15 @@ import {
 } from '../models';
 
 export interface CreateUserRequest {
-    body: User;
+    user: User;
 }
 
 export interface CreateUsersWithArrayInputRequest {
-    body: Array<User>;
+    user: Array<User>;
 }
 
 export interface CreateUsersWithListInputRequest {
-    body: Array<User>;
+    user: Array<User>;
 }
 
 export interface DeleteUserRequest {
@@ -46,7 +46,7 @@ export interface LoginUserRequest {
 
 export interface UpdateUserRequest {
     username: string;
-    body: User;
+    user: User;
 }
 
 /**
@@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI {
      * Create user
      */
     async createUserRaw(requestParameters: CreateUserRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: UserToJSON(requestParameters.body),
+            body: UserToJSON(requestParameters.user),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI {
      * Creates list of users with given input array
      */
     async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: requestParameters.body.map(UserToJSON),
+            body: requestParameters.user.map(UserToJSON),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI {
      * Creates list of users with given input array
      */
     async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: requestParameters.body.map(UserToJSON),
+            body: requestParameters.user.map(UserToJSON),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
         }
 
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'PUT',
             headers: headerParameters,
             query: queryParameters,
-            body: UserToJSON(requestParameters.body),
+            body: UserToJSON(requestParameters.user),
         });
 
         return new runtime.VoidApiResponse(response);
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts
index b07ddc8446a0..5eefa748f29f 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts
@@ -1,4 +1,6 @@
 export * from './Category';
+export * from './InlineObject';
+export * from './InlineObject1';
 export * from './ModelApiResponse';
 export * from './Order';
 export * from './Pet';
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
index 30278cad8aa4..5d5f1ed75ead 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
@@ -58,7 +58,7 @@ export class BaseAPI {
             // do not handle correctly sometimes.
             url += '?' + querystring(context.query);
         }
-        const body = (context.body instanceof FormData || context.body instanceof Body)
+        const body = (context.body instanceof FormData || context.body instanceof Blob)
 	    ? context.body
 	    : JSON.stringify(context.body);
         const init = {
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts
index 1fcb27ef1c5e..4185547227aa 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts
@@ -23,7 +23,7 @@ import {
 } from '../models';
 
 export interface AddPetRequest {
-    body: Pet;
+    pet: Pet;
 }
 
 export interface DeletePetRequest {
@@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest {
 
 export interface FindPetsByTagsRequest {
     tags: Array<string>;
+    maxCount?: number;
 }
 
 export interface GetPetByIdRequest {
@@ -44,7 +45,7 @@ export interface GetPetByIdRequest {
 }
 
 export interface UpdatePetRequest {
-    body: Pet;
+    pet: Pet;
 }
 
 export interface UpdatePetWithFormRequest {
@@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI {
      * Add a new pet to the store
      */
     async addPetRaw(requestParameters: AddPetRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
+        if (requestParameters.pet === null || requestParameters.pet === undefined) {
+            throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: PetToJSON(requestParameters.body),
+            body: PetToJSON(requestParameters.pet),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI {
         if (this.configuration && this.configuration.accessToken) {
             // oauth required
             if (typeof this.configuration.accessToken === 'function') {
-                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
             } else {
                 headerParameters["Authorization"] = this.configuration.accessToken;
             }
@@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI {
             queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
         }
 
+        if (requestParameters.maxCount !== undefined) {
+            queryParameters['maxCount'] = requestParameters.maxCount;
+        }
+
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.accessToken) {
             // oauth required
             if (typeof this.configuration.accessToken === 'function') {
-                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]);
             } else {
                 headerParameters["Authorization"] = this.configuration.accessToken;
             }
@@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI {
      * Update an existing pet
      */
     async updatePetRaw(requestParameters: UpdatePetRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
+        if (requestParameters.pet === null || requestParameters.pet === undefined) {
+            throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI {
             method: 'PUT',
             headers: headerParameters,
             query: queryParameters,
-            body: PetToJSON(requestParameters.body),
+            body: PetToJSON(requestParameters.pet),
         });
 
         return new runtime.VoidApiResponse(response);
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts
index 4b645dea987e..6ea93eb0757b 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts
@@ -28,7 +28,7 @@ export interface GetOrderByIdRequest {
 }
 
 export interface PlaceOrderRequest {
-    body: Order;
+    order: Order;
 }
 
 /**
@@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI {
      * Place an order for a pet
      */
     async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise<runtime.ApiResponse<Order>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
+        if (requestParameters.order === null || requestParameters.order === undefined) {
+            throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: OrderToJSON(requestParameters.body),
+            body: OrderToJSON(requestParameters.order),
         });
 
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts
index 4126b817ee94..e4daeb849130 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts
@@ -20,15 +20,15 @@ import {
 } from '../models';
 
 export interface CreateUserRequest {
-    body: User;
+    user: User;
 }
 
 export interface CreateUsersWithArrayInputRequest {
-    body: Array<User>;
+    user: Array<User>;
 }
 
 export interface CreateUsersWithListInputRequest {
-    body: Array<User>;
+    user: Array<User>;
 }
 
 export interface DeleteUserRequest {
@@ -46,7 +46,7 @@ export interface LoginUserRequest {
 
 export interface UpdateUserRequest {
     username: string;
-    body: User;
+    user: User;
 }
 
 /**
@@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI {
      * Create user
      */
     async createUserRaw(requestParameters: CreateUserRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: UserToJSON(requestParameters.body),
+            body: UserToJSON(requestParameters.user),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI {
      * Creates list of users with given input array
      */
     async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: requestParameters.body.map(UserToJSON),
+            body: requestParameters.user.map(UserToJSON),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI {
      * Creates list of users with given input array
      */
     async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise<runtime.ApiResponse<void>> {
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: requestParameters.body.map(UserToJSON),
+            body: requestParameters.user.map(UserToJSON),
         });
 
         return new runtime.VoidApiResponse(response);
@@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
         }
 
-        if (requestParameters.body === null || requestParameters.body === undefined) {
-            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
+        if (requestParameters.user === null || requestParameters.user === undefined) {
+            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.');
         }
 
         const queryParameters: runtime.HTTPQuery = {};
@@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI {
             method: 'PUT',
             headers: headerParameters,
             query: queryParameters,
-            body: UserToJSON(requestParameters.body),
+            body: UserToJSON(requestParameters.user),
         });
 
         return new runtime.VoidApiResponse(response);
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts
index b07ddc8446a0..5eefa748f29f 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts
@@ -1,4 +1,6 @@
 export * from './Category';
+export * from './InlineObject';
+export * from './InlineObject1';
 export * from './ModelApiResponse';
 export * from './Order';
 export * from './Pet';
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts
index 30278cad8aa4..5d5f1ed75ead 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts
@@ -58,7 +58,7 @@ export class BaseAPI {
             // do not handle correctly sometimes.
             url += '?' + querystring(context.query);
         }
-        const body = (context.body instanceof FormData || context.body instanceof Body)
+        const body = (context.body instanceof FormData || context.body instanceof Blob)
 	    ? context.body
 	    : JSON.stringify(context.body);
         const init = {