diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
index 6778f27518..8cae290faa 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -129,7 +129,7 @@ import org.hibernate.tool.schema.internal.StandardTableExporter;
 import org.hibernate.tool.schema.internal.StandardTableMigrator;
 import org.hibernate.tool.schema.internal.StandardUniqueKeyExporter;
 import org.hibernate.tool.schema.internal.StandardUserDefinedTypeExporter;
-import org.hibernate.tool.schema.internal.TableMigrator;
+import org.hibernate.tool.schema.spi.TableMigrator;
 import org.hibernate.tool.schema.spi.Cleaner;
 import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.tool.schema.spi.SchemaManagementTool;
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java b/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java
index 003de94ff9..cc18a0e641 100644
--- a/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java
+++ b/hibernate-core/src/main/java/org/hibernate/dialect/DialectDelegateWrapper.java
@@ -80,7 +80,7 @@ import org.hibernate.sql.ast.spi.SqlAppender;
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.internal.OptionalTableUpdate;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
-import org.hibernate.tool.schema.internal.TableMigrator;
+import org.hibernate.tool.schema.spi.TableMigrator;
 import org.hibernate.tool.schema.spi.Cleaner;
 import org.hibernate.tool.schema.spi.Exporter;
 import org.hibernate.tool.schema.spi.SchemaManagementTool;
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableMigrator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableMigrator.java
index 76d19a2e04..09169d5ba6 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableMigrator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/StandardTableMigrator.java
@@ -16,6 +16,7 @@ import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Table;
 import org.hibernate.tool.schema.extract.spi.ColumnInformation;
 import org.hibernate.tool.schema.extract.spi.TableInformation;
+import org.hibernate.tool.schema.spi.TableMigrator;
 import org.jboss.logging.Logger;
 
 import java.util.ArrayList;
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptTargetOutput.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptTargetOutput.java
index 69e3e73ec0..319eb3bdfb 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptTargetOutput.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/ScriptTargetOutput.java
@@ -5,8 +5,8 @@
 package org.hibernate.tool.schema.spi;
 
 /**
- * Contract for hiding the differences between a passed Writer, File or URL in
- * terms of how we write output scripts.
+ * Contract for hiding the differences between a passed {@code Writer},
+ * {@code File} or {@code URL} in terms of how we write output scripts.
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableMigrator.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TableMigrator.java
similarity index 93%
rename from hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableMigrator.java
rename to hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TableMigrator.java
index 6d19a6406e..44bfb88536 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/TableMigrator.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/spi/TableMigrator.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.tool.schema.internal;
+package org.hibernate.tool.schema.spi;
 
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.model.relational.SqlStringGenerationContext;