diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java
index 059f0f816150f..5ecc1bdd34aeb 100644
--- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java
+++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexRecoveryIT.java
@@ -314,7 +314,7 @@ private KernelExtensionFactory<LuceneIndexProviderFactory.Dependencies> createAl
             @Override
             public Lifecycle newInstance( KernelContext context, LuceneIndexProviderFactory.Dependencies dependencies )
             {
-                return new LuceneIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( context.contextDirectory() ),
+                return new LuceneIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( context.directory() ),
                         IndexProvider.Monitor.EMPTY, dependencies.getConfig(), context.databaseInfo().operationalMode )
                 {
                     @Override
@@ -337,7 +337,7 @@ private KernelExtensionFactory<LuceneIndexProviderFactory.Dependencies> createLu
             @Override
             public Lifecycle newInstance( KernelContext context, LuceneIndexProviderFactory.Dependencies dependencies )
             {
-                return new LuceneIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( context.contextDirectory() ),
+                return new LuceneIndexProvider( fs.get(), directoryFactory, defaultDirectoryStructure( context.directory() ),
                         IndexProvider.Monitor.EMPTY, dependencies.getConfig(), context.databaseInfo().operationalMode )
                 {
                     @Override
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/spi/KernelContext.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/spi/KernelContext.java
index 65d0eb4c9e1ad..6d29b57b9c0cc 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/spi/KernelContext.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/spi/KernelContext.java
@@ -30,7 +30,7 @@ public interface KernelContext
     /**
      * @return store directory for {@link ExtensionType#GLOBAL} extensions and
      * particular database directory if extension is per {@link ExtensionType#DATABASE}.
-     * @deprecated Please use {@link #contextDirectory()} instead.
+     * @deprecated Please use {@link #directory()} instead.
      */
     @Deprecated
     File storeDir();
@@ -43,7 +43,7 @@ public interface KernelContext
      * @return store directory for {@link ExtensionType#GLOBAL} extensions and
      * particular database directory if extension is per {@link ExtensionType#DATABASE}.
      */
-    default File contextDirectory()
+    default File directory()
     {
         return storeDir();
     }
diff --git a/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneKernelExtensionFactory.java b/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneKernelExtensionFactory.java
index b8396bcefd108..0613917b40b91 100644
--- a/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneKernelExtensionFactory.java
+++ b/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneKernelExtensionFactory.java
@@ -63,7 +63,7 @@ public LuceneKernelExtensionFactory()
     public Lifecycle newInstance( KernelContext context, Dependencies dependencies )
     {
         return new LuceneKernelExtension(
-                context.contextDirectory(),
+                context.directory(),
                 dependencies.getConfig(),
                 dependencies::getIndexStore,
                 dependencies.fileSystem(),
diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneKernelExtensionFactory.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneKernelExtensionFactory.java
index 6eaf585258144..13bd4bd6f0ce7 100644
--- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneKernelExtensionFactory.java
+++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/LuceneKernelExtensionFactory.java
@@ -51,7 +51,7 @@ public LuceneKernelExtensionFactory()
     public Lifecycle newInstance( KernelContext context, Dependencies dependencies )
     {
         return new LuceneKernelExtension(
-                context.contextDirectory(),
+                context.directory(),
                 dependencies.getConfig(),
                 dependencies::getIndexStore,
                 dependencies.fileSystem(),
diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java
index 31ed3b51f935d..a6d6ffb4b985d 100644
--- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java
+++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java
@@ -79,7 +79,7 @@ public LuceneIndexProviderFactory()
     public IndexProvider newInstance( KernelContext context, Dependencies dependencies )
     {
         PageCache pageCache = dependencies.pageCache();
-        File databaseDirectory = context.contextDirectory();
+        File databaseDirectory = context.directory();
         FileSystemAbstraction fs = dependencies.fileSystem();
         Monitors monitors = dependencies.monitors();
         Log log = dependencies.getLogService().getInternalLogProvider().getLog( LuceneIndexProvider.class );
diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java
index 4b7c86e552187..0b7c2ffb81d1a 100644
--- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java
+++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java
@@ -59,7 +59,7 @@ public interface Dependencies extends LuceneIndexProviderFactory.Dependencies
     public FusionIndexProvider newInstance( KernelContext context, Dependencies dependencies )
     {
         PageCache pageCache = dependencies.pageCache();
-        File databaseDirectory = context.contextDirectory();
+        File databaseDirectory = context.directory();
         FileSystemAbstraction fs = dependencies.fileSystem();
         Log log = dependencies.getLogService().getInternalLogProvider().getLog( FusionIndexProvider.class );
         Monitors monitors = dependencies.monitors();
diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java
index 6ef7ef391cd42..fb028f1f197cf 100644
--- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java
+++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java
@@ -59,7 +59,7 @@ public interface Dependencies extends LuceneIndexProviderFactory.Dependencies
     public FusionIndexProvider newInstance( KernelContext context, Dependencies dependencies )
     {
         PageCache pageCache = dependencies.pageCache();
-        File databaseDirectory = context.contextDirectory();
+        File databaseDirectory = context.directory();
         FileSystemAbstraction fs = dependencies.fileSystem();
         Log log = dependencies.getLogService().getInternalLogProvider().getLog( FusionIndexProvider.class );
         Monitors monitors = dependencies.monitors();
diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java
index 4b79e1264d44b..04217a55a124b 100644
--- a/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java
+++ b/enterprise/ha/src/test/java/org/neo4j/kernel/api/SchemaIndexHaIT.java
@@ -557,7 +557,7 @@ private static class ControllingIndexProviderFactory extends KernelExtensionFact
         public Lifecycle newInstance( KernelContext context, SchemaIndexHaIT.IndexProviderDependencies deps )
         {
             PageCache pageCache = deps.pageCache();
-            File databaseDirectory = context.contextDirectory();
+            File databaseDirectory = context.directory();
             DefaultFileSystemAbstraction fs = fileSystemRule.get();
             IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY;
             Config config = deps.config();
diff --git a/enterprise/metrics/src/main/java/org/neo4j/metrics/output/CsvOutput.java b/enterprise/metrics/src/main/java/org/neo4j/metrics/output/CsvOutput.java
index f26efeae64be5..963bed08c9ca7 100644
--- a/enterprise/metrics/src/main/java/org/neo4j/metrics/output/CsvOutput.java
+++ b/enterprise/metrics/src/main/java/org/neo4j/metrics/output/CsvOutput.java
@@ -83,7 +83,7 @@ public void init() throws IOException
         }
         Long rotationThreshold = config.get( MetricsSettings.csvRotationThreshold );
         Integer maxArchives = config.get( MetricsSettings.csvMaxArchives );
-        outputPath = absoluteFileOrRelativeTo( kernelContext.contextDirectory(), configuredPath );
+        outputPath = absoluteFileOrRelativeTo( kernelContext.directory(), configuredPath );
         csvReporter = RotatableCsvReporter.forRegistry( registry )
                 .convertRatesTo( TimeUnit.SECONDS )
                 .convertDurationsTo( TimeUnit.MILLISECONDS )