diff --git a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
index e80a56ae5c..81ec72a3d4 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpRequest.java
@@ -22,8 +22,8 @@ import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.io.buffer.Buffer;
-import reactor.io.net.http.HttpClient;
-import reactor.io.net.http.model.Method;
+import reactor.io.netty.http.HttpClient;
+import reactor.io.netty.http.model.Method;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferAllocator;
diff --git a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
index 4eaac99918..937d26d07b 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java
@@ -20,7 +20,7 @@ import java.nio.ByteBuffer;
 
 import reactor.core.publisher.Flux;
 import reactor.io.buffer.Buffer;
-import reactor.io.net.http.HttpChannel;
+import reactor.io.netty.http.HttpChannel;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferAllocator;
@@ -31,7 +31,7 @@ import org.springframework.http.HttpStatus;
  * {@link ClientHttpResponse} implementation for the Reactor Net HTTP client
  *
  * @author Brian Clozel
- * @see reactor.io.net.http.HttpClient
+ * @see reactor.io.netty.http.HttpClient
  */
 public class ReactorClientHttpResponse implements ClientHttpResponse {
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorHttpClientRequestFactory.java b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorHttpClientRequestFactory.java
index f3f83b95ae..e759e3b85f 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorHttpClientRequestFactory.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/client/reactive/ReactorHttpClientRequestFactory.java
@@ -18,8 +18,8 @@ package org.springframework.http.client.reactive;
 
 import java.net.URI;
 
-import reactor.io.net.ReactiveNet;
-import reactor.io.net.http.HttpClient;
+import reactor.io.netty.ReactiveNet;
+import reactor.io.netty.http.HttpClient;
 
 import org.springframework.core.io.buffer.DataBufferAllocator;
 import org.springframework.core.io.buffer.DefaultDataBufferAllocator;
diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java
index 15a78c126e..cf7136a4fa 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java
@@ -17,8 +17,8 @@ package org.springframework.http.server.reactive;
 
 import reactor.core.publisher.Mono;
 import reactor.io.buffer.Buffer;
-import reactor.io.net.ReactiveChannelHandler;
-import reactor.io.net.http.HttpChannel;
+import reactor.io.ipc.ChannelFluxHandler;
+import reactor.io.netty.http.HttpChannel;
 
 import org.springframework.core.io.buffer.DataBufferAllocator;
 import org.springframework.util.Assert;
@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
  * @author Stephane Maldini
  */
 public class ReactorHttpHandlerAdapter
-		implements ReactiveChannelHandler<Buffer, Buffer, HttpChannel<Buffer, Buffer>> {
+		implements ChannelFluxHandler<Buffer, Buffer, HttpChannel<Buffer, Buffer>> {
 
 	private final HttpHandler httpHandler;
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
index db3bb6186e..cb4f58fc50 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
@@ -21,8 +21,8 @@ import java.nio.ByteBuffer;
 
 import reactor.core.publisher.Flux;
 import reactor.io.buffer.Buffer;
-import reactor.io.net.http.HttpChannel;
-import reactor.io.net.http.model.Cookie;
+import reactor.io.netty.http.HttpChannel;
+import reactor.io.netty.http.model.Cookie;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferAllocator;
diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
index 37ec2b309e..0e57f1e2c7 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
@@ -22,9 +22,9 @@ import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.io.buffer.Buffer;
-import reactor.io.net.http.HttpChannel;
-import reactor.io.net.http.model.Cookie;
-import reactor.io.net.http.model.Status;
+import reactor.io.netty.http.HttpChannel;
+import reactor.io.netty.http.model.Cookie;
+import reactor.io.netty.http.model.Status;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpStatus;
diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java
index 9e61091331..5cbd81bfea 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/ReactorHttpServer.java
@@ -19,7 +19,7 @@ package org.springframework.http.server.reactive.boot;
 import reactor.core.flow.Loopback;
 import reactor.core.state.Completable;
 import reactor.io.buffer.Buffer;
-import reactor.io.net.ReactiveNet;
+import reactor.io.netty.ReactiveNet;
 
 import org.springframework.core.io.buffer.DataBufferAllocator;
 import org.springframework.core.io.buffer.DefaultDataBufferAllocator;
@@ -34,7 +34,7 @@ public class ReactorHttpServer extends HttpServerSupport
 
 	private ReactorHttpHandlerAdapter reactorHandler;
 
-	private reactor.io.net.http.HttpServer<Buffer, Buffer> reactorServer;
+	private reactor.io.netty.http.HttpServer<Buffer, Buffer> reactorServer;
 
 	private DataBufferAllocator allocator = new DefaultDataBufferAllocator();