diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/ReactiveConnectionPoolInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/ReactiveConnectionPoolInitiator.java
index 15c517acc..cf57e94f0 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/ReactiveConnectionPoolInitiator.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/ReactiveConnectionPoolInitiator.java
@@ -19,10 +19,10 @@
 import java.util.Map;
 
 /**
- * A Hibernate {@link StandardServiceInitiator service initiator} that
+ * A Hibernate {@linkplain StandardServiceInitiator service initiator} that
  * integrates our {@link ReactiveConnectionPool}. By default, the pool
- * implementation is {@link DefaultSqlClientPool}. A custom implementation may
- * be specified via {@link Settings#SQL_CLIENT_POOL}.
+ * implementation is {@link DefaultSqlClientPool}. A custom implementation
+ * may be specified via {@link Settings#SQL_CLIENT_POOL}.
  *
  * @see ReactiveConnectionPool
  * @see DefaultSqlClientPool
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/SqlClientPoolConfigurationInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/SqlClientPoolConfigurationInitiator.java
index e23656d21..1c12cc8b6 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/SqlClientPoolConfigurationInitiator.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/SqlClientPoolConfigurationInitiator.java
@@ -16,7 +16,7 @@
 import java.util.Map;
 
 /**
- * A Hibernate {@link StandardServiceInitiator service initiator} that
+ * A Hibernate {@linkplain StandardServiceInitiator service initiator} that
  * allows the user to define their own {@link SqlClientPoolConfiguration}
  * strategy.
  */
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcConnectionProviderInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcConnectionProviderInitiator.java
index 6ecdffe2f..a57f72b16 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcConnectionProviderInitiator.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcConnectionProviderInitiator.java
@@ -14,8 +14,8 @@
 import java.util.Map;
 
 /**
- * A Hibernate {@link StandardServiceInitiator service initiator} that
- * wraps the Hibernate {@link ConnectionProvider} in an instance of
+ * A Hibernate {@linkplain StandardServiceInitiator service initiator}
+ * that wraps the Hibernate {@link ConnectionProvider} in an instance of
  * {@link NoJdbcConnectionProvider}.
  *
  * @author Gavin King
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java
index 5580c99fa..953285dd4 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java
@@ -28,8 +28,8 @@
 import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
 
 /**
- * A Hibernate {@link StandardServiceInitiator service initiator} that
- * provides an implementation of {@link JdbcEnvironment} that infers
+ * A Hibernate {@linkplain StandardServiceInitiator service initiator}
+ * that provides an implementation of {@link JdbcEnvironment} that infers
  * the Hibernate {@link org.hibernate.dialect.Dialect} from the JDBC URL.
  */
 public class NoJdbcEnvironmentInitiator implements StandardServiceInitiator<JdbcEnvironment> {
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcMultiTenantConnectionProviderInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcMultiTenantConnectionProviderInitiator.java
index 60a6cf599..50e614e2e 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcMultiTenantConnectionProviderInitiator.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcMultiTenantConnectionProviderInitiator.java
@@ -13,8 +13,8 @@
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 /**
- * A Hibernate {@link StandardServiceInitiator service initiator} for
- * {@link NoJdbcMultiTenantConnectionProvider}.
+ * A Hibernate {@linkplain StandardServiceInitiator service initiator}
+ * for {@link NoJdbcMultiTenantConnectionProvider}.
  *
  * @author Gavin King
  */
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJtaPlatformInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJtaPlatformInitiator.java
index 30add8dae..8fd12fa10 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJtaPlatformInitiator.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJtaPlatformInitiator.java
@@ -13,7 +13,8 @@
 import java.util.Map;
 
 /**
- * A Hibernate {@link StandardServiceInitiator service initiator} for the non-configured form of JTA platform.
+ * A Hibernate {@linkplain StandardServiceInitiator service initiator}
+ * for the non-configured form of JTA platform.
  *
  * @see NoJtaPlatform
  */
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactiveMarkerServiceInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactiveMarkerServiceInitiator.java
index e7e92c270..46b4549d8 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactiveMarkerServiceInitiator.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactiveMarkerServiceInitiator.java
@@ -11,7 +11,8 @@
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 /**
- * A Hibernate {@link StandardServiceInitiator service initiator} for {@link ReactiveMarkerService}.
+ * A Hibernate {@linkplain StandardServiceInitiator service initiator} for
+ * {@link ReactiveMarkerService}.
  */
 public final class ReactiveMarkerServiceInitiator implements StandardServiceInitiator<ReactiveMarkerService> {
 
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactivePersisterClassResolverInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactivePersisterClassResolverInitiator.java
index 8e9670860..8edd7b4b1 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactivePersisterClassResolverInitiator.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactivePersisterClassResolverInitiator.java
@@ -12,8 +12,9 @@
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 /**
- * A Hibernate {@link StandardServiceInitiator service initiator} that creates a {@link ReactivePersisterClassResolver} to register
- * the persisters Hibernate Reactive needs.
+ * A Hibernate {@linkplain StandardServiceInitiator service initiator}
+ * that creates a {@link ReactivePersisterClassResolver} to register the
+ * persisters needed by Hibernate Reactive.
  */
 public class ReactivePersisterClassResolverInitiator implements StandardServiceInitiator<PersisterClassResolver> {
 	public static final ReactivePersisterClassResolverInitiator INSTANCE = new ReactivePersisterClassResolverInitiator();
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactiveSessionFactoryBuilderInitiator.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactiveSessionFactoryBuilderInitiator.java
index 768c36ec6..14805057f 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactiveSessionFactoryBuilderInitiator.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/ReactiveSessionFactoryBuilderInitiator.java
@@ -12,9 +12,9 @@
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
 /**
- * A Hibernate {@link StandardServiceInitiator service initiator} that
- * wraps the Hibernate {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider} in an instance of
- * {@link NoJdbcConnectionProvider}.
+ * A Hibernate {@linkplain StandardServiceInitiator service initiator} that wraps
+ * the Hibernate {@link org.hibernate.engine.jdbc.connections.spi.ConnectionProvider}
+ * in an instance of {@link NoJdbcConnectionProvider}.
  */
 public class ReactiveSessionFactoryBuilderInitiator implements StandardServiceInitiator<SessionFactoryBuilderService> {