diff --git a/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php b/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
index 89a7e76bd5a..aa0107d6166 100644
--- a/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
+++ b/core/modules/tour/lib/Drupal/tour/Plugin/Core/Entity/Tour.php
@@ -74,7 +74,7 @@ class Tour extends ConfigEntityBase {
   public function __construct(array $values, $entity_type) {
     parent::__construct($values, $entity_type);
 
-    $this->tipsBag = new TipsBag(drupal_container()->get('plugin.manager.tour'), $this->tips);
+    $this->tipsBag = new TipsBag(drupal_container()->get('plugin.manager.tour.tip'), $this->tips);
   }
 
   /**
diff --git a/core/modules/tour/lib/Drupal/tour/Tests/TourPluginTest.php b/core/modules/tour/lib/Drupal/tour/Tests/TourPluginTest.php
index 8256eed04a4..460e4978e1c 100644
--- a/core/modules/tour/lib/Drupal/tour/Tests/TourPluginTest.php
+++ b/core/modules/tour/lib/Drupal/tour/Tests/TourPluginTest.php
@@ -24,7 +24,7 @@ class TourPluginTest extends DrupalUnitTestBase {
   /**
    * Stores the tour plugin manager.
    *
-   * @var \Drupal\tour\TourManager
+   * @var \Drupal\tour\TipPluginManager
    */
   protected $pluginManager;
 
@@ -40,7 +40,7 @@ class TourPluginTest extends DrupalUnitTestBase {
     parent::setUp();
 
     config_install_default_config('module', 'tour');
-    $this->pluginManager = $this->container->get('plugin.manager.tour');
+    $this->pluginManager = $this->container->get('plugin.manager.tour.tip');
   }
 
   /**
diff --git a/core/modules/tour/lib/Drupal/tour/TourManager.php b/core/modules/tour/lib/Drupal/tour/TipPluginManager.php
similarity index 94%
rename from core/modules/tour/lib/Drupal/tour/TourManager.php
rename to core/modules/tour/lib/Drupal/tour/TipPluginManager.php
index ee44c9bc114..19732c1f200 100644
--- a/core/modules/tour/lib/Drupal/tour/TourManager.php
+++ b/core/modules/tour/lib/Drupal/tour/TipPluginManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\tour\TourManager.
+ * Contains \Drupal\tour\TipPluginManager.
  */
 
 namespace Drupal\tour;
@@ -16,7 +16,7 @@ use Drupal\Component\Plugin\Discovery\ProcessDecorator;
 /**
  * Configurable tour manager.
  */
-class TourManager extends PluginManagerBase {
+class TipPluginManager extends PluginManagerBase {
 
   /**
    * Overrides \Drupal\Component\Plugin\PluginManagerBase::__construct().
diff --git a/core/modules/tour/lib/Drupal/tour/TourBundle.php b/core/modules/tour/lib/Drupal/tour/TourBundle.php
index 337a6720e28..6839645ae63 100644
--- a/core/modules/tour/lib/Drupal/tour/TourBundle.php
+++ b/core/modules/tour/lib/Drupal/tour/TourBundle.php
@@ -21,6 +21,6 @@ class TourBundle extends Bundle {
   public function build(ContainerBuilder $container) {
     // Register the plugin manager for our plugin type with the dependency
     // injection container.
-    $container->register('plugin.manager.tour', 'Drupal\tour\TourManager');
+    $container->register('plugin.manager.tour.tip', 'Drupal\tour\TipPluginManager');
   }
 }
diff --git a/core/modules/tour/tour.api.php b/core/modules/tour/tour.api.php
index a3672b36482..548622e4f04 100644
--- a/core/modules/tour/tour.api.php
+++ b/core/modules/tour/tour.api.php
@@ -57,7 +57,7 @@ function hook_tour_presave($entity) {
  *   The tour object being inserted.
  */
 function hook_tour_insert($entity) {
-  drupal_container()->get('plugin.manager.tour')->clearCachedDefinitions();
+  drupal_container()->get('plugin.manager.tour.tip')->clearCachedDefinitions();
   cache('cache_tour')->deleteTags(array('tour_items'));
 }
 
@@ -68,6 +68,6 @@ function hook_tour_insert($entity) {
  *   The tour object being updated.
  */
 function hook_tour_update($entity) {
-  drupal_container()->get('plugin.manager.tour')->clearCachedDefinitions();
+  drupal_container()->get('plugin.manager.tour.tip')->clearCachedDefinitions();
   cache('cache_tour')->deleteTags(array('tour_items'));
 }
diff --git a/core/modules/tour/tour.module b/core/modules/tour/tour.module
index 7c1e1d6138d..f26b356d3e1 100644
--- a/core/modules/tour/tour.module
+++ b/core/modules/tour/tour.module
@@ -204,12 +204,12 @@ function tour_preprocess_page(&$variables) {
  * Implements hook_tour_insert().
  */
 function tour_tour_insert($entity) {
-  drupal_container()->get('plugin.manager.tour')->clearCachedDefinitions();
+  drupal_container()->get('plugin.manager.tour.tip')->clearCachedDefinitions();
 }
 
 /**
  * Implements hook_tour_update().
  */
 function tour_tour_update($entity) {
-  drupal_container()->get('plugin.manager.tour')->clearCachedDefinitions();
+  drupal_container()->get('plugin.manager.tour.tip')->clearCachedDefinitions();
 }