From e8c99bbe5b1bc78bf9f78b79f71b1c600f50b343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Tue, 2 Feb 2021 20:30:42 +0100
Subject: [PATCH] HSEARCH-4153 Rename LoadingContext to SearchLoadingContext
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

To avoid confusion with types we're about to introduce.

Signed-off-by: Yoann Rodière <yoann@hibernate.org>
---
 .../elasticsearch/ElasticsearchExtension.java |  8 ++---
 .../impl/IndexManagerBackendContext.java      |  4 +--
 ...asticsearchSearchQueryOptionsStepImpl.java |  4 +--
 ...lasticsearchSearchQuerySelectStepImpl.java |  8 ++---
 .../impl/ElasticsearchSearchQueryBuilder.java | 10 +++---
 ...lasticsearchSearchQueryBuilderFactory.java | 12 +++----
 .../impl/ElasticsearchSearchQueryImpl.java    |  6 ++--
 ...lasticsearchSearchQueryRequestContext.java |  6 ++--
 .../query/impl/SearchBackendContext.java      |  4 +--
 .../backend/lucene/LuceneExtension.java       |  8 ++---
 .../impl/IndexManagerBackendContext.java      |  4 +--
 .../LuceneSearchQueryOptionsStepImpl.java     |  4 +--
 .../impl/LuceneSearchQuerySelectStepImpl.java |  8 ++---
 .../query/impl/LuceneSearchQueryBuilder.java  | 10 +++---
 .../impl/LuceneSearchQueryBuilderFactory.java | 12 +++----
 .../query/impl/LuceneSearchQueryImpl.java     |  6 ++--
 .../impl/LuceneSearchQueryRequestContext.java |  8 ++---
 .../query/impl/SearchBackendContext.java      |  4 +--
 .../scope/impl/MappedIndexScopeImpl.java      |  4 +--
 .../mapper/scope/spi/MappedIndexScope.java    |  4 +--
 .../SearchLoadingContext.java}                |  6 ++--
 .../SearchLoadingContextBuilder.java}         |  8 ++---
 .../search/query/SearchQueryExtension.java    |  6 ++--
 .../query/dsl/SearchQueryDslExtension.java    |  6 ++--
 .../impl/DefaultSearchQueryOptionsStep.java   |  4 +--
 .../impl/DefaultSearchQuerySelectStep.java    |  8 ++---
 ...bstractExtendedSearchQueryOptionsStep.java |  4 +--
 .../spi/AbstractSearchQueryOptionsStep.java   |  6 ++--
 .../spi/AbstractSearchQuerySelectStep.java    |  4 +--
 .../query/spi/SearchQueryBuilderFactory.java  | 10 +++---
 .../ElasticsearchExtensionIT.java             |  4 +--
 .../backend/lucene/LuceneExtensionIT.java     |  4 +--
 .../search/projection/SearchProjectionIT.java |  6 ++--
 .../tck/search/query/SearchQueryBaseIT.java   | 18 +++++-----
 .../query/SearchQueryLoadingOptionsIT.java    | 12 +++----
 ...rchQueryResultLoadingOrTransformingIT.java | 34 +++++++++----------
 .../SearchQueryScrollResultLoadingIT.java     | 10 +++---
 .../tck/testsupport/stub/MapperMockUtils.java |  4 +--
 .../javabean/scope/impl/SearchScopeImpl.java  |  4 +--
 .../JavaBeanSearchLoadingContext.java}        | 17 +++++-----
 .../orm/scope/impl/SearchScopeImpl.java       |  4 +--
 .../HibernateOrmSearchLoadingContext.java}    | 21 +++++-------
 ...bernateOrmSearchQueryAdapterExtension.java | 10 +++---
 .../scope/impl/PojoScopeDelegateImpl.java     |  4 +--
 .../pojo/scope/spi/PojoScopeDelegate.java     |  4 +--
 .../common/rule/NextScrollWorkCall.java       |  6 ++--
 .../common/rule/ScrollWorkCall.java           |  6 ++--
 .../common/rule/SearchWorkCall.java           |  6 ++--
 .../rule/VerifyingStubBackendBehavior.java    |  8 ++---
 .../stub/backend/StubBackendBehavior.java     |  8 ++---
 .../impl/StubSearchQueryBuilderFactory.java   | 10 +++---
 .../stub/backend/search/StubSearchQuery.java  |  6 ++--
 .../search/StubSearchQueryBuilder.java        |  6 ++--
 .../stub/backend/search/StubSearchScroll.java |  6 ++--
 .../mapper/stub/GenericStubMappingScope.java  | 15 ++++----
 .../mapper/stub/StubMappingScope.java         |  4 +--
 ...ext.java => StubSearchLoadingContext.java} |  6 ++--
 57 files changed, 216 insertions(+), 223 deletions(-)
 rename engine/src/main/java/org/hibernate/search/engine/search/loading/{context/spi/LoadingContext.java => spi/SearchLoadingContext.java} (74%)
 rename engine/src/main/java/org/hibernate/search/engine/search/loading/{context/spi/LoadingContextBuilder.java => spi/SearchLoadingContextBuilder.java} (82%)
 rename mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/loading/{context/impl/JavaBeanLoadingContext.java => impl/JavaBeanSearchLoadingContext.java} (65%)
 rename mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/{context/impl/HibernateOrmLoadingContext.java => impl/HibernateOrmSearchLoadingContext.java} (80%)
 rename util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/{StubLoadingContext.java => StubSearchLoadingContext.java} (79%)

diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java
index 8eed57509bf..eff9f9bcbce 100644
--- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java
+++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java
@@ -34,8 +34,8 @@
 import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
 import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactoryExtension;
 import org.hibernate.search.engine.search.aggregation.dsl.spi.SearchAggregationDslContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
 import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactoryExtension;
 import org.hibernate.search.engine.search.predicate.dsl.spi.SearchPredicateDslContext;
