diff --git a/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php b/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php
index 3576744..5544eec 100644
--- a/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php
+++ b/core/lib/Drupal/Core/Entity/FieldableEntityStorageInterface.php
@@ -2,19 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface.
+ * Contains \Drupal\Core\Entity\FieldableEntityStorageInterface.
  */
 
 namespace Drupal\Core\Entity;
 
 /**
- * A storage that supports entity types with dynamic field definitions.
+ * A storage that supports entity types with field definitions.
  *
  * A storage that implements this interface can react to the entity type's field
  * definitions changing, due to modules being installed or uninstalled, or via
  * field UI, or via code changes to the entity class.
- *
- * For example, configurable fields defined and exposed by field.module.
  */
 interface FieldableEntityStorageInterface extends EntityStorageInterface {
 
diff --git a/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php b/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php
index fb9fb5b..9dc7c1f 100644
--- a/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php
+++ b/core/lib/Drupal/Core/Field/FieldModuleUninstallValidator.php
@@ -45,8 +45,8 @@ public function validate($module_name) {
     // purging.
     if ($module_name != 'field') {
       foreach ($this->entityManager->getDefinitions() as $entity_type_id => $entity_type) {
-        // We skip entity types defined by the module as there must be no content
-        // to be able to uninstall them anyway.
+        // We skip entity types defined by the module as there must be no
+        // content to be able to uninstall them anyway.
         // See \Drupal\Core\Entity\ContentUninstallValidator.
         if ($entity_type->getProvider() != $module_name && $entity_type->isSubclassOf('\Drupal\Core\Entity\FieldableEntityInterface')) {
           foreach ($this->entityManager->getFieldStorageDefinitions($entity_type_id) as $storage_definition) {