diff --git a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchLongPatternAcceptanceTest.scala b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchLongPatternAcceptanceTest.scala
index a6387d23910e..d8be04a8ce6c 100644
--- a/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchLongPatternAcceptanceTest.scala
+++ b/community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchLongPatternAcceptanceTest.scala
@@ -28,7 +28,7 @@ import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb.config.Setting
 import org.neo4j.graphdb.factory.GraphDatabaseSettings
 import org.neo4j.graphdb.factory.GraphDatabaseSettings.{cypher_idp_solver_duration_threshold, cypher_idp_solver_table_threshold}
-import org.neo4j.kernel.{GraphDatabaseQueryService, monitoring}
+import org.neo4j.kernel.monitoring
 import org.neo4j.test.ImpermanentGraphDatabase
 
 import scala.collection.JavaConverters._
@@ -232,7 +232,7 @@ class MatchLongPatternAcceptanceTest extends ExecutionEngineFunSuite with QueryS
     }
   }
 
-  private def runWithConfig(m: (Setting[_], String)*)(run: (ExecutionEngine, GraphDatabaseQueryService) => Unit) = {
+  private def runWithConfig(m: (Setting[_], String)*)(run: (ExecutionEngine, GraphDatabaseCypherService) => Unit) = {
     val config: util.Map[String, String] = m.map {
       case (setting, value) => setting.name() -> value
     }.toMap.asJava
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/GraphDatabaseCypherService.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/GraphDatabaseCypherService.java
index c33f235974f9..f918f5775479 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/GraphDatabaseCypherService.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/GraphDatabaseCypherService.java
@@ -82,7 +82,8 @@ public URL validateURLAccess( URL url ) throws URLAccessValidationError
         return graph.validateURLAccess( url );
     }
 
-    @Override
+    // This provides backwards compatibility to the older API for places that cannot (yet) stop using it.
+    // TODO: Remove this when possible (remove RULE, remove older compilers)
     public GraphDatabaseAPI getGraphDatabaseService()
     {
         return graph;
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala
index 469bf8afaddc..89196720b228 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala
@@ -36,11 +36,12 @@ import org.neo4j.cypher.internal.frontend.v2_3.{CypherException => InternalCyphe
 import org.neo4j.cypher.internal.javacompat.{PlanDescription, ProfilerStatistics}
 import org.neo4j.cypher.internal.spi.v2_3.{GeneratedQueryStructure, TransactionBoundGraphStatistics, TransactionBoundPlanContext, TransactionBoundQueryContext}
 import org.neo4j.cypher.internal.{CypherExecutionMode, ExtendedExecutionResult, ExtendedPlanDescription, LastCommittedTxIdProvider, ParsedQuery, PreParsedQuery, QueryStatistics, TransactionInfo}
+import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb.Result.ResultVisitor
 import org.neo4j.graphdb._
 import org.neo4j.graphdb.impl.notification.{NotificationCode, NotificationDetail}
 import org.neo4j.helpers.Clock
-import org.neo4j.kernel.{GraphDatabaseQueryService}
+import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.api.{KernelAPI, Statement}
 import org.neo4j.kernel.impl.core.NodeManager
 import org.neo4j.kernel.impl.query.{QueryExecutionMonitor, QuerySession}
@@ -439,7 +440,7 @@ case class CompatibilityFor2_3Cost(graph: GraphDatabaseQueryService,
 
     val nodeManager = graph.getDependencyResolver.resolveDependency(classOf[NodeManager])
     CypherCompilerFactory.costBasedCompiler(
-      graph.getGraphDatabaseService, new EntityAccessorWrapper2_3(nodeManager), config, clock, GeneratedQueryStructure, new WrappedMonitors2_3( kernelMonitors ),
+      graph.asInstanceOf[GraphDatabaseCypherService].getGraphDatabaseService, new EntityAccessorWrapper2_3(nodeManager), config, clock, GeneratedQueryStructure, new WrappedMonitors2_3( kernelMonitors ),
       new StringInfoLogger2_3( log ), rewriterSequencer, plannerName, runtimeName)
   }
 
@@ -454,7 +455,7 @@ case class CompatibilityFor2_3Rule(graph: GraphDatabaseQueryService,
   protected val compiler = {
     val nodeManager = graph.getDependencyResolver.resolveDependency(classOf[NodeManager])
     CypherCompilerFactory.ruleBasedCompiler(
-            graph.getGraphDatabaseService, new EntityAccessorWrapper2_3(nodeManager), config, clock, new WrappedMonitors2_3( kernelMonitors ), rewriterSequencer)
+      graph.asInstanceOf[GraphDatabaseCypherService].getGraphDatabaseService, new EntityAccessorWrapper2_3(nodeManager), config, clock, new WrappedMonitors2_3( kernelMonitors ), rewriterSequencer)
   }
 
   override val queryCacheSize: Int = config.queryCacheSize
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 edf6038bb80f..3402d60547e1 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
@@ -34,6 +34,7 @@ import org.neo4j.cypher.internal.compiler.v2_3.helpers.{BeansAPIRelationshipIter
 import org.neo4j.cypher.internal.compiler.v2_3.pipes.matching.PatternNode
 import org.neo4j.cypher.internal.compiler.v2_3.spi._
 import org.neo4j.cypher.internal.frontend.v2_3.{Bound, EntityNotFoundException, FailedIndexException, SemanticDirection}
+import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb.RelationshipType._
 import org.neo4j.graphdb._
 import org.neo4j.graphdb.traversal.{Evaluators, TraversalDescription, Uniqueness}
@@ -501,7 +502,10 @@ final class TransactionBoundQueryContext(graph: GraphDatabaseQueryService,
       case (Some(min), Some(max)) => Evaluators.includingDepths(min, max)
     }
 
-    val baseTraversalDescription: TraversalDescription = graph.getGraphDatabaseService.traversalDescription()
+    // The RULE compiler makes use of older kernel API capabilities for variable length expanding
+    // TODO: Consider re-writing this using similar code to the COST var-length expand
+    val baseTraversalDescription: TraversalDescription = graph.asInstanceOf[GraphDatabaseCypherService]
+      .getGraphDatabaseService.traversalDescription()
       .evaluator(depthEval)
       .uniqueness(Uniqueness.RELATIONSHIP_PATH)
 
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 8aabdc16919d..a48516235292 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
@@ -37,6 +37,7 @@ import org.neo4j.cypher.internal.compiler.v3_0.pipes.matching.PatternNode
 import org.neo4j.cypher.internal.compiler.v3_0.spi._
 import org.neo4j.cypher.internal.frontend.v3_0.{Bound, EntityNotFoundException, FailedIndexException, SemanticDirection}
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext.IndexSearchMonitor
+import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphalgo.impl.path.ShortestPath
 import org.neo4j.graphalgo.impl.path.ShortestPath.ShortestPathPredicate
 import org.neo4j.graphdb.RelationshipType._
@@ -498,7 +499,10 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
       case (Some(min), Some(max)) => Evaluators.includingDepths(min, max)
     }
 
-    val baseTraversalDescription: TraversalDescription = transactionalContext.graph.getGraphDatabaseService
+    // The RULE compiler makes use of older kernel API capabilities for variable length expanding
+    // TODO: Consider re-writing this using similar code to the COST var-length expand
+    val baseTraversalDescription: TraversalDescription = transactionalContext.graph.asInstanceOf[GraphDatabaseCypherService]
+      .getGraphDatabaseService
       .traversalDescription()
       .evaluator(depthEval)
       .uniqueness(Uniqueness.RELATIONSHIP_PATH)
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala b/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala
index 1326acc36da8..667344eff60c 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/QueryExecutionMonitorTest.scala
@@ -24,12 +24,13 @@ import java.util.Collections
 import org.mockito.Mockito._
 import org.neo4j.cypher.internal.ExecutionEngine
 import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
+import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.impl.query.{QueryEngineProvider, QueryExecutionMonitor}
 import org.neo4j.test.TestGraphDatabaseFactory
 
-class QueryExecutionMonitorTest extends CypherFunSuite {
+class QueryExecutionMonitorTest extends CypherFunSuite with GraphIcing {
 
   test("monitor is not called if iterator not exhausted") {
     // given
@@ -221,7 +222,7 @@ class QueryExecutionMonitorTest extends CypherFunSuite {
 
   override protected def afterEach(): Unit = {
     super.afterEach()
-    if (graph != null) graph.getGraphDatabaseService.shutdown()
+    if (graph != null) graph.shutdown()
   }
 
 }
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/CypherUpdateMapTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/CypherUpdateMapTest.java
index afa76a030909..5876fe7ca09e 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/CypherUpdateMapTest.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/internal/javacompat/CypherUpdateMapTest.java
@@ -40,7 +40,7 @@ public class CypherUpdateMapTest
 {
 
     private ExecutionEngine engine;
-    private GraphDatabaseQueryService gdb;
+    private GraphDatabaseCypherService gdb;
 
     @Test
     public void updateNodeByMapParameter()
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/GraphDatabaseTestSupport.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/GraphDatabaseTestSupport.scala
index 03075da689a1..bac8e05cfa04 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/GraphDatabaseTestSupport.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/GraphDatabaseTestSupport.scala
@@ -40,7 +40,7 @@ import scala.collection.Map
 trait GraphDatabaseTestSupport extends CypherTestSupport with GraphIcing {
   self: CypherFunSuite  =>
 
-  var graph: GraphDatabaseQueryService = null
+  var graph: GraphDatabaseCypherService = null
   var nodes: List[Node] = null
 
   def databaseConfig(): Map[Setting[_],String] = Map()
@@ -50,7 +50,7 @@ trait GraphDatabaseTestSupport extends CypherTestSupport with GraphIcing {
     graph = createGraphDatabase()
   }
 
-  protected def createGraphDatabase(): GraphDatabaseQueryService = {
+  protected def createGraphDatabase() = {
     new GraphDatabaseCypherService(new TestGraphDatabaseFactory().newImpermanentDatabase(databaseConfig().asJava))
   }
 
@@ -59,7 +59,7 @@ trait GraphDatabaseTestSupport extends CypherTestSupport with GraphIcing {
       super.stopTest()
     }
     finally {
-      if (graph != null) graph.getGraphDatabaseService.shutdown()
+      if (graph != null) graph.shutdown()
     }
   }
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/LastCommittedTxIdProviderTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/LastCommittedTxIdProviderTest.scala
index 1a49675f49df..5fe119d65b6e 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/LastCommittedTxIdProviderTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/LastCommittedTxIdProviderTest.scala
@@ -21,13 +21,13 @@ package org.neo4j.cypher.internal
 
 import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
-import org.neo4j.kernel.{GraphDatabaseQueryService, NeoStoreDataSource}
+import org.neo4j.kernel.NeoStoreDataSource
 import org.neo4j.test.TestGraphDatabaseFactory
 import org.scalatest.BeforeAndAfterAll
 
 class LastCommittedTxIdProviderTest extends CypherFunSuite with BeforeAndAfterAll {
 
-  var db: GraphDatabaseQueryService = null
+  var db: GraphDatabaseCypherService = null
   var lastCommittedTxIdProvider: LastCommittedTxIdProvider = null
 
   override protected def beforeAll(): Unit = {
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ActualCostCalculationTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ActualCostCalculationTest.scala
index 3d174db3b4e1..9e1ac7153c77 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ActualCostCalculationTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/ActualCostCalculationTest.scala
@@ -298,12 +298,12 @@ class ActualCostCalculationTest extends CypherFunSuite {
     }
   }
 
-  implicit class RichGraph(mad: GraphDatabaseQueryService) {
-    def statement = mad.getDependencyResolver.resolveDependency(classOf[ThreadToStatementContextBridge]).get()
-    val graph = mad.getGraphDatabaseService
+  implicit class RichGraph(graph: GraphDatabaseQueryService) {
+    def statement = graph.getDependencyResolver.resolveDependency(classOf[ThreadToStatementContextBridge]).get()
+    val gds = graph.asInstanceOf[GraphDatabaseCypherService].getGraphDatabaseService
 
     def withTx[T](f: Transaction => T): T = {
-      val tx = mad.beginTx()
+      val tx = graph.beginTx()
       try {
         val result = f(tx)
         tx.success()
@@ -313,17 +313,17 @@ class ActualCostCalculationTest extends CypherFunSuite {
       }
     }
 
-    def shutdown() = graph.shutdown()
+    def shutdown() = gds.shutdown()
 
-    def createNode(label: Label) = graph.createNode(label)
+    def createNode(label: Label) = gds.createNode(label)
 
     def createIndex(label: Label, propertyName: String) = {
-      mad.withTx { _ =>
-        graph.schema().indexFor(label).on(propertyName).create()
+      graph.withTx { _ =>
+        gds.schema().indexFor(label).on(propertyName).create()
       }
 
-      mad.withTx { _ =>
-        graph.schema().awaitIndexesOnline(10, TimeUnit.SECONDS)
+      graph.withTx { _ =>
+        gds.schema().awaitIndexesOnline(10, TimeUnit.SECONDS)
       }
     }
   }
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/GraphIcing.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/GraphIcing.scala
index 643018260f67..3b88a10331a0 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/GraphIcing.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/helpers/GraphIcing.scala
@@ -22,6 +22,7 @@ package org.neo4j.cypher.internal.helpers
 import java.util
 import java.util.concurrent.TimeUnit
 
+import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb.Label._
 import org.neo4j.graphdb._
 import org.neo4j.kernel.GraphDatabaseQueryService
@@ -41,9 +42,9 @@ trait GraphIcing {
     }
   }
 
-  implicit class RichGraphDatabaseAPI(mad: GraphDatabaseQueryService) {
+  implicit class RichGraphDatabaseAPI(graphService: GraphDatabaseQueryService) {
 
-    var graph = mad.getGraphDatabaseService
+    var graph = graphService.asInstanceOf[GraphDatabaseCypherService].getGraphDatabaseService
 
     def getAllNodes() = graph.getAllNodes
 
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala
index 77e3a4eb2767..b068366ed1b5 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/spi/v3_0/TransactionBoundQueryContextTest.scala
@@ -30,7 +30,6 @@ import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb._
 import org.neo4j.graphdb.config.Setting
 import org.neo4j.graphdb.factory.GraphDatabaseSettings
-import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.kernel.api._
 import org.neo4j.kernel.impl.api.{KernelStatement, KernelTransactionImplementation}
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge
@@ -41,7 +40,7 @@ import scala.collection.JavaConverters._
 
 class TransactionBoundQueryContextTest extends CypherFunSuite {
 
-  var graph: GraphDatabaseQueryService = null
+  var graph: GraphDatabaseCypherService = null
   var outerTx: Transaction = null
   var statement: Statement = null
   val indexSearchMonitor = mock[IndexSearchMonitor]
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/PerformanceTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/PerformanceTest.scala
index bebfde797a25..3d334350fbbd 100644
--- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/PerformanceTest.scala
+++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/PerformanceTest.scala
@@ -24,14 +24,13 @@ import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb.factory.GraphDatabaseFactory
 import org.neo4j.graphdb.{Node, RelationshipType}
-import org.neo4j.kernel.GraphDatabaseQueryService
 
 import scala.util.Random
 
 class PerformanceTest extends CypherFunSuite {
   val r = new Random()
 
-  var db: GraphDatabaseQueryService = null
+  var db: GraphDatabaseCypherService = null
   var engine: ExecutionEngine = null
 
   override def beforeEach() {
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java b/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java
index 12b2bc746af5..e853533cb01e 100644
--- a/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java
+++ b/community/kernel/src/main/java/org/neo4j/kernel/GraphDatabaseQueryService.java
@@ -41,5 +41,4 @@ public interface GraphDatabaseQueryService
     Relationship getRelationshipById(long id);
     Transaction beginTx();
     URL validateURLAccess( URL url ) throws URLAccessValidationError;
-    GraphDatabaseAPI getGraphDatabaseService();
 }
diff --git a/enterprise/kernel/src/test/scala/org/neo4j/cypher/EnterpriseGraphDatabaseTestSupport.scala b/enterprise/kernel/src/test/scala/org/neo4j/cypher/EnterpriseGraphDatabaseTestSupport.scala
index 6dfe3d8d051c..ef2125f0d017 100644
--- a/enterprise/kernel/src/test/scala/org/neo4j/cypher/EnterpriseGraphDatabaseTestSupport.scala
+++ b/enterprise/kernel/src/test/scala/org/neo4j/cypher/EnterpriseGraphDatabaseTestSupport.scala
@@ -21,13 +21,12 @@ package org.neo4j.cypher
 
 import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
-import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.test.TestEnterpriseGraphDatabaseFactory
 
 trait EnterpriseGraphDatabaseTestSupport extends GraphDatabaseTestSupport {
   self: CypherFunSuite =>
 
-  override protected def createGraphDatabase(): GraphDatabaseQueryService = {
+  override protected def createGraphDatabase() = {
     new GraphDatabaseCypherService(new TestEnterpriseGraphDatabaseFactory().newImpermanentDatabase())
   }
 }
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
index 3176f76f713a..c3a2b1e74d0a 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
@@ -24,14 +24,13 @@ import java.io.{File, PrintWriter, StringWriter}
 import org.junit.Test
 import org.neo4j.cypher._
 import org.neo4j.cypher.export.{DatabaseSubGraph, SubGraphExporter}
-import org.neo4j.cypher.internal.{ExecutionEngine, RewindableExecutionResult}
 import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
 import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
 import org.neo4j.cypher.internal.javacompat.GraphImpl
+import org.neo4j.cypher.internal.{ExecutionEngine, RewindableExecutionResult}
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb._
 import org.neo4j.graphdb.index.Index
-import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.test.GraphDatabaseServiceCleaner.cleanDatabaseContent
 import org.neo4j.test.{AsciiDocGenerator, GraphDescription, TestGraphDatabaseFactory}
 import org.neo4j.visualization.asciidoc.AsciidocHelper
@@ -44,7 +43,7 @@ Use this base class for tests that are more flowing text with queries intersecte
  */
 abstract class ArticleTest extends Assertions with DocumentationHelper {
 
-  var db: GraphDatabaseQueryService = null
+  var db: GraphDatabaseCypherService = null
   implicit var engine: ExecutionEngine = null
   var nodes: Map[String, Long] = null
   var nodeIndex: Index[Node] = null
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
index 6ef3d8c481b7..390f86d383df 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
@@ -55,7 +55,7 @@ import scala.reflect.ClassTag
 
 trait DocumentationHelper extends GraphIcing {
   def generateConsole: Boolean
-  def db: GraphDatabaseQueryService
+  def db: GraphDatabaseCypherService
 
   def niceify(in: String): String = in.toLowerCase.replace(" ", "-")
 
@@ -157,7 +157,7 @@ abstract class DocumentingTestBase extends JUnitSuite with DocumentationHelper w
   }
 
   def prepareAndTestQuery(title: String, text: String, queryText: String, optionalResultExplanation: String = "",
-                          prepare: GraphDatabaseQueryService => Unit, assertions: InternalExecutionResult => Unit) {
+                          prepare: GraphDatabaseCypherService => Unit, assertions: InternalExecutionResult => Unit) {
     internalTestQuery(title, text, queryText, optionalResultExplanation, None, Some(prepare), Map.empty, assertions)
   }
 
@@ -170,7 +170,7 @@ abstract class DocumentingTestBase extends JUnitSuite with DocumentationHelper w
                                    queryText: String,
                                    realQuery: Option[String],
                                    expectedException: Option[ClassTag[_ <: CypherException]],
-                                   prepare: Option[GraphDatabaseQueryService => Unit],
+                                   prepare: Option[GraphDatabaseCypherService => Unit],
                                    assertions: InternalExecutionResult => Unit) {
     preparationQueries = List()
 
@@ -238,7 +238,7 @@ abstract class DocumentingTestBase extends JUnitSuite with DocumentationHelper w
                                 queryText: String,
                                 optionalResultExplanation: String,
                                 expectedException: Option[ClassTag[_ <: CypherException]],
-                                prepare: Option[GraphDatabaseQueryService => Unit],
+                                prepare: Option[GraphDatabaseCypherService => Unit],
                                 parameters: Map[String, Any],
                                 assertions: InternalExecutionResult => Unit)
   {
@@ -286,9 +286,9 @@ abstract class DocumentingTestBase extends JUnitSuite with DocumentationHelper w
     }
   }
 
-  def prepareForTest(title: String, prepare: Option[GraphDatabaseQueryService => Unit]) {
+  def prepareForTest(title: String, prepare: Option[GraphDatabaseCypherService => Unit]) {
     prepare.foreach {
-      (prepareStep: GraphDatabaseQueryService => Any) => prepareStep(db)
+      (prepareStep: GraphDatabaseCypherService => Any) => prepareStep(db)
     }
     if (preparationQueries.nonEmpty) {
       dumpPreparationQueries(preparationQueries, dir, title)
@@ -330,7 +330,7 @@ abstract class DocumentingTestBase extends JUnitSuite with DocumentationHelper w
     results.headOption
   }
 
-  var db: GraphDatabaseQueryService = null
+  var db: GraphDatabaseCypherService = null
   var engine: ExecutionEngine = null
   var nodeMap: Map[String, Long] = null
   var nodeIndex: Index[Node] = null
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala
index 1ede3d3928b0..30220f1e7a15 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala
@@ -40,14 +40,13 @@ package org.neo4j.cypher.docgen.tooling
  */
 import org.neo4j.cypher.internal.ExecutionEngine
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
-import org.neo4j.kernel.GraphDatabaseQueryService
 import org.neo4j.test.TestGraphDatabaseFactory
 
 import scala.util.Try
 
 /* I exist so my users can have a restartable database that is lazily created */
 class RestartableDatabase(init: Seq[String], factory: TestGraphDatabaseFactory = new TestGraphDatabaseFactory()) {
-  private var _db: GraphDatabaseQueryService = null
+  private var _db: GraphDatabaseCypherService = null
   private var _engine: ExecutionEngine = null
   private var _failures: Seq[QueryRunResult] = null
   private var _markedForRestart = false
diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/captureStateAsGraphViz.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/captureStateAsGraphViz.scala
index a67ec1f0d37e..b809bf060657 100644
--- a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/captureStateAsGraphViz.scala
+++ b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/captureStateAsGraphViz.scala
@@ -23,7 +23,7 @@ import java.io.ByteArrayOutputStream
 
 import org.neo4j.cypher.internal.frontend.v3_0._
 import org.neo4j.cypher.internal.helpers.GraphIcing
-import org.neo4j.kernel.GraphDatabaseQueryService
+import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.visualization.graphviz.{AsciiDocSimpleStyle, GraphvizWriter}
 import org.neo4j.walk.Walker
 
@@ -33,9 +33,9 @@ import org.neo4j.walk.Walker
  */
 object captureStateAsGraphViz extends GraphIcing {
 
-  def apply(db: GraphDatabaseQueryService, name: String, count: Int, options: String): GraphViz = GraphViz(emitGraphviz(s"$name-$count", options, db))
+  def apply(db: GraphDatabaseCypherService, name: String, count: Int, options: String): GraphViz = GraphViz(emitGraphviz(s"$name-$count", options, db))
 
-  private def emitGraphviz(testid: String, graphVizOptions: String, db: GraphDatabaseQueryService): String = {
+  private def emitGraphviz(testid: String, graphVizOptions: String, db: GraphDatabaseCypherService): String = {
     val out = new ByteArrayOutputStream()
     val writer = new GraphvizWriter(AsciiDocSimpleStyle.withAutomaticRelationshipTypeColors())
 
diff --git a/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/CypherDoc.java b/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/CypherDoc.java
index c126c176ac12..a1cb32353a27 100644
--- a/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/CypherDoc.java
+++ b/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/CypherDoc.java
@@ -33,7 +33,6 @@
 import org.neo4j.graphdb.config.Setting;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction;
-import org.neo4j.kernel.GraphDatabaseQueryService;
 import org.neo4j.test.TestGraphDatabaseFactory;
 
 /**
@@ -73,7 +72,7 @@ public static String parse( String input, File parentDirectory, String url )
         //TODO remove config when compiled plans are feature complete
         Map<Setting<?>, String> config = new HashMap<>();
         config.put( GraphDatabaseSettings.cypher_runtime, "INTERPRETED" );
-        GraphDatabaseQueryService database = new GraphDatabaseCypherService(
+        GraphDatabaseCypherService database = new GraphDatabaseCypherService(
                 new TestGraphDatabaseFactory().setFileSystem( fs ).newImpermanentDatabase( config ) );
 
         Connection conn = null;
diff --git a/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/State.java b/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/State.java
index 2832c9480651..358ee08786dc 100644
--- a/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/State.java
+++ b/manual/cypher/graphgist/src/main/java/org/neo4j/doc/cypherdoc/State.java
@@ -27,12 +27,12 @@
 import java.util.Map;
 
 import org.neo4j.cypher.javacompat.internal.DocsExecutionEngine;
-import org.neo4j.kernel.GraphDatabaseQueryService;
+import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService;
 
 class State
 {
     final DocsExecutionEngine engine;
-    final GraphDatabaseQueryService database;
+    final GraphDatabaseCypherService database;
     final Connection sqlDatabase;
     final File parentDirectory;
     final String url;
@@ -44,7 +44,7 @@ class State
     Result latestSqlResult;
     Result testedSqlResult;
 
-    State( DocsExecutionEngine engine, GraphDatabaseQueryService database, Connection sqlConnection,
+    State( DocsExecutionEngine engine, GraphDatabaseCypherService database, Connection sqlConnection,
             File parentDirectory,
             String url )
     {
diff --git a/manual/cypher/graphgist/src/test/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngineTest.java b/manual/cypher/graphgist/src/test/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngineTest.java
index cb63006cb915..057dcd88518f 100644
--- a/manual/cypher/graphgist/src/test/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngineTest.java
+++ b/manual/cypher/graphgist/src/test/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngineTest.java
@@ -25,7 +25,6 @@
 
 import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult;
 import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction;
-import org.neo4j.kernel.GraphDatabaseQueryService;
 import org.neo4j.test.TestGraphDatabaseFactory;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -34,7 +33,7 @@
 
 public class DocsExecutionEngineTest
 {
-    private static GraphDatabaseQueryService database;
+    private static GraphDatabaseCypherService database;
     private static DocsExecutionEngine engine;
 
     @Before
diff --git a/manual/cypher/graphgist/src/test/java/org/neo4j/doc/cypherdoc/BlockTypeTest.java b/manual/cypher/graphgist/src/test/java/org/neo4j/doc/cypherdoc/BlockTypeTest.java
index edffa110ed78..2a52c1192066 100644
--- a/manual/cypher/graphgist/src/test/java/org/neo4j/doc/cypherdoc/BlockTypeTest.java
+++ b/manual/cypher/graphgist/src/test/java/org/neo4j/doc/cypherdoc/BlockTypeTest.java
@@ -41,7 +41,6 @@
 import org.neo4j.cypher.javacompat.internal.DocsExecutionEngine;
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService;
 import org.neo4j.graphdb.ResourceIterator;
-import org.neo4j.kernel.GraphDatabaseQueryService;
 import org.neo4j.test.TestGraphDatabaseFactory;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -58,7 +57,7 @@
 
 public class BlockTypeTest
 {
-    private GraphDatabaseQueryService database;
+    private GraphDatabaseCypherService database;
     private DocsExecutionEngine engine;
     private State state;
 
diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala
index 232d752436a7..15b5b78bbbae 100644
--- a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala
+++ b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala
@@ -32,8 +32,7 @@ import org.neo4j.cypher.internal.{ExecutionEngine, ExecutionResult, RewindableEx
 import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
 import org.neo4j.graphdb._
 import org.neo4j.graphdb.index.Index
-import org.neo4j.kernel.GraphDatabaseQueryService
-import org.neo4j.test.{GraphDatabaseServiceCleaner, GraphDescription, TestGraphDatabaseFactory}
+import org.neo4j.test.{GraphDescription, GraphDatabaseServiceCleaner, TestGraphDatabaseFactory}
 import org.neo4j.visualization.asciidoc.AsciidocHelper
 import org.scalatest.Assertions
 
@@ -44,7 +43,7 @@ Use this base class for refcard tests
  */
 abstract class RefcardTest extends Assertions with DocumentationHelper with GraphIcing {
 
-  var db: GraphDatabaseQueryService = null
+  var db: GraphDatabaseCypherService = null
   implicit var engine: ExecutionEngine = null
   var nodes: Map[String, Long] = null
   var nodeIndex: Index[Node] = null