diff --git a/core/core.services.yml b/core/core.services.yml
index a5a5b20..cf93d60 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -537,7 +537,7 @@ services:
     arguments: ['@state']
   router.builder:
     class: Drupal\Core\Routing\RouteBuilder
-    arguments: ['@router.dumper', '@lock', '@event_dispatcher', '@module_handler', '@controller_resolver', '@router.builder_indicator', '@access_manager']
+    arguments: ['@router.dumper', '@lock', '@event_dispatcher', '@module_handler', '@controller_resolver', '@router.builder_indicator', '@access_manager.check_provider']
   router.rebuild_subscriber:
     class: Drupal\Core\EventSubscriber\RouterRebuildSubscriber
     arguments: ['@router.builder']
diff --git a/core/lib/Drupal/Core/Routing/RouteBuilder.php b/core/lib/Drupal/Core/Routing/RouteBuilder.php
index b93088d..42ce881 100644
--- a/core/lib/Drupal/Core/Routing/RouteBuilder.php
+++ b/core/lib/Drupal/Core/Routing/RouteBuilder.php
@@ -2,23 +2,21 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Routing\RouteBuilder.
+ * Contains \Drupal\Core\Routing\RouteBuilder.
  */
 
 namespace Drupal\Core\Routing;
 
 use Drupal\Component\Discovery\YamlDiscovery;
-use Drupal\Core\Access\AccessManagerInterface;
+use Drupal\Core\Access\CheckProviderInterface;
 use Drupal\Core\Controller\ControllerResolverInterface;
-use Drupal\Core\State\StateInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Lock\LockBackendInterface;
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\Route;
 
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Lock\LockBackendInterface;
-
 /**
  * Managing class for rebuilding the router table.
  */
@@ -88,9 +86,11 @@ class RouteBuilder implements RouteBuilderInterface {
   protected $building = FALSE;
 
   /**
-   * @var \Drupal\Core\Access\AccessManagerInterface
+   * The check provider.
+   *
+   * @var \Drupal\Core\Access\CheckProviderInterface
    */
-  protected $accessManager;
+  protected $checkProvider;
 
   /**
    * Constructs the RouteBuilder using the passed MatcherDumperInterface.
@@ -107,17 +107,17 @@ class RouteBuilder implements RouteBuilderInterface {
    *   The controller resolver.
    * @param \Drupal\Core\Routing\RouteBuilderIndicatorInterface $route_build_indicator
    *   The route build indicator.
-   * @param \Drupal\Core\Access\AccessManagerInterface $access_manager
-   *   The access manager.
+   * @param \Drupal\Core\Access\CheckProviderInterface $check_provider
+   *   The check provider.
    */
-  public function __construct(MatcherDumperInterface $dumper, LockBackendInterface $lock, EventDispatcherInterface $dispatcher, ModuleHandlerInterface $module_handler, ControllerResolverInterface $controller_resolver, RouteBuilderIndicatorInterface $route_build_indicator = NULL, $access_manager) {
+  public function __construct(MatcherDumperInterface $dumper, LockBackendInterface $lock, EventDispatcherInterface $dispatcher, ModuleHandlerInterface $module_handler, ControllerResolverInterface $controller_resolver, RouteBuilderIndicatorInterface $route_build_indicator = NULL, CheckProviderInterface $check_provider) {
     $this->dumper = $dumper;
     $this->lock = $lock;
     $this->dispatcher = $dispatcher;
     $this->moduleHandler = $module_handler;
     $this->controllerResolver = $controller_resolver;
     $this->routeBuilderIndicator = $route_build_indicator;
-    $this->accessManager = $access_manager;
+    $this->checkProvider = $check_provider;
   }
 
   /**
@@ -188,7 +188,7 @@ public function rebuild() {
     // make it clear.
     $this->dispatcher->dispatch(RoutingEvents::ALTER, new RouteBuildEvent($collection));
 
-    $this->accessManager->setChecks($collection);
+    $this->checkProvider->setChecks($collection);
 
     $this->dumper->addRoutes($collection);
     $this->dumper->dump();
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
index e9fb871..8eac0df 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
@@ -79,9 +79,9 @@ class RouteBuilderTest extends UnitTestCase {
   protected $routeBuilderIndicator;
 
   /**
-   * @var \Drupal\Core\Access\AccessManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\Access\CheckProviderInterface|\PHPUnit_Framework_MockObject_MockObject
    */
-  protected $accessManager;
+  protected $checkProvider;
 
   protected function setUp() {
     $this->dumper = $this->getMock('Drupal\Core\Routing\MatcherDumperInterface');
@@ -93,9 +93,9 @@ protected function setUp() {
       ->disableOriginalConstructor()
       ->getMock();
     $this->routeBuilderIndicator = $this->getMock('\Drupal\Core\Routing\RouteBuilderIndicatorInterface');
-    $this->accessManager = $this->getMock('Drupal\Core\Access\AccessManagerInterface');
+    $this->checkProvider = $this->getMock('\Drupal\Core\Access\CheckProviderInterface');
 
-    $this->routeBuilder = new TestRouteBuilder($this->dumper, $this->lock, $this->dispatcher, $this->moduleHandler, $this->controllerResolver, $this->routeBuilderIndicator, $this->accessManager);
+    $this->routeBuilder = new TestRouteBuilder($this->dumper, $this->lock, $this->dispatcher, $this->moduleHandler, $this->controllerResolver, $this->routeBuilderIndicator, $this->checkProvider);
     $this->routeBuilder->setYamlDiscovery($this->yamlDiscovery);
   }
 
@@ -175,7 +175,7 @@ public function testRebuildWithStaticModuleRoutes() {
       ->with(RoutingEvents::ALTER, $route_build_event);
 
     // Ensure that access checks are set.
-    $this->accessManager->expects($this->once())
+    $this->checkProvider->expects($this->once())
       ->method('setChecks')
       ->with($route_collection);
 
@@ -245,7 +245,7 @@ public function testRebuildWithProviderBasedRoutes() {
       ->with(RoutingEvents::ALTER, $route_build_event);
 
     // Ensure that access checks are set.
-    $this->accessManager->expects($this->once())
+    $this->checkProvider->expects($this->once())
       ->method('setChecks')
       ->with($route_collection_filled);