diff --git a/core/lib/Drupal/Core/Field/PrepareCacheInterface.php b/core/lib/Drupal/Core/Field/PrepareCacheInterface.php
index 85d558c..42617e0 100644
--- a/core/lib/Drupal/Core/Field/PrepareCacheInterface.php
+++ b/core/lib/Drupal/Core/Field/PrepareCacheInterface.php
@@ -29,8 +29,9 @@
    *
    * The recommended way to implement it is to provide a computed field item
    * property that can accepts setting a value through setValue(). See
-   * \Drupal\text\Plugin\Field\FieldType\TextItemBase and the corresponding
-   * computed property Drupal\text\TextProcessed for an example.
+   * \Drupal\field\Plugin\Field\FieldType\TextItemBase and the corresponding
+   * computed property Drupal\field\Plugin\Field\FieldType\TextProcessed for an
+   * example.
    */
   public function getCacheData();
 
diff --git a/core/modules/block/custom_block/custom_block.info.yml b/core/modules/block/custom_block/custom_block.info.yml
index d72d448..5330869 100644
--- a/core/modules/block/custom_block/custom_block.info.yml
+++ b/core/modules/block/custom_block/custom_block.info.yml
@@ -6,4 +6,5 @@ version: VERSION
 core: 8.x
 dependencies:
   - block
+  - field
 configure: custom_block.list
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php b/core/modules/field/lib/Drupal/field/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
index 7b73c3f..18346e7 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
@@ -16,7 +16,7 @@
  * Note: This class also contains the implementations used by the
  * 'text_summary_or_trimmed' formatter.
  *
- * @see \Drupal\text\Field\Formatter\TextSummaryOrTrimmedFormatter
+ * @see \Drupal\field\Field\FieldFormatter\TextSummaryOrTrimmedFormatter
  *
  * @FieldFormatter(
  *   id = "text_trimmed",
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextItemBase.php b/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextItemBase.php
index c8522c4..ca70b63 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextItemBase.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextItemBase.php
@@ -38,7 +38,7 @@ public function getPropertyDefinitions() {
         ->setLabel(t('Processed text'))
         ->setDescription(t('The text value with the text format applied.'))
         ->setComputed(TRUE)
-        ->setClass('\Drupal\text\TextProcessed')
+        ->setClass('\Drupal\field\Plugin\Field\FieldType\TextProcessed')
         ->setSetting('text source', 'value');
     }
     return static::$propertyDefinitions;
@@ -74,7 +74,7 @@ public function getCacheData() {
     $text_processing = $this->getSetting('text_processing');
     if (!$text_processing || filter_format_allowcache($this->get('format')->getValue())) {
       foreach ($this->getPropertyDefinitions() as $property => $definition) {
-        if ($definition->getClass() == '\Drupal\text\TextProcessed') {
+        if ($definition->getClass() == '\Drupal\field\Plugin\Field\FieldType\TextProcessed') {
           $data[$property] = $this->get($property)->getValue();
         }
       }
@@ -93,7 +93,7 @@ public function onChange($property_name) {
 
     // Unset processed properties that are affected by the change.
     foreach ($this->getPropertyDefinitions() as $property => $definition) {
-      if ($definition->getClass() == '\Drupal\text\TextProcessed') {
+      if ($definition->getClass() == '\Drupal\field\Plugin\Field\FieldType\TextProcessed') {
         if ($property_name == 'format' || ($definition->getSetting('text source') == $property_name)) {
           $this->set($property, NULL, FALSE);
         }
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextProcessed.php b/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextProcessed.php
index 74402bf..adbfd23 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextProcessed.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextProcessed.php
@@ -57,7 +57,7 @@ public function getValue($langcode = NULL) {
     }
     else {
       // Escape all HTML and retain newlines.
-      // @see \Drupal\text\Plugin\field\formatter\TextPlainFormatter
+      // @see \Drupal\field\Plugin\Field\FieldFormatter\TextPlainFormatter
       $this->processed = nl2br(check_plain($text));
     }
     return $this->processed;
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextWithSummaryItem.php b/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextWithSummaryItem.php
index 0f809a1..5d035e8 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextWithSummaryItem.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Field/FieldType/TextWithSummaryItem.php
@@ -48,7 +48,7 @@ public function getPropertyDefinitions() {
         ->setLabel(t('Processed summary text'))
         ->setDescription(t('The summary text value with the text format applied.'))
         ->setComputed(TRUE)
-        ->setClass('\Drupal\text\TextProcessed')
+        ->setClass('\Drupal\field\Plugin\Field\FieldType\TextProcessed')
         ->setSetting('text source', 'summary');
     }
     return static::$propertyDefinitions;
diff --git a/core/modules/field/lib/Drupal/field/Tests/Text/TextWithSummaryItemTest.php b/core/modules/field/lib/Drupal/field/Tests/Text/TextWithSummaryItemTest.php
index 87d98bf..58bf934 100644
--- a/core/modules/field/lib/Drupal/field/Tests/Text/TextWithSummaryItemTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/Text/TextWithSummaryItemTest.php
@@ -13,7 +13,7 @@
 use Drupal\field\Tests\FieldUnitTestBase;
 
 /**
- * Tests for \Drupal\text\Plugin\Field\FieldType\TextWithSummaryItem.
+ * Tests for \Drupal\field\Plugin\Field\FieldType\TextWithSummaryItem.
  */
 class TextWithSummaryItemTest extends FieldUnitTestBase {