diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/ExplicitIndexTransactionState.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/ExplicitIndexTransactionState.java
index 4a3a8c7920316..151538827556a 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/ExplicitIndexTransactionState.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/ExplicitIndexTransactionState.java
@@ -23,9 +23,8 @@
import org.neo4j.internal.kernel.api.exceptions.explicitindex.ExplicitIndexNotFoundKernelException;
import org.neo4j.kernel.api.ExplicitIndex;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
import org.neo4j.kernel.impl.index.IndexEntityType;
-import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordState;
/**
* Defines transactional state for explicit indexes. Since the implementation of this enlists another transaction
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TxStateHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TxStateHolder.java
index c87e4b394faad..90331c8fbeb34 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TxStateHolder.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TxStateHolder.java
@@ -19,7 +19,7 @@
*/
package org.neo4j.kernel.api.txstate;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
public interface TxStateHolder
{
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionState.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionState.java
similarity index 96%
rename from community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionState.java
rename to community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionState.java
index 41b12a40fc9c1..830fc0807bde9 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionState.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionState.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordState;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateCloseException.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateCloseException.java
similarity index 95%
rename from community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateCloseException.java
rename to community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateCloseException.java
index 3b000d48dee51..40e318921fa38 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateCloseException.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateCloseException.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
public class AuxiliaryTransactionStateCloseException extends RuntimeException
{
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateHolder.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateHolder.java
similarity index 98%
rename from community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateHolder.java
rename to community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateHolder.java
index e0ac79ef7024c..053d8dcb8b2cf 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateHolder.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateHolder.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
import java.util.Collection;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateManager.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateManager.java
similarity index 97%
rename from community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateManager.java
rename to community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateManager.java
index 0a0b514ad8b07..9fe0ca2cac783 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateManager.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateManager.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
/**
* The auxiliary transaction state manager keeps track of what auxiliary transaction state providers are available, and is responsible for creating
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateProvider.java
similarity index 98%
rename from community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateProvider.java
rename to community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateProvider.java
index fd4317726a869..13dd08d081c9e 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/aux/AuxiliaryTransactionStateProvider.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/api/txstate/auxiliary/AuxiliaryTransactionStateProvider.java
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.neo4j.kernel.api.txstate.aux;
+package org.neo4j.kernel.api.txstate.auxiliary;
import org.neo4j.kernel.api.txstate.TxStateHolder;
import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ExplicitIndexTransactionStateProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ExplicitIndexTransactionStateProvider.java
index 36b00d281b8c3..4dd7179e854b8 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ExplicitIndexTransactionStateProvider.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/ExplicitIndexTransactionStateProvider.java
@@ -19,8 +19,8 @@
*/
package org.neo4j.kernel.impl.api;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateProvider;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateProvider;
import org.neo4j.kernel.impl.api.state.ExplicitIndexTransactionStateImpl;
import org.neo4j.kernel.impl.index.IndexConfigStore;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelAuxTransactionStateManager.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelAuxTransactionStateManager.java
index 2c0c8f1f94f11..66fb2a1f1ef32 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelAuxTransactionStateManager.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelAuxTransactionStateManager.java
@@ -26,11 +26,11 @@
import org.neo4j.internal.kernel.api.exceptions.TransactionFailureException;
import org.neo4j.io.IOUtils;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateCloseException;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateProvider;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateCloseException;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateHolder;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateProvider;
import org.neo4j.kernel.impl.util.CopyOnWriteHashMap;
import org.neo4j.storageengine.api.StorageCommand;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java
index ffd3c4aaa90d3..594b08ba63c47 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelStatement.java
@@ -43,7 +43,7 @@
import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
import org.neo4j.kernel.api.txstate.TransactionState;
import org.neo4j.kernel.api.txstate.TxStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
import org.neo4j.kernel.impl.locking.StatementLocks;
import org.neo4j.storageengine.api.StorageReader;
import org.neo4j.storageengine.api.lock.LockTracer;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
index f34c69999a8b5..4f41ba6c8f7ab 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
@@ -67,10 +67,10 @@
import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
import org.neo4j.kernel.api.txstate.TransactionState;
import org.neo4j.kernel.api.txstate.TxStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateCloseException;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateCloseException;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateHolder;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.impl.api.index.IndexingProvidersService;
import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java
index d9637ac0373a6..c6c7bc0924b48 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactions.java
@@ -38,7 +38,7 @@
import org.neo4j.kernel.api.KernelTransactionHandle;
import org.neo4j.kernel.api.exceptions.Status;
import org.neo4j.kernel.api.explicitindex.AutoIndexing;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
import org.neo4j.kernel.availability.AvailabilityGuard;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.impl.api.index.IndexingProvidersService;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
index b7785d7295922..62e06ebeb92b9 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/newapi/Read.java
@@ -45,7 +45,7 @@
import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
import org.neo4j.kernel.api.txstate.TransactionState;
import org.neo4j.kernel.api.txstate.TxStateHolder;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
import org.neo4j.kernel.impl.locking.Locks;
import org.neo4j.kernel.impl.locking.ResourceTypes;
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java b/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java
index 913b23eac0187..e72dfb9697548 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/api/KernelTransactionFactory.java
@@ -20,7 +20,6 @@
package org.neo4j.kernel.api;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
import org.neo4j.collection.pool.Pool;
import org.neo4j.graphdb.factory.GraphDatabaseSettings;
@@ -28,7 +27,7 @@
import org.neo4j.io.pagecache.tracing.cursor.PageCursorTracerSupplier;
import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier;
import org.neo4j.kernel.api.explicitindex.AutoIndexing;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
import org.neo4j.kernel.impl.api.SchemaState;
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java
index 44c8f6afd06e9..5dae64b6b1d10 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java
@@ -45,8 +45,7 @@
import org.neo4j.kernel.api.security.AnonymousContext;
import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
import org.neo4j.kernel.api.txstate.TransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateProvider;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionState;
import org.neo4j.kernel.impl.locking.Locks;
import org.neo4j.kernel.impl.locking.NoOpClient;
import org.neo4j.kernel.impl.locking.SimpleStatementLocks;
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java
index 1496963190e33..729852c25f3a1 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java
@@ -37,7 +37,7 @@
import org.neo4j.kernel.api.KernelTransaction;
import org.neo4j.kernel.api.exceptions.Status;
import org.neo4j.kernel.api.explicitindex.AutoIndexing;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.impl.api.index.IndexingService;
import org.neo4j.kernel.impl.api.state.ConstraintIndexCreator;
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java
index 238d9283eb407..873cc9b195e43 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTestBase.java
@@ -27,7 +27,6 @@
import java.util.Collection;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
import org.neo4j.collection.pool.Pool;
import org.neo4j.graphdb.factory.GraphDatabaseSettings;
@@ -38,9 +37,7 @@
import org.neo4j.io.pagecache.tracing.cursor.context.EmptyVersionContextSupplier;
import org.neo4j.kernel.api.explicitindex.AutoIndexing;
import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
-import org.neo4j.kernel.availability.AvailabilityGuard;
-import org.neo4j.kernel.availability.DatabaseAvailabilityGuard;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.impl.api.index.IndexingService;
import org.neo4j.kernel.impl.constraints.StandardConstraintSemantics;
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java
index 975c6f6e48a19..357b7a73b5540 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java
@@ -44,7 +44,7 @@
import org.neo4j.kernel.api.exceptions.Status;
import org.neo4j.kernel.api.explicitindex.AutoIndexing;
import org.neo4j.kernel.api.security.AnonymousContext;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
import org.neo4j.kernel.availability.AvailabilityGuard;
import org.neo4j.kernel.availability.DatabaseAvailabilityGuard;
import org.neo4j.kernel.configuration.Config;
diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/TransactionStatusResultTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/TransactionStatusResultTest.java
index c2bdc53b5101c..9d0bf0bf439f3 100644
--- a/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/TransactionStatusResultTest.java
+++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/TransactionStatusResultTest.java
@@ -42,8 +42,7 @@
import org.neo4j.kernel.api.explicitindex.AutoIndexing;
import org.neo4j.kernel.api.query.ExecutingQuery;
import org.neo4j.kernel.api.query.QuerySnapshot;
-import org.neo4j.kernel.api.txstate.ExplicitIndexTransactionState;
-import org.neo4j.kernel.api.txstate.aux.AuxiliaryTransactionStateManager;
+import org.neo4j.kernel.api.txstate.auxiliary.AuxiliaryTransactionStateManager;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.impl.api.KernelTransactionImplementation;
import org.neo4j.kernel.impl.api.SchemaState;