@@ -120,7 +120,7 @@ public Optional<ElasticsearchSearchQuerySelectStep<R, E, LOS>> extendOptional(
 			SearchQuerySelectStep<?, R, E, LOS, ?, ?> original,
 			IndexScope<?> indexScope,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
 		if ( indexScope instanceof ElasticsearchIndexScope ) {
 			return Optional.of( new ElasticsearchSearchQuerySelectStepImpl<>(
 					(ElasticsearchIndexScope) indexScope, sessionContext, loadingContextBuilder
@@ -136,7 +136,7 @@ public Optional<ElasticsearchSearchQuerySelectStep<R, E, LOS>> extendOptional(
 	 */
 	@Override
 	public Optional<ElasticsearchSearchQuery<H>> extendOptional(SearchQuery<H> original,
-			LoadingContext<?, ?> loadingContext) {
+			SearchLoadingContext<?, ?> loadingContext) {
 		if ( original instanceof ElasticsearchSearchQuery ) {
 			return Optional.of( (ElasticsearchSearchQuery<H>) original );
 		}
diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/index/impl/IndexManagerBackendContext.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/index/impl/IndexManagerBackendContext.java
index 74b11d9ff52..c32d3f93cc6 100644
--- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/index/impl/IndexManagerBackendContext.java
+++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/index/impl/IndexManagerBackendContext.java
@@ -41,7 +41,7 @@
 import org.hibernate.search.engine.backend.work.execution.spi.IndexWorkspace;
 import org.hibernate.search.engine.common.timing.spi.TimingSource;
 import org.hibernate.search.engine.reporting.FailureHandler;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.util.common.reporting.EventContext;
 
 import com.google.gson.Gson;
@@ -152,7 +152,7 @@ public ElasticsearchSearchContext createSearchContext(BackendMappingContext mapp
 	public <H> ElasticsearchSearchQueryBuilder<H> createSearchQueryBuilder(
 			ElasticsearchSearchContext searchContext,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			ElasticsearchSearchProjection<?, H> rootProjection) {
 		multiTenancyStrategy.documentIdHelper().checkTenantId( sessionContext.tenantIdentifier(), eventContext );
 		return new ElasticsearchSearchQueryBuilder<>(
diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQueryOptionsStepImpl.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQueryOptionsStepImpl.java
index b8719373250..b1e9319290c 100644
--- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQueryOptionsStepImpl.java
+++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQueryOptionsStepImpl.java
@@ -20,7 +20,7 @@
 import org.hibernate.search.backend.elasticsearch.scope.impl.ElasticsearchIndexScope;
 import org.hibernate.search.backend.elasticsearch.search.query.impl.ElasticsearchSearchQueryBuilder;
 import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
 import org.hibernate.search.engine.search.query.dsl.spi.AbstractExtendedSearchQueryOptionsStep;
 import org.hibernate.search.engine.search.sort.dsl.SearchSortFactory;
@@ -43,7 +43,7 @@ class ElasticsearchSearchQueryOptionsStepImpl<H, LOS>
 
 	ElasticsearchSearchQueryOptionsStepImpl(ElasticsearchIndexScope indexSearchScope,
 			ElasticsearchSearchQueryBuilder<H> searchQueryBuilder,
-			LoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
 		super( indexSearchScope, searchQueryBuilder, loadingContextBuilder );
 		this.searchQueryBuilder = searchQueryBuilder;
 	}
diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQuerySelectStepImpl.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQuerySelectStepImpl.java
index 5b886aa73d9..816e5ba5e3c 100644
--- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQuerySelectStepImpl.java
+++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/dsl/impl/ElasticsearchSearchQuerySelectStepImpl.java
@@ -24,7 +24,7 @@
 import org.hibernate.search.engine.search.predicate.dsl.PredicateFinalStep;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.query.dsl.spi.AbstractSearchQuerySelectStep;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 
 public class ElasticsearchSearchQuerySelectStepImpl<R, E, LOS>
 		extends AbstractSearchQuerySelectStep<
@@ -40,11 +40,11 @@ public class ElasticsearchSearchQuerySelectStepImpl<R, E, LOS>
 
 	private final ElasticsearchIndexScope indexScope;
 	private final BackendSessionContext sessionContext;
-	private final LoadingContextBuilder<R, E, LOS> loadingContextBuilder;
+	private final SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder;
 
 	public ElasticsearchSearchQuerySelectStepImpl(ElasticsearchIndexScope indexScope,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
 		this.indexScope = indexScope;
 		this.sessionContext = sessionContext;
 		this.loadingContextBuilder = loadingContextBuilder;
@@ -109,7 +109,7 @@ protected BackendSessionContext sessionContext() {
 	}
 
 	@Override
-	protected LoadingContextBuilder<R, E, LOS> loadingContextBuilder() {
+	protected SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder() {
 		return loadingContextBuilder;
 	}
 
diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilder.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilder.java
index 753b6348dbd..430912b2d0d 100644
--- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilder.java
+++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilder.java
@@ -30,8 +30,8 @@
 import org.hibernate.search.backend.elasticsearch.work.impl.ElasticsearchSearchResultExtractor;
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
 import org.hibernate.search.engine.search.aggregation.AggregationKey;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilder;
 import org.hibernate.search.engine.search.timeout.spi.TimeoutManager;
 import org.hibernate.search.engine.spatial.GeoPoint;
@@ -60,7 +60,7 @@ public class ElasticsearchSearchQueryBuilder<H>
 	private final BackendSessionContext sessionContext;
 
 	private final PredicateRequestContext rootPredicateContext;
-	private final LoadingContextBuilder<?, ?, ?> loadingContextBuilder;
+	private final SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder;
 	private final ElasticsearchSearchProjection<?, H> rootProjection;
 	private final Integer scrollTimeout;
 
@@ -81,7 +81,7 @@ public ElasticsearchSearchQueryBuilder(
 			ElasticsearchParallelWorkOrchestrator queryOrchestrator,
 			ElasticsearchSearchContext searchContext,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			ElasticsearchSearchProjection<?, H> rootProjection,
 			Integer scrollTimeout) {
 		this.workFactory = workFactory;
@@ -197,7 +197,7 @@ public ElasticsearchSearchQuery<H> build() {
 			payload.add( "sort", jsonSort );
 		}
 
-		LoadingContext<?, ?> loadingContext = loadingContextBuilder.build();
+		SearchLoadingContext<?, ?> loadingContext = loadingContextBuilder.build();
 
 		ElasticsearchSearchQueryRequestContext requestContext = new ElasticsearchSearchQueryRequestContext(
 				searchContext, sessionContext, loadingContext, rootPredicateContext, distanceSorts
diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilderFactory.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilderFactory.java
index 5c5f0b691cb..df3988fc245 100644
--- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilderFactory.java
+++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryBuilderFactory.java
@@ -17,7 +17,7 @@
 import org.hibernate.search.backend.elasticsearch.search.projection.impl.ElasticsearchSearchProjectionBuilderFactory;
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
 import org.hibernate.search.engine.search.projection.SearchProjection;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilderFactory;
 
 public class ElasticsearchSearchQueryBuilderFactory
@@ -38,7 +38,7 @@ public ElasticsearchSearchQueryBuilderFactory(SearchBackendContext searchBackend
 
 	@Override
 	public <E> ElasticsearchSearchQueryBuilder<E> selectEntity(
-			BackendSessionContext sessionContext, LoadingContextBuilder<?, E, ?> loadingContextBuilder) {
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<?, E, ?> loadingContextBuilder) {
 		return select(
 				sessionContext, loadingContextBuilder,
 				searchProjectionFactory.<E>entity().build()
@@ -47,7 +47,7 @@ public <E> ElasticsearchSearchQueryBuilder<E> selectEntity(
 
 	@Override
 	public <R> ElasticsearchSearchQueryBuilder<R> selectEntityReference(
-			BackendSessionContext sessionContext, LoadingContextBuilder<R, ?, ?> loadingContextBuilder) {
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<R, ?, ?> loadingContextBuilder) {
 		return select(
 				sessionContext, loadingContextBuilder,
 				searchProjectionFactory.<R>entityReference().build()
@@ -56,7 +56,7 @@ public <R> ElasticsearchSearchQueryBuilder<R> selectEntityReference(
 
 	@Override
 	public <P> ElasticsearchSearchQueryBuilder<P> select(
-			BackendSessionContext sessionContext, LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			SearchProjection<P> projection) {
 		return createSearchQueryBuilder( sessionContext, loadingContextBuilder,
 				ElasticsearchSearchProjection.from( searchContext, projection ) );
@@ -64,7 +64,7 @@ public <P> ElasticsearchSearchQueryBuilder<P> select(
 
 	@Override
 	public ElasticsearchSearchQueryBuilder<List<?>> select(
-			BackendSessionContext sessionContext, LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			SearchProjection<?>... projections) {
 		return createSearchQueryBuilder( sessionContext, loadingContextBuilder, createRootProjection( projections ) );
 	}
@@ -80,7 +80,7 @@ private ElasticsearchSearchProjection<?, List<?>> createRootProjection(SearchPro
 	}
 
 	private <H> ElasticsearchSearchQueryBuilder<H> createSearchQueryBuilder(
-			BackendSessionContext sessionContext, LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			ElasticsearchSearchProjection<?, H> rootProjection) {
 		return searchBackendContext.createSearchQueryBuilder(
 				searchContext,
diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryImpl.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryImpl.java
index 3539ead55b6..c0e1904383a 100644
--- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryImpl.java
+++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryImpl.java
@@ -33,7 +33,7 @@
 import org.hibernate.search.engine.backend.types.converter.runtime.spi.ToDocumentIdentifierValueConvertContext;
 import org.hibernate.search.engine.backend.types.converter.spi.ToDocumentIdentifierValueConverter;
 import org.hibernate.search.engine.common.dsl.spi.DslExtensionState;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchQueryExtension;
 import org.hibernate.search.engine.search.query.spi.AbstractSearchQuery;
 import org.hibernate.search.engine.search.timeout.spi.TimeoutManager;
@@ -59,7 +59,7 @@ public class ElasticsearchSearchQueryImpl<H> extends AbstractSearchQuery<H, Elas
 	private final ElasticsearchParallelWorkOrchestrator queryOrchestrator;
 	private final ElasticsearchSearchContext searchContext;
 	private final BackendSessionContext sessionContext;
-	private final LoadingContext<?, ?> loadingContext;
+	private final SearchLoadingContext<?, ?> loadingContext;
 	private final Set<String> routingKeys;
 	private final JsonObject payload;
 	private final ElasticsearchSearchRequestTransformer requestTransformer;
@@ -73,7 +73,7 @@ public class ElasticsearchSearchQueryImpl<H> extends AbstractSearchQuery<H, Elas
 			ElasticsearchParallelWorkOrchestrator queryOrchestrator,
 			ElasticsearchSearchContext searchContext,
 			BackendSessionContext sessionContext,
-			LoadingContext<?, ?> loadingContext,
+			SearchLoadingContext<?, ?> loadingContext,
 			Set<String> routingKeys,
 			JsonObject payload,
 			ElasticsearchSearchRequestTransformer requestTransformer,
diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryRequestContext.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryRequestContext.java
index 54c9be82d1c..63058f16965 100644
--- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryRequestContext.java
+++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/ElasticsearchSearchQueryRequestContext.java
@@ -16,7 +16,7 @@
 import org.hibernate.search.backend.elasticsearch.search.projection.impl.SearchProjectionRequestContext;
 import org.hibernate.search.backend.elasticsearch.lowlevel.syntax.search.impl.ElasticsearchSearchSyntax;
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.spatial.GeoPoint;
 
 import com.google.gson.JsonObject;
@@ -36,14 +36,14 @@ class ElasticsearchSearchQueryRequestContext implements SearchProjectionRequestC
 
 	private final ElasticsearchSearchContext searchContext;
 	private final BackendSessionContext sessionContext;
-	private final LoadingContext<?, ?> loadingContext;
+	private final SearchLoadingContext<?, ?> loadingContext;
 	private final PredicateRequestContext rootPredicateContext;
 	private final Map<DistanceSortKey, Integer> distanceSorts;
 
 	ElasticsearchSearchQueryRequestContext(
 			ElasticsearchSearchContext searchContext,
 			BackendSessionContext sessionContext,
-			LoadingContext<?, ?> loadingContext,
+			SearchLoadingContext<?, ?> loadingContext,
 			PredicateRequestContext rootPredicateContext,
 			Map<DistanceSortKey, Integer> distanceSorts) {
 		this.searchContext = searchContext;
diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/SearchBackendContext.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/SearchBackendContext.java
index c4445e94627..12739c33359 100644
--- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/SearchBackendContext.java
+++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/search/query/impl/SearchBackendContext.java
@@ -12,7 +12,7 @@
 import org.hibernate.search.backend.elasticsearch.search.projection.impl.SearchProjectionBackendContext;
 import org.hibernate.search.engine.backend.mapping.spi.BackendMappingContext;
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 
 /**
  * An interface with knowledge of the backend internals,
@@ -35,7 +35,7 @@ ElasticsearchSearchContext createSearchContext(BackendMappingContext mappingCont
 	<H> ElasticsearchSearchQueryBuilder<H> createSearchQueryBuilder(
 			ElasticsearchSearchContext searchContext,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			ElasticsearchSearchProjection<?, H> rootProjection);
 
 }
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java
index c19c09c55d8..b5d2ad4d954 100644
--- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java
+++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/LuceneExtension.java
@@ -45,8 +45,8 @@
 import org.hibernate.search.engine.search.sort.dsl.SearchSortFactoryExtension;
 import org.hibernate.search.engine.search.sort.dsl.spi.SearchSortDslContext;
 import org.hibernate.search.engine.backend.scope.spi.IndexScope;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.query.SearchQuery;
 import org.hibernate.search.engine.search.query.SearchQueryExtension;
 import org.hibernate.search.util.common.logging.impl.LoggerFactory;
@@ -120,7 +120,7 @@ public Optional<LuceneSearchQuerySelectStep<R, E, LOS>> extendOptional(
 			SearchQuerySelectStep<?, R, E, LOS, ?, ?> original,
 			IndexScope<?> indexScope,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
 		if ( indexScope instanceof LuceneIndexScope ) {
 			return Optional.of( new LuceneSearchQuerySelectStepImpl<>(
 					(LuceneIndexScope) indexScope, sessionContext, loadingContextBuilder
@@ -136,7 +136,7 @@ public Optional<LuceneSearchQuerySelectStep<R, E, LOS>> extendOptional(
 	 */
 	@Override
 	public Optional<LuceneSearchQuery<H>> extendOptional(SearchQuery<H> original,
-			LoadingContext<?, ?> loadingContext) {
+			SearchLoadingContext<?, ?> loadingContext) {
 		if ( original instanceof LuceneSearchQuery ) {
 			return Optional.of( (LuceneSearchQuery<H>) original );
 		}
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/index/impl/IndexManagerBackendContext.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/index/impl/IndexManagerBackendContext.java
index c5c3a9b87d4..de5078dda33 100644
--- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/index/impl/IndexManagerBackendContext.java
+++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/index/impl/IndexManagerBackendContext.java
@@ -50,7 +50,7 @@
 import org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource;
 import org.hibernate.search.engine.common.timing.spi.TimingSource;
 import org.hibernate.search.engine.reporting.FailureHandler;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.util.common.impl.SuppressingCloser;
 import org.hibernate.search.util.common.reporting.EventContext;
 
@@ -159,7 +159,7 @@ public LuceneSearchContext createSearchContext(BackendMappingContext mappingCont
 	public <H> LuceneSearchQueryBuilder<H> createSearchQueryBuilder(
 			LuceneSearchContext searchContext,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			LuceneSearchProjection<?, H> rootProjection) {
 		multiTenancyStrategy.checkTenantId( sessionContext.tenantIdentifier(), eventContext );
 
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQueryOptionsStepImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQueryOptionsStepImpl.java
index e5541153f09..335cf31e3b2 100644
--- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQueryOptionsStepImpl.java
+++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQueryOptionsStepImpl.java
@@ -19,7 +19,7 @@
 import org.hibernate.search.backend.lucene.scope.impl.LuceneIndexScope;
 import org.hibernate.search.backend.lucene.search.query.impl.LuceneSearchQueryBuilder;
 import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
 import org.hibernate.search.engine.search.query.dsl.spi.AbstractExtendedSearchQueryOptionsStep;
 import org.hibernate.search.engine.search.sort.dsl.SearchSortFactory;
@@ -42,7 +42,7 @@ class LuceneSearchQueryOptionsStepImpl<H, LOS>
 
 	LuceneSearchQueryOptionsStepImpl(LuceneIndexScope indexSearchScope,
 			LuceneSearchQueryBuilder<H> searchQueryBuilder,
-			LoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
 		super( indexSearchScope, searchQueryBuilder, loadingContextBuilder );
 		this.searchQueryBuilder = searchQueryBuilder;
 	}
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQuerySelectStepImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQuerySelectStepImpl.java
index cb93667a738..a6e6ef9d952 100644
--- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQuerySelectStepImpl.java
+++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/dsl/impl/LuceneSearchQuerySelectStepImpl.java
@@ -24,7 +24,7 @@
 import org.hibernate.search.engine.search.predicate.dsl.PredicateFinalStep;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
 import org.hibernate.search.engine.search.query.dsl.spi.AbstractSearchQuerySelectStep;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 
 public class LuceneSearchQuerySelectStepImpl<R, E, LOS>
 		extends AbstractSearchQuerySelectStep<
@@ -40,11 +40,11 @@ public class LuceneSearchQuerySelectStepImpl<R, E, LOS>
 
 	private final LuceneIndexScope indexScope;
 	private final BackendSessionContext sessionContext;
-	private final LoadingContextBuilder<R, E, LOS> loadingContextBuilder;
+	private final SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder;
 
 	public LuceneSearchQuerySelectStepImpl(LuceneIndexScope indexScope,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
 		this.indexScope = indexScope;
 		this.sessionContext = sessionContext;
 		this.loadingContextBuilder = loadingContextBuilder;
@@ -109,7 +109,7 @@ protected BackendSessionContext sessionContext() {
 	}
 
 	@Override
-	protected LoadingContextBuilder<R, E, LOS> loadingContextBuilder() {
+	protected SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder() {
 		return loadingContextBuilder;
 	}
 
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilder.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilder.java
index 293c08c8c47..af7e4662dd5 100644
--- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilder.java
+++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilder.java
@@ -32,8 +32,8 @@
 import org.hibernate.search.backend.lucene.work.impl.LuceneWorkFactory;
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
 import org.hibernate.search.engine.search.aggregation.AggregationKey;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilder;
 import org.hibernate.search.engine.search.timeout.spi.TimeoutManager;
 import org.hibernate.search.util.common.logging.impl.LoggerFactory;
@@ -57,7 +57,7 @@ public class LuceneSearchQueryBuilder<H>
 	private final BackendSessionContext sessionContext;
 	private final Set<String> routingKeys;
 
-	private final LoadingContextBuilder<?, ?, ?> loadingContextBuilder;
+	private final SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder;
 	private final LuceneSearchProjection<?, H> rootProjection;
 
 	private List<LuceneFieldComparatorSource> nestedFieldSorts;
@@ -75,7 +75,7 @@ public LuceneSearchQueryBuilder(
 			LuceneSyncWorkOrchestrator queryOrchestrator,
 			LuceneSearchContext searchContext,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			LuceneSearchProjection<?, H> rootProjection) {
 		this.workFactory = workFactory;
 		this.queryOrchestrator = queryOrchestrator;
@@ -170,7 +170,7 @@ public <A> void collectAggregation(AggregationKey<A> key, LuceneSearchAggregatio
 
 	@Override
 	public LuceneSearchQuery<H> build() {
-		LoadingContext<?, ?> loadingContext = loadingContextBuilder.build();
+		SearchLoadingContext<?, ?> loadingContext = loadingContextBuilder.build();
 
 		BooleanQuery.Builder luceneQueryBuilder = new BooleanQuery.Builder();
 		luceneQueryBuilder.add( luceneQuery, Occur.MUST );
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilderFactory.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilderFactory.java
index 7831932a0c6..a5c8facfe5e 100644
--- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilderFactory.java
+++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryBuilderFactory.java
@@ -17,7 +17,7 @@
 import org.hibernate.search.backend.lucene.search.projection.impl.LuceneSearchProjectionBuilderFactory;
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
 import org.hibernate.search.engine.search.projection.SearchProjection;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilderFactory;
 
 public class LuceneSearchQueryBuilderFactory
@@ -39,19 +39,19 @@ public LuceneSearchQueryBuilderFactory(SearchBackendContext searchBackendContext
 
 	@Override
 	public <E> LuceneSearchQueryBuilder<E> selectEntity(
-			BackendSessionContext sessionContext, LoadingContextBuilder<?, E, ?> loadingContextBuilder) {
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<?, E, ?> loadingContextBuilder) {
 		return select( sessionContext, loadingContextBuilder, searchProjectionFactory.<E>entity().build() );
 	}
 
 	@Override
 	public <R> LuceneSearchQueryBuilder<R> selectEntityReference(
-			BackendSessionContext sessionContext, LoadingContextBuilder<R, ?, ?> loadingContextBuilder) {
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<R, ?, ?> loadingContextBuilder) {
 		return select( sessionContext, loadingContextBuilder, searchProjectionFactory.<R>entityReference().build() );
 	}
 
 	@Override
 	public <P> LuceneSearchQueryBuilder<P> select(
-			BackendSessionContext sessionContext, LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			SearchProjection<P> projection) {
 		return createSearchQueryBuilder( sessionContext, loadingContextBuilder,
 				LuceneSearchProjection.from( searchContext, projection ) );
@@ -59,7 +59,7 @@ public <P> LuceneSearchQueryBuilder<P> select(
 
 	@Override
 	public LuceneSearchQueryBuilder<List<?>> select(
-			BackendSessionContext sessionContext, LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			SearchProjection<?>... projections) {
 		return createSearchQueryBuilder( sessionContext, loadingContextBuilder, createRootProjection( projections ) );
 	}
@@ -75,7 +75,7 @@ private LuceneSearchProjection<?, List<?>> createRootProjection(SearchProjection
 	}
 
 	private <H> LuceneSearchQueryBuilder<H> createSearchQueryBuilder(
-			BackendSessionContext sessionContext, LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			BackendSessionContext sessionContext, SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			LuceneSearchProjection<?, H> rootProjection) {
 		return searchBackendContext.createSearchQueryBuilder(
 				searchContext, sessionContext, loadingContextBuilder, rootProjection
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryImpl.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryImpl.java
index 8b76c104a09..4d53471847e 100644
--- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryImpl.java
+++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryImpl.java
@@ -27,7 +27,7 @@
 import org.hibernate.search.backend.lucene.work.impl.ReadWork;
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
 import org.hibernate.search.engine.common.dsl.spi.DslExtensionState;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchQueryExtension;
 import org.hibernate.search.engine.search.query.spi.AbstractSearchQuery;
 import org.hibernate.search.engine.search.timeout.spi.TimeoutManager;
@@ -48,7 +48,7 @@ public class LuceneSearchQueryImpl<H> extends AbstractSearchQuery<H, LuceneSearc
 	private final LuceneWorkFactory workFactory;
 	private final LuceneSearchContext searchContext;
 	private final BackendSessionContext sessionContext;
-	private final LoadingContext<?, ?> loadingContext;
+	private final SearchLoadingContext<?, ?> loadingContext;
 	private final Set<String> routingKeys;
 	private final Query luceneQuery;
 	private final Sort luceneSort;
@@ -60,7 +60,7 @@ public class LuceneSearchQueryImpl<H> extends AbstractSearchQuery<H, LuceneSearc
 	LuceneSearchQueryImpl(LuceneSyncWorkOrchestrator queryOrchestrator,
 			LuceneWorkFactory workFactory, LuceneSearchContext searchContext,
 			BackendSessionContext sessionContext,
-			LoadingContext<?, ?> loadingContext,
+			SearchLoadingContext<?, ?> loadingContext,
 			Set<String> routingKeys,
 			TimeoutManager timeoutManager,
 			Query luceneQuery, Sort luceneSort,
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryRequestContext.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryRequestContext.java
index fad1e0f8577..c3b34f94f88 100644
--- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryRequestContext.java
+++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/LuceneSearchQueryRequestContext.java
@@ -7,7 +7,7 @@
 package org.hibernate.search.backend.lucene.search.query.impl;
 
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Sort;
@@ -19,13 +19,13 @@
 class LuceneSearchQueryRequestContext {
 
 	private final BackendSessionContext sessionContext;
-	private final LoadingContext<?, ?> loadingContext;
+	private final SearchLoadingContext<?, ?> loadingContext;
 	private final Query luceneQuery;
 	private final Sort luceneSort;
 
 	LuceneSearchQueryRequestContext(
 			BackendSessionContext sessionContext,
-			LoadingContext<?, ?> loadingContext,
+			SearchLoadingContext<?, ?> loadingContext,
 			Query luceneQuery,
 			Sort luceneSort) {
 		this.sessionContext = sessionContext;
@@ -38,7 +38,7 @@ BackendSessionContext getSessionContext() {
 		return sessionContext;
 	}
 
-	LoadingContext<?, ?> getLoadingContext() {
+	SearchLoadingContext<?, ?> getLoadingContext() {
 		return loadingContext;
 	}
 
diff --git a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/SearchBackendContext.java b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/SearchBackendContext.java
index b66cc1f1826..bfd3c81873c 100644
--- a/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/SearchBackendContext.java
+++ b/backend/lucene/src/main/java/org/hibernate/search/backend/lucene/search/query/impl/SearchBackendContext.java
@@ -11,7 +11,7 @@
 import org.hibernate.search.backend.lucene.search.projection.impl.LuceneSearchProjection;
 import org.hibernate.search.engine.backend.mapping.spi.BackendMappingContext;
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 
 /**
  * An interface with knowledge of the backend internals,
@@ -32,7 +32,7 @@ LuceneSearchContext createSearchContext(BackendMappingContext mappingContext,
 	<H> LuceneSearchQueryBuilder<H> createSearchQueryBuilder(
 			LuceneSearchContext searchContext,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder,
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder,
 			LuceneSearchProjection<?, H> rootProjection);
 
 }
diff --git a/engine/src/main/java/org/hibernate/search/engine/mapper/scope/impl/MappedIndexScopeImpl.java b/engine/src/main/java/org/hibernate/search/engine/mapper/scope/impl/MappedIndexScopeImpl.java
index 694d14fae90..e7e016f7cab 100644
--- a/engine/src/main/java/org/hibernate/search/engine/mapper/scope/impl/MappedIndexScopeImpl.java
+++ b/engine/src/main/java/org/hibernate/search/engine/mapper/scope/impl/MappedIndexScopeImpl.java
@@ -12,7 +12,7 @@
 import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
 import org.hibernate.search.engine.search.aggregation.dsl.impl.DefaultSearchAggregationFactory;
 import org.hibernate.search.engine.search.aggregation.dsl.impl.SearchAggregationDslContextImpl;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
 import org.hibernate.search.engine.search.predicate.dsl.impl.DefaultSearchPredicateFactory;
 import org.hibernate.search.engine.search.predicate.dsl.impl.SearchPredicateDslContextImpl;
@@ -45,7 +45,7 @@ public String toString() {
 	@Override
 	public <LOS> SearchQuerySelectStep<?, R, E, LOS, SearchProjectionFactory<R, E>, ?> search(
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
 		return new DefaultSearchQuerySelectStep<>( delegate, sessionContext, loadingContextBuilder );
 	}
 
diff --git a/engine/src/main/java/org/hibernate/search/engine/mapper/scope/spi/MappedIndexScope.java b/engine/src/main/java/org/hibernate/search/engine/mapper/scope/spi/MappedIndexScope.java
index ea63e447750..50e3448e5ce 100644
--- a/engine/src/main/java/org/hibernate/search/engine/mapper/scope/spi/MappedIndexScope.java
+++ b/engine/src/main/java/org/hibernate/search/engine/mapper/scope/spi/MappedIndexScope.java
@@ -12,7 +12,7 @@
 import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
 import org.hibernate.search.engine.search.query.dsl.SearchQuerySelectStep;
 import org.hibernate.search.engine.search.sort.dsl.SearchSortFactory;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 
 /**
  * @param <R> The type of entity references, i.e. the type of hits returned by
@@ -32,7 +32,7 @@ public interface MappedIndexScope<R, E> {
 	 */
 	<LOS> SearchQuerySelectStep<?, R, E, LOS, SearchProjectionFactory<R, E>, ?> search(
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E, LOS> loadingContextBuilder);
+			SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder);
 
 	SearchPredicateFactory predicate();
 
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/loading/context/spi/LoadingContext.java b/engine/src/main/java/org/hibernate/search/engine/search/loading/spi/SearchLoadingContext.java
similarity index 74%
rename from engine/src/main/java/org/hibernate/search/engine/search/loading/context/spi/LoadingContext.java
rename to engine/src/main/java/org/hibernate/search/engine/search/loading/spi/SearchLoadingContext.java
index 84291ad089c..92e60049ec8 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/loading/context/spi/LoadingContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/loading/spi/SearchLoadingContext.java
@@ -4,9 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.engine.search.loading.context.spi;
-
-import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
+package org.hibernate.search.engine.search.loading.spi;
 
 /**
  * An execution context for queries,
@@ -15,7 +13,7 @@
  * @param <R> The type of entity references.
  * @param <E> The type of loaded entities.
  */
-public interface LoadingContext<R, E> {
+public interface SearchLoadingContext<R, E> {
 
 	ProjectionHitMapper<R, E> createProjectionHitMapper();
 
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/loading/context/spi/LoadingContextBuilder.java b/engine/src/main/java/org/hibernate/search/engine/search/loading/spi/SearchLoadingContextBuilder.java
similarity index 82%
rename from engine/src/main/java/org/hibernate/search/engine/search/loading/context/spi/LoadingContextBuilder.java
rename to engine/src/main/java/org/hibernate/search/engine/search/loading/spi/SearchLoadingContextBuilder.java
index cb0c3bc058f..b59b4ab3f4b 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/loading/context/spi/LoadingContextBuilder.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/loading/spi/SearchLoadingContextBuilder.java
@@ -4,21 +4,21 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.engine.search.loading.context.spi;
+package org.hibernate.search.engine.search.loading.spi;
 
 import java.util.function.Consumer;
 
 import org.hibernate.search.engine.search.query.dsl.SearchQueryOptionsStep;
 
 /**
- * A builder for {@link LoadingContext},
+ * A builder for {@link SearchLoadingContext},
  * allowing to change the parameters of object loading while a query is being built.
  *
  * @param <R> The type of entity references.
  * @param <E> The type of loaded entities.
  * @param <LOS> The type of the initial step of the loading options definition DSL accessible through {@link SearchQueryOptionsStep#loading(Consumer)}.
  */
-public interface LoadingContextBuilder<R, E, LOS> {
+public interface SearchLoadingContextBuilder<R, E, LOS> {
 
 	/**
 	 * @return The inital step of the loading options definition DSL passed to user-defined consumers added through
@@ -29,6 +29,6 @@ public interface LoadingContextBuilder<R, E, LOS> {
 	/**
 	 * @return The configured loading context.
 	 */
-	LoadingContext<R, E> build();
+	SearchLoadingContext<R, E> build();
 
 }
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/query/SearchQueryExtension.java b/engine/src/main/java/org/hibernate/search/engine/search/query/SearchQueryExtension.java
index dd74dd6846f..5163ea5f435 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/query/SearchQueryExtension.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/query/SearchQueryExtension.java
@@ -9,7 +9,7 @@
 
 import java.util.Optional;
 
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 
 /**
  * An extension to the search query, allowing to wrap a query.
@@ -32,10 +32,10 @@ public interface SearchQueryExtension<Q, H> {
 	 * <strong>WARNING:</strong> this method is not API, see comments at the type level.
 	 *
 	 * @param original The original, non-extended {@link org.hibernate.search.engine.search.query.SearchQuery}.
-	 * @param loadingContext The {@link LoadingContext} used by the original query.
+	 * @param loadingContext The {@link SearchLoadingContext} used by the original query.
 	 * @return An optional containing the extended search query ({@link Q}) in case
 	 * of success, or an empty optional otherwise.
 	 */
-	Optional<Q> extendOptional(SearchQuery<H> original, LoadingContext<?, ?> loadingContext);
+	Optional<Q> extendOptional(SearchQuery<H> original, SearchLoadingContext<?, ?> loadingContext);
 
 }
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/SearchQueryDslExtension.java b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/SearchQueryDslExtension.java
index d14d6962edc..08e7b4929f6 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/SearchQueryDslExtension.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/SearchQueryDslExtension.java
@@ -12,7 +12,7 @@
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
 import org.hibernate.search.engine.search.query.dsl.spi.AbstractSearchQueryOptionsStep;
 import org.hibernate.search.engine.backend.scope.spi.IndexScope;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 
 /**
  * An extension to the search query DSL, allowing to set non-standard options on a query.
@@ -41,13 +41,13 @@ public interface SearchQueryDslExtension<T, R, E, LOS> {
 	 * @param original The original, non-extended {@link SearchQuerySelectStep}.
 	 * @param indexScope An {@link IndexScope}.
 	 * @param sessionContext A {@link BackendSessionContext}.
-	 * @param loadingContextBuilder A {@link LoadingContextBuilder}.
+	 * @param loadingContextBuilder A {@link SearchLoadingContextBuilder}.
 	 * @return An optional containing the extended search query DSL step ({@link T}) in case
 	 * of success, or an empty optional otherwise.
 	 */
 	Optional<T> extendOptional(SearchQuerySelectStep<?, R, E, LOS, ?, ?> original,
 			IndexScope<?> indexScope,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E, LOS> loadingContextBuilder);
+			SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder);
 
 }
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/impl/DefaultSearchQueryOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/impl/DefaultSearchQueryOptionsStep.java
index cf0cc342d25..1a0d285bb74 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/impl/DefaultSearchQueryOptionsStep.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/impl/DefaultSearchQueryOptionsStep.java
@@ -7,7 +7,7 @@
 package org.hibernate.search.engine.search.query.dsl.impl;
 
 import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
 import org.hibernate.search.engine.search.query.dsl.SearchQueryOptionsStep;
 import org.hibernate.search.engine.search.query.dsl.SearchQueryWhereStep;
@@ -30,7 +30,7 @@ final class DefaultSearchQueryOptionsStep<H, LOS, C>
 				SearchQueryOptionsStep<DefaultSearchQueryOptionsStep<H, LOS, C>, H, LOS, SearchSortFactory, SearchAggregationFactory> {
 
 	DefaultSearchQueryOptionsStep(IndexScope<C> indexScope, SearchQueryBuilder<H, C> searchQueryBuilder,
-			LoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
 		super( indexScope, searchQueryBuilder, loadingContextBuilder );
 	}
 
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/impl/DefaultSearchQuerySelectStep.java b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/impl/DefaultSearchQuerySelectStep.java
index ea27bbdb32f..667432c1a33 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/impl/DefaultSearchQuerySelectStep.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/impl/DefaultSearchQuerySelectStep.java
@@ -19,7 +19,7 @@
 import org.hibernate.search.engine.search.query.dsl.SearchQueryOptionsStep;
 import org.hibernate.search.engine.search.query.dsl.spi.AbstractSearchQuerySelectStep;
 import org.hibernate.search.engine.backend.scope.spi.IndexScope;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilder;
 
 public final class DefaultSearchQuerySelectStep<R, E, LOS, C>
@@ -35,11 +35,11 @@ public final class DefaultSearchQuerySelectStep<R, E, LOS, C>
 
 	private final IndexScope<C> indexScope;
 	private final BackendSessionContext sessionContext;
-	private final LoadingContextBuilder<R, E, LOS> loadingContextBuilder;
+	private final SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder;
 
 	public DefaultSearchQuerySelectStep(IndexScope<C> indexScope,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
 		this.indexScope = indexScope;
 		this.sessionContext = sessionContext;
 		this.loadingContextBuilder = loadingContextBuilder;
@@ -103,7 +103,7 @@ protected BackendSessionContext sessionContext() {
 	}
 
 	@Override
-	protected LoadingContextBuilder<R, E, LOS> loadingContextBuilder() {
+	protected SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder() {
 		return loadingContextBuilder;
 	}
 }
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractExtendedSearchQueryOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractExtendedSearchQueryOptionsStep.java
index 5199a1d79eb..8737315eb74 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractExtendedSearchQueryOptionsStep.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractExtendedSearchQueryOptionsStep.java
@@ -7,7 +7,7 @@
 package org.hibernate.search.engine.search.query.dsl.spi;
 
 import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory;
 import org.hibernate.search.engine.search.query.SearchScroll;
 import org.hibernate.search.engine.search.query.dsl.SearchQueryOptionsStep;
@@ -32,7 +32,7 @@ public abstract class AbstractExtendedSearchQueryOptionsStep<
 
 	public AbstractExtendedSearchQueryOptionsStep(IndexScope<C> indexScope,
 			SearchQueryBuilder<H, C> searchQueryBuilder,
-			LoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
 		super( indexScope, searchQueryBuilder, loadingContextBuilder );
 	}
 
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractSearchQueryOptionsStep.java b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractSearchQueryOptionsStep.java
index 0e538530cdf..fa65012a0f8 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractSearchQueryOptionsStep.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractSearchQueryOptionsStep.java
@@ -13,7 +13,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.predicate.SearchPredicate;
 import org.hibernate.search.engine.search.query.SearchScroll;
 import org.hibernate.search.engine.search.predicate.dsl.impl.SearchPredicateDslContextImpl;
@@ -54,11 +54,11 @@ public abstract class AbstractSearchQueryOptionsStep<
 
 	private final IndexScope<C> indexScope;
 	private final SearchQueryBuilder<H, C> searchQueryBuilder;
-	private final LoadingContextBuilder<?, ?, LOS> loadingContextBuilder;
+	private final SearchLoadingContextBuilder<?, ?, LOS> loadingContextBuilder;
 
 	public AbstractSearchQueryOptionsStep(IndexScope<C> indexScope,
 			SearchQueryBuilder<H, C> searchQueryBuilder,
-			LoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<?, ?, LOS> loadingContextBuilder) {
 		this.indexScope = indexScope;
 		this.searchQueryBuilder = searchQueryBuilder;
 		this.loadingContextBuilder = loadingContextBuilder;
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractSearchQuerySelectStep.java b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractSearchQuerySelectStep.java
index b5fa6614d64..7fd4e1bc91d 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractSearchQuerySelectStep.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/query/dsl/spi/AbstractSearchQuerySelectStep.java
@@ -16,7 +16,7 @@
 import org.hibernate.search.engine.search.query.dsl.SearchQueryDslExtension;
 import org.hibernate.search.engine.search.query.dsl.SearchQuerySelectStep;
 import org.hibernate.search.engine.backend.scope.spi.IndexScope;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 
 public abstract class AbstractSearchQuerySelectStep<
 				N extends SearchQueryOptionsStep<?, E, LOS, ?, ?>,
@@ -49,5 +49,5 @@ protected final SearchProjectionFactory<R, E> createDefaultProjectionFactory() {
 
 	protected abstract BackendSessionContext sessionContext();
 
-	protected abstract LoadingContextBuilder<R, E, LOS> loadingContextBuilder();
+	protected abstract SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder();
 }
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/query/spi/SearchQueryBuilderFactory.java b/engine/src/main/java/org/hibernate/search/engine/search/query/spi/SearchQueryBuilderFactory.java
index 33281c9a0e0..e2b2f804d5f 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/query/spi/SearchQueryBuilderFactory.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/query/spi/SearchQueryBuilderFactory.java
@@ -10,7 +10,7 @@
 
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
 import org.hibernate.search.engine.search.projection.SearchProjection;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 
 /**
  * A factory for search query builders.
@@ -23,15 +23,15 @@
 public interface SearchQueryBuilderFactory<C> {
 
 	<E> SearchQueryBuilder<E, C> selectEntity(BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, E, ?> loadingContextBuilder);
+			SearchLoadingContextBuilder<?, E, ?> loadingContextBuilder);
 
 	<R> SearchQueryBuilder<R, C> selectEntityReference(BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, ?, ?> loadingContextBuilder);
+			SearchLoadingContextBuilder<R, ?, ?> loadingContextBuilder);
 
 	<P> SearchQueryBuilder<P, C> select(BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder, SearchProjection<P> projection);
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder, SearchProjection<P> projection);
 
 	SearchQueryBuilder<List<?>, C> select(BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder, SearchProjection<?>... projections);
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder, SearchProjection<?>... projections);
 
 }
diff --git a/integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ElasticsearchExtensionIT.java b/integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ElasticsearchExtensionIT.java
index fff79a083c0..d5596b44d04 100644
--- a/integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ElasticsearchExtensionIT.java
+++ b/integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ElasticsearchExtensionIT.java
@@ -49,7 +49,7 @@
 import org.hibernate.search.engine.search.predicate.SearchPredicate;
 import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.sort.SearchSort;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchQuery;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.util.ValueWrapper;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.util.rule.SearchSetupHelper;
@@ -163,7 +163,7 @@ public void query() {
 
 		// Unsupported extension
 		assertThatThrownBy(
-				() -> query.extension( (SearchQuery<DocumentReference> original, LoadingContext<?, ?> loadingContext) -> Optional.empty() )
+				() -> query.extension( (SearchQuery<DocumentReference> original, SearchLoadingContext<?, ?> loadingContext) -> Optional.empty() )
 		)
 				.isInstanceOf( SearchException.class );
 	}
diff --git a/integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/LuceneExtensionIT.java b/integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/LuceneExtensionIT.java
index feb297a09ec..2ad42d6efe0 100644
--- a/integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/LuceneExtensionIT.java
+++ b/integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/LuceneExtensionIT.java
@@ -63,7 +63,7 @@
 import org.hibernate.search.engine.search.aggregation.AggregationKey;
 import org.hibernate.search.engine.search.common.ValueConvert;
 import org.hibernate.search.engine.search.projection.SearchProjection;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.util.ValueWrapper;
 import org.hibernate.search.util.impl.integrationtest.mapper.stub.SimpleMappedIndex;
 import org.hibernate.search.util.impl.integrationtest.mapper.stub.StubLoadingOptionsStep;
@@ -169,7 +169,7 @@ public void query() {
 
 		// Unsupported extension
 		assertThatThrownBy(
-				() -> query.extension( (SearchQuery<DocumentReference> original, LoadingContext<?, ?> loadingContext) -> Optional.empty() )
+				() -> query.extension( (SearchQuery<DocumentReference> original, SearchLoadingContext<?, ?> loadingContext) -> Optional.empty() )
 		)
 				.isInstanceOf( SearchException.class );
 	}
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/SearchProjectionIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/SearchProjectionIT.java
index e97b552f699..9c2bb46578d 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/SearchProjectionIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/projection/SearchProjectionIT.java
@@ -29,7 +29,7 @@
 import org.hibernate.search.engine.backend.types.Projectable;
 import org.hibernate.search.engine.backend.types.dsl.IndexFieldTypeFactory;
 import org.hibernate.search.engine.backend.types.dsl.StandardIndexFieldTypeOptionsStep;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.loading.spi.EntityLoader;
 import org.hibernate.search.engine.search.projection.SearchProjection;
 import org.hibernate.search.engine.search.projection.dsl.ProjectionFinalStep;
@@ -159,8 +159,8 @@ public void references_transformed() {
 		StubLoadedObject document3LoadedObject = new StubLoadedObject( document3Reference );
 		StubLoadedObject emptyLoadedObject = new StubLoadedObject( emptyReference );
 
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
+				mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock =
 				mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock =
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryBaseIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryBaseIT.java
index 57d2d474dff..7b66040beac 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryBaseIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryBaseIT.java
@@ -23,8 +23,8 @@
 import org.hibernate.search.engine.backend.scope.spi.IndexScope;
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
 import org.hibernate.search.engine.backend.types.Sortable;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.query.SearchQuery;
 import org.hibernate.search.engine.search.query.SearchQueryExtension;
 import org.hibernate.search.engine.search.query.SearchResult;
@@ -37,7 +37,7 @@
 import org.hibernate.search.integrationtest.backend.tck.testsupport.util.rule.SearchSetupHelper;
 import org.hibernate.search.util.common.SearchException;
 import org.hibernate.search.util.impl.integrationtest.mapper.stub.SimpleMappedIndex;
-import org.hibernate.search.util.impl.integrationtest.mapper.stub.StubLoadingContext;
+import org.hibernate.search.util.impl.integrationtest.mapper.stub.StubSearchLoadingContext;
 import org.hibernate.search.util.impl.integrationtest.mapper.stub.StubMappingScope;
 
 import org.junit.Before;
@@ -225,9 +225,9 @@ public SearchResult<H> extendedFetch() {
 	private static class SupportedQueryExtension<H> implements SearchQueryExtension<QueryWrapper<H>, H> {
 		@Override
 		public Optional<QueryWrapper<H>> extendOptional(SearchQuery<H> original,
-				LoadingContext<?, ?> loadingContext) {
+				SearchLoadingContext<?, ?> loadingContext) {
 			assertThat( original ).isNotNull();
-			assertThat( loadingContext ).isNotNull().isInstanceOf( StubLoadingContext.class );
+			assertThat( loadingContext ).isNotNull().isInstanceOf( StubSearchLoadingContext.class );
 			return Optional.of( new QueryWrapper<>( original ) );
 		}
 	}
@@ -235,9 +235,9 @@ public Optional<QueryWrapper<H>> extendOptional(SearchQuery<H> original,
 	private static class UnSupportedQueryExtension<H> implements SearchQueryExtension<QueryWrapper<H>, H> {
 		@Override
 		public Optional<QueryWrapper<H>> extendOptional(SearchQuery<H> original,
-				LoadingContext<?, ?> loadingContext) {
+				SearchLoadingContext<?, ?> loadingContext) {
 			assertThat( original ).isNotNull();
-			assertThat( loadingContext ).isNotNull().isInstanceOf( StubLoadingContext.class );
+			assertThat( loadingContext ).isNotNull().isInstanceOf( StubSearchLoadingContext.class );
 			return Optional.empty();
 		}
 	}
@@ -247,7 +247,7 @@ private static class SupportedQueryDslExtension<R, E, LOS> implements
 		@Override
 		public Optional<MyExtendedDslContext<R>> extendOptional(SearchQuerySelectStep<?, R, E, LOS, ?, ?> original,
 				IndexScope<?> indexScope, BackendSessionContext sessionContext,
-				LoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
+				SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
 			assertThat( original ).isNotNull();
 			assertThat( indexScope ).isNotNull();
 			assertThat( sessionContext ).isNotNull();
@@ -261,7 +261,7 @@ private static class UnSupportedQueryDslExtension<R, E, LOS> implements
 		@Override
 		public Optional<MyExtendedDslContext<R>> extendOptional(SearchQuerySelectStep<?, R, E, LOS, ?, ?> original,
 				IndexScope<?> indexScope, BackendSessionContext sessionContext,
-				LoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
+				SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder) {
 			assertThat( original ).isNotNull();
 			assertThat( indexScope ).isNotNull();
 			assertThat( sessionContext ).isNotNull();
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryLoadingOptionsIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryLoadingOptionsIT.java
index 02fe13beb3c..6b8813cb364 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryLoadingOptionsIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryLoadingOptionsIT.java
@@ -14,7 +14,7 @@
 import org.hibernate.search.engine.backend.document.IndexFieldReference;
 import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement;
 import org.hibernate.search.engine.backend.types.Projectable;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.stub.StubLoadedObject;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.stub.StubTransformedReference;
 import org.hibernate.search.integrationtest.backend.tck.testsupport.util.rule.SearchSetupHelper;
@@ -50,7 +50,7 @@ public void setup() {
 
 	@Test
 	public void defaultResultType() {
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( SearchLoadingContext.class );
 		Consumer<Object> loadingOptionsStepMock = mock( Consumer.class );
 
 		Object someOption = new Object();
@@ -66,7 +66,7 @@ public void defaultResultType() {
 
 	@Test
 	public void selectEntity() {
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( SearchLoadingContext.class );
 		Consumer<Object> loadingOptionsStepMock = mock( Consumer.class );
 
 		Object someOption = new Object();
@@ -81,7 +81,7 @@ public void selectEntity() {
 
 	@Test
 	public void selectEntityReference() {
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( SearchLoadingContext.class );
 		Consumer<Object> loadingOptionsStepMock = mock( Consumer.class );
 
 		Object someOption = new Object();
@@ -96,8 +96,8 @@ public void selectEntityReference() {
 
 	@Test
 	public void select() {
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
+				mock( SearchLoadingContext.class );
 		Consumer<Object> loadingOptionsStepMock = mock( Consumer.class );
 
 		Object someOption = new Object();
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryResultLoadingOrTransformingIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryResultLoadingOrTransformingIT.java
index 7f1e783ce3d..b18345c6a0e 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryResultLoadingOrTransformingIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryResultLoadingOrTransformingIT.java
@@ -30,7 +30,7 @@
 import org.hibernate.search.engine.backend.types.ObjectStructure;
 import org.hibernate.search.engine.backend.types.Projectable;
 import org.hibernate.search.engine.backend.common.DocumentReference;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.loading.spi.DefaultProjectionHitMapper;
 import org.hibernate.search.engine.search.loading.spi.EntityLoader;
 import org.hibernate.search.engine.backend.common.spi.DocumentReferenceConverter;
@@ -99,8 +99,8 @@ public void defaultResultType() {
 		StubLoadedObject mainLoadedObject = new StubLoadedObject( mainReference );
 		StubLoadedObject emptyLoadedObject = new StubLoadedObject( emptyReference );
 
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
+				mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock =
 				mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock =
@@ -144,8 +144,8 @@ public void defaultResultType_entityLoadingTimeout() {
 		StubLoadedObject mainLoadedObject = new StubLoadedObject( mainReference );
 		StubLoadedObject emptyLoadedObject = new StubLoadedObject( emptyReference );
 
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
+				mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock =
 				mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock =
@@ -220,8 +220,8 @@ public void selectEntityReference_referenceTransformer() {
 		StubTransformedReference mainTransformedReference = new StubTransformedReference( mainReference );
 		StubTransformedReference emptyTransformedReference = new StubTransformedReference( emptyReference );
 
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
+				mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock =
 				mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock =
@@ -266,8 +266,8 @@ public void selectEntity_referencesTransformer_entityLoading() {
 		StubLoadedObject mainLoadedObject = new StubLoadedObject( mainReference );
 		StubLoadedObject emptyLoadedObject = new StubLoadedObject( emptyReference );
 
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
+				mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock =
 				mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock =
@@ -312,8 +312,8 @@ public void select_referencesTransformer_entityLoading() {
 		StubLoadedObject mainLoadedObject = new StubLoadedObject( mainReference );
 		StubLoadedObject emptyLoadedObject = new StubLoadedObject( emptyReference );
 
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
+				mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock =
 				mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock =
@@ -438,8 +438,8 @@ public void select_hitTransformer_referencesTransformer_entityLoading() {
 		StubLoadedObject mainLoadedObject = new StubLoadedObject( mainReference );
 		StubLoadedObject emptyLoadedObject = new StubLoadedObject( emptyReference );
 
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
+				mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock =
 				mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock =
@@ -563,8 +563,8 @@ public void countQueryWithProjection() {
 
 	@Test
 	public void callGetProjectionHitMapperEveryTime() {
-		LoadingContext<DocumentReference, DocumentReference> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<DocumentReference, DocumentReference> loadingContextMock =
+				mock( SearchLoadingContext.class );
 
 		GenericStubMappingScope<DocumentReference, DocumentReference> scope = index.createGenericScope();
 		SearchQuery<DocumentReference> query = scope.query( loadingContextMock )
@@ -597,8 +597,8 @@ public void failedEntityLoading_skipHit() {
 		StubTransformedReference emptyEntityReference = new StubTransformedReference( emptyDocumentReference );
 		StubLoadedObject emptyLoadedObject = new StubLoadedObject( emptyDocumentReference );
 
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
-				mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock =
+				mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock =
 				mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock =
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryScrollResultLoadingIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryScrollResultLoadingIT.java
index b767fd590ac..cbc9b54168f 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryScrollResultLoadingIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/query/SearchQueryScrollResultLoadingIT.java
@@ -20,7 +20,7 @@
 import org.hibernate.search.engine.backend.document.IndexFieldReference;
 import org.hibernate.search.engine.backend.document.model.dsl.IndexSchemaElement;
 import org.hibernate.search.engine.backend.types.Sortable;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.loading.spi.EntityLoader;
 import org.hibernate.search.engine.search.query.SearchQuery;
 import org.hibernate.search.engine.search.query.SearchScroll;
@@ -70,7 +70,7 @@ public static void setup() {
 
 	@Test
 	public void resultLoadingOnScrolling() {
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock = mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock = mock( StubEntityLoader.class );
 
@@ -86,7 +86,7 @@ public void resultLoadingOnScrolling() {
 
 	@Test
 	public void resultLoadingOnScrolling_entityLoadingTimeout() {
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock = mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock = mock( StubEntityLoader.class );
 
@@ -103,7 +103,7 @@ public void resultLoadingOnScrolling_entityLoadingTimeout() {
 
 	@Test
 	public void resultLoadingOnScrolling_softTimeout() {
-		LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( LoadingContext.class );
+		SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock = mock( SearchLoadingContext.class );
 		DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock = mock( StubDocumentReferenceConverter.class );
 		EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock = mock( StubEntityLoader.class );
 
@@ -119,7 +119,7 @@ public void resultLoadingOnScrolling_softTimeout() {
 		verifyLoading( loadingContextMock, documentReferenceConverterMock, objectLoaderMock, scroll );
 	}
 
-	private void verifyLoading(LoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock,
+	private void verifyLoading(SearchLoadingContext<StubTransformedReference, StubLoadedObject> loadingContextMock,
 			DocumentReferenceConverter<StubTransformedReference> documentReferenceConverterMock,
 			EntityLoader<StubTransformedReference, StubLoadedObject> objectLoaderMock,
 			SearchScroll<StubLoadedObject> scroll) {
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/stub/MapperMockUtils.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/stub/MapperMockUtils.java
index bb6aac2ffaf..1989bb47a82 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/stub/MapperMockUtils.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/testsupport/stub/MapperMockUtils.java
@@ -22,7 +22,7 @@
 
 import org.hibernate.search.engine.backend.common.DocumentReference;
 import org.hibernate.search.engine.backend.common.spi.DocumentReferenceConverter;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.loading.spi.DefaultProjectionHitMapper;
 import org.hibernate.search.engine.search.loading.spi.EntityLoader;
 import org.hibernate.search.util.impl.integrationtest.common.MockUtils;
@@ -41,7 +41,7 @@ private MapperMockUtils() {
 	 * @param <E> The entity type.
 	 */
 	public static <R, E> void expectHitMapping(
-			LoadingContext<R, E> loadingContextMock,
+			SearchLoadingContext<R, E> loadingContextMock,
 			DocumentReferenceConverter<R> referenceTransformerMock,
 			EntityLoader<R, E> objectLoaderMock,
 			Consumer<HitMappingDefinitionContext<R, E>> hitMappingDefinition) {
diff --git a/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/impl/SearchScopeImpl.java b/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/impl/SearchScopeImpl.java
index 23a388ab615..c2e166000b9 100644
--- a/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/impl/SearchScopeImpl.java
+++ b/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/scope/impl/SearchScopeImpl.java
@@ -18,7 +18,7 @@
 import org.hibernate.search.mapper.javabean.common.EntityReference;
 import org.hibernate.search.mapper.javabean.entity.SearchIndexedEntity;
 import org.hibernate.search.mapper.javabean.scope.SearchScope;
-import org.hibernate.search.mapper.javabean.search.loading.context.impl.JavaBeanLoadingContext;
+import org.hibernate.search.mapper.javabean.search.loading.impl.JavaBeanSearchLoadingContext;
 import org.hibernate.search.mapper.pojo.scope.spi.PojoScopeDelegate;
 
 public class SearchScopeImpl<E> implements SearchScope<E> {
@@ -56,6 +56,6 @@ public Set<? extends SearchIndexedEntity<? extends E>> includedTypes() {
 
 	public SearchQuerySelectStep<?, EntityReference, Void, ?, ?, ?> search(BackendSessionContext sessionContext,
 			DocumentReferenceConverter<EntityReference> documentReferenceConverter) {
-		return delegate.search( sessionContext, new JavaBeanLoadingContext.Builder( documentReferenceConverter ) );
+		return delegate.search( sessionContext, new JavaBeanSearchLoadingContext.Builder( documentReferenceConverter ) );
 	}
 }
diff --git a/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/loading/context/impl/JavaBeanLoadingContext.java b/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/loading/impl/JavaBeanSearchLoadingContext.java
similarity index 65%
rename from mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/loading/context/impl/JavaBeanLoadingContext.java
rename to mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/loading/impl/JavaBeanSearchLoadingContext.java
index 45b8d6a23cd..ec2e931a975 100644
--- a/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/loading/context/impl/JavaBeanLoadingContext.java
+++ b/mapper/javabean/src/main/java/org/hibernate/search/mapper/javabean/search/loading/impl/JavaBeanSearchLoadingContext.java
@@ -4,26 +4,25 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.mapper.javabean.search.loading.context.impl;
+package org.hibernate.search.mapper.javabean.search.loading.impl;
 
 import java.lang.invoke.MethodHandles;
 
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
 import org.hibernate.search.engine.backend.common.spi.DocumentReferenceConverter;
 import org.hibernate.search.mapper.javabean.log.impl.Log;
-import org.hibernate.search.mapper.javabean.search.loading.impl.JavaBeanProjectionHitMapper;
 import org.hibernate.search.mapper.javabean.common.EntityReference;
 import org.hibernate.search.util.common.logging.impl.LoggerFactory;
 
-public final class JavaBeanLoadingContext implements LoadingContext<EntityReference, Void> {
+public final class JavaBeanSearchLoadingContext implements SearchLoadingContext<EntityReference, Void> {
 
 	private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
 
 	private final DocumentReferenceConverter<EntityReference> documentReferenceConverter;
 
-	private JavaBeanLoadingContext(DocumentReferenceConverter<EntityReference> documentReferenceConverter) {
+	private JavaBeanSearchLoadingContext(DocumentReferenceConverter<EntityReference> documentReferenceConverter) {
 		this.documentReferenceConverter = documentReferenceConverter;
 	}
 
@@ -32,7 +31,7 @@ public ProjectionHitMapper<EntityReference, Void> createProjectionHitMapper() {
 		return new JavaBeanProjectionHitMapper( documentReferenceConverter );
 	}
 
-	public static final class Builder implements LoadingContextBuilder<EntityReference, Void, Void> {
+	public static final class Builder implements SearchLoadingContextBuilder<EntityReference, Void, Void> {
 		private final DocumentReferenceConverter<EntityReference> documentReferenceConverter;
 
 		public Builder(DocumentReferenceConverter<EntityReference> documentReferenceConverter) {
@@ -45,8 +44,8 @@ public Void toAPI() {
 		}
 
 		@Override
-		public LoadingContext<EntityReference, Void> build() {
-			return new JavaBeanLoadingContext( documentReferenceConverter );
+		public SearchLoadingContext<EntityReference, Void> build() {
+			return new JavaBeanSearchLoadingContext( documentReferenceConverter );
 		}
 	}
 }
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/SearchScopeImpl.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/SearchScopeImpl.java
index 9db8e5b96f3..2d013362d56 100644
--- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/SearchScopeImpl.java
+++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/scope/impl/SearchScopeImpl.java
@@ -22,7 +22,7 @@
 import org.hibernate.search.mapper.orm.scope.SearchScope;
 import org.hibernate.search.mapper.orm.search.loading.dsl.SearchLoadingOptionsStep;
 import org.hibernate.search.mapper.orm.search.query.dsl.impl.HibernateOrmSearchQuerySelectStep;
-import org.hibernate.search.mapper.orm.search.loading.context.impl.HibernateOrmLoadingContext;
+import org.hibernate.search.mapper.orm.search.loading.impl.HibernateOrmSearchLoadingContext;
 import org.hibernate.search.mapper.orm.work.SearchWorkspace;
 import org.hibernate.search.mapper.orm.work.impl.SearchWorkspaceImpl;
 import org.hibernate.search.mapper.pojo.schema.management.spi.PojoScopeSchemaManager;
@@ -42,7 +42,7 @@ public SearchScopeImpl(HibernateOrmScopeMappingContext mappingContext,
 
 	public SearchQuerySelectStep<?, EntityReference, E, SearchLoadingOptionsStep, ?, ?> search(
 			HibernateOrmScopeSessionContext sessionContext) {
-		HibernateOrmLoadingContext.Builder<E> loadingContextBuilder = new HibernateOrmLoadingContext.Builder<>(
+		HibernateOrmSearchLoadingContext.Builder<E> loadingContextBuilder = new HibernateOrmSearchLoadingContext.Builder<>(
 				mappingContext, sessionContext, delegate.includedIndexedTypes()
 		);
 		return new HibernateOrmSearchQuerySelectStep<>(
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/context/impl/HibernateOrmLoadingContext.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/impl/HibernateOrmSearchLoadingContext.java
similarity index 80%
rename from mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/context/impl/HibernateOrmLoadingContext.java
rename to mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/impl/HibernateOrmSearchLoadingContext.java
index 58dc48b40b5..e6541002fc3 100644
--- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/context/impl/HibernateOrmLoadingContext.java
+++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/loading/impl/HibernateOrmSearchLoadingContext.java
@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.search.mapper.orm.search.loading.context.impl;
+package org.hibernate.search.mapper.orm.search.loading.impl;
 
 import java.lang.invoke.MethodHandles;
 import java.util.Set;
@@ -15,8 +15,8 @@
 import org.hibernate.graph.GraphSemantic;
 import org.hibernate.graph.RootGraph;
 import org.hibernate.search.engine.backend.common.spi.DocumentReferenceConverter;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.loading.spi.DefaultProjectionHitMapper;
 import org.hibernate.search.engine.search.loading.spi.EntityLoader;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
@@ -24,16 +24,11 @@
 import org.hibernate.search.mapper.orm.search.loading.EntityLoadingCacheLookupStrategy;
 import org.hibernate.search.mapper.orm.scope.impl.HibernateOrmScopeIndexedTypeContext;
 import org.hibernate.search.mapper.orm.search.loading.dsl.SearchLoadingOptionsStep;
-import org.hibernate.search.mapper.orm.search.loading.impl.EntityGraphHint;
-import org.hibernate.search.mapper.orm.search.loading.impl.SearchEntityLoaderBuilder;
-import org.hibernate.search.mapper.orm.search.loading.impl.SearchLoadingMappingContext;
-import org.hibernate.search.mapper.orm.search.loading.impl.SearchLoadingSessionContext;
-import org.hibernate.search.mapper.orm.search.loading.impl.MutableEntityLoadingOptions;
 import org.hibernate.search.mapper.orm.common.EntityReference;
 import org.hibernate.search.util.common.impl.Contracts;
 import org.hibernate.search.util.common.logging.impl.LoggerFactory;
 
-public final class HibernateOrmLoadingContext<E> implements LoadingContext<EntityReference, E> {
+public final class HibernateOrmSearchLoadingContext<E> implements SearchLoadingContext<EntityReference, E> {
 
 	private static final Log log = LoggerFactory.make( Log.class, MethodHandles.lookup() );
 
@@ -42,7 +37,7 @@ public final class HibernateOrmLoadingContext<E> implements LoadingContext<Entit
 	private final EntityLoader<EntityReference, ? extends E> entityLoader;
 	private final MutableEntityLoadingOptions loadingOptions;
 
-	private HibernateOrmLoadingContext(SessionImplementor sessionImplementor,
+	private HibernateOrmSearchLoadingContext(SessionImplementor sessionImplementor,
 			DocumentReferenceConverter<EntityReference> referenceHitMapper,
 			EntityLoader<EntityReference, ? extends E> entityLoader,
 			MutableEntityLoadingOptions loadingOptions) {
@@ -73,7 +68,7 @@ public MutableEntityLoadingOptions loadingOptions() {
 	}
 
 	public static final class Builder<E>
-			implements LoadingContextBuilder<EntityReference, E, SearchLoadingOptionsStep>, SearchLoadingOptionsStep {
+			implements SearchLoadingContextBuilder<EntityReference, E, SearchLoadingOptionsStep>, SearchLoadingOptionsStep {
 		private final SearchLoadingSessionContext sessionContext;
 		private final SearchEntityLoaderBuilder<E> entityLoaderBuilder;
 		private final MutableEntityLoadingOptions loadingOptions;
@@ -116,10 +111,10 @@ public SearchLoadingOptionsStep graph(String graphName, GraphSemantic semantic)
 		}
 
 		@Override
-		public LoadingContext<EntityReference, E> build() {
+		public SearchLoadingContext<EntityReference, E> build() {
 			DocumentReferenceConverter<EntityReference> referenceHitMapper = sessionContext.referenceHitMapper();
 			EntityLoader<EntityReference, ? extends E> entityLoader = entityLoaderBuilder.build( loadingOptions );
-			return new HibernateOrmLoadingContext<>(
+			return new HibernateOrmSearchLoadingContext<>(
 					sessionContext.session(),
 					referenceHitMapper, entityLoader,
 					loadingOptions
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapterExtension.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapterExtension.java
index 8d863c8380f..4b5008cd370 100644
--- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapterExtension.java
+++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapterExtension.java
@@ -9,11 +9,11 @@
 
 import java.util.Optional;
 
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchQuery;
 import org.hibernate.search.engine.search.query.SearchQueryExtension;
 import org.hibernate.search.engine.search.query.spi.SearchQueryImplementor;
-import org.hibernate.search.mapper.orm.search.loading.context.impl.HibernateOrmLoadingContext;
+import org.hibernate.search.mapper.orm.search.loading.impl.HibernateOrmSearchLoadingContext;
 
 final class HibernateOrmSearchQueryAdapterExtension<H> implements
 		SearchQueryExtension<HibernateOrmSearchQueryAdapter<H>, H> {
@@ -25,9 +25,9 @@ static <H> HibernateOrmSearchQueryAdapterExtension<H> get() {
 	}
 
 	@Override
-	public Optional<HibernateOrmSearchQueryAdapter<H>> extendOptional(SearchQuery<H> original, LoadingContext<?, ?> loadingContext) {
-		if ( loadingContext instanceof HibernateOrmLoadingContext ) {
-			HibernateOrmLoadingContext<?> castedLoadingContext = (HibernateOrmLoadingContext<?>) loadingContext;
+	public Optional<HibernateOrmSearchQueryAdapter<H>> extendOptional(SearchQuery<H> original, SearchLoadingContext<?, ?> loadingContext) {
+		if ( loadingContext instanceof HibernateOrmSearchLoadingContext ) {
+			HibernateOrmSearchLoadingContext<?> castedLoadingContext = (HibernateOrmSearchLoadingContext<?>) loadingContext;
 			return Optional.of( new HibernateOrmSearchQueryAdapter<>(
 					// All SearchQuery implementations should implement SearchQueryImplementor
 					(SearchQueryImplementor<H>) original,
diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/scope/impl/PojoScopeDelegateImpl.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/scope/impl/PojoScopeDelegateImpl.java
index a7e3ebae421..d2c4771f22c 100644
--- a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/scope/impl/PojoScopeDelegateImpl.java
+++ b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/scope/impl/PojoScopeDelegateImpl.java
@@ -22,7 +22,7 @@
 import org.hibernate.search.engine.search.aggregation.dsl.SearchAggregationFactory;
 import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
 import org.hibernate.search.engine.search.query.dsl.SearchQuerySelectStep;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.mapper.pojo.logging.impl.Log;
 import org.hibernate.search.mapper.pojo.model.spi.PojoRawTypeIdentifier;
 import org.hibernate.search.mapper.pojo.schema.management.impl.PojoScopeSchemaManagerImpl;
@@ -100,7 +100,7 @@ public Set<C> includedIndexedTypes() {
 	@Override
 	public <LOS> SearchQuerySelectStep<?, R, E2, LOS, SearchProjectionFactory<R, E2>, ?> search(
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E2, LOS> loadingContextBuilder) {
+			SearchLoadingContextBuilder<R, E2, LOS> loadingContextBuilder) {
 		return getIndexScope().search( sessionContext, loadingContextBuilder );
 	}
 
diff --git a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/scope/spi/PojoScopeDelegate.java b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/scope/spi/PojoScopeDelegate.java
index fb6018464e9..0f062d6ba18 100644
--- a/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/scope/spi/PojoScopeDelegate.java
+++ b/mapper/pojo-base/src/main/java/org/hibernate/search/mapper/pojo/scope/spi/PojoScopeDelegate.java
@@ -15,7 +15,7 @@
 import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
 import org.hibernate.search.engine.search.query.dsl.SearchQuerySelectStep;
 import org.hibernate.search.engine.search.sort.dsl.SearchSortFactory;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.mapper.pojo.schema.management.spi.PojoScopeSchemaManager;
 import org.hibernate.search.mapper.pojo.work.spi.PojoScopeWorkspace;
 
@@ -35,7 +35,7 @@ public interface PojoScopeDelegate<R, E, C> {
 
 	<LOS> SearchQuerySelectStep<?, R, E, LOS, SearchProjectionFactory<R, E>, ?> search(
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, E, LOS> loadingContextBuilder);
+			SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder);
 
 	SearchPredicateFactory predicate();
 
diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/NextScrollWorkCall.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/NextScrollWorkCall.java
index 11e97b4b48a..4672d0cf326 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/NextScrollWorkCall.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/NextScrollWorkCall.java
@@ -12,7 +12,7 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchScrollResult;
 import org.hibernate.search.engine.search.query.spi.SimpleSearchResultTotal;
 import org.hibernate.search.engine.search.query.spi.SimpleSearchScrollResult;
@@ -26,14 +26,14 @@ public class NextScrollWorkCall<T> extends Call<NextScrollWorkCall<?>> {
 	private final Set<String> indexNames;
 	private final StubSearchWork work;
 	private final StubSearchProjectionContext projectionContext;
-	private final LoadingContext<?, ?> loadingContext;
+	private final SearchLoadingContext<?, ?> loadingContext;
 	private final StubSearchProjection<T> rootProjection;
 	private final StubNextScrollWorkBehavior<?> behavior;
 	private final Deadline deadline;
 
 	NextScrollWorkCall(Set<String> indexNames, StubSearchWork work,
 			StubSearchProjectionContext projectionContext,
-			LoadingContext<?, ?> loadingContext,
+			SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection,
 			Deadline deadline) {
 		this.indexNames = indexNames;
diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/ScrollWorkCall.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/ScrollWorkCall.java
index 9cb4f6671c2..9c8517f5dc8 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/ScrollWorkCall.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/ScrollWorkCall.java
@@ -13,7 +13,7 @@
 import java.util.Set;
 
 import org.hibernate.search.engine.common.timing.spi.TimingSource;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchScroll;
 import org.hibernate.search.util.impl.integrationtest.common.stub.backend.StubBackendBehavior;
 import org.hibernate.search.util.impl.integrationtest.common.stub.backend.search.StubSearchScroll;
@@ -28,12 +28,12 @@ public class ScrollWorkCall<T> extends Call<ScrollWorkCall<?>> {
 	private final int chunkSize;
 	private final StubBackendBehavior behavior;
 	private final StubSearchProjectionContext projectionContext;
-	private final LoadingContext<?, ?> loadingContext;
+	private final SearchLoadingContext<?, ?> loadingContext;
 	private final StubSearchProjection<T> rootProjection;
 	private final TimingSource timingSource;
 
 	ScrollWorkCall(Set<String> indexNames, StubSearchWork work, int chunkSize, StubBackendBehavior behavior,
-			StubSearchProjectionContext projectionContext, LoadingContext<?, ?> loadingContext,
+			StubSearchProjectionContext projectionContext, SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection, TimingSource timingSource) {
 		this.indexNames = indexNames;
 		this.work = work;
diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/SearchWorkCall.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/SearchWorkCall.java
index c11e2d8ed89..1228ed23bd0 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/SearchWorkCall.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/SearchWorkCall.java
@@ -16,7 +16,7 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchResult;
 import org.hibernate.search.engine.search.loading.spi.LoadingResult;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
@@ -32,7 +32,7 @@ class SearchWorkCall<T> extends Call<SearchWorkCall<?>> {
 	private final Set<String> indexNames;
 	private final StubSearchWork work;
 	private final StubSearchProjectionContext projectionContext;
-	private final LoadingContext<?, ?> loadingContext;
+	private final SearchLoadingContext<?, ?> loadingContext;
 	private final StubSearchProjection<T> rootProjection;
 	private final StubSearchWorkBehavior<?> behavior;
 	private final Deadline deadline;
@@ -40,7 +40,7 @@ class SearchWorkCall<T> extends Call<SearchWorkCall<?>> {
 	SearchWorkCall(Set<String> indexNames,
 			StubSearchWork work,
 			StubSearchProjectionContext projectionContext,
-			LoadingContext<?, ?> loadingContext,
+			SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection,
 			Deadline deadline) {
 		this.indexNames = indexNames;
diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/VerifyingStubBackendBehavior.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/VerifyingStubBackendBehavior.java
index dc0dc71251e..094eb99889a 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/VerifyingStubBackendBehavior.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/rule/VerifyingStubBackendBehavior.java
@@ -23,7 +23,7 @@
 import org.hibernate.search.engine.backend.spi.BackendBuildContext;
 import org.hibernate.search.engine.common.timing.spi.TimingSource;
 import org.hibernate.search.engine.reporting.spi.ContextualFailureCollector;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchResult;
 import org.hibernate.search.engine.search.query.SearchScroll;
 import org.hibernate.search.engine.search.query.SearchScrollResult;
@@ -254,7 +254,7 @@ public CompletableFuture<?> processAndExecuteDocumentWork(String indexName, Stub
 
 	@Override
 	public <T> SearchResult<T> executeSearchWork(Set<String> indexNames, StubSearchWork work,
-			StubSearchProjectionContext projectionContext, LoadingContext<?, ?> loadingContext,
+			StubSearchProjectionContext projectionContext, SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection, Deadline deadline) {
 		return searchCalls.verify(
 				new SearchWorkCall<>( indexNames, work, projectionContext, loadingContext, rootProjection,
@@ -286,7 +286,7 @@ public long executeCountWork(Set<String> indexNames) {
 
 	@Override
 	public <T> SearchScroll<T> executeScrollWork(Set<String> indexNames, StubSearchWork work, int chunkSize,
-			StubSearchProjectionContext projectionContext, LoadingContext<?, ?> loadingContext,
+			StubSearchProjectionContext projectionContext, SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection, TimingSource timingSource) {
 		return scrollCalls.verify(
 				new ScrollWorkCall<>( indexNames, work, chunkSize, this, projectionContext, loadingContext,
@@ -309,7 +309,7 @@ public void executeCloseScrollWork(Set<String> indexNames) {
 
 	@Override
 	public <T> SearchScrollResult<T> executeNextScrollWork(Set<String> indexNames, StubSearchWork work,
-			StubSearchProjectionContext projectionContext, LoadingContext<?, ?> loadingContext,
+			StubSearchProjectionContext projectionContext, SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection, Deadline deadline) {
 		return nextScrollCalls.verify(
 				new NextScrollWorkCall<>( indexNames, work, projectionContext, loadingContext, rootProjection,
diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/StubBackendBehavior.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/StubBackendBehavior.java
index b641817954f..3028b84bbe2 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/StubBackendBehavior.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/StubBackendBehavior.java
@@ -12,7 +12,7 @@
 import org.hibernate.search.engine.backend.spi.BackendBuildContext;
 import org.hibernate.search.engine.common.timing.spi.TimingSource;
 import org.hibernate.search.engine.reporting.spi.ContextualFailureCollector;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchResult;
 import org.hibernate.search.engine.search.query.SearchScroll;
 import org.hibernate.search.engine.search.query.SearchScrollResult;
@@ -50,7 +50,7 @@ public abstract CompletableFuture<?> executeSchemaManagementWork(String indexNam
 	public abstract CompletableFuture<?> processAndExecuteDocumentWork(String indexName, StubDocumentWork work);
 
 	public abstract <T> SearchResult<T> executeSearchWork(Set<String> indexNames, StubSearchWork work,
-			StubSearchProjectionContext projectionContext, LoadingContext<?, ?> loadingContext,
+			StubSearchProjectionContext projectionContext, SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection, Deadline deadline);
 
 	public abstract CompletableFuture<?> executeIndexScaleWork(String indexName, StubIndexScaleWork work);
@@ -58,13 +58,13 @@ public abstract <T> SearchResult<T> executeSearchWork(Set<String> indexNames, St
 	public abstract long executeCountWork(Set<String> indexNames);
 
 	public abstract <T> SearchScroll<T> executeScrollWork(Set<String> indexNames, StubSearchWork work, int chunkSize,
-			StubSearchProjectionContext projectionContext, LoadingContext<?, ?> loadingContext,
+			StubSearchProjectionContext projectionContext, SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection, TimingSource timingSource);
 
 	public abstract void executeCloseScrollWork(Set<String> indexNames);
 
 	public abstract <T> SearchScrollResult<T> executeNextScrollWork(Set<String> indexNames, StubSearchWork work,
-			StubSearchProjectionContext projectionContext, LoadingContext<?, ?> loadingContext,
+			StubSearchProjectionContext projectionContext, SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection, Deadline deadline);
 
 }
diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubSearchQueryBuilderFactory.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubSearchQueryBuilderFactory.java
index c41dac27935..a1ae0dd86df 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubSearchQueryBuilderFactory.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/index/impl/StubSearchQueryBuilderFactory.java
@@ -12,7 +12,7 @@
 
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
 import org.hibernate.search.engine.search.projection.SearchProjection;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilder;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilderFactory;
 import org.hibernate.search.util.impl.integrationtest.common.stub.backend.search.StubQueryElementCollector;
@@ -35,7 +35,7 @@ class StubSearchQueryBuilderFactory implements SearchQueryBuilderFactory<StubQue
 
 	@Override
 	public <E> SearchQueryBuilder<E, StubQueryElementCollector> selectEntity(BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, E, ?> loadingContextBuilder) {
+			SearchLoadingContextBuilder<?, E, ?> loadingContextBuilder) {
 		return new StubSearchQueryBuilder<>(
 				backend, scopeModel, StubSearchWork.ResultType.OBJECTS,
 				sessionContext,
@@ -46,7 +46,7 @@ public <E> SearchQueryBuilder<E, StubQueryElementCollector> selectEntity(Backend
 
 	@Override
 	public <R> SearchQueryBuilder<R, StubQueryElementCollector> selectEntityReference(BackendSessionContext sessionContext,
-			LoadingContextBuilder<R, ?, ?> loadingContextBuilder) {
+			SearchLoadingContextBuilder<R, ?, ?> loadingContextBuilder) {
 		return new StubSearchQueryBuilder<>(
 				backend, scopeModel, StubSearchWork.ResultType.REFERENCES,
 				sessionContext,
@@ -57,7 +57,7 @@ public <R> SearchQueryBuilder<R, StubQueryElementCollector> selectEntityReferenc
 
 	@Override
 	public <P> SearchQueryBuilder<P, StubQueryElementCollector> select(BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder, SearchProjection<P> projection) {
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder, SearchProjection<P> projection) {
 		return new StubSearchQueryBuilder<>(
 				backend, scopeModel, StubSearchWork.ResultType.PROJECTIONS,
 				sessionContext,
@@ -68,7 +68,7 @@ public <P> SearchQueryBuilder<P, StubQueryElementCollector> select(BackendSessio
 
 	@Override
 	public SearchQueryBuilder<List<?>, StubQueryElementCollector> select(BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder, SearchProjection<?>... projections) {
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder, SearchProjection<?>... projections) {
 		return new StubSearchQueryBuilder<>(
 				backend, scopeModel, StubSearchWork.ResultType.PROJECTIONS,
 				sessionContext,
diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchQuery.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchQuery.java
index f3c5db011f1..111451550c0 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchQuery.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchQuery.java
@@ -11,7 +11,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.hibernate.search.engine.common.dsl.spi.DslExtensionState;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchScroll;
 import org.hibernate.search.engine.search.query.spi.AbstractSearchQuery;
 import org.hibernate.search.engine.search.query.SearchQuery;
@@ -29,12 +29,12 @@ final class StubSearchQuery<H> extends AbstractSearchQuery<H, SearchResult<H>>
 	private final Set<String> indexNames;
 	private final StubSearchWork.Builder workBuilder;
 	private final StubSearchProjectionContext projectionContext;
-	private final LoadingContext<?, ?> loadingContext;
+	private final SearchLoadingContext<?, ?> loadingContext;
 	private final StubSearchProjection<H> rootProjection;
 
 	StubSearchQuery(StubBackend backend, Set<String> indexNames, StubSearchWork.Builder workBuilder,
 			StubSearchProjectionContext projectionContext,
-			LoadingContext<?, ?> loadingContext, StubSearchProjection<H> rootProjection) {
+			SearchLoadingContext<?, ?> loadingContext, StubSearchProjection<H> rootProjection) {
 		this.backend = backend;
 		this.indexNames = indexNames;
 		this.workBuilder = workBuilder;
diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchQueryBuilder.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchQueryBuilder.java
index 77867f5bd0e..6fd1efcd838 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchQueryBuilder.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchQueryBuilder.java
@@ -9,7 +9,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.hibernate.search.engine.backend.session.spi.BackendSessionContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 import org.hibernate.search.engine.search.query.SearchQuery;
 import org.hibernate.search.engine.search.query.spi.SearchQueryBuilder;
 import org.hibernate.search.util.impl.integrationtest.common.stub.backend.index.impl.StubBackend;
@@ -23,13 +23,13 @@ public class StubSearchQueryBuilder<H> implements SearchQueryBuilder<H, StubQuer
 	private final StubScopeModel scopeModel;
 	private final StubSearchWork.Builder workBuilder;
 	private final StubSearchProjectionContext projectionContext;
-	private final LoadingContextBuilder<?, ?, ?> loadingContextBuilder;
+	private final SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder;
 	private final StubSearchProjection<H> rootProjection;
 
 	public StubSearchQueryBuilder(StubBackend backend, StubScopeModel scopeModel,
 			StubSearchWork.ResultType resultType,
 			BackendSessionContext sessionContext,
-			LoadingContextBuilder<?, ?, ?> loadingContextBuilder, StubSearchProjection<H> rootProjection) {
+			SearchLoadingContextBuilder<?, ?, ?> loadingContextBuilder, StubSearchProjection<H> rootProjection) {
 		this.backend = backend;
 		this.scopeModel = scopeModel;
 		this.workBuilder = StubSearchWork.builder( resultType );
diff --git a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchScroll.java b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchScroll.java
index 244a8ede99f..10553b08322 100644
--- a/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchScroll.java
+++ b/util/internal/integrationtest/common/src/main/java/org/hibernate/search/util/impl/integrationtest/common/stub/backend/search/StubSearchScroll.java
@@ -9,7 +9,7 @@
 import java.util.Set;
 
 import org.hibernate.search.engine.common.timing.spi.TimingSource;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.query.SearchScroll;
 import org.hibernate.search.engine.search.query.SearchScrollResult;
 import org.hibernate.search.util.impl.integrationtest.common.stub.backend.StubBackendBehavior;
@@ -23,12 +23,12 @@ public class StubSearchScroll<T> implements SearchScroll<T> {
 	private final Set<String> indexNames;
 	private final StubSearchWork work;
 	private final StubSearchProjectionContext projectionContext;
-	private final LoadingContext<?, ?> loadingContext;
+	private final SearchLoadingContext<?, ?> loadingContext;
 	private final StubSearchProjection<T> rootProjection;
 	private final StubTimeoutManager timeoutManager;
 
 	public StubSearchScroll(StubBackendBehavior behavior, Set<String> indexNames, StubSearchWork work,
-			StubSearchProjectionContext projectionContext, LoadingContext<?, ?> loadingContext,
+			StubSearchProjectionContext projectionContext, SearchLoadingContext<?, ?> loadingContext,
 			StubSearchProjection<T> rootProjection, TimingSource timingSource) {
 		this.behavior = behavior;
 		this.indexNames = indexNames;
diff --git a/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/GenericStubMappingScope.java b/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/GenericStubMappingScope.java
index 61af6c7ddc2..263671b8239 100644
--- a/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/GenericStubMappingScope.java
+++ b/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/GenericStubMappingScope.java
@@ -12,8 +12,8 @@
 import org.hibernate.search.engine.search.projection.dsl.SearchProjectionFactory;
 import org.hibernate.search.engine.search.query.dsl.SearchQuerySelectStep;
 import org.hibernate.search.engine.search.sort.dsl.SearchSortFactory;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContextBuilder;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContextBuilder;
 
 /**
  * A wrapper around {@link MappedIndexScope} providing some syntactic sugar,
@@ -27,25 +27,26 @@ public class GenericStubMappingScope<R, E> {
 		this.delegate = delegate;
 	}
 
-	public SearchQuerySelectStep<?, R, E, StubLoadingOptionsStep, ?, ?> query(LoadingContext<R, E> loadingContext) {
+	public SearchQuerySelectStep<?, R, E, StubLoadingOptionsStep, ?, ?> query(
+			SearchLoadingContext<R, E> loadingContext) {
 		return query( new StubBackendSessionContext(), loadingContext );
 	}
 
 	public SearchQuerySelectStep<?, R, E, StubLoadingOptionsStep, ?, ?> query(StubBackendSessionContext sessionContext,
-			LoadingContext<R, E> loadingContext) {
+			SearchLoadingContext<R, E> loadingContext) {
 		return query( sessionContext, loadingContext, new StubLoadingOptionsStep() );
 	}
 
 	public <LOS> SearchQuerySelectStep<?, R, E, LOS, ?, ?> query(StubBackendSessionContext sessionContext,
-			LoadingContext<R, E> loadingContext, LOS loadingOptionsStep) {
-		LoadingContextBuilder<R, E, LOS> loadingContextBuilder = new LoadingContextBuilder<R, E, LOS>() {
+			SearchLoadingContext<R, E> loadingContext, LOS loadingOptionsStep) {
+		SearchLoadingContextBuilder<R, E, LOS> loadingContextBuilder = new SearchLoadingContextBuilder<R, E, LOS>() {
 			@Override
 			public LOS toAPI() {
 				return loadingOptionsStep;
 			}
 
 			@Override
-			public LoadingContext<R, E> build() {
+			public SearchLoadingContext<R, E> build() {
 				return loadingContext;
 			}
 		};
diff --git a/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubMappingScope.java b/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubMappingScope.java
index 105309fc87b..b1998a773f3 100644
--- a/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubMappingScope.java
+++ b/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubMappingScope.java
@@ -23,11 +23,11 @@ public class StubMappingScope extends GenericStubMappingScope<DocumentReference,
 	}
 
 	public SearchQuerySelectStep<?, DocumentReference, DocumentReference, StubLoadingOptionsStep, ?, ?> query() {
-		return query( new StubLoadingContext() );
+		return query( new StubSearchLoadingContext() );
 	}
 
 	public SearchQuerySelectStep<?, DocumentReference, DocumentReference, StubLoadingOptionsStep, ?, ?> query(
 			StubBackendSessionContext sessionContext) {
-		return query( sessionContext, new StubLoadingContext() );
+		return query( sessionContext, new StubSearchLoadingContext() );
 	}
 }
diff --git a/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubLoadingContext.java b/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubSearchLoadingContext.java
similarity index 79%
rename from util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubLoadingContext.java
rename to util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubSearchLoadingContext.java
index 33777ea70b8..b86e83819d6 100644
--- a/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubLoadingContext.java
+++ b/util/internal/integrationtest/mapper/stub/src/main/java/org/hibernate/search/util/impl/integrationtest/mapper/stub/StubSearchLoadingContext.java
@@ -7,14 +7,14 @@
 package org.hibernate.search.util.impl.integrationtest.mapper.stub;
 
 import org.hibernate.search.engine.backend.common.DocumentReference;
-import org.hibernate.search.engine.search.loading.context.spi.LoadingContext;
+import org.hibernate.search.engine.search.loading.spi.SearchLoadingContext;
 import org.hibernate.search.engine.search.loading.spi.DefaultProjectionHitMapper;
 import org.hibernate.search.engine.search.loading.spi.EntityLoader;
 import org.hibernate.search.engine.search.loading.spi.ProjectionHitMapper;
 
-public class StubLoadingContext implements LoadingContext<DocumentReference, DocumentReference> {
+public class StubSearchLoadingContext implements SearchLoadingContext<DocumentReference, DocumentReference> {
 
-	StubLoadingContext() {
+	StubSearchLoadingContext() {
 	}
 
 	@Override