diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpRequest.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpRequest.java
index 10960ab2ae..28f7a0e5ba 100644
--- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpRequest.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpRequest.java
@@ -26,13 +26,13 @@ import reactor.io.net.http.HttpChannel;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.reactive.web.http.ServerHttpRequest;
+import org.springframework.http.server.ReactiveServerHttpRequest;
 import org.springframework.util.Assert;
 
 /**
  * @author Stephane Maldini
  */
-public class PublisherReactorServerHttpRequest implements ServerHttpRequest {
+public class PublisherReactorServerHttpRequest implements ReactiveServerHttpRequest {
 
 	private final HttpChannel<Buffer, ?> channel;
 
diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpResponse.java
index 4f52316968..0e9827ad2f 100644
--- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpResponse.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/PublisherReactorServerHttpResponse.java
@@ -25,13 +25,13 @@ import reactor.io.net.http.model.Status;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
-import org.springframework.reactive.web.http.ServerHttpResponse;
+import org.springframework.http.server.ReactiveServerHttpResponse;
 import org.springframework.util.Assert;
 
 /**
  * @author Stephane Maldini
  */
-public class PublisherReactorServerHttpResponse implements ServerHttpResponse {
+public class PublisherReactorServerHttpResponse implements ReactiveServerHttpResponse {
 
 	private final HttpChannel<?, Buffer> channel;
 
@@ -67,7 +67,7 @@ public class PublisherReactorServerHttpResponse implements ServerHttpResponse {
 	}
 
 	@Override
-	public Publisher<Void> writeWith(Publisher<ByteBuffer> contentPublisher) {
+	public Publisher<Void> addBody(Publisher<ByteBuffer> contentPublisher) {
 		applyHeaders();
 		return this.channel.writeWith(Publishers.map(contentPublisher, Buffer::new));
 	}
diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java
index 12426ba5c1..2a50a26edf 100644
--- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/reactor/ReactorServerHttpResponse.java
@@ -15,20 +15,14 @@
  */
 package org.springframework.reactive.web.http.reactor;
 
+import java.nio.ByteBuffer;
+
 import org.reactivestreams.Publisher;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.reactive.web.http.ServerHttpResponse;
-import org.springframework.util.Assert;
-import reactor.Publishers;
 import reactor.io.buffer.Buffer;
 import reactor.io.net.http.HttpChannel;
-import reactor.io.net.http.model.Status;
 import reactor.rx.Stream;
 import reactor.rx.Streams;
 
-import java.nio.ByteBuffer;
-
 /**
  * @author Stephane Maldini
  */
@@ -44,7 +38,7 @@ public class ReactorServerHttpResponse extends PublisherReactorServerHttpRespons
 	}
 
 	@Override
-	public Stream<Void> writeWith(Publisher<ByteBuffer> contentPublisher) {
-		return Streams.wrap(super.writeWith(contentPublisher));
+	public Stream<Void> addBody(Publisher<ByteBuffer> contentPublisher) {
+		return Streams.wrap(super.addBody(contentPublisher));
 	}
 }