diff --git a/src/main/resources/android-java/api.mustache b/src/main/resources/android-java/api.mustache
index afd6297c451..fb510052ac8 100644
--- a/src/main/resources/android-java/api.mustache
+++ b/src/main/resources/android-java/api.mustache
@@ -19,11 +19,11 @@ public class {{classname}} {
   public ApiInvoker getInvoker() {
     return apiInvoker;
   }
-  
+
   public void setBasePath(String basePath) {
     this.basePath = basePath;
   }
-  
+
   public String getBasePath() {
     return basePath;
   }
@@ -45,10 +45,10 @@ public class {{classname}} {
     Map<String, String> headerParams = new HashMap<String, String>();
 
     {{#queryParams}}if(!"null".equals(String.valueOf({{paramName}})))
-      queryParams.put("{{paramName}}", String.valueOf({{paramName}}));
+      queryParams.put("{{baseName}}", String.valueOf({{paramName}}));
     {{/queryParams}}
 
-    {{#headerParams}}headerParams.put("{{paramName}}", {{paramName}});
+    {{#headerParams}}headerParams.put("{{baseName}}", {{paramName}});
     {{/headerParams}}
 
     String contentType = "application/json";
@@ -72,4 +72,4 @@ public class {{classname}} {
   }
   {{/operation}}
 }
-{{/operations}}
\ No newline at end of file
+{{/operations}}