diff --git a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java
index 31ab36f2f..5d309126e 100644
--- a/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java
+++ b/spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/BasicJdbcConverter.java
@@ -84,7 +84,7 @@ public class BasicJdbcConverter extends BasicRelationalConverter implements Jdbc
 	private SpELContext spELContext;
 
 	/**
-	 * Creates a new {@link BasicRelationalConverter} given {@link MappingContext} and a
+	 * Creates a new {@link BasicJdbcConverter} given {@link MappingContext} and a
 	 * {@link JdbcTypeFactory#unsupported() no-op type factory} throwing {@link UnsupportedOperationException} on type
 	 * creation. Use
 	 * {@link #BasicJdbcConverter(RelationalMappingContext, RelationResolver, CustomConversions, JdbcTypeFactory, IdentifierProcessing)}
@@ -108,7 +108,7 @@ public class BasicJdbcConverter extends BasicRelationalConverter implements Jdbc
 	}
 
 	/**
-	 * Creates a new {@link BasicRelationalConverter} given {@link MappingContext}.
+	 * Creates a new {@link BasicJdbcConverter} given {@link MappingContext}.
 	 *
 	 * @param context must not be {@literal null}.
 	 * @param relationResolver used to fetch additional relations from the database. Must not be {@literal null}.
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java
index 66addb188..a53b773a9 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/BasicRelationalConverterAggregateReferenceUnitTests.java
@@ -29,7 +29,7 @@ import org.springframework.data.util.TypeInformation;
 
 /**
  * Unit tests for the handling of {@link AggregateReference}s in the
- * {@link org.springframework.data.relational.core.conversion.BasicRelationalConverter}.
+ * {@link org.springframework.data.jdbc.core.convert.BasicJdbcConverter}.
  *
  * @author Jens Schauder
  */
diff --git a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java
index 4f705bf09..dad0acabf 100644
--- a/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java
+++ b/spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java
@@ -224,7 +224,7 @@ public abstract class AbstractR2dbcConfiguration implements ApplicationContextAw
 
 	/**
 	 * Register custom {@link Converter}s in a {@link CustomConversions} object if required. These
-	 * {@link CustomConversions} will be registered with the {@link BasicRelationalConverter} and
+	 * {@link CustomConversions} will be registered with the {@link MappingR2dbcConverter} and
 	 * {@link #r2dbcMappingContext(Optional, R2dbcCustomConversions, RelationalManagedTypes)}. Returns an empty
 	 * {@link R2dbcCustomConversions} instance by default. Override {@link #getCustomConverters()} to supply custom
 	 * converters.
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java
index 55a070791..322f2de71 100644
--- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java
+++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/NamingStrategy.java
@@ -88,7 +88,7 @@ public interface NamingStrategy {
 	}
 
 	/**
-	 * @deprecated use {@link #getReverseColumnName(AggregatePath)} instead.
+	 * @deprecated use {@link #getReverseColumnName(RelationalPersistentEntity)} instead.
 	 */
 	@Deprecated(since = "3.2", forRemoval = true)
 	default String getReverseColumnName(PersistentPropertyPathExtension path) {