diff --git a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
index f1025bc88d3..fb116161d55 100644
--- a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
@@ -166,7 +166,7 @@ public class ApiInvoker {
   }
 
   public String invokeAPI(String host, String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType, String[] authNames) throws ApiException {
-    processAuthParams(authNames, queryParams, headerParams);
+    updateParamsForAuth(authNames, queryParams, headerParams);
 
     Client client = getClient(host);
 
@@ -266,11 +266,12 @@ public class ApiInvoker {
     }
   }
 
-  private void processAuthParams(String[] authNames, Map<String, String> queryParams, Map<String, String> headerParams) {
+  /* Update hearder and query params based on authentication settings. */
+  private void updateParamsForAuth(String[] authNames, Map<String, String> queryParams, Map<String, String> headerParams) {
     for (String authName : authNames) {
       Authentication auth = Configuration.getAuthentication(authName);
       if (auth == null) throw new RuntimeException("Authentication has not been setup for " + authName);
-      auth.processParams(queryParams, headerParams);
+      auth.applyToParams(queryParams, headerParams);
     }
   }
 
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
index f854bab9170..65720b958cb 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
@@ -39,7 +39,7 @@ public class ApiKeyAuth implements Authentication {
   }
 
   @Override
-  public void processParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
     String value;
     if (apiKeyPrefix != null) {
       value = apiKeyPrefix + " " + apiKey;
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
index 7aba61e631a..1b2e2bc2fbe 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
@@ -3,5 +3,6 @@ package {{invokerPackage}}.auth;
 import java.util.Map;
 
 public interface Authentication {
-  void processParams(Map<String, String> queryParams, Map<String, String> headerParams);
+  /** Apply authentication settings to header and query params. */
+  void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams);
 }
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
index f77bbf57b75..28d5703b757 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
@@ -26,7 +26,7 @@ public class HttpBasicAuth implements Authentication {
   }
 
   @Override
-  public void processParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
     try {
       headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary((username + ":" + password).getBytes("UTF-8")));
     } catch (UnsupportedEncodingException e) {
diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
index f970481426d..ef84b8cc05e 100644
--- a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
@@ -4,7 +4,7 @@ import java.util.Map;
 
 public class OAuth implements Authentication {
   @Override
-  public void processParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
     // TODO: support oauth
   }
 }
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
index 8ed18b62c15..841a348e0b3 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -166,7 +166,7 @@ public class ApiInvoker {
   }
 
   public String invokeAPI(String host, String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType, String[] authNames) throws ApiException {
-    processAuthParams(authNames, queryParams, headerParams);
+    updateParamsForAuth(authNames, queryParams, headerParams);
 
     Client client = getClient(host);
 
@@ -266,11 +266,12 @@ public class ApiInvoker {
     }
   }
 
-  private void processAuthParams(String[] authNames, Map<String, String> queryParams, Map<String, String> headerParams) {
+  /* Update hearder and query params based on authentication settings. */
+  private void updateParamsForAuth(String[] authNames, Map<String, String> queryParams, Map<String, String> headerParams) {
     for (String authName : authNames) {
       Authentication auth = Configuration.getAuthentication(authName);
       if (auth == null) throw new RuntimeException("Authentication has not been setup for " + authName);
-      auth.processParams(queryParams, headerParams);
+      auth.applyToParams(queryParams, headerParams);
     }
   }
 
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
index 1f84fd12685..ce55babb51d 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
@@ -39,7 +39,7 @@ public class ApiKeyAuth implements Authentication {
   }
 
   @Override
-  public void processParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
     String value;
     if (apiKeyPrefix != null) {
       value = apiKeyPrefix + " " + apiKey;
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java
index 50ed42e15f2..3f372404c8d 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java
@@ -3,5 +3,6 @@ package io.swagger.client.auth;
 import java.util.Map;
 
 public interface Authentication {
-  void processParams(Map<String, String> queryParams, Map<String, String> headerParams);
+  /** Apply authentication settings to header and query params. */
+  void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams);
 }
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
index b4a1266a1b4..37ceffa1638 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
@@ -26,7 +26,7 @@ public class HttpBasicAuth implements Authentication {
   }
 
   @Override
-  public void processParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
     try {
       headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary((username + ":" + password).getBytes("UTF-8")));
     } catch (UnsupportedEncodingException e) {
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java
index e4b6ab49c0d..d834f4580c2 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java
@@ -4,7 +4,7 @@ import java.util.Map;
 
 public class OAuth implements Authentication {
   @Override
-  public void processParams(Map<String, String> queryParams, Map<String, String> headerParams) {
+  public void applyToParams(Map<String, String> queryParams, Map<String, String> headerParams) {
     // TODO: support oauth
   }
 }
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
index 13289a7c495..f90ee3d7b22 100644
--- a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
+++ b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
@@ -8,13 +8,13 @@ import org.junit.*;
 
 public class ApiKeyAuthTest {
   @Test
-  public void testProcessParamsInQuery() {
+  public void testApplyToParamsInQuery() {
     Map<String, String> queryParams = new HashMap<String, String>();
     Map<String, String> headerParams = new HashMap<String, String>();
 
     ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
     auth.setApiKey("my-api-key");
-    auth.processParams(queryParams, headerParams);
+    auth.applyToParams(queryParams, headerParams);
 
     assertEquals(1, queryParams.size());
     assertEquals("my-api-key", queryParams.get("api_key"));
@@ -23,14 +23,14 @@ public class ApiKeyAuthTest {
   }
 
   @Test
-  public void testProcessParamsInHeaderWithPrefix() {
+  public void testApplyToParamsInHeaderWithPrefix() {
     Map<String, String> queryParams = new HashMap<String, String>();
     Map<String, String> headerParams = new HashMap<String, String>();
 
     ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
     auth.setApiKey("my-api-token");
     auth.setApiKeyPrefix("Token");
-    auth.processParams(queryParams, headerParams);
+    auth.applyToParams(queryParams, headerParams);
 
     // no changes to query parameters
     assertEquals(0, queryParams.size());
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
index 8c4db19adfa..dc57a61391a 100644
--- a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
+++ b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
@@ -15,13 +15,13 @@ public class HttpBasicAuthTest {
   }
 
   @Test
-  public void testProcessParams() {
+  public void testApplyToParams() {
     Map<String, String> queryParams = new HashMap<String, String>();
     Map<String, String> headerParams = new HashMap<String, String>();
 
     auth.setUsername("my-username");
     auth.setPassword("my-password");
-    auth.processParams(queryParams, headerParams);
+    auth.applyToParams(queryParams, headerParams);
 
     // no changes to query parameters
     assertEquals(0, queryParams.size());