diff --git a/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java b/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
index a16bdc4ef3..2044297a68 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -150,9 +150,9 @@ public final class MockRestServiceServer {
 	 * to reply to the given {@code RestGatewaySupport}.
 	 * @since 4.3
 	 */
-	public static MockRestServiceServerBuilder bindTo(RestGatewaySupport restGateway) {
-		Assert.notNull(restGateway, "'gatewaySupport' must not be null");
-		return new DefaultBuilder(restGateway.getRestTemplate());
+	public static MockRestServiceServerBuilder bindTo(RestGatewaySupport restGatewaySupport) {
+		Assert.notNull(restGatewaySupport, "'restGatewaySupport' must not be null");
+		return new DefaultBuilder(restGatewaySupport.getRestTemplate());
 	}
 
 
@@ -312,12 +312,12 @@ public final class MockRestServiceServer {
 		}
 
 		private org.springframework.mock.http.client.MockAsyncClientHttpRequest createRequestInternal(
-				URI uri, HttpMethod method) {
+				URI uri, HttpMethod httpMethod) {
 
 			Assert.notNull(uri, "'uri' must not be null");
-			Assert.notNull(method, "'httpMethod' must not be null");
+			Assert.notNull(httpMethod, "'httpMethod' must not be null");
 
-			return new org.springframework.mock.http.client.MockAsyncClientHttpRequest(method, uri) {
+			return new org.springframework.mock.http.client.MockAsyncClientHttpRequest(httpMethod, uri) {
 
 				@Override
 				protected ClientHttpResponse executeInternal() throws IOException {