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 5f6428ce7e2..6528a5d3a22 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-node/api.mustache
@@ -160,37 +160,34 @@ export class {{classname}} {
         var path = this.url + this.basePath + '{{path}}';
 
 {{#pathParams}}
-        path = path.replace('{' + '{{paramName}}' + '}', String({{paramName}}));
+        path = path.replace('{' + '{{baseName}}' + '}', String({{paramName}}));
 
 {{/pathParams}}
         var queryParameters: any = {};
         var headerParams: any = {};
         var formParams: any = {};
 
-{{#allParams}}
-{{#required}}
+{{#allParams}}{{#required}}
         // verify required parameter '{{paramName}}' is set
         if (!{{paramName}}) {
             throw new Error('Missing required parameter {{paramName}} when calling {{nickname}}');
         }
-
-{{/required}}
-{{/allParams}}
+{{/required}}{{/allParams}}
 {{#queryParams}}
         if ({{paramName}} !== undefined) {
-            queryParameters['{{paramName}}'] = {{paramName}};
+            queryParameters['{{baseName}}'] = {{paramName}};
         }
 
 {{/queryParams}}
 {{#headerParams}}
-        headerParams['{{paramName}}'] = {{paramName}};
+        headerParams['{{baseName}}'] = {{paramName}};
 
 {{/headerParams}}
         var useFormData = false;
 
 {{#formParams}}
         if ({{paramName}} !== undefined) {
-            formParams['{{paramName}}'] = {{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..148782a4000 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,6 +387,7 @@ 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');
@@ -433,6 +439,7 @@ 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');
@@ -485,6 +492,7 @@ 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');
@@ -559,6 +567,7 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -606,6 +615,7 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse;  }>();
@@ -653,6 +663,7 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         if (status !== undefined) {
             queryParameters['status'] = status;
         }
@@ -703,6 +714,7 @@ export class PetApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         if (tags !== undefined) {
             queryParameters['tags'] = tags;
         }
@@ -755,6 +767,7 @@ 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');
@@ -810,6 +823,7 @@ 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');
@@ -871,12 +885,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 deletePet');
         }
 
-        headerParams['apiKey'] = apiKey;
+        headerParams['api_key'] = apiKey;
 
         var useFormData = false;
 
@@ -926,6 +941,7 @@ 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');
@@ -1011,6 +1027,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 +1074,7 @@ export class StoreApi {
         var headerParams: any = {};
         var formParams: any = {};
 
+
         var useFormData = false;
 
         var deferred = promise.defer<{ response: http.ClientResponse; body: Order;  }>();
@@ -1104,6 +1122,7 @@ 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');
@@ -1155,6 +1174,7 @@ 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');