diff -u b/core/lib/Drupal/Core/Block/BlockBase.php b/core/lib/Drupal/Core/Block/BlockBase.php
--- b/core/lib/Drupal/Core/Block/BlockBase.php
+++ b/core/lib/Drupal/Core/Block/BlockBase.php
@@ -13,7 +13,7 @@
 use Drupal\Component\Plugin\ContextAwarePluginInterface;
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Condition\ConditionAccessResolverTrait;
-use Drupal\Core\Condition\ConditionPluginCollection;
+use Drupal\Core\Condition\ConditionLazyPluginCollection;
 use Drupal\Core\Form\FormState;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContextAwarePluginBase;
@@ -40,7 +40,7 @@
   /**
    * The condition plugin collection.
    *
-   * @var \Drupal\Core\Condition\ConditionPluginCollection
+   * @var \Drupal\Core\Condition\ConditionLazyPluginCollection
    */
   protected $conditionCollection;
 
@@ -508,7 +508,7 @@
    */
   public function getVisibilityConditions() {
     if (!isset($this->conditionCollection)) {
-      $this->conditionCollection = new ConditionPluginCollection($this->conditionPluginManager(), $this->configuration['visibility']);
+      $this->conditionCollection = new ConditionLazyPluginCollection($this->conditionPluginManager(), $this->configuration['visibility']);
     }
     return $this->conditionCollection;
   }
diff -u b/core/lib/Drupal/Core/Block/BlockPluginInterface.php b/core/lib/Drupal/Core/Block/BlockPluginInterface.php
--- b/core/lib/Drupal/Core/Block/BlockPluginInterface.php
+++ b/core/lib/Drupal/Core/Block/BlockPluginInterface.php
@@ -146,7 +146,7 @@
   /**
    * Gets conditions for this block.
    *
-   * @return \Drupal\Core\Condition\ConditionInterface[]|\Drupal\Core\Condition\ConditionPluginCollection
+   * @return \Drupal\Core\Condition\ConditionInterface[]|\Drupal\Core\Condition\ConditionLazyPluginCollection
    *   An array or collection of configured condition plugins.
    */
   public function getVisibilityConditions();
diff -u b/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php b/core/lib/Drupal/Core/Condition/ConditionLazyPluginCollection.php
--- b/core/lib/Drupal/Core/Condition/ConditionPluginCollection.php
+++ b/core/lib/Drupal/Core/Condition/ConditionLazyPluginCollection.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Condition\ConditionPluginCollection.
+ * Contains \Drupal\Core\Condition\ConditionLazyPluginCollection.
  */
 
 namespace Drupal\Core\Condition;
@@ -13,7 +13,7 @@
 /**
  * Provides a collection of condition plugins.
  */
