diff --git a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java
index bc454b92b2..4c6f0361ca 100644
--- a/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java
+++ b/spring-messaging/src/main/java/org/springframework/messaging/rsocket/RSocketRequester.java
@@ -56,7 +56,7 @@ public interface RSocketRequester {
 	 * <p>For requestChannel interactions, i.e. Flux-to-Flux the metadata is
 	 * attached to the first request payload.
 	 * @param route the routing destination
-	 * @return a spec for further defining and executing the reuqest
+	 * @return a spec for further defining and executing the request
 	 */
 	RequestSpec route(String route);
 
@@ -64,8 +64,8 @@ public interface RSocketRequester {
 	/**
 	 * Obtain a builder for an {@link RSocketRequester} by connecting to an
 	 * RSocket server. The builder allows for customization of
-	 * {@link RSocketFactory.ClientRSocketFactory ClientRSocketFactory} settings,
-	 * {@link RSocketStrategies}, and for selecting the transport to use.
+	 * {@link io.rsocket.RSocketFactory.ClientRSocketFactory ClientRSocketFactory}
+	 * settings, {@link RSocketStrategies}, and for selecting the transport to use.
 	 */
 	static RSocketRequester.Builder builder() {
 		return new DefaultRSocketRequesterBuilder();
@@ -164,7 +164,7 @@ public interface RSocketRequester {
 		 * Provide request payload data. The given Object may be a synchronous
 		 * value, or a {@link Publisher} of values, or another async type that's
 		 * registered in the configured {@link ReactiveAdapterRegistry}.
-		 * <p>For multivalued Publishers, prefer using
+		 * <p>For multi-valued Publishers, prefer using
 		 * {@link #data(Publisher, Class)} or
 		 * {@link #data(Publisher, ParameterizedTypeReference)} since that makes
 		 * it possible to find a compatible {@code Encoder} up front vs looking
@@ -179,7 +179,7 @@ public interface RSocketRequester {
 		 * <p>Publisher semantics determined through the configured
 		 * {@link ReactiveAdapterRegistry} influence which of the 4 RSocket
 		 * interactions to use. Publishers with unknown semantics are treated
-		 * as multivalued. Consider registering a reactive type adapter, or
+		 * as multi-valued. Consider registering a reactive type adapter, or
 		 * passing {@code Mono.from(publisher)}.
 		 * <p>If the publisher completes empty, possibly {@code Publisher<Void>},
 		 * the request will have an empty data Payload.
@@ -214,7 +214,7 @@ public interface RSocketRequester {
 		 * expected data type is {@code Void.class}, the returned {@code Mono}
 		 * will complete after all data is consumed.
 		 * <p><strong>Note:</strong> Use of this method will raise an error if
-		 * the request payload is a multivalued {@link Publisher} as
+		 * the request payload is a multi-valued {@link Publisher} as
 		 * determined through the configured {@link ReactiveAdapterRegistry}.
 		 * @param dataType the expected data type for the response
 		 * @param <T> parameter for the expected data type
diff --git a/spring-test/src/main/java/org/springframework/test/context/TestConstructor.java b/spring-test/src/main/java/org/springframework/test/context/TestConstructor.java
index 8625e0db0c..461eaa4e29 100644
--- a/spring-test/src/main/java/org/springframework/test/context/TestConstructor.java
+++ b/spring-test/src/main/java/org/springframework/test/context/TestConstructor.java
@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
  *
  * <p>If {@code @TestConstructor} is not <em>present</em> or <em>meta-present</em>
  * on a test class, the default <em>test constructor autowire</em> mode will be used.
- * See {@link #AUTOWIRE_TEST_CONSTRUCTOR_PROPERTY_NAME} for details on how to change
+ * See {@link #TEST_CONSTRUCTOR_AUTOWIRE_PROPERTY_NAME} for details on how to change
  * the default mode. Note, however, that a local declaration of
  * {@link org.springframework.beans.factory.annotation.Autowired @Autowired} on
  * a constructor takes precedence over both {@code @TestConstructor} and the default
@@ -81,12 +81,12 @@ public @interface TestConstructor {
 	 * Flag for setting the <em>test constructor autowire</em> mode for the
 	 * current test class.
 	 * <p>Setting this flag overrides the global default. See
-	 * {@link #AUTOWIRE_TEST_CONSTRUCTOR_PROPERTY_NAME} for details on how to
+	 * {@link #TEST_CONSTRUCTOR_AUTOWIRE_PROPERTY_NAME} for details on how to
 	 * change the global default.
 	 * @return {@code true} if all test constructor arguments should be autowired
 	 * from the test's {@link org.springframework.context.ApplicationContext
 	 * ApplicationContext}
-	 * @see #AUTOWIRE_TEST_CONSTRUCTOR_PROPERTY_NAME
+	 * @see #TEST_CONSTRUCTOR_AUTOWIRE_PROPERTY_NAME
 	 * @see org.springframework.beans.factory.annotation.Autowired @Autowired
 	 */
 	boolean autowire();