diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateFieldSetContext.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateFieldSetContext.java
index 4b19c88d23d..8983dcee7e4 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateFieldSetContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/MatchPredicateFieldSetContext.java
@@ -46,7 +46,7 @@ default MatchPredicateFieldSetContext orField(String absoluteFieldPath) {
 	 * The signature of this method defines this parameter as an {@link Object},
 	 * but a specific type is expected depending on the targeted field.
 	 * See <a href="SearchPredicateContainerContext.html#commonconcepts-parametertype">there</a> for more information.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	SearchPredicateTerminalContext matching(Object value);
 
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java
index 4b57c3368ea..4075ea7a201 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/NestedPredicateFieldContext.java
@@ -24,7 +24,7 @@ public interface NestedPredicateFieldContext {
 	 * matches the inner predicate.
 	 *
 	 * @param searchPredicate The predicate that must be matched by at least one element of the nested object field.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	SearchPredicateTerminalContext nest(SearchPredicate searchPredicate);
 
@@ -45,7 +45,7 @@ public interface NestedPredicateFieldContext {
 	 *
 	 * @param predicateContributor A consumer that will add a predicate to the context passed in parameter.
 	 * Should generally be a lambda expression.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	SearchPredicateTerminalContext nest(Consumer<? super SearchPredicateContainerContext> predicateContributor);
 
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFieldSetContext.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFieldSetContext.java
index 9d2e4de0de9..5666b2170fb 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFieldSetContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/RangePredicateFieldSetContext.java
@@ -81,7 +81,7 @@ default RangePredicateFromContext from(Object value) {
 	 * but a specific type is expected depending on the targeted field.
 	 * See <a href="SearchPredicateContainerContext.html#commonconcepts-parametertype">there</a> for more information.
 	 * @param inclusion Whether the lower bound should be included in or excluded from the range.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	SearchPredicateTerminalContext above(Object value, RangeBoundInclusion inclusion);
 
@@ -94,7 +94,7 @@ default RangePredicateFromContext from(Object value) {
 	 *
 	 * @param value The lower bound of the range (included)
 	 * (see {@link #above(Object, RangeBoundInclusion)} for details about null-ness and type).
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 *
 	 * @see #above(Object, RangeBoundInclusion)
 	 */
@@ -111,7 +111,7 @@ default SearchPredicateTerminalContext above(Object value) {
 	 * but a specific type is expected depending on the targeted field.
 	 * See <a href="SearchPredicateContainerContext.html#commonconcepts-parametertype">there</a> for more information.
 	 * @param inclusion Whether the upper bound should be included in or excluded from the range.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	SearchPredicateTerminalContext below(Object value, RangeBoundInclusion inclusion);
 
@@ -124,7 +124,7 @@ default SearchPredicateTerminalContext above(Object value) {
 	 *
 	 * @param value The upper bound of the range (included)
 	 * (see {@link #below(Object, RangeBoundInclusion)} for details about null-ness and type).
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 *
 	 * @see #below(Object, RangeBoundInclusion)
 	 */
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java
index 1ca7b4c9299..8f3ae03ab02 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateContainerContext.java
@@ -58,7 +58,7 @@ public interface SearchPredicateContainerContext {
 	 * Match all documents.
 	 *
 	 * @return A context allowing to define the predicate more precisely
-	 * and ultimately {@link SearchPredicateTerminalContext#end() end the predicate definition}.
+	 * and ultimately {@link SearchPredicateTerminalContext#toPredicate() get the resulting predicate}.
 	 * @see MatchAllPredicateContext
 	 */
 	MatchAllPredicateContext matchAll();
@@ -67,7 +67,7 @@ public interface SearchPredicateContainerContext {
 	 * Match documents if they match a combination of boolean clauses.
 	 *
 	 * @return A context allowing to define the predicate more precisely
-	 * and ultimately {@link SearchPredicateTerminalContext#end() end the predicate definition}.
+	 * and ultimately {@link SearchPredicateTerminalContext#toPredicate() get the resulting predicate}.
 	 * @see BooleanJunctionPredicateContext
 	 */
 	BooleanJunctionPredicateContext bool();
@@ -80,7 +80,7 @@ public interface SearchPredicateContainerContext {
 	 *
 	 * @param clauseContributor A consumer that will add clauses to the context passed in parameter.
 	 * Should generally be a lambda expression.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 * @see BooleanJunctionPredicateContext
 	 */
 	SearchPredicateTerminalContext bool(Consumer<? super BooleanJunctionPredicateContext> clauseContributor);
@@ -93,7 +93,7 @@ public interface SearchPredicateContainerContext {
 	 * while analyzed, full-text fields imply approximate matches depending on how they are analyzed.
 	 *
 	 * @return A context allowing to define the predicate more precisely
-	 * and ultimately {@link SearchPredicateTerminalContext#end() end the predicate definition}.
+	 * and ultimately {@link SearchPredicateTerminalContext#toPredicate() get the resulting predicate}.
 	 * @see MatchPredicateContext
 	 */
 	MatchPredicateContext match();
@@ -102,7 +102,7 @@ public interface SearchPredicateContainerContext {
 	 * Match documents where targeted fields have a value within lower and upper bounds.
 	 *
 	 * @return A context allowing to define the predicate more precisely
-	 * and ultimately {@link SearchPredicateTerminalContext#end() end the predicate definition}.
+	 * and ultimately {@link SearchPredicateTerminalContext#toPredicate() get the resulting predicate}.
 	 * @see RangePredicateContext
 	 */
 	RangePredicateContext range();
@@ -113,7 +113,7 @@ public interface SearchPredicateContainerContext {
 	 * matches a given predicate.
 	 *
 	 * @return A context allowing to define the predicate more precisely
-	 * and ultimately {@link SearchPredicateTerminalContext#end() end the predicate definition}.
+	 * and ultimately {@link SearchPredicateTerminalContext#toPredicate() get the resulting predicate}.
 	 * @see NestedPredicateContext
 	 */
 	NestedPredicateContext nested();
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateTerminalContext.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateTerminalContext.java
index 561401e2ac5..8565078853a 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateTerminalContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SearchPredicateTerminalContext.java
@@ -14,15 +14,6 @@
  */
 public interface SearchPredicateTerminalContext {
 
-	/**
-	 * End the current context and get the resulting {@link SearchPredicate} object.
-	 *
-	 * @return The {@link SearchPredicate} resulting from the previous DSL steps.
-	 */
-	default SearchPredicate end() {
-		return toPredicate();
-	}
-
 	/**
 	 * Create a {@link SearchPredicate} instance
 	 * matching the definition given in the previous DSL steps.
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialPredicateContext.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialPredicateContext.java
index ce245d9eb41..c21abd10356 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialPredicateContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialPredicateContext.java
@@ -17,7 +17,7 @@ public interface SpatialPredicateContext {
 	 * a circle (maximum distance matching), a polygon, a bounding box, ...
 	 *
 	 * @return A context allowing to define the predicate more precisely
-	 * and ultimately {@link SearchPredicateTerminalContext#end() end the predicate definition}.
+	 * and ultimately {@link SearchPredicateTerminalContext#toPredicate() get the resulting predicate}.
 	 */
 	SpatialWithinPredicateContext within();
 
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialWithinPredicateFieldSetContext.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialWithinPredicateFieldSetContext.java
index f34c94f7ceb..ddb07e2e35a 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialWithinPredicateFieldSetContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/predicate/SpatialWithinPredicateFieldSetContext.java
@@ -52,7 +52,7 @@ default SpatialWithinPredicateFieldSetContext orField(String absoluteFieldPath)
 	 * @param center The center of the bounding circle.
 	 * @param radius The radius of the bounding circle, in the unit defined by parameter {@code unit}.
 	 * @param unit The unit used for the radius.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	SearchPredicateTerminalContext circle(GeoPoint center, double radius, DistanceUnit unit);
 
@@ -62,7 +62,7 @@ default SpatialWithinPredicateFieldSetContext orField(String absoluteFieldPath)
 	 *
 	 * @param center The center of the bounding circle.
 	 * @param radiusInMeters The radius of the bounding circle, in meters.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	default SearchPredicateTerminalContext circle(GeoPoint center, double radiusInMeters) {
 		return circle( center, radiusInMeters, DistanceUnit.METERS );
@@ -76,7 +76,7 @@ default SearchPredicateTerminalContext circle(GeoPoint center, double radiusInMe
 	 * @param longitude The longitude of the center of the bounding circle.
 	 * @param radius The radius of the bounding circle, in the unit defined by parameter {@code unit}.
 	 * @param unit The unit used for the radius.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	default SearchPredicateTerminalContext circle(double latitude, double longitude, double radius, DistanceUnit unit) {
 		return circle( GeoPoint.of( latitude, longitude ), radius, unit );
@@ -89,7 +89,7 @@ default SearchPredicateTerminalContext circle(double latitude, double longitude,
 	 * @param latitude The latitude of the center of the bounding circle.
 	 * @param longitude The longitude of the center of the bounding circle.
 	 * @param radiusInMeters The radius of the bounding circle, in meters.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	default SearchPredicateTerminalContext circle(double latitude, double longitude, double radiusInMeters) {
 		return circle( GeoPoint.of( latitude, longitude ), radiusInMeters, DistanceUnit.METERS );
@@ -99,7 +99,7 @@ default SearchPredicateTerminalContext circle(double latitude, double longitude,
 	 * Require at least one of the targeted fields to point to a location within the given polygon.
 	 *
 	 * @param polygon The bounding polygon.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	SearchPredicateTerminalContext polygon(GeoPolygon polygon);
 
@@ -107,7 +107,7 @@ default SearchPredicateTerminalContext circle(double latitude, double longitude,
 	 * Require at least one of the targeted fields to point to a location within the given box (~rectangle).
 	 *
 	 * @param boundingBox The bounding box.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	SearchPredicateTerminalContext boundingBox(GeoBoundingBox boundingBox);
 
@@ -118,7 +118,7 @@ default SearchPredicateTerminalContext circle(double latitude, double longitude,
 	 * @param topLeftLongitude The longitude of the top-left corner of the box.
 	 * @param bottomRightLatitude The latitude of the bottom-right corner of the box.
 	 * @param bottomRightLongitude The longitude of the bottom-right corner of the box.
-	 * @return A context allowing to end the predicate definition.
+	 * @return A context allowing to get the resulting predicate.
 	 */
 	default SearchPredicateTerminalContext boundingBox(double topLeftLatitude, double topLeftLongitude, double bottomRightLatitude,
 			double bottomRightLongitude) {
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerContext.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerContext.java
index 73b85d9e648..72d94bd9966 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortContainerContext.java
@@ -24,7 +24,7 @@ public interface SearchSortContainerContext {
 	 * The default order is <strong>descending</strong>, i.e. higher scores come first.
 	 *
 	 * @return A context allowing to define the sort more precisely, {@link NonEmptySortContext#then() chain other sorts}
-	 * or {@link SearchSortTerminalContext#end() end the sort definition}.
+	 * or {@link SearchSortTerminalContext#toSort() get the resulting sort}.
 	 */
 	ScoreSortContext byScore();
 
@@ -32,7 +32,7 @@ public interface SearchSortContainerContext {
 	 * Order elements by their internal index order.
 	 *
 	 * @return A context allowing to {@link NonEmptySortContext#then() chain other sorts}
-	 * or {@link SearchSortTerminalContext#end() end the sort definition}.
+	 * or {@link SearchSortTerminalContext#toSort() get the resulting sort}.
 	 */
 	NonEmptySortContext byIndexOrder();
 
@@ -43,7 +43,7 @@ public interface SearchSortContainerContext {
 	 *
 	 * @param absoluteFieldPath The absolute path of the index field to sort by
 	 * @return A context allowing to define the sort more precisely, {@link NonEmptySortContext#then() chain other sorts}
-	 * or {@link SearchSortTerminalContext#end() end the sort definition}.
+	 * or {@link SearchSortTerminalContext#toSort() get the resulting sort}.
 	 * @throws SearchException If the sort field type could not be automatically determined.
 	 */
 	FieldSortContext byField(String absoluteFieldPath);
@@ -56,7 +56,7 @@ public interface SearchSortContainerContext {
 	 * @param absoluteFieldPath The absolute path of the indexed location field to sort by.
 	 * @param location The location to which we want to compute the distance.
 	 * @return A context allowing to define the sort more precisely, {@link NonEmptySortContext#then() chain other sorts}
-	 * or {@link SearchSortTerminalContext#end() end the sort definition}.
+	 * or {@link SearchSortTerminalContext#toSort() get the resulting sort}.
 	 * @throws SearchException If the field type does not constitute a valid location.
 	 */
 	DistanceSortContext byDistance(String absoluteFieldPath, GeoPoint location);
@@ -70,7 +70,7 @@ public interface SearchSortContainerContext {
 	 * @param latitude The latitude of the location to which we want to compute the distance.
 	 * @param longitude The longitude of the location to which we want to compute the distance.
 	 * @return A context allowing to define the sort more precisely, {@link NonEmptySortContext#then() chain other sorts}
-	 * or {@link SearchSortTerminalContext#end() end the sort definition}.
+	 * or {@link SearchSortTerminalContext#toSort() get the resulting sort}.
 	 * @throws SearchException If the field type does not constitute a valid location.
 	 */
 	default DistanceSortContext byDistance(String absoluteFieldPath, double latitude, double longitude) {
@@ -85,7 +85,7 @@ default DistanceSortContext byDistance(String absoluteFieldPath, double latitude
 	 *
 	 * @param sort A previously-built {@link SearchSort} object.
 	 * @return A context allowing to {@link NonEmptySortContext#then() chain other sorts}
-	 * or {@link SearchSortTerminalContext#end() end the sort definition}.
+	 * or {@link SearchSortTerminalContext#toSort() get the resulting sort}.
 	 */
 	NonEmptySortContext by(SearchSort sort);
 
diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortTerminalContext.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortTerminalContext.java
index d7107940652..170d8a9e502 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortTerminalContext.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/SearchSortTerminalContext.java
@@ -14,15 +14,6 @@
  */
 public interface SearchSortTerminalContext {
 
-	/**
-	 * End the current context and get the resulting {@link SearchSort} object.
-	 *
-	 * @return The {@link SearchSort} resulting from the previous DSL steps.
-	 */
-	default SearchSort end() {
-		return toSort();
-	}
-
 	/**
 	 * Create a {@link SearchSort} instance
 	 * matching the definition given in the previous DSL steps.
diff --git a/integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java b/integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java
index 55a7892d694..3e005a14468 100644
--- a/integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java
+++ b/integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/ExtensionIT.java
@@ -116,9 +116,9 @@ public void predicate_fromJsonString_separatePredicate() {
 		IndexSearchTarget searchTarget = indexManager.createSearchTarget().build();
 
 		SearchPredicate predicate1 = searchTarget.predicate().extension( ElasticsearchExtension.get() )
-				.fromJsonString( "{'match': {'string': 'text 1'}}" ).end();
+				.fromJsonString( "{'match': {'string': 'text 1'}}" ).toPredicate();
 		SearchPredicate predicate2 = searchTarget.predicate().extension( ElasticsearchExtension.get() )
-				.fromJsonString( "{'match': {'integer': 2}}" ).end();
+				.fromJsonString( "{'match': {'integer': 2}}" ).toPredicate();
 		SearchPredicate predicate3 = searchTarget.predicate().extension( ElasticsearchExtension.get() )
 				.fromJsonString(
 						"{"
@@ -131,16 +131,16 @@ public void predicate_fromJsonString_separatePredicate() {
 							+ "}"
 						+ "}"
 				)
-				.end();
+				.toPredicate();
 		// Also test using the standard DSL on a field defined with the extension
 		SearchPredicate predicate4 = searchTarget.predicate().match().onField( "yearDays" )
-				.matching( "'2018:12'" ).end();
+				.matching( "'2018:12'" ).toPredicate();
 		SearchPredicate booleanPredicate = searchTarget.predicate().bool( b -> {
 			b.should( predicate1 );
 			b.should( predicate2 );
 			b.should( predicate3 );
 			b.should( predicate4 );
-		} ).end();
+		} ).toPredicate();
 
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -201,18 +201,18 @@ public void sort_fromJsonString_separateSort() {
 
 		SearchSort sort1Asc = searchTarget.sort().extension( ElasticsearchExtension.get() )
 				.fromJsonString( "{'sort1': 'asc'}" )
-				.end();
+				.toSort();
 		SearchSort sort2Asc = searchTarget.sort().extension( ElasticsearchExtension.get() )
 				.fromJsonString( "{'sort2': 'asc'}" )
-				.end();
+				.toSort();
 		SearchSort sort3Asc = searchTarget.sort().extension( ElasticsearchExtension.get() )
 				.fromJsonString( "{'sort3': 'asc'}" )
-				.end();
+				.toSort();
 		// Also test using the standard DSL on a field defined with the extension
 		SearchSort sort4Asc = searchTarget.sort()
 				.byField( "sort4" ).asc().onMissingValue().sortLast()
 				.then().byField( "sort5" ).asc().onMissingValue().sortFirst()
-				.end();
+				.toSort();
 
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -224,17 +224,17 @@ public void sort_fromJsonString_separateSort() {
 
 		SearchSort sort1Desc = searchTarget.sort().extension( ElasticsearchExtension.get() )
 				.fromJsonString( "{'sort1': 'desc'}" )
-				.end();
+				.toSort();
 		SearchSort sort2Desc = searchTarget.sort().extension( ElasticsearchExtension.get() )
 				.fromJsonString( "{'sort2': 'desc'}" )
-				.end();
+				.toSort();
 		SearchSort sort3Desc = searchTarget.sort().extension( ElasticsearchExtension.get() )
 				.fromJsonString( "{'sort3': 'desc'}" )
-				.end();
+				.toSort();
 		SearchSort sort4Desc = searchTarget.sort()
 				.byField( "sort4" ).desc().onMissingValue().sortLast()
 				.then().byField( "sort5" ).asc().onMissingValue().sortFirst()
-				.end();
+				.toSort();
 
 		query = searchTarget.query( sessionContext )
 				.asReferences()
diff --git a/integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java b/integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java
index 8f0f70f48f8..3187ea052da 100644
--- a/integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java
+++ b/integrationtest/backend/lucene/src/test/java/org/hibernate/search/integrationtest/backend/lucene/ExtensionIT.java
@@ -119,16 +119,16 @@ public void predicate_fromLuceneQuery_separatePredicate() {
 		IndexSearchTarget searchTarget = indexManager.createSearchTarget().build();
 
 		SearchPredicate predicate1 = searchTarget.predicate().extension( LuceneExtension.get() )
-				.fromLuceneQuery( new TermQuery( new Term( "string", "text 1" ) ) ).end();
+				.fromLuceneQuery( new TermQuery( new Term( "string", "text 1" ) ) ).toPredicate();
 		SearchPredicate predicate2 = searchTarget.predicate().extension( LuceneExtension.get() )
-				.fromLuceneQuery( IntPoint.newExactQuery( "integer", 2 ) ).end();
+				.fromLuceneQuery( IntPoint.newExactQuery( "integer", 2 ) ).toPredicate();
 		SearchPredicate predicate3 = searchTarget.predicate().extension( LuceneExtension.get() )
-				.fromLuceneQuery( LatLonPoint.newDistanceQuery( "geoPoint", 40, -70, 200_000 ) ).end();
+				.fromLuceneQuery( LatLonPoint.newDistanceQuery( "geoPoint", 40, -70, 200_000 ) ).toPredicate();
 		SearchPredicate booleanPredicate = searchTarget.predicate().bool( b -> {
 			b.should( predicate1 );
 			b.should( predicate2 );
 			b.should( predicate3 );
-		} ).end();
+		} ).toPredicate();
 
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -191,17 +191,17 @@ public void sort_fromLuceneSortField_separateSort() {
 								c2 -> c2.fromLuceneSortField( new SortField( "sort1", Type.STRING ) )
 						)
 						.orElseFail()
-				.end();
+				.toSort();
 		SearchSort sort2 = searchTarget.sort().extension( LuceneExtension.get() )
 				.fromLuceneSortField( new SortField( "sort2", Type.STRING ) )
-				.end();
+				.toSort();
 		SearchSort sort3 = searchTarget.sort().extension()
 				.ifSupported(
 						LuceneExtension.get(),
 						c2 -> c2.fromLuceneSortField( new SortField( "sort3", Type.STRING ) )
 				)
 				.orElseFail()
-				.end();
+				.toSort();
 
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -218,7 +218,7 @@ public void sort_fromLuceneSortField_separateSort() {
 						new SortField( "sort1", Type.STRING )
 					)
 				)
-				.end();
+				.toSort();
 
 		query = searchTarget.query( sessionContext )
 				.asReferences()
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/SmokeIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/SmokeIT.java
index 26d415b63da..0c8a914d982 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/SmokeIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/SmokeIT.java
@@ -244,7 +244,7 @@ public void predicate_nested() {
 	public void separatePredicate() {
 		IndexSearchTarget searchTarget = indexManager.createSearchTarget().build();
 
-		SearchPredicate predicate = searchTarget.predicate().match().onField( "string" ).matching( "text 1" ).end();
+		SearchPredicate predicate = searchTarget.predicate().match().onField( "string" ).matching( "text 1" ).toPredicate();
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
 				.predicate( predicate )
@@ -253,7 +253,7 @@ public void separatePredicate() {
 				.hasReferencesHitsAnyOrder( INDEX_NAME, "1" )
 				.hasHitCount( 1 );
 
-		predicate = searchTarget.predicate().range().onField( "integer" ).from( 1 ).to( 2 ).end();
+		predicate = searchTarget.predicate().range().onField( "integer" ).from( 1 ).to( 2 ).toPredicate();
 		query = searchTarget.query( sessionContext )
 				.asReferences()
 				.predicate( predicate )
@@ -265,7 +265,7 @@ public void separatePredicate() {
 		predicate = searchTarget.predicate().bool()
 				.should( c -> c.match().onField( "integer" ).matching( 1 ) )
 				.should( c -> c.match().onField( "integer" ).matching( 2 ) )
-				.end();
+				.toPredicate();
 		query = searchTarget.query( sessionContext )
 				.asReferences()
 				.predicate( predicate )
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/BoolSearchPredicateIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/BoolSearchPredicateIT.java
index b96688b0ec0..fddacec98f5 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/BoolSearchPredicateIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/BoolSearchPredicateIT.java
@@ -139,7 +139,7 @@ public void must_consumer() {
 	public void must_predicate() {
 		IndexSearchTarget searchTarget = indexManager.createSearchTarget().build();
 
-		SearchPredicate predicate = searchTarget.predicate().match().onField( "field1" ).matching( FIELD1_VALUE1 ).end();
+		SearchPredicate predicate = searchTarget.predicate().match().onField( "field1" ).matching( FIELD1_VALUE1 ).toPredicate();
 
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -198,8 +198,8 @@ public void should_consumer() {
 	public void should_predicate() {
 		IndexSearchTarget searchTarget = indexManager.createSearchTarget().build();
 
-		SearchPredicate predicate1 = searchTarget.predicate().match().onField( "field1" ).matching( FIELD1_VALUE1 ).end();
-		SearchPredicate predicate2 = searchTarget.predicate().match().onField( "field1" ).matching( FIELD1_VALUE3 ).end();
+		SearchPredicate predicate1 = searchTarget.predicate().match().onField( "field1" ).matching( FIELD1_VALUE1 ).toPredicate();
+		SearchPredicate predicate2 = searchTarget.predicate().match().onField( "field1" ).matching( FIELD1_VALUE3 ).toPredicate();
 
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -258,7 +258,7 @@ public void mustNot_consumer() {
 	public void mustNot_predicate() {
 		IndexSearchTarget searchTarget = indexManager.createSearchTarget().build();
 
-		SearchPredicate predicate = searchTarget.predicate().match().onField( "field1" ).matching( FIELD1_VALUE2 ).end();
+		SearchPredicate predicate = searchTarget.predicate().match().onField( "field1" ).matching( FIELD1_VALUE2 ).toPredicate();
 
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchAllSearchPredicateIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchAllSearchPredicateIT.java
index f6e2dc5077f..03f7d6bda8d 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchAllSearchPredicateIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchAllSearchPredicateIT.java
@@ -83,7 +83,7 @@ public void matchAll_except() {
 		DocumentReferencesSearchResultAssert.assertThat( query )
 				.hasReferencesHitsAnyOrder( INDEX_NAME, DOCUMENT_2, DOCUMENT_3 );
 
-		SearchPredicate searchPredicate = searchTarget.predicate().match().onField( "string" ).matching( STRING_2 ).end();
+		SearchPredicate searchPredicate = searchTarget.predicate().match().onField( "string" ).matching( STRING_2 ).toPredicate();
 		query = searchTarget.query( sessionContext )
 				.asReferences()
 				.predicate( root -> root.matchAll().except( searchPredicate ) )
@@ -107,8 +107,8 @@ public void matchAll_multipleExcepts() {
 		DocumentReferencesSearchResultAssert.assertThat( query )
 				.hasReferencesHitsAnyOrder( INDEX_NAME, DOCUMENT_3 );
 
-		SearchPredicate searchPredicate1 = searchTarget.predicate().match().onField( "string" ).matching( STRING_3 ).end();
-		SearchPredicate searchPredicate2 = searchTarget.predicate().match().onField( "string" ).matching( STRING_2 ).end();
+		SearchPredicate searchPredicate1 = searchTarget.predicate().match().onField( "string" ).matching( STRING_3 ).toPredicate();
+		SearchPredicate searchPredicate2 = searchTarget.predicate().match().onField( "string" ).matching( STRING_2 ).toPredicate();
 
 		query = searchTarget.query( sessionContext )
 				.asReferences()
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchSearchPredicateIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchSearchPredicateIT.java
index 42b16e64ce5..8343faf4766 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchSearchPredicateIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/MatchSearchPredicateIT.java
@@ -187,10 +187,10 @@ public void boost() {
 				.asReferences()
 				.predicate( root -> root.bool()
 						.should( c -> c.match().onField( indexMapping.string1Field.relativeFieldName )
-								.matching( indexMapping.string1Field.document1Value.indexedValue ).end()
+								.matching( indexMapping.string1Field.document1Value.indexedValue ).toPredicate()
 						)
 						.should( c -> c.match().onField( indexMapping.string1Field.relativeFieldName ).boostedTo( 42 )
-								.matching( indexMapping.string1Field.document3Value.indexedValue ).end()
+								.matching( indexMapping.string1Field.document3Value.indexedValue ).toPredicate()
 						)
 				)
 				.sort( c -> c.byScore() )
@@ -203,10 +203,10 @@ public void boost() {
 				.asReferences()
 				.predicate( root -> root.bool()
 						.should( c -> c.match().onField( indexMapping.string1Field.relativeFieldName ).boostedTo( 42 )
-								.matching( indexMapping.string1Field.document1Value.indexedValue ).end()
+								.matching( indexMapping.string1Field.document1Value.indexedValue ).toPredicate()
 						)
 						.should( c -> c.match().onField( indexMapping.string1Field.relativeFieldName )
-								.matching( indexMapping.string1Field.document3Value.indexedValue ).end()
+								.matching( indexMapping.string1Field.document3Value.indexedValue ).toPredicate()
 						)
 				)
 				.sort( c -> c.byScore() )
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/NestedSearchPredicateIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/NestedSearchPredicateIT.java
index ff79d4932ed..59aa8bde998 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/NestedSearchPredicateIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/NestedSearchPredicateIT.java
@@ -162,7 +162,7 @@ public void search_nestedOnTwoLevels_separatePredicates() {
 			b2.must( c2 -> c2.match().onField( "nestedObject.nestedObject.field2" )
 					.matching( MATCHING_SECOND_LEVEL_CONDITION1_FIELD2 )
 			);
-		} ) ).end();
+		} ) ).toPredicate();
 
 		SearchPredicate predicate2 = searchTarget.predicate().nested().onObjectField( "nestedObject.nestedObject" ).nest( c -> c.bool( b2 -> {
 			b2.must( c2 -> c2.match().onField( "nestedObject.nestedObject.field1" )
@@ -171,7 +171,7 @@ public void search_nestedOnTwoLevels_separatePredicates() {
 			b2.must( c2 -> c2.match().onField( "nestedObject.nestedObject.field2" )
 					.matching( MATCHING_SECOND_LEVEL_CONDITION2_FIELD2 )
 			);
-		} ) ).end();
+		} ) ).toPredicate();
 
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/RangeSearchPredicateIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/RangeSearchPredicateIT.java
index 6a0b671574a..0dc7800f689 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/RangeSearchPredicateIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/RangeSearchPredicateIT.java
@@ -363,10 +363,10 @@ public void boost() {
 				.asReferences()
 				.predicate( root -> root.bool()
 						.should( c -> c.range().onField( indexMapping.string1Field.relativeFieldName )
-								.above( indexMapping.string1Field.document3Value.indexedValue ).end()
+								.above( indexMapping.string1Field.document3Value.indexedValue ).toPredicate()
 						)
 						.should( c -> c.range().onField( indexMapping.string1Field.relativeFieldName ).boostedTo( 42 )
-								.below( indexMapping.string1Field.document1Value.indexedValue ).end()
+								.below( indexMapping.string1Field.document1Value.indexedValue ).toPredicate()
 						)
 				)
 				.sort( c -> c.byScore() )
@@ -379,10 +379,10 @@ public void boost() {
 				.asReferences()
 				.predicate( root -> root.bool()
 						.should( c -> c.range().onField( indexMapping.string1Field.relativeFieldName ).boostedTo( 42 )
-								.above( indexMapping.string1Field.document3Value.indexedValue ).end()
+								.above( indexMapping.string1Field.document3Value.indexedValue ).toPredicate()
 						)
 						.should( c -> c.range().onField( indexMapping.string1Field.relativeFieldName )
-								.below( indexMapping.string1Field.document1Value.indexedValue ).end()
+								.below( indexMapping.string1Field.document1Value.indexedValue ).toPredicate()
 						)
 				)
 				.sort( c -> c.byScore() )
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java
index d180818d87e..c08d165cee4 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/predicate/SearchPredicateIT.java
@@ -87,7 +87,7 @@ public void match_fluid() {
 	public void match_search_predicate() {
 		IndexSearchTarget searchTarget = indexManager.createSearchTarget().build();
 
-		SearchPredicate predicate = searchTarget.predicate().match().onField( "string" ).matching( STRING_1 ).end();
+		SearchPredicate predicate = searchTarget.predicate().match().onField( "string" ).matching( STRING_1 ).toPredicate();
 
 		SearchQuery<DocumentReference> query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -210,7 +210,7 @@ public void extension() {
 						// FIXME find some way to forbid using the context passed to the consumers twice... ?
 						.ifSupported(
 								new SupportedExtension(),
-								c -> c.match().onField( "string" ).matching( STRING_1 ).end()
+								c -> c.match().onField( "string" ).matching( STRING_1 ).toPredicate()
 						)
 						.ifSupported(
 								new SupportedExtension(),
@@ -232,7 +232,7 @@ public void extension() {
 						)
 						.ifSupported(
 								new SupportedExtension(),
-								c -> c.match().onField( "string" ).matching( STRING_1 ).end()
+								c -> c.match().onField( "string" ).matching( STRING_1 ).toPredicate()
 						)
 						.orElse(
 								ignored -> Assert.fail( "This should not be called" )
@@ -255,7 +255,7 @@ public void extension() {
 								ignored -> Assert.fail( "This should not be called" )
 						)
 						.orElse(
-								c -> c.match().onField( "string" ).matching( STRING_1 ).end()
+								c -> c.match().onField( "string" ).matching( STRING_1 ).toPredicate()
 						)
 				)
 				.build();
@@ -273,9 +273,9 @@ public void extension() {
 								)
 						)
 						.must(
-								c -> c.match().onField( "string" ).matching( STRING_1 ).end()
+								c -> c.match().onField( "string" ).matching( STRING_1 ).toPredicate()
 						)
-						.end()
+						.toPredicate()
 				)
 				.build();
 		DocumentReferencesSearchResultAssert.assertThat( query )
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java
index 19a9b862426..e9206bd43e3 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/sort/SearchSortIT.java
@@ -131,7 +131,7 @@ public void byScore() {
 		SearchQuery<DocumentReference> query;
 
 		SearchPredicate predicate = searchTarget.predicate()
-				.match().onField( "string_analyzed_forScore" ).matching( "hooray" ).end();
+				.match().onField( "string_analyzed_forScore" ).matching( "hooray" ).toPredicate();
 
 		query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -165,7 +165,7 @@ public void separateSort() {
 
 		SearchSort sortAsc = searchTarget.sort()
 				.byField( "string" ).asc().onMissingValue().sortLast()
-				.end();
+				.toSort();
 
 		query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -185,7 +185,7 @@ public void separateSort() {
 
 		SearchSort sortDesc = searchTarget.sort()
 				.byField( "string" ).desc().onMissingValue().sortLast()
-				.end();
+				.toSort();
 
 		query = searchTarget.query( sessionContext )
 				.asReferences()
@@ -283,12 +283,12 @@ public void extension() {
 
 		// Mandatory extension
 		query = simpleQuery( c -> c
-				.extension( new SupportedExtension() ).byField( "string" ).onMissingValue().sortLast().end()
+				.extension( new SupportedExtension() ).byField( "string" ).onMissingValue().sortLast().toSort()
 		);
 		DocumentReferencesSearchResultAssert.assertThat( query )
 				.hasReferencesHitsAnyOrder( INDEX_NAME, FIRST_ID, SECOND_ID, THIRD_ID, EMPTY_ID );
 		query = simpleQuery( b -> b
-				.extension( new SupportedExtension() ).byField( "string" ).desc().onMissingValue().sortLast().end()
+				.extension( new SupportedExtension() ).byField( "string" ).desc().onMissingValue().sortLast().toSort()
 		);
 		DocumentReferencesSearchResultAssert.assertThat( query )
 				.hasReferencesHitsAnyOrder( INDEX_NAME, THIRD_ID, SECOND_ID, FIRST_ID, EMPTY_ID );
@@ -298,7 +298,7 @@ public void extension() {
 				.extension()
 						.ifSupported(
 								new SupportedExtension(),
-								c -> c.byField( "string" ).onMissingValue().sortLast().end()
+								c -> c.byField( "string" ).onMissingValue().sortLast().toSort()
 						)
 						.ifSupported(
 								new SupportedExtension(),
@@ -312,7 +312,7 @@ public void extension() {
 				.extension()
 						.ifSupported(
 								new SupportedExtension(),
-								c -> c.byField( "string" ).desc().onMissingValue().sortLast().end()
+								c -> c.byField( "string" ).desc().onMissingValue().sortLast().toSort()
 						)
 						.ifSupported(
 								new SupportedExtension(),
@@ -332,7 +332,7 @@ public void extension() {
 						)
 						.ifSupported(
 								new SupportedExtension(),
-								c -> c.byField( "string" ).onMissingValue().sortLast().end()
+								c -> c.byField( "string" ).onMissingValue().sortLast().toSort()
 						)
 						.orElse( ignored -> Assert.fail( "This should not be called" ) )
 		);
@@ -346,7 +346,7 @@ public void extension() {
 						)
 						.ifSupported(
 								new SupportedExtension(),
-								c -> c.byField( "string" ).desc().onMissingValue().sortLast().end()
+								c -> c.byField( "string" ).desc().onMissingValue().sortLast().toSort()
 						)
 						.orElse( ignored -> Assert.fail( "This should not be called" ) )
 		);
@@ -365,7 +365,7 @@ public void extension() {
 								ignored -> Assert.fail( "This should not be called" )
 						)
 						.orElse(
-								c -> c.byField( "string" ).onMissingValue().sortLast().end()
+								c -> c.byField( "string" ).onMissingValue().sortLast().toSort()
 						)
 		);
 		DocumentReferencesSearchResultAssert.assertThat( query )
@@ -381,7 +381,7 @@ public void extension() {
 								ignored -> Assert.fail( "This should not be called" )
 						)
 						.orElse(
-								c -> c.byField( "string" ).desc().onMissingValue().sortLast().end()
+								c -> c.byField( "string" ).desc().onMissingValue().sortLast().toSort()
 						)
 		);
 
@@ -394,7 +394,7 @@ public void extension() {
 							new UnSupportedExtension(),
 							ignored -> Assert.fail( "This should not be called" )
 					);
-			b.byField( "string" ).onMissingValue().sortLast().end();
+			b.byField( "string" ).onMissingValue().sortLast().toSort();
 		} );
 		DocumentReferencesSearchResultAssert.assertThat( query )
 				.hasReferencesHitsAnyOrder( INDEX_NAME, FIRST_ID, SECOND_ID, THIRD_ID, EMPTY_ID );
@@ -404,7 +404,7 @@ public void extension() {
 							new UnSupportedExtension(),
 							ignored -> Assert.fail( "This should not be called" )
 					);
-			b.byField( "string" ).desc().onMissingValue().sortLast().end();
+			b.byField( "string" ).desc().onMissingValue().sortLast().toSort();
 		} );
 		DocumentReferencesSearchResultAssert.assertThat( query )
 				.hasReferencesHitsAnyOrder( INDEX_NAME, THIRD_ID, SECOND_ID, FIRST_ID, EMPTY_ID );
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinBoundingBoxSearchPredicateIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinBoundingBoxSearchPredicateIT.java
index 6bb278c3a0b..0336a63c6e6 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinBoundingBoxSearchPredicateIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinBoundingBoxSearchPredicateIT.java
@@ -248,7 +248,7 @@ public void unknown_field() {
 		SubTest.expectException(
 				"spatial().within().boundingBox() predicate on unknown field",
 				() -> searchTarget.predicate().spatial().within().onField( "unknown_field" )
-						.boundingBox( BOUNDING_BOX_1 ).end()
+						.boundingBox( BOUNDING_BOX_1 ).toPredicate()
 		)
 				.assertThrown()
 				.isInstanceOf( SearchException.class )
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinCircleSearchPredicateIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinCircleSearchPredicateIT.java
index 7fc3c2cade9..1c560b31d83 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinCircleSearchPredicateIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinCircleSearchPredicateIT.java
@@ -226,7 +226,7 @@ public void unknown_field() {
 		SubTest.expectException(
 				"spatial().within().circle() predicate on unknown field",
 				() -> searchTarget.predicate().spatial().within().onField( "unknown_field" )
-						.circle( METRO_GARIBALDI, 100 ).end()
+						.circle( METRO_GARIBALDI, 100 ).toPredicate()
 		)
 				.assertThrown()
 				.isInstanceOf( SearchException.class )
diff --git a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinPolygonSearchPredicateIT.java b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinPolygonSearchPredicateIT.java
index a264f67c659..630f3faaf5d 100644
--- a/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinPolygonSearchPredicateIT.java
+++ b/integrationtest/backend/tck/src/main/java/org/hibernate/search/integrationtest/backend/tck/search/spatial/SpatialWithinPolygonSearchPredicateIT.java
@@ -212,7 +212,7 @@ public void unknown_field() {
 		SubTest.expectException(
 				"spatial().within().polygon() predicate on unknown field",
 				() -> searchTarget.predicate().spatial().within().onField( "unknown_field" )
-						.polygon( POLYGON_1 ).end()
+						.polygon( POLYGON_1 ).toPredicate()
 		)
 				.assertThrown()
 				.isInstanceOf( SearchException.class )
diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxDocumentDao.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxDocumentDao.java
index ea2eefa0a4f..959af53668f 100644
--- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxDocumentDao.java
+++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxDocumentDao.java
@@ -44,7 +44,7 @@ public Optional<Book> getByIsbn(String isbnAsString) {
 				.asEntities()
 				.predicate(
 						// TODO allow to bypass the bridge in the DSL
-						target.predicate().match().onField( "isbn" ).matching( new ISBN( isbnAsString ) ).end()
+						target.predicate().match().onField( "isbn" ).matching( new ISBN( isbnAsString ) ).toPredicate()
 				)
 				.build();
 
@@ -62,20 +62,20 @@ public List<Book> searchByMedium(String terms, BookMedium medium, int offset, in
 					.onField( "title" ).boostedTo( 2.0f )
 					.orField( "summary" )
 					.matching( terms )
-					.end()
+					.toPredicate()
 			);
 		}
 
 		booleanBuilder.must(
 				target.predicate().nested().onObjectField( "copies" )
-						.nest( target.predicate().match().onField( "copies.medium" ).matching( medium ).end() )
-						.end()
+						.nest( target.predicate().match().onField( "copies.medium" ).matching( medium ).toPredicate() )
+						.toPredicate()
 		);
 
 		FullTextQuery<Book> query = entityManager.search( Book.class ).query()
 				.asEntities()
-				.predicate( booleanBuilder.end() )
-				.sort( target.sort().byField( "title_sort" ).end() )
+				.predicate( booleanBuilder.toPredicate() )
+				.sort( target.sort().byField( "title_sort" ).toSort() )
 				.build();
 
 		query.setFirstResult( offset );
@@ -99,7 +99,7 @@ public List<Document<?>> searchAroundMe(String terms, String tags,
 					.onField( "title" ).boostedTo( 2.0f )
 					.orField( "summary" )
 					.matching( terms )
-					.end()
+					.toPredicate()
 			);
 		}
 
@@ -111,7 +111,7 @@ public List<Document<?>> searchAroundMe(String terms, String tags,
 						target.predicate().match()
 						.onField( "tags" )
 						.matching( tag )
-						.end()
+						.toPredicate()
 				);
 			}
 		}
@@ -125,9 +125,9 @@ public List<Document<?>> searchAroundMe(String terms, String tags,
 									.within()
 									.onField( "copies.library.location" )
 									.circle( myLocation, maxDistanceInKilometers, DistanceUnit.KILOMETERS )
-									.end()
+									.toPredicate()
 							)
-							.end()
+							.toPredicate()
 			);
 		}
 
@@ -139,21 +139,21 @@ public List<Document<?>> searchAroundMe(String terms, String tags,
 						target.predicate().match()
 						.onField( "copies.library.services" )
 						.matching( service )
-						.end()
+						.toPredicate()
 				);
 			}
 			booleanBuilder.must(
 					target.predicate().nested().onObjectField( "copies" )
-							.nest( nestedBoolean.end() )
-							.end()
+							.nest( nestedBoolean.toPredicate() )
+							.toPredicate()
 			);
 		}
 
 		FullTextQuery<Document<?>> query = target.query()
 				.asEntities()
-				.predicate( booleanBuilder.end() )
+				.predicate( booleanBuilder.toPredicate() )
 				// TODO facets (tag, medium, library in particular)
-				.sort( target.sort().byScore().end() )
+				.sort( target.sort().byScore().toSort() )
 				.build();
 
 		query.setFirstResult( offset );
diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxLibraryDao.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxLibraryDao.java
index 6bf65f53ca1..6123da67a48 100644
--- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxLibraryDao.java
+++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxLibraryDao.java
@@ -32,13 +32,13 @@ public List<Library> search(String terms, int offset, int limit) {
 		FullTextQuery<Library> query = target.query()
 				.asEntities()
 				.predicate(
-						target.predicate().match().onField( "name" ).matching( terms ).end()
+						target.predicate().match().onField( "name" ).matching( terms ).toPredicate()
 				)
 				.sort(
 						target.sort()
 						.byField( "collectionSize" ).desc()
 						.then().byField( "name_sort" )
-						.end()
+						.toSort()
 				)
 				.build();
 
diff --git a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxPersonDao.java b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxPersonDao.java
index c752a3923ca..800a5e7aa52 100644
--- a/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxPersonDao.java
+++ b/integrationtest/showcase/library/src/main/java/org/hibernate/search/integrationtest/showcase/library/dao/syntax/object/ObjectSyntaxPersonDao.java
@@ -32,13 +32,13 @@ public List<Person> search(String terms, int offset, int limit) {
 		FullTextQuery<Person> query = target.query()
 				.asEntities()
 				.predicate(
-						target.predicate().match().onFields( "firstName", "lastName" ).matching( terms ).end()
+						target.predicate().match().onFields( "firstName", "lastName" ).matching( terms ).toPredicate()
 				)
 				.sort(
 						target.sort()
 						.byField( "lastName_sort" )
 						.then().byField( "firstName_sort" )
-						.end()
+						.toSort()
 				)
 				.build();
 
@@ -55,10 +55,10 @@ public List<Person> listTopBorrowers(String borrowalsCountField, int offset, int
 		FullTextQuery<Person> query = target.query()
 				.asEntities()
 				.predicate(
-						target.predicate().matchAll().end()
+						target.predicate().matchAll().toPredicate()
 				)
 				.sort(
-						target.sort().by( target.sort().byField( borrowalsCountField ).desc().end() ).end()
+						target.sort().by( target.sort().byField( borrowalsCountField ).desc().toSort() ).toSort()
 				)
 				.build();