-class ConditionPluginCollection extends DefaultLazyPluginCollection {
+class ConditionLazyPluginCollection extends DefaultLazyPluginCollection {
 
   /**
    * An array of collected contexts for conditions.
diff -u b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
--- b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -43,8 +43,8 @@
   /**
    * The name of the property that is used to store plugin configuration.
    *
-   * This is needed when the entity utilizes a LazyPluginCollection, to dictate where the
-   * plugin configuration should be stored.
+   * This is needed when the entity utilizes a LazyPluginCollection, to dictate
+   * where the plugin configuration should be stored.
    *
    * @var string
    */
diff -u b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php
--- b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityWithPluginCollectionInterface.php
@@ -17,7 +17,7 @@
 interface EntityWithPluginCollectionInterface extends EntityInterface {
 
   /**
-   * Returns the plugin collectionss used by this entity.
+   * Returns the plugin collections used by this entity.
    *
    * @return \Drupal\Component\Plugin\LazyPluginCollection[]
    *   An array of plugin collections, keyed by the property name they use to
diff -u b/core/modules/block/src/Event/BlockConditionContextEvent.php b/core/modules/block/src/Event/BlockConditionContextEvent.php
--- b/core/modules/block/src/Event/BlockConditionContextEvent.php
+++ b/core/modules/block/src/Event/BlockConditionContextEvent.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\block\Event;
 
-use Drupal\Core\Condition\ConditionPluginCollection;
+use Drupal\Core\Condition\ConditionLazyPluginCollection;
 use Symfony\Component\EventDispatcher\Event;
 
 /**
@@ -18,14 +18,14 @@
 class BlockConditionContextEvent extends Event {
 
   /**
-   * @var \Drupal\Core\Condition\ConditionPluginCollection
+   * @var \Drupal\Core\Condition\ConditionLazyPluginCollection
    */
   protected $conditions;
 
   /**
-   * @param \Drupal\Core\Condition\ConditionPluginCollection $conditions
+   * @param \Drupal\Core\Condition\ConditionLazyPluginCollection $conditions
    */
-  public function __construct(ConditionPluginCollection $conditions) {
+  public function __construct(ConditionLazyPluginCollection $conditions) {
     $this->conditions = $conditions;
   }
 
diff -u b/core/modules/block/src/EventSubscriber/BlockConditionContextSubscriberBase.php b/core/modules/block/src/EventSubscriber/BlockConditionContextSubscriberBase.php
--- b/core/modules/block/src/EventSubscriber/BlockConditionContextSubscriberBase.php
+++ b/core/modules/block/src/EventSubscriber/BlockConditionContextSubscriberBase.php
@@ -18,7 +18,7 @@
 abstract class BlockConditionContextSubscriberBase implements EventSubscriberInterface {
 
   /**
-   * @var \Drupal\Core\Condition\ConditionPluginCollection
+   * @var \Drupal\Core\Condition\ConditionLazyPluginCollection
    */
   protected $conditions;
 
diff -u b/core/modules/editor/src/Entity/Editor.php b/core/modules/editor/src/Entity/Editor.php
--- b/core/modules/editor/src/Entity/Editor.php
+++ b/core/modules/editor/src/Entity/Editor.php
@@ -102,8 +102,8 @@
     parent::calculateDependencies();
     // Create a dependency on the associated FilterFormat.
     $this->addDependency('entity', $this->getFilterFormat()->getConfigDependencyName());
-    // @todo use EntityWithPluginCollectionInterface so configuration between config
-    //   entity and dependency on provider is managed automatically.
+    // @todo use EntityWithPluginCollectionInterface so configuration between
+    // config entity and dependency on provider is managed automatically.
     $definition = $this->editorPluginManager()->createInstance($this->editor)->getPluginDefinition();
     $this->addDependency('module', $definition['provider']);
     return $this->dependencies;
diff -u b/core/modules/system/core.api.php b/core/modules/system/core.api.php
--- b/core/modules/system/core.api.php
+++ b/core/modules/system/core.api.php
@@ -1163,14 +1163,14 @@
  * different title, or other plugin-specific settings. To make this possible,
  * a plugin type can make use of what's known as a plugin collection.
  *
- * A plugin collection is a class that extends \Drupal\Component\Plugin\LazyPluginCollection or
- * one of its subclasses; there are several examples in Drupal Core. If your
- * plugin type uses a plugin collection, it will usually also have a
- * configuration entity, and the entity class should implement
- * \Drupal\Core\Entity\EntityWithPluginCollectionInterface. Again,
- * there are several examples in Drupal Core; see also the
- * @link config_api Configuration API topic @endlink for more information about
- * configuration entities.
+ * A plugin collection is a class that extends
+ * \Drupal\Component\Plugin\LazyPluginCollection or one of its subclasses; there
+ * are several examples in Drupal Core. If your plugin type uses a plugin
+ * collection, it will usually also have a configuration entity, and the entity
+ * class should implement
+ * \Drupal\Core\Entity\EntityWithPluginCollectionInterface. Again, there are
+ * several examples in Drupal Core; see also the @link config_api Configuration
+ * API topic @endlink for more information about configuration entities.
  *
  * @section sec_create Creating a plugin of an existing type
  * Assuming the plugin type uses annotation-based discovery, in order to create
diff -u b/core/modules/views_ui/src/Tests/DisplayFeedTest.php b/core/modules/views_ui/src/Tests/DisplayFeedTest.php
--- b/core/modules/views_ui/src/Tests/DisplayFeedTest.php
+++ b/core/modules/views_ui/src/Tests/DisplayFeedTest.php
@@ -49,7 +49,8 @@
     $this->drupalGet('admin/structure/views');
     // Verify that the page lists the $view_name view.
     // Regression test: ViewListBuilder::getDisplayPaths() did not properly
-    // check whether a DisplayCollection was returned in iterating over all displays.
+    // check whether a DisplayCollection was returned in iterating over all
+    // displays.
     $this->assertText($view_name);
 
     // Check the attach TO interface.