diff --git a/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java b/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
index 58ec1ad4..eab4b6e4 100644
--- a/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
+++ b/src/main/java/org/springframework/cloud/gateway/config/GatewayAutoConfiguration.java
@@ -13,7 +13,7 @@ import org.springframework.cloud.gateway.handler.predicate.HeaderPredicateFactor
 import org.springframework.cloud.gateway.handler.predicate.HostPredicateFactory;
 import org.springframework.cloud.gateway.handler.predicate.GatewayPredicateFactory;
 import org.springframework.cloud.gateway.handler.GatewayWebHandler;
-import org.springframework.cloud.gateway.handler.ServerWebExchangePredicateHandlerMapping;
+import org.springframework.cloud.gateway.handler.GatewayPredicateHandlerMapping;
 import org.springframework.cloud.gateway.handler.predicate.MethodPredicateFactory;
 import org.springframework.cloud.gateway.handler.predicate.QueryPredicateFactory;
 import org.springframework.cloud.gateway.handler.predicate.UrlPredicateFactory;
@@ -58,10 +58,10 @@ public class GatewayAutoConfiguration {
 	}
 
 	@Bean
-	public ServerWebExchangePredicateHandlerMapping serverWebExchangePredicateHandlerMapping(GatewayProperties properties,
-																							 GatewayFilteringWebHandler webHandler,
-																							 List<GatewayPredicateFactory> predicateFactories) {
-		return new ServerWebExchangePredicateHandlerMapping(webHandler, predicateFactories, properties);
+	public GatewayPredicateHandlerMapping gatewayPredicateHandlerMapping(GatewayProperties properties,
+																		 GatewayFilteringWebHandler webHandler,
+																		 List<GatewayPredicateFactory> predicateFactories) {
+		return new GatewayPredicateHandlerMapping(webHandler, predicateFactories, properties);
 	}
 
 	@Bean
diff --git a/src/main/java/org/springframework/cloud/gateway/handler/ServerWebExchangePredicateHandlerMapping.java b/src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java
similarity index 95%
rename from src/main/java/org/springframework/cloud/gateway/handler/ServerWebExchangePredicateHandlerMapping.java
rename to src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java
index ac53e475..70aa83da 100644
--- a/src/main/java/org/springframework/cloud/gateway/handler/ServerWebExchangePredicateHandlerMapping.java
+++ b/src/main/java/org/springframework/cloud/gateway/handler/GatewayPredicateHandlerMapping.java
@@ -22,7 +22,7 @@ import static org.springframework.cloud.gateway.filter.GatewayFilter.GATEWAY_ROU
 /**
  * @author Spencer Gibb
  */
-public class ServerWebExchangePredicateHandlerMapping extends AbstractHandlerMapping {
+public class GatewayPredicateHandlerMapping extends AbstractHandlerMapping {
 
 	private Map<String, GatewayPredicateFactory> predicateFactories = new LinkedHashMap<>();
 	private GatewayProperties properties;
@@ -30,7 +30,7 @@ public class ServerWebExchangePredicateHandlerMapping extends AbstractHandlerMap
 
 	private List<Route> routes;
 
-	public ServerWebExchangePredicateHandlerMapping(WebHandler webHandler, List<GatewayPredicateFactory> predicateFactories, GatewayProperties properties) {
+	public GatewayPredicateHandlerMapping(WebHandler webHandler, List<GatewayPredicateFactory> predicateFactories, GatewayProperties properties) {
 		this.webHandler = webHandler;
 		this.properties = properties;
 
diff --git a/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java b/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java
index eb7c6c83..b0f6bfda 100644
--- a/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java
+++ b/src/test/java/org/springframework/cloud/gateway/test/GatewayIntegrationTests.java
@@ -10,7 +10,7 @@ import org.springframework.boot.context.embedded.LocalServerPort;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.gateway.config.Route;
 import org.springframework.cloud.gateway.filter.GatewayFilter;
-import org.springframework.cloud.gateway.handler.ServerWebExchangePredicateHandlerMapping;
+import org.springframework.cloud.gateway.handler.GatewayPredicateHandlerMapping;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpHeaders;
@@ -51,7 +51,7 @@ public class GatewayIntegrationTests {
 				.consumeNextWith(
 						httpHeaders -> {
 							assertThat(httpHeaders.getFirst(HANDLER_MAPPER_HEADER))
-									.isEqualTo(ServerWebExchangePredicateHandlerMapping.class.getSimpleName());
+									.isEqualTo(GatewayPredicateHandlerMapping.class.getSimpleName());
 							assertThat(httpHeaders.getFirst(ROUTE_ID_HEADER))
 									.isEqualTo("default_path_to_httpbin");
 						})
@@ -74,7 +74,7 @@ public class GatewayIntegrationTests {
 							HttpHeaders httpHeaders = response.headers().asHttpHeaders();
 							HttpStatus statusCode = response.statusCode();
 							assertThat(httpHeaders.getFirst(HANDLER_MAPPER_HEADER))
-									.isEqualTo(ServerWebExchangePredicateHandlerMapping.class.getSimpleName());
+									.isEqualTo(GatewayPredicateHandlerMapping.class.getSimpleName());
 							assertThat(httpHeaders.getFirst(ROUTE_ID_HEADER))
 									.isEqualTo("host_example_to_httpbin");
 							assertThat(statusCode).isEqualTo(HttpStatus.OK);
@@ -100,7 +100,7 @@ public class GatewayIntegrationTests {
 							HttpHeaders httpHeaders = response.headers().asHttpHeaders();
 							HttpStatus statusCode = response.statusCode();
 							assertThat(httpHeaders.getFirst(HANDLER_MAPPER_HEADER))
-									.isEqualTo(ServerWebExchangePredicateHandlerMapping.class.getSimpleName());
+									.isEqualTo(GatewayPredicateHandlerMapping.class.getSimpleName());
 							assertThat(httpHeaders.getFirst(ROUTE_ID_HEADER))
 									.isEqualTo("host_foo_path_headers_to_httpbin");
 							assertThat(statusCode).isEqualTo(HttpStatus.OK);