diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java
index 52ef55bbde85..99c450274c93 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilder.java
@@ -125,7 +125,7 @@ private Mono<RSocketRequester> doConnect(ClientTransport transport) {
 			messageHandler.setHandlers(this.handlers);
 			messageHandler.setRSocketStrategies(rsocketStrategies);
 			messageHandler.afterPropertiesSet();
-			rsocketFactory.acceptor(messageHandler.clientAcceptor());
+			rsocketFactory.acceptor(messageHandler.clientResponder());
 		}
 		rsocketFactory.frameDecoder(PayloadDecoder.ZERO_COPY);
 		this.factoryConfigurers.forEach(consumer -> consumer.accept(rsocketFactory));
diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
index 0f21f3be734f..dfbb1272e3fb 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java
@@ -53,7 +53,7 @@
  * Extension of {@link MessageMappingMessageHandler} to use as an RSocket
  * responder by handling incoming streams via {@code @MessageMapping} annotated
  * methods.
- * <p>Use {@link #clientAcceptor()} and {@link #serverAcceptor()} to obtain
+ * <p>Use {@link #clientResponder()} and {@link #serverResponder()} to obtain
  * {@link io.rsocket.RSocketFactory.ClientRSocketFactory#acceptor(Function) client} or
  * {@link io.rsocket.RSocketFactory.ServerRSocketFactory#acceptor(SocketAcceptor) server}
  * side adapters.
@@ -270,7 +270,7 @@ protected void handleNoMatch(@Nullable RouteMatcher.Route destination, Message<?
 	 * <p>Subsequent stream requests can be handled with
 	 * {@link MessageMapping MessageMapping} methods.
 	 */
-	public SocketAcceptor serverAcceptor() {
+	public SocketAcceptor serverResponder() {
 		return (setupPayload, sendingRSocket) -> {
 			MessagingRSocket responder = createResponder(setupPayload, sendingRSocket);
 			return responder.handleConnectionSetupPayload(setupPayload).then(Mono.just(responder));
@@ -291,7 +291,7 @@ public SocketAcceptor serverAcceptor() {
 	 * <p>Subsequent stream requests can be handled with
 	 * {@link MessageMapping MessageMapping} methods.
 	 */
-	public BiFunction<ConnectionSetupPayload, RSocket, RSocket> clientAcceptor() {
+	public BiFunction<ConnectionSetupPayload, RSocket, RSocket> clientResponder() {
 		return (setupPayload, sendingRSocket) -> {
 			MessagingRSocket responder = createResponder(setupPayload, sendingRSocket);
 			responder.handleConnectionSetupPayload(setupPayload).subscribe();
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java
index 93e34ad77e28..d95218707d45 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketBufferLeakTests.java
@@ -79,7 +79,7 @@ public static void setupOnce() {
 		server = RSocketFactory.receive()
 				.frameDecoder(PayloadDecoder.ZERO_COPY)
 				.addResponderPlugin(payloadInterceptor) // intercept responding
-				.acceptor(context.getBean(RSocketMessageHandler.class).serverAcceptor())
+				.acceptor(context.getBean(RSocketMessageHandler.class).serverResponder())
 				.transport(TcpServerTransport.create("localhost", 7000))
 				.start()
 				.block();
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java
index 4e8ca25db46c..e6e4e1f2d669 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketClientToServerIntegrationTests.java
@@ -68,7 +68,7 @@ public static void setupOnce() {
 		server = RSocketFactory.receive()
 				.addResponderPlugin(interceptor)
 				.frameDecoder(PayloadDecoder.ZERO_COPY)
-				.acceptor(context.getBean(RSocketMessageHandler.class).serverAcceptor())
+				.acceptor(context.getBean(RSocketMessageHandler.class).serverResponder())
 				.transport(TcpServerTransport.create("localhost", 7000))
 				.start()
 				.block();
diff --git a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java
index fddc50ea5af5..32d78e578ce1 100644
--- a/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java
+++ b/spring-messaging/src/test/java/org/springframework/messaging/rsocket/RSocketServerToClientIntegrationTests.java
@@ -65,7 +65,7 @@ public static void setupOnce() {
 
 		server = RSocketFactory.receive()
 				.frameDecoder(PayloadDecoder.ZERO_COPY)
-				.acceptor(context.getBean(RSocketMessageHandler.class).serverAcceptor())
+				.acceptor(context.getBean(RSocketMessageHandler.class).serverResponder())
 				.transport(TcpServerTransport.create("localhost", 0))
 				.start()
 				.block();
diff --git a/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketClientToServerCoroutinesIntegrationTests.kt b/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketClientToServerCoroutinesIntegrationTests.kt
index b32ce7a6849d..179d04b944a1 100644
--- a/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketClientToServerCoroutinesIntegrationTests.kt
+++ b/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketClientToServerCoroutinesIntegrationTests.kt
@@ -202,7 +202,7 @@ class RSocketClientToServerCoroutinesIntegrationTests {
 			server = RSocketFactory.receive()
 					.addResponderPlugin(interceptor)
 					.frameDecoder(PayloadDecoder.ZERO_COPY)
-					.acceptor(context.getBean(RSocketMessageHandler::class.java).serverAcceptor())
+					.acceptor(context.getBean(RSocketMessageHandler::class.java).serverResponder())
 					.transport(TcpServerTransport.create("localhost", 7000))
 					.start()
 					.block()!!