diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java
index acda0a0f1faa1..d261b36e4f4a6 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/DataSourceModule.java
@@ -40,7 +40,7 @@
 import org.neo4j.kernel.AvailabilityGuard;
 import org.neo4j.kernel.DatabaseAvailability;
 import org.neo4j.kernel.NeoStoreDataSource;
-import org.neo4j.kernel.ProcedureGuard;
+import org.neo4j.procedure.TerminationGuard;
 import org.neo4j.kernel.api.KernelAPI;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.Statement;
@@ -367,7 +367,7 @@ private Procedures setupProcedures( PlatformModule platform, EditionModule editi
         // Register injected public API components
         Log proceduresLog = platform.logging.getUserLog( Procedures.class );
         procedures.registerComponent( Log.class, ( ctx ) -> proceduresLog );
-        procedures.registerComponent( ProcedureGuard.class, procedureGuard( platform.dependencies ) );
+        procedures.registerComponent( TerminationGuard.class, procedureGuard( platform.dependencies ) );
 
         // Register injected private API components: useful to have available in procedures to access the kernel etc.
         ProcedureGDSFactory gdsFactory = new ProcedureGDSFactory( platform.config, platform.storeDir,
@@ -402,13 +402,13 @@ private Procedures setupProcedures( PlatformModule platform, EditionModule editi
         return procedures;
     }
 
-    private ComponentRegistry.Provider<ProcedureGuard> procedureGuard( final Dependencies dependencies )
+    private ComponentRegistry.Provider<TerminationGuard> procedureGuard( final Dependencies dependencies )
     {
         Guard guard = dependencies.resolveDependency( Guard.class );
         return (ctx) ->
         {
             KernelTransaction ktx = ctx.get( KERNEL_TRANSACTION );
-            return (ProcedureGuard) () ->
+            return (TerminationGuard) () ->
             {
                 Status reason = ktx.getReasonIfTerminated();
                 if ( reason == null )
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/ProcedureGuard.java b/community/kernel/src/main/java/org/neo4j/procedure/TerminationGuard.java
similarity index 86%
rename from community/kernel/src/main/java/org/neo4j/kernel/ProcedureGuard.java
rename to community/kernel/src/main/java/org/neo4j/procedure/TerminationGuard.java
index 04c008a362e75..6ffb410c20954 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/ProcedureGuard.java
+++ b/community/kernel/src/main/java/org/neo4j/procedure/TerminationGuard.java
@@ -17,14 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.kernel;
+package org.neo4j.procedure;
 
 /**
- * ProcedureGuard allows a long running procedure to check at regular intervals if the surrounding executing
+ * TerminationGuard allows a long running procedure to check at regular intervals if the surrounding executing
  * query has been terminated by the user or a database administrator or was timed out for some other reason.
  *
  */
-public interface ProcedureGuard
+public interface TerminationGuard
 {
     /**
      * Check that the surrounding executing query has not yet been terminated or timed out. Throws an appropriate
diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BuiltInProceduresInteractionTestBase.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BuiltInProceduresInteractionTestBase.java
index e1c8cbd0a5465..d493146ead804 100644
--- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BuiltInProceduresInteractionTestBase.java
+++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/BuiltInProceduresInteractionTestBase.java
@@ -46,7 +46,7 @@
 
 import org.neo4j.graphdb.Result;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
-import org.neo4j.kernel.ProcedureGuard;
+import org.neo4j.procedure.TerminationGuard;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.enterprise.builtinprocs.QueryId;
 import org.neo4j.kernel.impl.proc.Procedures;
@@ -972,7 +972,7 @@ protected ThreadingRule threading()
     public static class NeverEndingProcedure {
 
         @Context
-        public ProcedureGuard guard;
+        public TerminationGuard guard;
 
         @Procedure(name = "test.loop")
         public void loop()
diff --git a/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java b/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java
index ba8d2f915b7e9..b78067835db0f 100644
--- a/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java
+++ b/integrationtests/src/test/java/org/neo4j/procedure/ProcedureIT.java
@@ -56,7 +56,6 @@
 import org.neo4j.helpers.Exceptions;
 import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.io.fs.FileUtils;
-import org.neo4j.kernel.ProcedureGuard;
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.api.security.AccessMode;
@@ -1221,7 +1220,7 @@ public static class ClassWithProcedures
         public Log log;
 
         @Context
-        public ProcedureGuard guard;
+        public TerminationGuard guard;
 
         @Context
         public KernelTransaction ktx;