diff --git a/build.gradle b/build.gradle
index e2e0cfab28..001020410b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -811,8 +811,8 @@ project("spring-web") {
 	}
 }
 
-project("spring-web-reactive") {
-	description = "Spring Web Reactive"
+project("spring-webflux") {
+	description = "Spring WebFlux"
 
 	dependencies {
 		compile(project(":spring-core"))
diff --git a/settings.gradle b/settings.gradle
index 316022a704..d62c833cc6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,7 +19,7 @@ include "spring-test"
 include "spring-tx"
 include "spring-web"
 include "spring-webmvc"
-include "spring-web-reactive"
+include "spring-webflux"
 include "spring-websocket"
 include "spring-framework-bom"
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/BindingContext.java b/spring-webflux/src/main/java/org/springframework/web/reactive/BindingContext.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/BindingContext.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/BindingContext.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/HandlerAdapter.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/HandlerAdapter.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/HandlerMapping.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/HandlerMapping.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java b/spring-webflux/src/main/java/org/springframework/web/reactive/HandlerResult.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/HandlerResult.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/AbstractMappingContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/AbstractMappingContentTypeResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/AbstractMappingContentTypeResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/AbstractMappingContentTypeResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/CompositeContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/CompositeContentTypeResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/CompositeContentTypeResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/CompositeContentTypeResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/FixedContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/FixedContentTypeResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/FixedContentTypeResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/FixedContentTypeResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/HeaderContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/HeaderContentTypeResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/HeaderContentTypeResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/HeaderContentTypeResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/MappingContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/MappingContentTypeResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/MappingContentTypeResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/MappingContentTypeResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/ParameterContentTypeResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilder.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilder.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/RequestedContentTypeResolverBuilder.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/accept/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/accept/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/accept/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/CorsRegistration.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/CorsRegistration.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/CorsRegistration.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/CorsRegistration.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/CorsRegistry.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/CorsRegistry.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/CorsRegistry.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/CorsRegistry.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfiguration.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfiguration.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfiguration.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfiguration.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/EnableWebReactive.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/EnableWebReactive.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/EnableWebReactive.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/EnableWebReactive.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/PathMatchConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/PathMatchConfigurer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/PathMatchConfigurer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/PathMatchConfigurer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ResourceChainRegistration.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceChainRegistration.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ResourceChainRegistration.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceChainRegistration.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistration.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/UrlBasedViewResolverRegistration.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/UrlBasedViewResolverRegistration.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/UrlBasedViewResolverRegistration.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/UrlBasedViewResolverRegistration.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ViewResolverRegistry.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ViewResolverRegistry.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ViewResolverRegistry.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/ViewResolverRegistry.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurationSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurationSupport.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurationSupport.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurationSupport.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurerComposite.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurerComposite.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurerComposite.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/WebReactiveConfigurerComposite.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/config/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/config/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractor.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractor.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractor.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractor.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyExtractors.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserter.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserter.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserter.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserters.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/BodyInserters.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/BodyInserters.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/UnsupportedMediaTypeException.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientRequest.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ClientResponse.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilder.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilder.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilder.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultClientResponse.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultExchangeStrategiesBuilder.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunction.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctions.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunction.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeFunctions.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeStrategies.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeStrategies.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/ExchangeStrategies.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeStrategies.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClient.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClientException.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientException.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/WebClientException.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/WebClientException.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/client/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/client/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultHandlerStrategiesBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultHandlerStrategiesBuilder.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultHandlerStrategiesBuilder.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultHandlerStrategiesBuilder.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerFilterFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/HandlerFilterFunction.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerFilterFunction.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/HandlerFilterFunction.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/HandlerFunction.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerFunction.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/HandlerFunction.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerStrategies.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/HandlerStrategies.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerStrategies.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/HandlerStrategies.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RouterFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunction.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RouterFunction.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunction.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/HandlerFunctionAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/HandlerFunctionAdapter.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/HandlerFunctionAdapter.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/HandlerFunctionAdapter.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/handler/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/AbstractResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AbstractResourceResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/AbstractResourceResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/AbstractResourceResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/AbstractVersionStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AbstractVersionStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/AbstractVersionStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/AbstractVersionStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/CachingResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CachingResourceResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/CachingResourceResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/CachingResourceResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/CachingResourceTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CachingResourceTransformer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/CachingResourceTransformer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/CachingResourceTransformer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ContentVersionStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ContentVersionStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ContentVersionStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/ContentVersionStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/CssLinkResourceTransformer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/DefaultResourceResolverChain.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/DefaultResourceResolverChain.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/DefaultResourceResolverChain.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/DefaultResourceResolverChain.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/DefaultResourceTransformerChain.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/DefaultResourceTransformerChain.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/DefaultResourceTransformerChain.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/DefaultResourceTransformerChain.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/FixedVersionStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/FixedVersionStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/FixedVersionStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/FixedVersionStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/HttpResource.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/HttpResource.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/HttpResource.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/HttpResource.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/PathResourceResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceResolverChain.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceResolverChain.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceResolverChain.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceResolverChain.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceTransformer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerChain.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerChain.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerChain.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerChain.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceWebHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/TransformedResource.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/TransformedResource.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/TransformedResource.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/TransformedResource.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionPathStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionPathStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionPathStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionPathStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/VersionStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/WebJarsResourceResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/resource/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/AbstractHandlerResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/AbstractHandlerResultHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/AbstractHandlerResultHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/AbstractHandlerResultHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/SimpleHandlerAdapter.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractMediaTypeExpression.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/AbstractNameValueExpression.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractNameValueExpression.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/AbstractNameValueExpression.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractNameValueExpression.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/AbstractRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractRequestCondition.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/AbstractRequestCondition.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/AbstractRequestCondition.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ConsumesRequestCondition.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/HeadersRequestCondition.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/MediaTypeExpression.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/MediaTypeExpression.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/MediaTypeExpression.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/MediaTypeExpression.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/NameValueExpression.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/NameValueExpression.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/NameValueExpression.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/NameValueExpression.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ParamsRequestCondition.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/PatternsRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/PatternsRequestCondition.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/PatternsRequestCondition.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/PatternsRequestCondition.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/ProducesRequestCondition.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestCondition.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestCondition.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestCondition.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestConditionHolder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestConditionHolder.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestConditionHolder.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestConditionHolder.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestCondition.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestCondition.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestCondition.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/AbstractHandlerMethodMapping.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/HandlerMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/SyncHandlerMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/SyncHandlerMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/SyncHandlerMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/SyncHandlerMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/SyncInvocableHandlerMethod.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/SyncInvocableHandlerMethod.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/SyncInvocableHandlerMethod.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/SyncInvocableHandlerMethod.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageReaderArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractMessageWriterResultHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueSyncArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueSyncArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueSyncArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/AbstractNamedValueSyncArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/BindingContextFactory.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/BindingContextFactory.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/BindingContextFactory.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/BindingContextFactory.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ErrorsMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ErrorsMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ErrorsMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ErrorsMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContext.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContext.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContext.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContext.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMapMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMapMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMapMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMapMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/PrincipalArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PrincipalArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/PrincipalArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/PrincipalArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/WebSessionArgumentResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/WebSessionArgumentResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/WebSessionArgumentResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/WebSessionArgumentResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/method/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/AbstractUrlBasedView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractUrlBasedView.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/AbstractUrlBasedView.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractUrlBasedView.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/AbstractView.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/BindStatus.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/BindStatus.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/BindStatus.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/BindStatus.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/HttpMessageWriterView.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestContext.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/RequestDataValueProcessor.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestDataValueProcessor.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/RequestDataValueProcessor.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RequestDataValueProcessor.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/UrlBasedViewResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/View.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/View.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/View.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/View.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfig.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfig.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfig.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfig.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerConfigurer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerView.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/RenderingContext.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/RenderingContext.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/RenderingContext.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/RenderingContext.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateConfig.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateConfig.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateConfig.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateConfig.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateConfigurer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateConfigurer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateConfigurer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateView.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateView.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateView.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewResolver.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewResolver.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewResolver.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/script/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/result/view/script/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/CloseStatus.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/HandshakeInfo.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketHandler.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketMessage.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/WebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketSession.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/WebSocketSession.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/WebSocketSession.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/AbstractListenerWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/AbstractListenerWebSocketSession.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/AbstractListenerWebSocketSession.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/AbstractListenerWebSocketSession.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/AbstractWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/AbstractWebSocketSession.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/AbstractWebSocketSession.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/AbstractWebSocketSession.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketHandlerAdapter.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/JettyWebSocketSession.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/NettyWebSocketSessionSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/NettyWebSocketSessionSupport.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/NettyWebSocketSessionSupport.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/NettyWebSocketSessionSupport.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/ReactorNettyWebSocketSession.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/RxNettyWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/RxNettyWebSocketSession.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/RxNettyWebSocketSession.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/RxNettyWebSocketSession.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketHandlerAdapter.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/StandardWebSocketSession.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketHandlerAdapter.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketSession.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketSession.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketSession.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/UndertowWebSocketSession.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/adapter/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/adapter/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/JettyWebSocketClient.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/ReactorNettyWebSocketClient.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/RxNettyWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/RxNettyWebSocketClient.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/RxNettyWebSocketClient.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/RxNettyWebSocketClient.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/StandardWebSocketClient.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/UndertowWebSocketClient.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClient.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClient.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClient.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClientSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClientSupport.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClientSupport.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/WebSocketClientSupport.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/client/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/client/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/RequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/RequestUpgradeStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/RequestUpgradeStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/RequestUpgradeStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/WebSocketService.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/WebSocketService.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/WebSocketService.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/WebSocketService.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/HandshakeWebSocketService.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/WebSocketHandlerAdapter.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/support/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/support/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/support/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/DefaultServerEndpointConfig.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/DefaultServerEndpointConfig.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/DefaultServerEndpointConfig.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/DefaultServerEndpointConfig.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/JettyRequestUpgradeStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/ReactorNettyRequestUpgradeStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/RxNettyRequestUpgradeStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/TomcatRequestUpgradeStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/UndertowRequestUpgradeStrategy.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/UndertowRequestUpgradeStrategy.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/UndertowRequestUpgradeStrategy.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/UndertowRequestUpgradeStrategy.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/socket/server/upgrade/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/socket/server/upgrade/package-info.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/support/AbstractAnnotationConfigDispatcherHandlerInitializer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/support/AbstractAnnotationConfigDispatcherHandlerInitializer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/support/AbstractAnnotationConfigDispatcherHandlerInitializer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/support/AbstractAnnotationConfigDispatcherHandlerInitializer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/support/AbstractDispatcherHandlerInitializer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/support/AbstractDispatcherHandlerInitializer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/support/AbstractDispatcherHandlerInitializer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/support/AbstractDispatcherHandlerInitializer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/support/AbstractServletHttpHandlerAdapterInitializer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/support/AbstractServletHttpHandlerAdapterInitializer.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/support/AbstractServletHttpHandlerAdapterInitializer.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/support/AbstractServletHttpHandlerAdapterInitializer.java
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/support/package-info.java b/spring-webflux/src/main/java/org/springframework/web/reactive/support/package-info.java
similarity index 100%
rename from spring-web-reactive/src/main/java/org/springframework/web/reactive/support/package-info.java
rename to spring-webflux/src/main/java/org/springframework/web/reactive/support/package-info.java
diff --git a/spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/BodyExtractorsExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/BodyExtractorsExtensions.kt
similarity index 100%
rename from spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/BodyExtractorsExtensions.kt
rename to spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/BodyExtractorsExtensions.kt
diff --git a/spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/BodyInsertersExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/BodyInsertersExtensions.kt
similarity index 100%
rename from spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/BodyInsertersExtensions.kt
rename to spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/BodyInsertersExtensions.kt
diff --git a/spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt
similarity index 100%
rename from spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt
rename to spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/ClientResponseExtensions.kt
diff --git a/spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt
similarity index 100%
rename from spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt
rename to spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/client/WebClientExtensions.kt
diff --git a/spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt
similarity index 100%
rename from spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt
rename to spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensions.kt
diff --git a/spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt b/spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt
similarity index 100%
rename from spring-web-reactive/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt
rename to spring-webflux/src/main/kotlin/org/springframework/web/reactive/function/server/ServerRequestExtensions.kt
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/CompositeContentTypeResolverBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/CompositeContentTypeResolverBuilderTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/CompositeContentTypeResolverBuilderTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/accept/CompositeContentTypeResolverBuilderTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/MappingContentTypeResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/MappingContentTypeResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/MappingContentTypeResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/accept/MappingContentTypeResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/config/CorsRegistryTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfigurationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfigurationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfigurationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/config/DelegatingWebReactiveConfigurationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/config/ViewResolverRegistryTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationSupportTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationSupportTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationSupportTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationSupportTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultClientResponseTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/client/DefaultWebClientTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeFilterFunctionsTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/ExchangeStrategiesTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeStrategiesTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/ExchangeStrategiesTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/client/ExchangeStrategiesTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/AbstractRouterFunctionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/AbstractRouterFunctionIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/AbstractRouterFunctionIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/AbstractRouterFunctionIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/HandlerStrategiesTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HandlerStrategiesTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/HandlerStrategiesTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HandlerStrategiesTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTest.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTest.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTest.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTest.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/MockServerRequest.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/MockServerRequest.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/MockServerRequest.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/MockServerRequest.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RequestPredicateTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RequestPredicateTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RequestPredicateTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RequestPredicateTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RequestPredicatesTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RequestPredicatesTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RequestPredicatesTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RequestPredicatesTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/SseHandlerFunctionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/SseHandlerFunctionIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/SseHandlerFunctionIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/SseHandlerFunctionIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/CorsUrlHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/handler/CorsUrlHandlerMappingTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/CorsUrlHandlerMappingTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/handler/CorsUrlHandlerMappingTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ContentBasedVersionStrategyTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ContentBasedVersionStrategyTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ContentBasedVersionStrategyTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/ContentBasedVersionStrategyTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/FixedVersionStrategyTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/GzipResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/GzipResourceResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/GzipResourceResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/GzipResourceResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceTransformerSupportTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceTransformerSupportTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceTransformerSupportTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceTransformerSupportTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/VersionResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/VersionResourceResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/VersionResourceResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/VersionResourceResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/HandlerResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/HandlerResultHandlerTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/HandlerResultHandlerTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/HandlerResultHandlerTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/ResolvableMethod.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/ResolvableMethod.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/ResolvableMethod.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/ResolvableMethod.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/SimpleUrlHandlerMappingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/SimpleUrlHandlerMappingIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/SimpleUrlHandlerMappingIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/SimpleUrlHandlerMappingIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/CompositeRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/CompositeRequestConditionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/CompositeRequestConditionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/CompositeRequestConditionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/RequestConditionHolderTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestConditionHolderTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/RequestConditionHolderTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestConditionHolderTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestConditionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestConditionTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestConditionTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestConditionTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/HandlerMethodMappingTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/InvocableHandlerMethodTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/AbstractRequestMappingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/AbstractRequestMappingIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/AbstractRequestMappingIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/AbstractRequestMappingIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/BindingContextFactoryTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/BindingContextFactoryTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/BindingContextFactoryTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/BindingContextFactoryTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ContextPathIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ContextPathIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ContextPathIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ContextPathIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CookieValueMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/CrossOriginAnnotationIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CrossOriginAnnotationIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/CrossOriginAnnotationIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/CrossOriginAnnotationIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ErrorsArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ErrorsArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ErrorsArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ErrorsArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ExpressionValueMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/GlobalCorsConfigIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/GlobalCorsConfigIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/GlobalCorsConfigIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/GlobalCorsConfigIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/HttpEntityArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContextTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContextTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContextTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContextTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/JacksonHintsIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/JacksonHintsIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/JacksonHintsIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/JacksonHintsIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageReaderArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/MessageWriterResultHandlerTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ModelAttributeMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMapMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMapMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMapMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/PathVariableMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestAttributeMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestBodyArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestHeaderMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingDataBindingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingDataBindingIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingDataBindingIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingDataBindingIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingExceptionHandlingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingExceptionHandlingIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingExceptionHandlingIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingExceptionHandlingIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingMessageConversionIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingViewResolutionIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingViewResolutionIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingViewResolutionIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingViewResolutionIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMapMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandlerTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ServerWebExchangeArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SessionAttributeMethodArgumentResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/SseIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageWriterViewTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/HttpMessageWriterViewTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageWriterViewTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/HttpMessageWriterViewTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/RedirectViewTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/RedirectViewTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/RedirectViewTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/RedirectViewTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/RequestContextTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/RequestContextTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/RequestContextTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/RequestContextTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/UrlBasedViewResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/UrlBasedViewResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/UrlBasedViewResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/UrlBasedViewResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/JRubyScriptTemplateTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/JRubyScriptTemplateTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/JRubyScriptTemplateTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/JRubyScriptTemplateTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/JythonScriptTemplateTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/JythonScriptTemplateTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/JythonScriptTemplateTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/JythonScriptTemplateTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/KotlinScriptTemplateTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/KotlinScriptTemplateTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/KotlinScriptTemplateTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/KotlinScriptTemplateTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/NashornScriptTemplateTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/NashornScriptTemplateTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/NashornScriptTemplateTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/NashornScriptTemplateTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewResolverTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewResolverTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewResolverTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/result/view/script/ScriptTemplateViewTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java
diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
similarity index 100%
rename from spring-web-reactive/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
rename to spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java
diff --git a/spring-web-reactive/src/test/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensionsTests.kt b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensionsTests.kt
similarity index 100%
rename from spring-web-reactive/src/test/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensionsTests.kt
rename to spring-webflux/src/test/kotlin/org/springframework/web/reactive/function/server/RouterFunctionExtensionsTests.kt
diff --git a/spring-web-reactive/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt
similarity index 100%
rename from spring-web-reactive/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt
rename to spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt
diff --git a/spring-web-reactive/src/test/kotlin/org/springframework/web/reactive/result/view/script/ScriptTemplateWithBindingsExtensions.kt b/spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/view/script/ScriptTemplateWithBindingsExtensions.kt
similarity index 100%
rename from spring-web-reactive/src/test/kotlin/org/springframework/web/reactive/result/view/script/ScriptTemplateWithBindingsExtensions.kt
rename to spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/view/script/ScriptTemplateWithBindingsExtensions.kt
diff --git a/spring-web-reactive/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory b/spring-webflux/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory
similarity index 100%
rename from spring-web-reactive/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory
rename to spring-webflux/src/test/resources/META-INF/services/javax.script.ScriptEngineFactory
diff --git a/spring-web-reactive/src/test/resources/log4j2-test.xml b/spring-webflux/src/test/resources/log4j2-test.xml
similarity index 100%
rename from spring-web-reactive/src/test/resources/log4j2-test.xml
rename to spring-webflux/src/test/resources/log4j2-test.xml
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/config/testStylesheet.css b/spring-webflux/src/test/resources/org/springframework/web/reactive/config/testStylesheet.css
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/config/testStylesheet.css
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/config/testStylesheet.css
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/response.txt b/spring-webflux/src/test/resources/org/springframework/web/reactive/function/response.txt
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/response.txt
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/function/response.txt
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/server/child/response.txt b/spring-webflux/src/test/resources/org/springframework/web/reactive/function/server/child/response.txt
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/server/child/response.txt
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/function/server/child/response.txt
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/server/response.txt b/spring-webflux/src/test/resources/org/springframework/web/reactive/function/server/response.txt
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/function/server/response.txt
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/function/server/response.txt
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/handler/map.xml b/spring-webflux/src/test/resources/org/springframework/web/reactive/handler/map.xml
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/handler/map.xml
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/handler/map.xml
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/bar.css b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/bar.css
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/bar.css
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/bar.css
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/error.appcache b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/error.appcache
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/error.appcache
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/error.appcache
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/external.css b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/external.css
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/external.css
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/external.css
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/foo-e36d2e05253c6c7085a91522ce43a0b4.css b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/foo-e36d2e05253c6c7085a91522ce43a0b4.css
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/foo-e36d2e05253c6c7085a91522ce43a0b4.css
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/foo-e36d2e05253c6c7085a91522ce43a0b4.css
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/foo.css b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/foo.css
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/foo.css
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/foo.css
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/foo.html b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/foo.html
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/foo.html
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/foo.html
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/foo.txt b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/foo.txt
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/foo.txt
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/foo.txt
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/images/image.png b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/images/image.png
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/images/image.png
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/images/image.png
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/js/bar.js b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/js/bar.js
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/js/bar.js
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/js/bar.js
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/js/foo.js b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/js/foo.js
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/js/foo.js
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/js/foo.js
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/main.css b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/main.css
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/main.css
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/main.css
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/test.appcache b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/test.appcache
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/test/test.appcache
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/test/test.appcache
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/bar.css b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/bar.css
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/bar.css
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/bar.css
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/baz.css b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/baz.css
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/baz.css
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/baz.css
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/js/baz.js b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/js/baz.js
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/js/baz.js
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/testalternatepath/js/baz.js
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/testsecret/secret.txt b/spring-webflux/src/test/resources/org/springframework/web/reactive/resource/testsecret/secret.txt
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/resource/testsecret/secret.txt
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/resource/testsecret/secret.txt
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/method/annotation/logo.png b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/method/annotation/logo.png
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/method/annotation/logo.png
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/method/annotation/logo.png
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test.ftl b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test.ftl
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test.ftl
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/freemarker/test.ftl
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/empty.txt b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/empty.txt
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/empty.txt
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/empty.txt
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/jruby/render.rb b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jruby/render.rb
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/jruby/render.rb
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jruby/render.rb
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/jruby/template.erb b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jruby/template.erb
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/jruby/template.erb
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jruby/template.erb
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/jython/render.py b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jython/render.py
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/jython/render.py
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jython/render.py
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/jython/template.html b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jython/template.html
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/jython/template.html
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/jython/template.html
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/footer.html b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/footer.html
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/footer.html
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/footer.html
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/header.html b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/header.html
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/header.html
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/header.html
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/render.kts b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/render.kts
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/render.kts
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/render.kts
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/template.kts b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/template.kts
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/template.kts
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/kotlin/template.kts
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/messages_en.properties b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/messages_en.properties
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/messages_en.properties
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/messages_en.properties
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/messages_fr.properties b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/messages_fr.properties
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/messages_fr.properties
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/messages_fr.properties
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/nashorn/render.js b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/nashorn/render.js
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/nashorn/render.js
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/nashorn/render.js
diff --git a/spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/nashorn/template.html b/spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/nashorn/template.html
similarity index 100%
rename from spring-web-reactive/src/test/resources/org/springframework/web/reactive/result/view/script/nashorn/template.html
rename to spring-webflux/src/test/resources/org/springframework/web/reactive/result/view/script/nashorn/template.html
diff --git a/src/asciidoc/images/web-reactive-overview.png b/src/asciidoc/images/web-reactive-overview.png
deleted file mode 100644
index adc7629cf6..0000000000
Binary files a/src/asciidoc/images/web-reactive-overview.png and /dev/null differ
diff --git a/src/asciidoc/images/webflux-overview.png b/src/asciidoc/images/webflux-overview.png
new file mode 100644
index 0000000000..62774d0c64
Binary files /dev/null and b/src/asciidoc/images/webflux-overview.png differ
diff --git a/src/asciidoc/web-reactive.adoc b/src/asciidoc/web-flux.adoc
similarity index 91%
rename from src/asciidoc/web-reactive.adoc
rename to src/asciidoc/web-flux.adoc
index e6d4ffcfa2..2ce9758c59 100644
--- a/src/asciidoc/web-reactive.adoc
+++ b/src/asciidoc/web-flux.adoc
@@ -1,5 +1,5 @@
 [[web-reactive]]
-= Reactive Web Applications
+= WebFlux framework
 
 This section provides basic information on the reactive programming
 support for Web applications in Spring Framework 5.
@@ -53,16 +53,16 @@ by Sebastien Deleuze.
 
 
 [[web-reactive-feature-overview]]
-== Spring Web Reactive Module
+== Spring WebFlux Module
 
-Spring Framework 5 includes a new `spring-web-reactive` module. The module contains support
+Spring Framework 5 includes a new `spring-webflux` module. The module contains support
 for reactive HTTP and WebSocket clients as well as for reactive server web applications
 including REST, HTML browser, and WebSocket style interactions.
 
 [[web-reactive-server]]
 === Server Side
 
-On the server-side the new reactive module supports 2 distinct programming models:
+On the server-side WebFlux supports 2 distinct programming models:
 
 * Annotation-based with `@Controller` and the other annotations supported also with Spring MVC
 * Functional, Java 8 lambda style routing and handling
@@ -70,12 +70,12 @@ On the server-side the new reactive module supports 2 distinct programming model
 Both programming models are executed on the same reactive foundation that adapts
 non-blocking HTTP runtimes to the Reactive Streams API. The diagram
 below shows the server-side stack including traditional, Servlet-based
-Spring MVC on the left from the `spring-web-mvc` module and also the
-reactive stack on the right from the `spring-web-reactive` module.
+Spring MVC on the left from the `spring-webmvc` module and also the
+reactive stack on the right from the `spring-webflux` module.
 
-image::images/web-reactive-overview.png[width=720]
+image::images/webflux-overview.png[width=720]
 
-The new reactive stack can run on Servlet containers with support for the
+WebFlux can run on Servlet containers with support for the
 Servlet 3.1 Non-Blocking IO API as well as on other async runtimes such as
 Netty and Undertow. Each runtime is adapted to a reactive
 `ServerHttpRequest` and `ServerHttpResponse` exposing the body of the
@@ -88,8 +88,8 @@ as a `Flux<Object>`, and so is HTML view rendering and Server-Sent Events.
 ==== Annotation-based Programming Model
 
 The same `@Controller` programming model and the same annotations used in Spring MVC
-are also supported on the reactive side. The main difference is that the framework
-contracts underneath -- i.e. `HandlerMapping`, `HandlerAdapter`, are
+are also supported in WebFlux. The main difference is that the underlying core,
+framework contracts -- i.e. `HandlerMapping`, `HandlerAdapter`, are
 non-blocking and operate on the reactive `ServerHttpRequest` and `ServerHttpResponse`
 rather than on the `HttpServletRequest` and `HttpServletResponse`.
 Below is an example with a reactive controller:
@@ -157,7 +157,7 @@ https://spring.io/blog/2016/09/22/new-in-spring-5-functional-web-framework[M3 re
 [[web-reactive-client]]
 === Client Side
 
-Spring Framework 5 includes a functional, reactive `WebClient` that offers a fully
+WebFlux includes a functional, reactive `WebClient` that offers a fully
 non-blocking and reactive alternative to the `RestTemplate`. It exposes network
 input and output as a reactive `ClientHttpRequest` and `ClientHttpRespones` where
 the body of the request and response is a `Flux<DataBuffer>` rather than an
@@ -169,14 +169,11 @@ implementation to plug in a specific HTTP client such as Reactor Netty:
 [source,java,indent=0]
 [subs="verbatim,quotes"]
 ----
-WebClient client = WebClient.create(new ReactorClientHttpConnector());
+WebClient client = WebClient.create("http://example.com");
 
-ClientRequest<Void> request = ClientRequest
-		.GET("http://example.com/accounts/{id}", 1L)
+Mono<Account> account = client.get()
+		.url("/accounts/{id}", 1L)
 		.accept(APPLICATION_JSON)
-		.build();
-
-Mono<Account> account = client
 		.exchange(request)
 		.then(response -> response.bodyToMono(Account.class));
 ----
@@ -224,8 +221,8 @@ when the method returns; implies a synchronous, non-blocking controller method.
 [[web-reactive-websocket-support]]
 === Reactive WebSocket Support
 
-The Spring Framework 5 `spring-web-reactive` module includes reactive WebSocket
-client and server support. Both client and server are supported on the Java WebSocket API
+WebFlux includes reactive WebSocket client and server support.
+Both client and server are supported on the Java WebSocket API
 (JSR-356), Jetty, Undertow, Reactor Netty, and RxNetty.
 
 On the server side, declare a `WebSocketHandlerAdapter` and then simply add
@@ -291,7 +288,7 @@ it's very easy to try it out. See the next section on "Manual Bootstrapping".
 
 This section outlines the steps to get up and running manually.
 
-For dependencies start with `spring-web-reactive` and `spring-context`.
+For dependencies start with `spring-webflux` and `spring-context`.
 Then add `jackson-databind` and `io.netty:netty-buffer`
 (temporarily see https://jira.spring.io/browse/SPR-14528[SPR-14528]) for JSON support.
 Lastly add the dependencies for one of the supported runtimes:
@@ -379,4 +376,4 @@ You will find code examples useful to build reactive Web application in the foll
 * https://github.com/thymeleaf/thymeleafsandbox-biglist-reactive[Reactive Thymeleaf Sandbox]
 * https://github.com/mix-it/mixit/[Mix-it 2017 website]: Kotlin + Reactive + Functional web and bean registration API application
 * https://github.com/simonbasle/reactor-by-example[Reactor by example]: code snippets coming from this https://www.infoq.com/articles/reactor-by-example[InfoQ article]
-* https://github.com/spring-projects/spring-framework/tree/master/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/method/annotation[Spring integration tests]: various features tested with Reactor https://projectreactor.io/docs/test/release/api/index.html?reactor/test/StepVerifier.html[`StepVerifier`]
+* https://github.com/spring-projects/spring-framework/tree/master/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation[Spring integration tests]: various features tested with Reactor https://projectreactor.io/docs/test/release/api/index.html?reactor/test/StepVerifier.html[`StepVerifier`]
diff --git a/src/asciidoc/web.adoc b/src/asciidoc/web.adoc
index 8a7a56bda3..31139894ec 100644
--- a/src/asciidoc/web.adoc
+++ b/src/asciidoc/web.adoc
@@ -30,4 +30,4 @@ include::web-integration.adoc[leveloffset=+1]
 
 include::web-websocket.adoc[leveloffset=+1]
 
-include::web-reactive.adoc[leveloffset=+1]
+include::web-flux.adoc[leveloffset=+1]