diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala
index 852c1042a648..e7d51138af1e 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ExecutionEngine.scala
@@ -147,7 +147,7 @@ class ExecutionEngine(val queryService: GraphDatabaseQueryService, logProvider:
       var n = 0
       while (n < ExecutionEngine.PLAN_BUILDING_TRIES) {
         // create transaction and query context
-        val tc = externalTransactionalContext.provideContext()
+        val tc = externalTransactionalContext.getOrBeginNewIfClosed()
 
         // Temporarily change access mode during query planning
         // NOTE: The OVERRIDE_READ mode will force read access even if the current transaction did not have it
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapperv3_0.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapperv3_0.scala
index a1ea70c2447b..af885e7e796f 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapperv3_0.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapperv3_0.scala
@@ -35,7 +35,7 @@ case class TransactionalContextWrapperv3_0(tc: TransactionalContext) extends Que
 
   override type DbmsOps = DbmsOperations
 
-  def provideContext(): TransactionalContextWrapperv3_0 = TransactionalContextWrapperv3_0(tc.provideContext())
+  def getOrBeginNewIfClosed(): TransactionalContextWrapperv3_0 = TransactionalContextWrapperv3_0(tc.getOrBeginNewIfClosed())
 
   def isOpen: Boolean = tc.isOpen
 
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapperv3_1.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapperv3_1.scala
index 19dd48f3910b..ce2d7f859048 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapperv3_1.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/TransactionalContextWrapperv3_1.scala
@@ -35,7 +35,7 @@ case class TransactionalContextWrapperv3_1(tc: TransactionalContext) extends Que
 
   override type DbmsOps = DbmsOperations
 
-  def provideContext(): TransactionalContextWrapperv3_1 = TransactionalContextWrapperv3_1(tc.provideContext())
+  def getOrBeginNewIfClosed(): TransactionalContextWrapperv3_1 = TransactionalContextWrapperv3_1(tc.getOrBeginNewIfClosed())
 
   def isOpen: Boolean = tc.isOpen
 
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala
index 5295b198ecf9..e90e13880090 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala
@@ -74,7 +74,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapperv3_1)
     if (tc.isOpen) {
       work(this)
     } else {
-      val context = tc.provideContext()
+      val context = tc.getOrBeginNewIfClosed()
       var success = false
       try {
         val result = work(new TransactionBoundQueryContext(context))
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala
index f2ef34a139ec..765be0e18c6e 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContext.scala
@@ -76,7 +76,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
     if (transactionalContext.isOpen) {
       work(this)
     } else {
-      val context = transactionalContext.provideContext()
+      val context = transactionalContext.getOrBeginNewIfClosed()
       var success = false
       try {
         val result = work(new TransactionBoundQueryContext(context))
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala
index 1bf3541880aa..454076e05ad5 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala
@@ -77,7 +77,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
     if (transactionalContext.isOpen) {
       work(this)
     } else {
-      val context = transactionalContext.provideContext()
+      val context = transactionalContext.getOrBeginNewIfClosed()
       var success = false
       try {
         val result = work(new TransactionBoundQueryContext(context))
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java
index 59919b24b6df..acbae1c8a718 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/Neo4jTransactionalContext.java
@@ -194,7 +194,7 @@ public void cleanForReuse()
     }
 
     @Override
-    public TransactionalContext provideContext()
+    public TransactionalContext getOrBeginNewIfClosed()
     {
         if ( isOpen )
         {
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java
index 563fa2b691f2..160d7bc565bf 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/TransactionalContext.java
@@ -46,7 +46,7 @@ public interface TransactionalContext
 
     void cleanForReuse();
 
-    TransactionalContext provideContext();
+    TransactionalContext getOrBeginNewIfClosed();
 
     boolean isOpen();
 
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/query/FakeTransactionalContext.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/query/FakeTransactionalContext.java
index 0f001906986e..5548c2bce40e 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/query/FakeTransactionalContext.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/query/FakeTransactionalContext.java
@@ -81,7 +81,7 @@ public void cleanForReuse()
     }
 
     @Override
-    public TransactionalContext provideContext()
+    public TransactionalContext getOrBeginNewIfClosed()
     {
         throw new UnsupportedOperationException( "fake test class" );
     }