diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
index 3377618ac9e7..6efbabb6b94f 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java
@@ -17,7 +17,6 @@
 import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.scan.spi.Scanner;
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
-import org.hibernate.boot.model.TypeBeanInstanceProducer;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -25,6 +24,7 @@
 import org.hibernate.boot.registry.selector.spi.StrategySelector;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.ClassLoaderAccess;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.config.spi.ConfigurationService;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeBeanInstanceProducer.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/TypeBeanInstanceProducer.java
similarity index 94%
rename from hibernate-core/src/main/java/org/hibernate/boot/model/TypeBeanInstanceProducer.java
rename to hibernate-core/src/main/java/org/hibernate/boot/internal/TypeBeanInstanceProducer.java
index ffabe3fca571..5cc24d146814 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeBeanInstanceProducer.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/TypeBeanInstanceProducer.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.boot.model;
+package org.hibernate.boot.internal;
 
 import org.hibernate.InstantiationException;
 import org.hibernate.Internal;
@@ -19,7 +19,7 @@
  *
  * @author Christian Beikov
  */
-@Internal //TODO: move this to org.hibernate.boot.internal, where its only usage is
+@Internal
 public class TypeBeanInstanceProducer implements BeanInstanceProducer, TypeBootstrapContext {
 	private final ConfigurationService configurationService;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java
index 8012a822206f..4cdcf972ef6a 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/AbstractConverterDescriptor.java
@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.AutoApplicableConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java
index d5da7294f560..1987e71ddba8 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ClassBasedConverterDescriptor.java
@@ -4,7 +4,7 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext;
 import org.hibernate.resource.beans.spi.ManagedBean;
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java
index e4093de3796d..ff4408f53ee9 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/ConverterHelper.java
@@ -12,7 +12,7 @@
 
 import org.hibernate.AnnotationException;
 import org.hibernate.HibernateException;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.internal.util.GenericsHelper;
 import org.hibernate.internal.util.type.PrimitiveWrapperHelper;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java
index 989a619b3d34..d20732c38766 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/convert/internal/InstanceBasedConverterDescriptor.java
@@ -4,7 +4,7 @@
  */
 package org.hibernate.boot.model.convert.internal;
 
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.JpaAttributeConverterCreationContext;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.resource.beans.spi.ProvidedInstanceManagedBeanImpl;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/XMLContext.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/XMLContext.java
index 0531e86ae94f..8089bc3001d7 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/XMLContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/XMLContext.java
@@ -11,7 +11,7 @@
 import java.util.Map;
 
 import org.hibernate.AnnotationException;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbConverterImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityImpl;
 import org.hibernate.boot.jaxb.mapping.spi.JaxbEntityListenerContainerImpl;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConversionRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConversionRegistration.java
index 17d2ed46a613..69c6ba6f1116 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConversionRegistration.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/models/spi/ConversionRegistration.java
@@ -8,7 +8,7 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.internal.AutoApplicableConverterDescriptorBypassedImpl;
 import org.hibernate.boot.model.convert.internal.AutoApplicableConverterDescriptorStandardImpl;
 import org.hibernate.boot.model.convert.internal.ConverterHelper;
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
index 746c4141649f..fa4c04244b26 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
@@ -13,7 +13,6 @@
 import org.hibernate.boot.archive.scan.spi.ScanEnvironment;
 import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
-import org.hibernate.boot.internal.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -61,7 +60,7 @@ public interface BootstrapContext {
 	/**
 	 * The {@link BeanInstanceProducer} to use when creating custom type references.
 	 *
-	 * @implNote Usually a {@link org.hibernate.boot.model.TypeBeanInstanceProducer}.
+	 * @implNote Usually a {@link org.hibernate.boot.internal.TypeBeanInstanceProducer}.
 	 */
 	BeanInstanceProducer getCustomTypeProducer();
 
@@ -104,9 +103,8 @@ public interface BootstrapContext {
 	/**
 	 * Access to the shared {@link ClassmateContext} object used
 	 * throughout the bootstrap process.
-	 *
-	 * @return Access to the shared {@link ClassmateContext} delegates.
 	 */
+	@Incubating
 	ClassmateContext getClassmateContext();
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassmateContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/ClassmateContext.java
similarity index 84%
rename from hibernate-core/src/main/java/org/hibernate/boot/internal/ClassmateContext.java
rename to hibernate-core/src/main/java/org/hibernate/boot/spi/ClassmateContext.java
index e07273569198..bd216e2d0f34 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/internal/ClassmateContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/ClassmateContext.java
@@ -2,14 +2,18 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.boot.internal;
+package org.hibernate.boot.spi;
 
 import com.fasterxml.classmate.MemberResolver;
 import com.fasterxml.classmate.TypeResolver;
+import org.hibernate.Incubating;
 
 /**
+ * Exposes the Classmate {@link TypeResolver} and {@link MemberResolver}.
+ *
  * @author Steve Ebersole
  */
+@Incubating
 public class ClassmateContext {
 	private TypeResolver typeResolver = new TypeResolver();
 	private MemberResolver memberResolver = new MemberResolver( typeResolver );
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
index 3a384c934228..34e97c252ec3 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
@@ -26,7 +26,7 @@
 import org.hibernate.boot.MetadataBuilder;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.SessionFactoryBuilder;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.jaxb.spi.Binding;
 import org.hibernate.boot.model.FunctionContributor;
 import org.hibernate.boot.model.NamedEntityGraphDefinition;
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
index 22e53e68ebe6..9ed86a0ed846 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java
@@ -26,7 +26,7 @@
 import org.hibernate.boot.cfgxml.spi.CfgXmlAccessService;
 import org.hibernate.boot.cfgxml.spi.LoadedConfig;
 import org.hibernate.boot.cfgxml.spi.MappingReference;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmHibernateMapping;
 import org.hibernate.boot.jaxb.hbm.spi.JaxbHbmRootEntityType;
 import org.hibernate.boot.jaxb.spi.Binding;
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
index d90eb61e7337..1e6191984b50 100644
--- a/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
+++ b/hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java
@@ -17,7 +17,7 @@
 import org.hibernate.annotations.SoftDelete;
 import org.hibernate.annotations.SoftDeleteType;
 import org.hibernate.annotations.TimeZoneStorageType;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.TypeDefinition;
 import org.hibernate.boot.model.convert.internal.AutoApplicableConverterDescriptorBypassedImpl;
 import org.hibernate.boot.model.convert.internal.InstanceBasedConverterDescriptor;
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
index 02740dcaf1f9..f93a675ccf83 100644
--- a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/InformationExtractorJdbcDatabaseMetaDataImpl.java
@@ -53,8 +53,8 @@ protected <T> T processSchemaResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					  getJdbcDatabaseMetaData()
-							  .getSchemas( catalog, schemaPattern ) ) {
+					getJdbcDatabaseMetaData()
+							.getSchemas( catalog, schemaPattern ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -68,8 +68,8 @@ protected <T> T processTableResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					  getJdbcDatabaseMetaData()
-							  .getTables( catalog, schemaPattern, tableNamePattern, types) ) {
+					getJdbcDatabaseMetaData()
+							.getTables( catalog, schemaPattern, tableNamePattern, types) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -83,8 +83,8 @@ protected <T> T processColumnsResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					 getJdbcDatabaseMetaData()
-							 .getColumns( catalog, schemaPattern, tableNamePattern, columnNamePattern ) ) {
+					getJdbcDatabaseMetaData()
+							.getColumns( catalog, schemaPattern, tableNamePattern, columnNamePattern ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -97,8 +97,8 @@ protected <T> T processPrimaryKeysResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					 getJdbcDatabaseMetaData()
-							 .getPrimaryKeys( catalogFilter, schemaFilter, tableName.getText() ) ) {
+					getJdbcDatabaseMetaData()
+							.getPrimaryKeys( catalogFilter, schemaFilter, tableName.getText() ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -113,8 +113,8 @@ protected <T> T processIndexInfoResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					  getJdbcDatabaseMetaData()
-							  .getIndexInfo( catalog, schema, table, unique, approximate ) ) {
+					getJdbcDatabaseMetaData()
+							.getIndexInfo( catalog, schema, table, unique, approximate ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -127,8 +127,8 @@ protected <T> T processImportedKeysResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					  getJdbcDatabaseMetaData()
-							  .getImportedKeys( catalog, schema, table ) ) {
+					getJdbcDatabaseMetaData()
+							.getImportedKeys( catalog, schema, table ) ) {
 			return processor.process( resultSet );
 		}
 	}
@@ -144,9 +144,9 @@ protected <T> T processCrossReferenceResultSet(
 			ExtractionContext.ResultSetProcessor<T> processor)
 					throws SQLException {
 		try ( ResultSet resultSet =
-					 getJdbcDatabaseMetaData()
-							 .getCrossReference( parentCatalog, parentSchema, parentTable,
-									 foreignCatalog, foreignSchema, foreignTable) ) {
+					getJdbcDatabaseMetaData()
+							.getCrossReference( parentCatalog, parentSchema, parentTable,
+									foreignCatalog, foreignSchema, foreignTable) ) {
 			return processor.process( resultSet );
 		}
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
index b6ff4774e166..8a8e778aa9df 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/BootstrapContextTesting.java
@@ -16,8 +16,8 @@
 import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
 import org.hibernate.boot.internal.ClassLoaderAccessImpl;
-import org.hibernate.boot.internal.ClassmateContext;
-import org.hibernate.boot.model.TypeBeanInstanceProducer;
+import org.hibernate.boot.spi.ClassmateContext;
+import org.hibernate.boot.internal.TypeBeanInstanceProducer;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
index 90cbdab2ea9b..70a8534c7044 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/scanning/ScanningCoordinatorTest.java
@@ -25,7 +25,7 @@
 import org.hibernate.boot.archive.scan.spi.ScanResult;
 import org.hibernate.boot.archive.scan.spi.Scanner;
 import org.hibernate.boot.archive.spi.InputStreamAccess;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.process.internal.ManagedResourcesImpl;
 import org.hibernate.boot.model.process.internal.ScanningCoordinator;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java
index bc8203479077..a18ac1ed67b1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java
@@ -13,7 +13,7 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.model.convert.internal.InstanceBasedConverterDescriptor;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java
index 078604018997..68e8cf47fecb 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java
@@ -11,7 +11,7 @@
 import org.hibernate.boot.archive.scan.spi.ScanEnvironment;
 import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
-import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.boot.spi.ClassmateContext;
 import org.hibernate.boot.internal.MetadataBuilderImpl;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;