From 781458b0d19823d7b7e036c87fa2368468083f84 Mon Sep 17 00:00:00 2001
From: Laurent Van der Linden <laurent.vanderlinden@jessazh.be>
Date: Thu, 17 Sep 2015 12:46:20 +0200
Subject: [PATCH 1/2] Use the baseName when referring to path and query
 parameters.

---
 .../src/main/resources/TypeScript-Angular/api.mustache        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
index 23b5fe2ea50..e459a7b419c 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
@@ -27,7 +27,7 @@ module {{package}} {
             var path = this.basePath + '{{path}}';
 
 {{#pathParams}}
-            path = path.replace('{' + '{{paramName}}' + '}', String({{paramName}}));
+            path = path.replace('{' + '{{baseName}}' + '}', String({{paramName}}));
 
 {{/pathParams}}
             var queryParameters: any = {};
@@ -44,7 +44,7 @@ module {{package}} {
 {{/allParams}}
 {{#queryParams}}
             if ({{paramName}} !== undefined) {
-                queryParameters['{{paramName}}'] = {{paramName}};
+                queryParameters['{{baseName}}'] = {{paramName}};
             }
 
 {{/queryParams}}

From c83c564a19e8497243b3d1adf1ea4428433a450a Mon Sep 17 00:00:00 2001
From: Laurent Van der Linden <laurent.vanderlinden@jessazh.be>
Date: Fri, 18 Sep 2015 08:05:13 +0200
Subject: [PATCH 2/2] Use the baseName when referring to header parameters.

---
 .../src/main/resources/TypeScript-Angular/api.mustache          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
index e459a7b419c..f08e6633375 100644
--- a/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/TypeScript-Angular/api.mustache
@@ -49,7 +49,7 @@ module {{package}} {
 
 {{/queryParams}}
 {{#headerParams}}
-            headerParams['{{paramName}}'] = {{paramName}};
+            headerParams['{{baseName}}'] = {{paramName}};
 
 {{/headerParams}}
             var httpRequestParams: any = {