diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java
index cb4c9e817911..b7a80baa8421 100644
--- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java
+++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java
@@ -21,7 +21,6 @@
 
 import org.junit.Test;
 
-import org.neo4j.bolt.v1.runtime.CypherAdapterStream;
 import org.neo4j.bolt.v1.runtime.spi.Record;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.graphdb.ExecutionPlanDescription;
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTests.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTests.java
index 7403af3a2890..5307be969412 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTests.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/ExecutionEngineTests.java
@@ -34,9 +34,9 @@
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
 import org.neo4j.kernel.impl.coreapi.PropertyContainerLocker;
 import org.neo4j.kernel.impl.query.Neo4jTransactionalContextFactory;
-import org.neo4j.kernel.impl.query.QueryEngineProvider;
 import org.neo4j.kernel.impl.query.TransactionalContext;
 import org.neo4j.kernel.impl.query.TransactionalContextFactory;
+import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
 import org.neo4j.logging.NullLogProvider;
 import org.neo4j.test.rule.DatabaseRule;
 import org.neo4j.test.rule.ImpermanentDatabaseRule;
@@ -79,6 +79,6 @@ private TransactionalContext createTransactionContext( GraphDatabaseQueryService
     {
         PropertyContainerLocker locker = new PropertyContainerLocker();
         TransactionalContextFactory contextFactory = Neo4jTransactionalContextFactory.create( graph, locker );
-        return contextFactory.newContext( QueryEngineProvider.describe(), tx, query, Collections.emptyMap() );
+        return contextFactory.newContext( ClientConnectionInfo.EMBEDDED_CONNECTION, tx, query, Collections.emptyMap() );
     }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
index 2cbc5b99ace0..6aec593a1560 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/GraphDatabaseFacade.java
@@ -92,9 +92,9 @@
 import org.neo4j.kernel.impl.coreapi.TopLevelTransaction;
 import org.neo4j.kernel.impl.coreapi.schema.SchemaImpl;
 import org.neo4j.kernel.impl.query.Neo4jTransactionalContextFactory;
-import org.neo4j.kernel.impl.query.QueryEngineProvider;
 import org.neo4j.kernel.impl.query.TransactionalContext;
 import org.neo4j.kernel.impl.query.TransactionalContextFactory;
+import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
 import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.traversal.BidirectionalTraversalDescriptionImpl;
 import org.neo4j.kernel.impl.traversal.MonoDirectionalTraversalDescription;
@@ -422,7 +422,7 @@ public Result execute( InternalTransaction transaction, String query, Map<String
             throws QueryExecutionException
     {
         TransactionalContext context =
-                contextFactory.newContext( QueryEngineProvider.describe(), transaction, query, parameters );
+                contextFactory.newContext( ClientConnectionInfo.EMBEDDED_CONNECTION, transaction, query, parameters );
         return spi.executeQuery( query, parameters, context );
     }
 
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryEngineProvider.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryEngineProvider.java
index 85df1530edf6..8c0247709ad3 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryEngineProvider.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/QueryEngineProvider.java
@@ -20,7 +20,6 @@
 package org.neo4j.kernel.impl.query;
 
 import org.neo4j.helpers.Service;
-import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
 import org.neo4j.kernel.impl.util.Dependencies;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 
@@ -60,9 +59,4 @@ public static QueryExecutionEngine noEngine()
     {
         return NoQueryEngine.INSTANCE;
     }
-
-    public static ClientConnectionInfo describe()
-    {
-        return ClientConnectionInfo.EMBEDDED_CONNECTION;
-    }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/BoltConnectionInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/BoltConnectionInfo.java
index 284ffa5209bb..970dfbc433ab 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/BoltConnectionInfo.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/BoltConnectionInfo.java
@@ -22,6 +22,9 @@
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
+/**
+ * @see ClientConnectionInfo Parent class for documentation and tests.
+ */
 public class BoltConnectionInfo extends ClientConnectionInfo
 {
     private final String principalName;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ClientConnectionInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ClientConnectionInfo.java
index 8e92f5a5ede5..713fddfd453f 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ClientConnectionInfo.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ClientConnectionInfo.java
@@ -19,6 +19,11 @@
  */
 package org.neo4j.kernel.impl.query.clientconnection;
 
+/**
+ * This is implemented as an abstract class in order to support different formatting for {@link #asConnectionDetails()},
+ * when this method is no longer needed, and we move to a standardized format across all types of connections, we can
+ * turn this class into a simpler value type that just holds the fields that are actually used.
+ */
 public abstract class ClientConnectionInfo
 {
     /**
@@ -31,19 +36,42 @@ public ClientConnectionInfo withUsername( String username )
         return new ConnectionInfoWithUsername( this, username );
     }
 
+    /**
+     * This method provides the custom format for each type of connection.
+     * <p>
+     * Preferably we would not need to have a custom format for each type of connection, but this is provided for
+     * backwards compatibility reasons.
+     *
+     * @return a custom log-line format describing this type of connection.
+     */
     @Deprecated
     public abstract String asConnectionDetails();
 
+    /**
+     * This method is overridden in the subclasses where this information is available.
+     *
+     * @return the scheme used for connecting to the server, or {@code null} if no scheme is available.
+     */
     public String requestScheme()
     {
         return null;
     }
 
+    /**
+     * This method is overridden in the subclasses where this information is available.
+     *
+     * @return the address of the client. or {@code null} if the address is not available.
+     */
     public String clientAddress()
     {
         return null;
     }
 
+    /**
+     * This method is overridden in the subclasses where this information is available.
+     *
+     * @return the URI of this server that the client connected to, or {@code null} if the URI is not available.
+     */
     public String requestURI()
     {
         return null;
@@ -58,6 +86,9 @@ public String asConnectionDetails()
         }
     };
 
+    /**
+     * Should be removed along with {@link #withUsername(String)} and {@link #asConnectionDetails()}.
+     */
     @Deprecated
     private static class ConnectionInfoWithUsername extends ClientConnectionInfo
     {
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/HttpConnectionInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/HttpConnectionInfo.java
index 084a952ca290..6da4d59fc5b6 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/HttpConnectionInfo.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/HttpConnectionInfo.java
@@ -21,6 +21,9 @@
 
 import java.net.InetSocketAddress;
 
+/**
+ * @see ClientConnectionInfo Parent class for documentation and tests.
+ */
 public class HttpConnectionInfo extends ClientConnectionInfo
 {
     private final String scheme;
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ShellConnectionInfo.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ShellConnectionInfo.java
index f2648db389d1..24726f5f8757 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ShellConnectionInfo.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/query/clientconnection/ShellConnectionInfo.java
@@ -21,6 +21,9 @@
 
 import java.io.Serializable;
 
+/**
+ * @see ClientConnectionInfo Parent class for documentation and tests.
+ */
 public class ShellConnectionInfo extends ClientConnectionInfo
 {
     private final Serializable id;
diff --git a/community/server/src/main/java/org/neo4j/server/database/CypherExecutor.java b/community/server/src/main/java/org/neo4j/server/database/CypherExecutor.java
index 6b1fc7c56f12..e86163693d34 100644
--- a/community/server/src/main/java/org/neo4j/server/database/CypherExecutor.java
+++ b/community/server/src/main/java/org/neo4j/server/database/CypherExecutor.java
@@ -36,7 +36,7 @@
 import org.neo4j.kernel.impl.query.TransactionalContextFactory;
 import org.neo4j.kernel.lifecycle.LifecycleAdapter;
 import org.neo4j.logging.LogProvider;
-import org.neo4j.server.rest.web.ServerQuerySession;
+import org.neo4j.server.rest.web.HttpConnectionInfoFactory;
 
 import org.neo4j.logging.Log;
 
@@ -84,7 +84,7 @@ public TransactionalContext createTransactionContext( String query, Map<String,
             HttpServletRequest request )
     {
         InternalTransaction tx = getInternalTransaction( request );
-        return contextFactory.newContext( ServerQuerySession.describe( request ), tx, query, parameters );
+        return contextFactory.newContext( HttpConnectionInfoFactory.create( request ), tx, query, parameters );
     }
 
     private InternalTransaction getInternalTransaction( HttpServletRequest request )
diff --git a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java
index 661ff4e08e85..c1ecbb7dd433 100644
--- a/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java
+++ b/community/server/src/main/java/org/neo4j/server/rest/transactional/TransitionalPeriodTransactionMessContainer.java
@@ -33,7 +33,7 @@
 import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
 import org.neo4j.kernel.impl.query.TransactionalContext;
 import org.neo4j.kernel.impl.query.TransactionalContextFactory;
-import org.neo4j.server.rest.web.ServerQuerySession;
+import org.neo4j.server.rest.web.HttpConnectionInfoFactory;
 
 public class TransitionalPeriodTransactionMessContainer
 {
@@ -68,7 +68,7 @@ public TransactionalContext create(
             Map<String, Object> queryParameters)
     {
         TransactionalContextFactory contextFactory = Neo4jTransactionalContextFactory.create( service, locker );
-        ClientConnectionInfo clientConnection = ServerQuerySession.describe( request );
+        ClientConnectionInfo clientConnection = HttpConnectionInfoFactory.create( request );
         InternalTransaction transaction = service.beginTransaction( type, securityContext );
         return contextFactory.newContext( clientConnection, transaction, query, queryParameters );
     }
diff --git a/community/server/src/main/java/org/neo4j/server/rest/web/ServerQuerySession.java b/community/server/src/main/java/org/neo4j/server/rest/web/HttpConnectionInfoFactory.java
similarity index 92%
rename from community/server/src/main/java/org/neo4j/server/rest/web/ServerQuerySession.java
rename to community/server/src/main/java/org/neo4j/server/rest/web/HttpConnectionInfoFactory.java
index 6bf184899cc5..74d459e5142b 100644
--- a/community/server/src/main/java/org/neo4j/server/rest/web/ServerQuerySession.java
+++ b/community/server/src/main/java/org/neo4j/server/rest/web/HttpConnectionInfoFactory.java
@@ -27,9 +27,9 @@
 
 import static javax.ws.rs.core.HttpHeaders.USER_AGENT;
 
-public class ServerQuerySession
+public class HttpConnectionInfoFactory
 {
-    public static ClientConnectionInfo describe( HttpServletRequest request )
+    public static ClientConnectionInfo create( HttpServletRequest request )
     {
         return new HttpConnectionInfo(
                 request.getScheme(),
diff --git a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Start.java b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Start.java
index 9d25ef645cb9..ec8de4b7fa31 100644
--- a/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Start.java
+++ b/community/shell/src/main/java/org/neo4j/shell/kernel/apps/cypher/Start.java
@@ -35,7 +35,6 @@
 import org.neo4j.kernel.impl.query.Neo4jTransactionalContextFactory;
 import org.neo4j.kernel.impl.query.QueryExecutionEngine;
 import org.neo4j.kernel.impl.query.QueryExecutionKernelException;
-import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
 import org.neo4j.kernel.impl.query.TransactionalContext;
 import org.neo4j.kernel.impl.query.TransactionalContextFactory;
 import org.neo4j.kernel.impl.query.clientconnection.ShellConnectionInfo;
@@ -200,18 +199,10 @@ private TransactionalContext createTransactionContext( String queryText, Map<Str
         InternalTransaction transaction =
             graph.beginTransaction( KernelTransaction.Type.implicit, SecurityContext.AUTH_DISABLED );
         return contextFactory.newContext(
-            ShellQuerySession.describe( session ),
+            new ShellConnectionInfo( session.getId() ),
             transaction,
             queryText,
             queryParameters
         );
     }
-
-    private static class ShellQuerySession
-    {
-        public static ClientConnectionInfo describe( Session session )
-        {
-            return new ShellConnectionInfo( session.getId() );
-        }
-    }
 }
diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java
index 138bf961f92d..a09fd43f6a2e 100644
--- a/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java
+++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/enterprise/builtinprocs/ListQueriesProcedureTest.java
@@ -144,7 +144,7 @@ public void shouldContainSpecificConnectionDetails() throws Exception
         // then
         assertThat( data, hasKey( "requestScheme" ) );
         assertThat( data, hasKey( "clientAddress" ) );
-        assertThat( data, hasKey( "requestURI" ) );
+        assertThat( data, hasKey( "requestUri" ) );
     }
 
     private Map<String,Object> getQueryListing( String query )
diff --git a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java
index 55e75b8b9cfe..ed699fb875f5 100644
--- a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java
+++ b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java
@@ -49,6 +49,7 @@
 import org.neo4j.kernel.enterprise.api.security.EnterpriseSecurityContext;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
+import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.server.security.enterprise.auth.EmbeddedInteraction;
 import org.neo4j.test.TestEnterpriseGraphDatabaseFactory;
@@ -226,7 +227,7 @@ public void shouldLogParametersWhenNestedMap() throws Exception
 
     private String clientConnectionInfo()
     {
-        return QueryEngineProvider.describe().withUsername( AUTH_DISABLED.username() ).asConnectionDetails();
+        return ClientConnectionInfo.EMBEDDED_CONNECTION.withUsername( AUTH_DISABLED.username() ).asConnectionDetails();
     }
 
     @Test