core/modules/ckeditor/js/ckeditor.js                               |    4 ++--
 core/modules/edit/edit.module                                      |    4 ++--
 .../edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php       |    2 +-
 .../modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php |    2 +-
 core/modules/editor/editor.module                                  |    2 +-
 .../modules/editor/lib/Drupal/editor/Plugin/edit/editor/Editor.php |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/modules/ckeditor/js/ckeditor.js b/core/modules/ckeditor/js/ckeditor.js
index 3568452..f7f0e0e 100644
--- a/core/modules/ckeditor/js/ckeditor.js
+++ b/core/modules/ckeditor/js/ckeditor.js
@@ -1,4 +1,4 @@
-(function (Drupal, drupalSettings, CKEDITOR, $) {
+(function (Drupal, CKEDITOR, $) {
 
 "use strict";
 
@@ -82,4 +82,4 @@ Drupal.editors.ckeditor = {
 
 };
 
-})(Drupal, drupalSettings, CKEDITOR, jQuery);
+})(Drupal, CKEDITOR, jQuery);
diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module
index ad6bce9..a6ee046 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/edit/edit.module
@@ -117,7 +117,7 @@ function edit_library_info() {
       array('system', 'drupalSettings'),
     ),
   );
-  $libraries['edit.editor.form'] = array(
+  $libraries['edit.editorWidget.form'] = array(
     'title' => '"Form" Create.js PropertyEditor widget',
     'version' => VERSION,
     'js' => array(
@@ -127,7 +127,7 @@ function edit_library_info() {
       array('edit', 'edit'),
     ),
   );
-  $libraries['edit.editor.direct'] = array(
+  $libraries['edit.editorWidget.direct'] = array(
     'title' => '"Direct" Create.js PropertyEditor widget',
     'version' => VERSION,
     'js' => array(
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php
index 0988e2d..28b86f9 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php
+++ b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php
@@ -50,7 +50,7 @@ function isCompatible(FieldInstance $instance, array $items) {
   public function getAttachments() {
     return array(
       'library' => array(
-        array('edit', 'edit.editor.direct'),
+        array('edit', 'edit.editorWidget.direct'),
       ),
     );
   }
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php
index 667e931..65ddc58 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php
+++ b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php
@@ -35,7 +35,7 @@ function isCompatible(FieldInstance $instance, array $items) {
   public function getAttachments() {
     return array(
       'library' => array(
-        array('edit', 'edit.editor.form'),
+        array('edit', 'edit.editorWidget.form'),
       ),
     );
   }
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index f0ad7fd..ff3ac55 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -79,7 +79,7 @@ function editor_library_info() {
     ),
   );
   // Create.js PropertyEditor widget library names begin with "edit.editor".
-  $libraries['edit.editor.editor'] = array(
+  $libraries['edit.editorWidget.editor'] = array(
     'title' => '"Editor" Create.js PropertyEditor widget',
     'version' => VERSION,
     'js' => array(
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/edit/editor/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/edit/editor/Editor.php
index 7bda22f..da8f189 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/edit/editor/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/edit/editor/Editor.php
@@ -92,7 +92,7 @@ public function getAttachments() {
     $attachments = $manager->getAttachments($formats);
 
     // Also include editor.module's Create.js PropertyEditor widget.
-    $attachments['library'][] = array('editor', 'edit.editor.editor');
+    $attachments['library'][] = array('editor', 'edit.editorWidget.editor');
 
     return $attachments;
   }