diff --git a/driver/clirr-ignored-differences.xml b/driver/clirr-ignored-differences.xml
index e601ce6ce8..aac03eace6 100644
--- a/driver/clirr-ignored-differences.xml
+++ b/driver/clirr-ignored-differences.xml
@@ -421,4 +421,10 @@
org.neo4j.driver.BookmarkManager queryBookmarkManager()
+
+ org/neo4j/driver/Driver
+ 7012
+ org.neo4j.driver.BookmarkManager queryTaskBookmarkManager()
+
+
diff --git a/driver/src/main/java/org/neo4j/driver/Driver.java b/driver/src/main/java/org/neo4j/driver/Driver.java
index 91da25772a..5426545b23 100644
--- a/driver/src/main/java/org/neo4j/driver/Driver.java
+++ b/driver/src/main/java/org/neo4j/driver/Driver.java
@@ -78,10 +78,10 @@ public interface Driver extends AutoCloseable {
* Returns an instance of {@link BookmarkManager} used by {@link QueryTask} instances by default.
*
* @return bookmark manager, must not be {@code null}
- * @since 5.5
+ * @since 5.6
*/
@Experimental
- BookmarkManager queryBookmarkManager();
+ BookmarkManager queryTaskBookmarkManager();
/**
* Return a flag to indicate whether or not encryption is used for this driver.
diff --git a/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java b/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java
index dd38245772..162b1b7802 100644
--- a/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java
+++ b/driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java
@@ -74,7 +74,7 @@ public QueryTask queryTask(String query) {
}
@Override
- public BookmarkManager queryBookmarkManager() {
+ public BookmarkManager queryTaskBookmarkManager() {
return queryBookmarkManager;
}
diff --git a/driver/src/main/java/org/neo4j/driver/internal/InternalQueryTask.java b/driver/src/main/java/org/neo4j/driver/internal/InternalQueryTask.java
index 486f126dd0..11db4e76f5 100644
--- a/driver/src/main/java/org/neo4j/driver/internal/InternalQueryTask.java
+++ b/driver/src/main/java/org/neo4j/driver/internal/InternalQueryTask.java
@@ -61,7 +61,7 @@ public T execute(Collector recordCollector, ResultFinish
var sessionConfigBuilder = SessionConfig.builder();
config.database().ifPresent(sessionConfigBuilder::withDatabase);
config.impersonatedUser().ifPresent(sessionConfigBuilder::withImpersonatedUser);
- config.bookmarkManager(driver.queryBookmarkManager()).ifPresent(sessionConfigBuilder::withBookmarkManager);
+ config.bookmarkManager(driver.queryTaskBookmarkManager()).ifPresent(sessionConfigBuilder::withBookmarkManager);
var supplier = recordCollector.supplier();
var accumulator = recordCollector.accumulator();
var finisher = recordCollector.finisher();
diff --git a/driver/src/test/java/org/neo4j/driver/internal/InternalQueryTaskTest.java b/driver/src/test/java/org/neo4j/driver/internal/InternalQueryTaskTest.java
index c5de47c688..8be3702bbc 100644
--- a/driver/src/test/java/org/neo4j/driver/internal/InternalQueryTaskTest.java
+++ b/driver/src/test/java/org/neo4j/driver/internal/InternalQueryTaskTest.java
@@ -118,7 +118,7 @@ void shouldExecuteAndReturnResult(RoutingControl routingControl) {
// GIVEN
var driver = mock(Driver.class);
var bookmarkManager = mock(BookmarkManager.class);
- given(driver.queryBookmarkManager()).willReturn(bookmarkManager);
+ given(driver.queryTaskBookmarkManager()).willReturn(bookmarkManager);
var session = mock(Session.class);
given(driver.session(any(SessionConfig.class))).willReturn(session);
var txContext = mock(TransactionContext.class);