diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
index eab02d5c4d1..95373b21da2 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
@@ -188,7 +188,7 @@ export class {{classname}} {
 
 {{#formParams}}
         if ({{paramName}} !== undefined) {
-            formParams['{baseName}}'] = {{paramName}};
+            formParams['{{baseName}}'] = {{paramName}};
         }
 {{#isFile}}
         useFormData = true;
diff --git a/samples/client/petstore/typescript-node/api.ts b/samples/client/petstore/typescript-node/api.ts
index 52a3d7f9706..0cdad04ba38 100644
--- a/samples/client/petstore/typescript-node/api.ts
+++ b/samples/client/petstore/typescript-node/api.ts
@@ -149,6 +149,7 @@ export class UserApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -194,6 +195,7 @@ export class UserApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -239,6 +241,7 @@ export class UserApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -284,6 +287,7 @@ export class UserApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         if (username !== undefined) {
             queryParameters['username'] = username;
         }
@@ -336,6 +340,7 @@ export class UserApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -382,11 +387,13 @@ export class UserApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         // verify required parameter 'username' is set
         if (!username) {
             throw new Error('Missing required parameter username when calling getUserByName');
         }
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse; body: User;  }>();
@@ -433,11 +440,13 @@ export class UserApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         // verify required parameter 'username' is set
         if (!username) {
             throw new Error('Missing required parameter username when calling updateUser');
         }
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -485,11 +494,13 @@ export class UserApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         // verify required parameter 'username' is set
         if (!username) {
             throw new Error('Missing required parameter username when calling deleteUser');
         }
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -559,6 +570,7 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -606,6 +618,7 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -653,6 +666,7 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         if (status !== undefined) {
             queryParameters['status'] = status;
         }
@@ -703,6 +717,7 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         if (tags !== undefined) {
             queryParameters['tags'] = tags;
         }
@@ -755,11 +770,13 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         // verify required parameter 'petId' is set
         if (!petId) {
             throw new Error('Missing required parameter petId when calling getPetById');
         }
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse; body: Pet;  }>();
@@ -810,19 +827,21 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         // verify required parameter 'petId' is set
         if (!petId) {
             throw new Error('Missing required parameter petId when calling updatePetWithForm');
         }
 
+
         var useFormData = false;
 
         if (name !== undefined) {
-            formParams['name'] = name;
+            formParams['{baseName}}'] = name;
         }
 
         if (status !== undefined) {
-            formParams['status'] = status;
+            formParams['{baseName}}'] = status;
         }
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -871,12 +890,14 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         // verify required parameter 'petId' is set
         if (!petId) {
             throw new Error('Missing required parameter petId when calling deletePet');
         }
 
-        headerParams['apiKey'] = apiKey;
+
+        headerParams['api_key'] = apiKey;
 
         var useFormData = false;
 
@@ -926,19 +947,21 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         // verify required parameter 'petId' is set
         if (!petId) {
             throw new Error('Missing required parameter petId when calling uploadFile');
         }
 
+
         var useFormData = false;
 
         if (additionalMetadata !== undefined) {
-            formParams['additionalMetadata'] = additionalMetadata;
+            formParams['{baseName}}'] = additionalMetadata;
         }
 
         if (file !== undefined) {
-            formParams['file'] = file;
+            formParams['{baseName}}'] = file;
         }
         useFormData = true;
 
@@ -1011,6 +1034,7 @@ export class StoreApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse; body: { [key: string]: number; };  }>();
@@ -1057,6 +1081,7 @@ export class StoreApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
@@ -1104,11 +1129,13 @@ export class StoreApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         // verify required parameter 'orderId' is set
         if (!orderId) {
             throw new Error('Missing required parameter orderId when calling getOrderById');
         }
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
@@ -1155,11 +1182,13 @@ export class StoreApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         // verify required parameter 'orderId' is set
         if (!orderId) {
             throw new Error('Missing required parameter orderId when calling deleteOrder');
         }
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();