diff --git a/core/core.services.yml b/core/core.services.yml
index d04bcc6..ce35658 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -150,7 +150,7 @@ services:
     arguments: ['@typed_data_manager']
   cron:
     class: Drupal\Core\Cron
-    arguments: ['@module_handler', '@lock', '@queue', '@state', '@current_user', '@session_manager', '@logger.channel.cron', '@plugin.manager.queue']
+    arguments: ['@module_handler', '@lock', '@queue', '@state', '@current_user', '@session_manager', '@logger.channel.cron', '@plugin.manager.queue_worker']
   diff.formatter:
     class: Drupal\Core\Diff\DiffFormatter
     arguments: ['@config.factory']
@@ -346,8 +346,8 @@ services:
   plugin.manager.display_variant:
     class: Drupal\Core\Display\VariantManager
     parent: default_plugin_manager
-  plugin.manager.queue:
-    class: Drupal\Core\Queue\QueuePluginManager
+  plugin.manager.queue_worker:
+    class: Drupal\Core\Queue\QueueWorkerManager
     parent: default_plugin_manager
   plugin.cache_clearer:
     class: Drupal\Core\Plugin\CachedDiscoveryClearer
diff --git a/core/lib/Drupal/Core/Annotation/QueuePlugin.php b/core/lib/Drupal/Core/Annotation/QueueWorker.php
similarity index 83%
rename from core/lib/Drupal/Core/Annotation/QueuePlugin.php
rename to core/lib/Drupal/Core/Annotation/QueueWorker.php
index 5366b51..8b5df53 100644
--- a/core/lib/Drupal/Core/Annotation/QueuePlugin.php
+++ b/core/lib/Drupal/Core/Annotation/QueueWorker.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Annotation\QueuePlugin.
+ * Contains \Drupal\Core\Annotation\QueueWorker.
  */
 
 namespace Drupal\Core\Annotation;
@@ -10,7 +10,7 @@
 use Drupal\Component\Annotation\Plugin;
 
 /**
- * Declare queues holding items that need to be run periodically.
+ * Declare queue workers that need to be run periodically.
  *
  * While there can be only one hook_cron() process running at the same time,
  * there can be any number of processes defined here running. Because of
@@ -25,12 +25,12 @@
  *
  * @see hook_cron()
  * @see hook_queue_info_alter()
- * @see \Drupal\Core\Queue\QueuePluginInterface
- * @see \Drupal\Core\Queue\QueuePluginManagerInterface
+ * @see \Drupal\Core\Queue\QueueWorkerInterface
+ * @see \Drupal\Core\Queue\QueueWorkerManagerInterface
  *
  * @Annotation
  */
