diff --git a/core/config/schema/core.data_types.schema.yml b/core/config/schema/core.data_types.schema.yml
index d453573..21ec926 100644
--- a/core/config/schema/core.data_types.schema.yml
+++ b/core/config/schema/core.data_types.schema.yml
@@ -233,13 +233,13 @@ config_dependencies:
         - type: string
 
 # Human readable string that is associated with a format.
-text_with_format:
+text_format:
   type: mapping
-  label: 'Text with format'
+  label: 'Text with text format'
   mapping:
     value:
       type: text
-      label: 'Content'
+      label: 'Text'
       translatable: true
     format:
       type: string
diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module
index e2f19ee..d4a2a84 100644
--- a/core/modules/config_translation/config_translation.module
+++ b/core/modules/config_translation/config_translation.module
@@ -195,7 +195,7 @@ function config_translation_config_translation_type_info_alter(&$definitions) {
     'label' => '\Drupal\config_translation\FormElement\Textfield',
     'text' => '\Drupal\config_translation\FormElement\Textarea',
     'date_format' => '\Drupal\config_translation\FormElement\DateFormat',
-    'text_with_format' => '\Drupal\config_translation\FormElement\TextFormat',
+    'text_format' => '\Drupal\config_translation\FormElement\TextFormat',
   );
 
   // Enhance the text and date type definitions with classes to generate proper
diff --git a/core/modules/config_translation/tests/modules/config_translation_test/config/schema/config_translation_test.schema.yml b/core/modules/config_translation/tests/modules/config_translation_test/config/schema/config_translation_test.schema.yml
index 3fcaac3..757448f 100644
--- a/core/modules/config_translation/tests/modules/config_translation_test/config/schema/config_translation_test.schema.yml
+++ b/core/modules/config_translation/tests/modules/config_translation_test/config/schema/config_translation_test.schema.yml
@@ -14,5 +14,5 @@ config_translation_test.content:
       type: string
       label: 'Default language'
     content:
-      type: text_with_format
+      type: text_format
       label: 'Content'
diff --git a/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php b/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php
index 59dde52..f6c9d24 100644
--- a/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php
+++ b/core/modules/editor/lib/Drupal/editor/Tests/EditorLoadingTest.php
@@ -146,11 +146,12 @@ public function testLoading() {
     ));
 
     // The untrusted user tries to edit content that is written in a text format
-    // that (s)he is not allowed to use.
+    // that (s)he is not allowed to use. The editor is still loaded. CKEditor,
+    // for example, supports being loaded in a disabled state.
     $this->drupalGet('node/1/edit');
     list( , $editor_settings_present, $editor_js_present, $body, $format_selector) = $this->getThingsToCheck();
-    $this->assertFalse($editor_settings_present, 'No Text Editor module settings.');
-    $this->assertFalse($editor_js_present, 'No Text Editor JavaScript.');
+    $this->assertTrue($editor_settings_present, 'No Text Editor module settings.');
+    $this->assertTrue($editor_js_present, 'No Text Editor JavaScript.');
     $this->assertTrue(count($body) === 1, 'A body field exists.');
     $this->assertFieldByXPath('//textarea[@id="edit-body-0-value" and @disabled="disabled"]', t('This field has been disabled because you do not have sufficient permissions to edit it.'), 'Text format access denied message found.');
     $this->assertTrue(count($format_selector) === 0, 'No text format selector exists on the page.');