diff --git a/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java b/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java
index bbd5022a88..13e2b6d8e7 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java
@@ -22,7 +22,7 @@ import org.reactivestreams.Publisher;
 
 /**
  * Represents a "reactive" HTTP output message, consisting of {@linkplain #getHeaders() headers}
- * and the capability to add a {@linkplain #addBody(Publisher) body}.
+ * and the capability to add a {@linkplain #setBody(Publisher) body}.
  *
  * <p>Typically implemented by an HTTP request on the client-side, or a response on the server-side.
  *
@@ -36,6 +36,6 @@ public interface ReactiveHttpOutputMessage extends HttpMessage {
 	 * @param body the body to add
 	 * @return a publisher that indicates completion
 	 */
-	Publisher<Void> addBody(Publisher<ByteBuffer> body);
+	Publisher<Void> setBody(Publisher<ByteBuffer> body);
 
 }
diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java
index 221b0cbd61..2fa6eb650a 100644
--- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/dispatch/method/annotation/ResponseBodyResultHandler.java
@@ -140,10 +140,11 @@ public class ResponseBodyResultHandler implements HandlerResultHandler, Ordered
 				outputStream = postProcessor.encode(outputStream, elementType, mediaType, hints.toArray());
 			}
 			response.getHeaders().setContentType(mediaType);
-			return response.addBody(outputStream);
+			return response.setBody(outputStream);
 		}
 		return Publishers.error(new IllegalStateException(
-		  "Return value type '" + returnType.getParameterType().getName() + "' with media type '" + mediaType + "' not supported"  ));
+				"Return value type '" + returnType.getParameterType().getName() +
+						"' with media type '" + mediaType + "' not supported"));
 	}
 
 	private MediaType resolveMediaType(ReactiveServerHttpRequest request) {
diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpHandler.java
index 87076451b6..ff86a9a722 100644
--- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpHandler.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/HttpHandler.java
@@ -31,7 +31,7 @@ import org.springframework.http.server.ReactiveServerHttpResponse;
  * @author Rossen Stoyanchev
  * @author Sebastien Deleuze
  * @see ReactiveServerHttpRequest#getBody()
- * @see ReactiveServerHttpResponse#addBody(Publisher)
+ * @see ReactiveServerHttpResponse#setBody(Publisher)
  */
 public interface HttpHandler {
 
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 0e9827ad2f..dcc605fc3c 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
@@ -67,7 +67,7 @@ public class PublisherReactorServerHttpResponse implements ReactiveServerHttpRes
 	}
 
 	@Override
-	public Publisher<Void> addBody(Publisher<ByteBuffer> contentPublisher) {
+	public Publisher<Void> setBody(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 2a50a26edf..54bcac5eaa 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
@@ -38,7 +38,7 @@ public class ReactorServerHttpResponse extends PublisherReactorServerHttpRespons
 	}
 
 	@Override
-	public Stream<Void> addBody(Publisher<ByteBuffer> contentPublisher) {
-		return Streams.wrap(super.addBody(contentPublisher));
+	public Stream<Void> setBody(Publisher<ByteBuffer> contentPublisher) {
+		return Streams.wrap(super.setBody(contentPublisher));
 	}
 }
diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java
index 91989ec9c2..b19180dd89 100644
--- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/rxnetty/RxNettyServerHttpResponse.java
@@ -75,7 +75,7 @@ public class RxNettyServerHttpResponse implements ReactiveServerHttpResponse {
 	}
 
 	@Override
-	public Publisher<Void> addBody(Publisher<ByteBuffer> contentPublisher) {
+	public Publisher<Void> setBody(Publisher<ByteBuffer> contentPublisher) {
 		applyHeaders();
 		Observable<byte[]> contentObservable = RxJava1Converter.from(contentPublisher).map(content -> new Buffer(content).asBytes());
 		return RxJava1Converter.from(this.response.writeBytes(contentObservable));
diff --git a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java
index 614942283a..e0bc7c78f7 100644
--- a/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java
+++ b/spring-web-reactive/src/main/java/org/springframework/reactive/web/http/servlet/ServletServerHttpResponse.java
@@ -69,7 +69,7 @@ public class ServletServerHttpResponse implements ReactiveServerHttpResponse {
 	}
 
 	@Override
-	public Publisher<Void> addBody(final Publisher<ByteBuffer> contentPublisher) {
+	public Publisher<Void> setBody(final Publisher<ByteBuffer> contentPublisher) {
 		applyHeaders();
 		return (s -> contentPublisher.subscribe(responseSubscriber));
 	}
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMappingIntegrationTests.java
index 764a66ce56..70ca1c7b5c 100644
--- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMappingIntegrationTests.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/dispatch/handler/SimpleUrlHandlerMappingIntegrationTests.java
@@ -101,7 +101,7 @@ public class SimpleUrlHandlerMappingIntegrationTests extends AbstractHttpHandler
 
 		@Override
 		public Publisher<Void> handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) {
-			return response.addBody(Streams.just(Buffer.wrap("foo").byteBuffer()));
+			return response.setBody(Streams.just(Buffer.wrap("foo").byteBuffer()));
 		}
 	}
 
@@ -109,7 +109,7 @@ public class SimpleUrlHandlerMappingIntegrationTests extends AbstractHttpHandler
 
 		@Override
 		public Publisher<Void> handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) {
-			return response.addBody(Streams.just(Buffer.wrap("bar").byteBuffer()));
+			return response.setBody(Streams.just(Buffer.wrap("bar").byteBuffer()));
 		}
 	}
 
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java
index 62a29932fc..907191b95f 100644
--- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/EchoHandler.java
@@ -28,6 +28,6 @@ public class EchoHandler implements HttpHandler {
 
 	@Override
 	public Publisher<Void> handle(ReactiveServerHttpRequest request, ReactiveServerHttpResponse response) {
-		return response.addBody(request.getBody());
+		return response.setBody(request.getBody());
 	}
 }
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandler.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandler.java
index 592b510c38..79a87fd76e 100644
--- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandler.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/RandomHandler.java
@@ -76,7 +76,7 @@ public class RandomHandler implements HttpHandler {
 		});
 
 		response.getHeaders().setContentLength(RESPONSE_SIZE);
-		return response.addBody(Streams.just(ByteBuffer.wrap(randomBytes())));
+		return response.setBody(Streams.just(ByteBuffer.wrap(randomBytes())));
 	}
 
 	private byte[] randomBytes() {
diff --git a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandler.java b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandler.java
index fc18ec885f..490cbd4c1b 100644
--- a/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandler.java
+++ b/spring-web-reactive/src/test/java/org/springframework/reactive/web/http/XmlHandler.java
@@ -75,7 +75,7 @@ public class XmlHandler implements HttpHandler {
 			bos.close();
 			buffer.flip();
 
-			return response.addBody(Streams.just(buffer.byteBuffer()));
+			return response.setBody(Streams.just(buffer.byteBuffer()));
 		}
 		catch (Exception ex) {
 			logger.error(ex, ex);