-class QueuePlugin extends Plugin {
+class QueueWorker extends Plugin {
 
   /**
    * The plugin ID.
diff --git a/core/lib/Drupal/Core/Cron.php b/core/lib/Drupal/Core/Cron.php
index 8bfe378..6b25b1d 100644
--- a/core/lib/Drupal/Core/Cron.php
+++ b/core/lib/Drupal/Core/Cron.php
@@ -8,7 +8,7 @@
 namespace Drupal\Core;
 
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Queue\QueuePluginManagerInterface;
+use Drupal\Core\Queue\QueueWorkerManagerInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\Lock\LockBackendInterface;
 use Drupal\Core\Queue\QueueFactory;
@@ -75,7 +75,7 @@ class Cron implements CronInterface {
   /**
    * The queue plugin manager.
    *
-   * @var \Drupal\Core\Queue\QueuePluginManagerInterface
+   * @var \Drupal\Core\Queue\QueueWorkerManagerInterface
    */
   protected $queueManager;
 
@@ -96,10 +96,10 @@ class Cron implements CronInterface {
    *   The session manager.
    * @param \Psr\Log\LoggerInterface $logger
    *   A logger instance.
-   * @param \Drupal\Core\Queue\QueuePluginManagerInterface
+   * @param \Drupal\Core\Queue\QueueWorkerManagerInterface
    *   The queue plugin manager.
    */
-  public function __construct(ModuleHandlerInterface $module_handler, LockBackendInterface $lock, QueueFactory $queue_factory, StateInterface $state, AccountProxyInterface $current_user, SessionManagerInterface $session_manager, LoggerInterface $logger, QueuePluginManagerInterface $queue_manager) {
+  public function __construct(ModuleHandlerInterface $module_handler, LockBackendInterface $lock, QueueFactory $queue_factory, StateInterface $state, AccountProxyInterface $current_user, SessionManagerInterface $session_manager, LoggerInterface $logger, QueueWorkerManagerInterface $queue_manager) {
     $this->moduleHandler = $module_handler;
     $this->lock = $lock;
     $this->queueFactory = $queue_factory;
@@ -179,12 +179,12 @@ protected function processQueues() {
         // an existing queue.
         $this->queueFactory->get($queue_name)->createQueue();
 
-        $queue_item = $this->queueManager->createInstance($queue_name);
+        $queue_worker = $this->queueManager->createInstance($queue_name);
         $end = time() + (isset($info['cron']['time']) ? $info['cron']['time'] : 15);
         $queue = $this->queueFactory->get($queue_name);
         while (time() < $end && ($item = $queue->claimItem())) {
           try {
-            $queue_item->processItem($item->data);
+            $queue_worker->processItem($item->data);
             $queue->deleteItem($item);
           }
           catch (SuspendQueueException $e) {
diff --git a/core/lib/Drupal/Core/Queue/QueuePluginBase.php b/core/lib/Drupal/Core/Queue/QueuePluginBase.php
deleted file mode 100644
index 87fa4cd..0000000
--- a/core/lib/Drupal/Core/Queue/QueuePluginBase.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Queue\QueuePluginBase.
- */
-
-namespace Drupal\Core\Queue;
-
-use Drupal\Component\Plugin\PluginBase;
-
-/**
- * Provides a basis for queue plugins.
- */
-abstract class QueuePluginBase extends PluginBase implements QueuePluginInterface {
-
-}
diff --git a/core/lib/Drupal/Core/Queue/QueuePluginManagerInterface.php b/core/lib/Drupal/Core/Queue/QueuePluginManagerInterface.php
deleted file mode 100644
index 8fdd555..0000000
--- a/core/lib/Drupal/Core/Queue/QueuePluginManagerInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Queue\QueuePluginManagerInterface.
- */
-
-namespace Drupal\Core\Queue;
-
-use Drupal\Component\Plugin\PluginManagerInterface;
-
-/**
- * Provides an interface for a queue item manager.
- */
-interface QueuePluginManagerInterface extends PluginManagerInterface {
-
-}
diff --git a/core/lib/Drupal/Core/Queue/QueueWorkerBase.php b/core/lib/Drupal/Core/Queue/QueueWorkerBase.php
new file mode 100644
index 0000000..1a3dd44
--- /dev/null
+++ b/core/lib/Drupal/Core/Queue/QueueWorkerBase.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Queue\QueueWorkerBase.
+ */
+
+namespace Drupal\Core\Queue;
+
+use Drupal\Component\Plugin\PluginBase;
+
+/**
+ * Provides a basis for queue worker plugins.
+ */
+abstract class QueueWorkerBase extends PluginBase implements QueueWorkerInterface {
+
+}
diff --git a/core/lib/Drupal/Core/Queue/QueuePluginInterface.php b/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php
similarity index 59%
rename from core/lib/Drupal/Core/Queue/QueuePluginInterface.php
rename to core/lib/Drupal/Core/Queue/QueueWorkerInterface.php
index bada537..376e5ad 100644
--- a/core/lib/Drupal/Core/Queue/QueuePluginInterface.php
+++ b/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Queue\QueuePluginInterface.
+ * Contains \Drupal\Core\Queue\QueueWorkerInterface.
  */
 
 namespace Drupal\Core\Queue;
@@ -10,9 +10,9 @@
 use Drupal\Component\Plugin\PluginInspectionInterface;
 
 /**
- * Defines an interface for queues of items that need to be processed.
+ * Defines an interface for queue workers.
  */
-interface QueuePluginInterface extends PluginInspectionInterface {
+interface QueueWorkerInterface extends PluginInspectionInterface {
 
   /**
    * @param mixed $data
diff --git a/core/lib/Drupal/Core/Queue/QueuePluginManager.php b/core/lib/Drupal/Core/Queue/QueueWorkerManager.php
similarity index 75%
rename from core/lib/Drupal/Core/Queue/QueuePluginManager.php
rename to core/lib/Drupal/Core/Queue/QueueWorkerManager.php
index 3253422..6c140a8 100644
--- a/core/lib/Drupal/Core/Queue/QueuePluginManager.php
+++ b/core/lib/Drupal/Core/Queue/QueueWorkerManager.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Queue\QueuePluginManager.
+ * Contains \Drupal\Core\Queue\QueueWorkerManager.
  */
 
 namespace Drupal\Core\Queue;
@@ -12,12 +12,12 @@
 use Drupal\Core\Plugin\DefaultPluginManager;
 
 /**
- * Defines the queue item manager.
+ * Defines the queue worker manager.
  */
-class QueuePluginManager extends DefaultPluginManager implements QueuePluginManagerInterface {
+class QueueWorkerManager extends DefaultPluginManager implements QueueWorkerManagerInterface {
 
   /**
-   * Constructs an QueuePluginManager object.
+   * Constructs an QueueWorkerManager object.
    *
    * @param \Traversable $namespaces
    *   An object that implements \Traversable which contains the root paths
@@ -28,7 +28,7 @@ class QueuePluginManager extends DefaultPluginManager implements QueuePluginMana
    *   The module handler.
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/QueuePlugin', $namespaces, $module_handler, 'Drupal\Core\Queue\QueuePluginInterface', 'Drupal\Core\Annotation\QueuePlugin');
+    parent::__construct('Plugin/QueueWorker', $namespaces, $module_handler, 'Drupal\Core\Queue\QueueWorkerInterface', 'Drupal\Core\Annotation\QueueWorker');
 
     $this->setCacheBackend($cache_backend, 'queue_plugins');
     $this->alterInfo('queue_info');
@@ -51,7 +51,7 @@ public function processDefinition(&$definition, $plugin_id) {
   /**
    * {@inheritdoc}
    *
-   * @return \Drupal\Core\Queue\QueuePluginInterface
+   * @return \Drupal\Core\Queue\QueueWorkerInterface
    */
   public function createInstance($plugin_id, array $configuration = []) {
     return parent::createInstance($plugin_id, $configuration);
diff --git a/core/lib/Drupal/Core/Queue/QueueWorkerManagerInterface.php b/core/lib/Drupal/Core/Queue/QueueWorkerManagerInterface.php
new file mode 100644
index 0000000..e80776b
--- /dev/null
+++ b/core/lib/Drupal/Core/Queue/QueueWorkerManagerInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Queue\QueueWorkerManagerInterface.
+ */
+
+namespace Drupal\Core\Queue;
+
+use Drupal\Component\Plugin\PluginManagerInterface;
+
+/**
+ * Provides an interface for a queue worker manager.
+ */
+interface QueueWorkerManagerInterface extends PluginManagerInterface {
+
+}
diff --git a/core/modules/aggregator/src/Plugin/QueuePlugin/AggregatorRefresh.php b/core/modules/aggregator/src/Plugin/QueueWorker/AggregatorRefresh.php
similarity index 61%
rename from core/modules/aggregator/src/Plugin/QueuePlugin/AggregatorRefresh.php
rename to core/modules/aggregator/src/Plugin/QueueWorker/AggregatorRefresh.php
index 0f7a745..d3267eb 100644
--- a/core/modules/aggregator/src/Plugin/QueuePlugin/AggregatorRefresh.php
+++ b/core/modules/aggregator/src/Plugin/QueueWorker/AggregatorRefresh.php
@@ -2,22 +2,22 @@
 
 /**
  * @file
- * Contains \Drupal\aggregator\Plugin\QueuePlugin\AggregatorRefresh.
+ * Contains \Drupal\aggregator\Plugin\QueueWorker\AggregatorRefresh.
  */
 
-namespace Drupal\aggregator\Plugin\QueuePlugin;
+namespace Drupal\aggregator\Plugin\QueueWorker;
 
 use Drupal\aggregator\FeedInterface;
-use Drupal\Core\Queue\QueuePluginBase;
+use Drupal\Core\Queue\QueueWorkerBase;
 
 /**
- * @QueuePlugin(
+ * @QueueWorker(
  *   id = "aggregator_feeds",
  *   title = @Translation("Aggregator refresh"),
  *   cron = {"time" = 60}
  * )
  */
-class AggregatorRefresh extends QueuePluginBase {
+class AggregatorRefresh extends QueueWorkerBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 6668bad..d3673f1 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -376,7 +376,7 @@ function locale_themes_disabled($themes) {
 /**
  * Implements hook_cron().
  *
- * @see \Drupal\locale\Plugin\QueuePlugin\LocaleTranslation
+ * @see \Drupal\locale\Plugin\QueueWorker\LocaleTranslation
  */
 function locale_cron() {
   // Update translations only when an update frequency was set by the admin
diff --git a/core/modules/locale/src/Plugin/QueuePlugin/LocaleTranslation.php b/core/modules/locale/src/Plugin/QueueWorker/LocaleTranslation.php
similarity index 94%
rename from core/modules/locale/src/Plugin/QueuePlugin/LocaleTranslation.php
rename to core/modules/locale/src/Plugin/QueueWorker/LocaleTranslation.php
index 6ecb715..50e197a 100644
--- a/core/modules/locale/src/Plugin/QueuePlugin/LocaleTranslation.php
+++ b/core/modules/locale/src/Plugin/QueueWorker/LocaleTranslation.php
@@ -2,25 +2,25 @@
 
 /**
  * @file
- * Contains \Drupal\locale\Plugin\QueuePlugin\LocaleTranslation.
+ * Contains \Drupal\locale\Plugin\QueueWorker\LocaleTranslation.
  */
 
-namespace Drupal\locale\Plugin\QueuePlugin;
+namespace Drupal\locale\Plugin\QueueWorker;
 
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Queue\QueueInterface;
-use Drupal\Core\Queue\QueuePluginBase;
+use Drupal\Core\Queue\QueueWorkerBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * @QueuePlugin(
+ * @QueueWorker(
  *   id = "locale_translation",
  *   title = @Translation("Update translations"),
  *   cron = {"time" = 30}
  * )
  */
-class LocaleTranslation extends QueuePluginBase implements ContainerFactoryPluginInterface {
+class LocaleTranslation extends QueueWorkerBase implements ContainerFactoryPluginInterface {
 
   /**
    * The module handler.
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index 0c3dbb8..14aa532 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -62,7 +62,7 @@ function hook_hook_info() {
  * Long-running tasks and tasks that could time out, such as retrieving remote
  * data, sending email, and intensive file tasks, should use the queue API
  * instead of executing the tasks directly. To do this, first define one or
- * more queues via a \Drupal\Core\Annotation\QueuePlugin plugin. Then, add items
+ * more queues via a \Drupal\Core\Annotation\QueueWorker plugin. Then, add items
  * that need to be processed to the defined queues.
  */
 function hook_cron() {
@@ -107,8 +107,8 @@ function hook_data_type_info_alter(&$data_types) {
  * @param array $queues
  *   An array of cron queue information.
  *
- * @see \Drupal\Core\QueuePlugin\QueuePluginInterface
- * @see \Drupal\Core\Annotation\QueuePlugin
+ * @see \Drupal\Core\QueueWorker\QueueWorkerInterface
+ * @see \Drupal\Core\Annotation\QueueWorker
  * @see \Drupal\Core\Cron
  */
 function hook_queue_info_alter(&$queues) {
diff --git a/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueuePlugin/CronQueueTestBrokenQueue.php b/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestBrokenQueue.php
similarity index 64%
rename from core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueuePlugin/CronQueueTestBrokenQueue.php
rename to core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestBrokenQueue.php
index b70f7b6..f642a4d 100644
--- a/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueuePlugin/CronQueueTestBrokenQueue.php
+++ b/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestBrokenQueue.php
@@ -2,22 +2,22 @@
 
 /**
  * @file
- * Contains \Drupal\cron_queue_test\Plugin\QueuePlugin\CronQueueTestBrokenQueue.
+ * Contains \Drupal\cron_queue_test\Plugin\QueueWorker\CronQueueTestBrokenQueue.
  */
 
-namespace Drupal\cron_queue_test\Plugin\QueuePlugin;
+namespace Drupal\cron_queue_test\Plugin\QueueWorker;
 
-use Drupal\Core\Queue\QueuePluginBase;
+use Drupal\Core\Queue\QueueWorkerBase;
 use Drupal\Core\Queue\SuspendQueueException;
 
 /**
- * @QueuePlugin(
+ * @QueueWorker(
  *   id = "cron_queue_test_broken_queue",
  *   title = @Translation("Broken queue test"),
  *   cron = {"time" = 60}
  * )
  */
-class CronQueueTestBrokenQueue extends QueuePluginBase {
+class CronQueueTestBrokenQueue extends QueueWorkerBase {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueuePlugin/CronQueueTestException.php b/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestException.php
similarity index 57%
rename from core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueuePlugin/CronQueueTestException.php
rename to core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestException.php
index d159c67..ff32209 100644
--- a/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueuePlugin/CronQueueTestException.php
+++ b/core/modules/system/tests/modules/cron_queue_test/src/Plugin/QueueWorker/CronQueueTestException.php
@@ -2,21 +2,21 @@
 
 /**
  * @file
- * Contains \Drupal\cron_queue_test\Plugin\QueuePlugin\CronQueueTestException.
+ * Contains \Drupal\cron_queue_test\Plugin\QueueWorker\CronQueueTestException.
  */
 
-namespace Drupal\cron_queue_test\Plugin\QueuePlugin;
+namespace Drupal\cron_queue_test\Plugin\QueueWorker;
 
-use Drupal\Core\Queue\QueuePluginBase;
+use Drupal\Core\Queue\QueueWorkerBase;
 
 /**
- * @QueuePlugin(
+ * @QueueWorker(
  *   id = "cron_queue_test_exception",
  *   title = @Translation("Exception test"),
  *   cron = {"time" = 60}
  * )
  */
-class CronQueueTestException extends QueuePluginBase {
+class CronQueueTestException extends QueueWorkerBase {
 
   /**
    * {@inheritdoc}