diff --git a/core/modules/edit/edit.module b/core/modules/edit/edit.module
index d72e0d16231..b5caaac3b6a 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/edit/edit.module
@@ -83,7 +83,7 @@ function edit_library_info() {
       $path . '/js/models/EditorModel.js' => $options,
       // Views.
       $path . '/js/views/AppView.js' => $options,
-      $path . '/js/views/EditorDecorationView.js' => $options,
+      $path . '/js/views/FieldDecorationView.js' => $options,
       $path . '/js/views/EntityDecorationView.js' => $options,
       $path . '/js/views/EntityToolbarView.js' => $options,
       $path . '/js/views/ContextualLinkView.js' => $options,
diff --git a/core/modules/edit/js/models/FieldModel.js b/core/modules/edit/js/models/FieldModel.js
index 0b464104b5a..fc4a3dcb2f4 100644
--- a/core/modules/edit/js/models/FieldModel.js
+++ b/core/modules/edit/js/models/FieldModel.js
@@ -44,7 +44,7 @@ Drupal.edit.FieldModel = Backbone.Model.extend({
     // states in which the field is still changed.
     isChanged: false,
     // Is tracked by the EntityModel, is mirrored here solely for decorative
-    // purposes: so that EditorDecorationView.renderChanged() can react to it.
+    // purposes: so that FieldDecorationView.renderChanged() can react to it.
     inTempStore: false,
     // The full HTML representation of this field (with the element that has
     // the data-edit-field-id as the outer element). Used to propagate changes
diff --git a/core/modules/edit/js/views/AppView.js b/core/modules/edit/js/views/AppView.js
index 039f3449961..c4303801a94 100644
--- a/core/modules/edit/js/views/AppView.js
+++ b/core/modules/edit/js/views/AppView.js
@@ -261,8 +261,9 @@ Drupal.edit.AppView = Backbone.View.extend({
       fieldModel: fieldModel
     });
 
-    // Create in-place editor's toolbar — positions appropriately above the
-    // edited element.
+    // Create in-place editor's toolbar for this field — stored inside the
+    // entity toolbar, the entity toolbar will position itself appropriately
+    // above (or below) the edited element.
     var toolbarView = new Drupal.edit.FieldToolbarView({
       el: fieldToolbarRoot,
       model: fieldModel,
@@ -273,7 +274,7 @@ Drupal.edit.AppView = Backbone.View.extend({
 
     // Create decoration for edited element: padding if necessary, sets classes
     // on the element to style it according to the current state.
-    var decorationView = new Drupal.edit.EditorDecorationView({
+    var decorationView = new Drupal.edit.FieldDecorationView({
       el: $(editorView.getEditedElement()),
       model: fieldModel,
       editorView: editorView
diff --git a/core/modules/edit/js/views/EditorDecorationView.js b/core/modules/edit/js/views/FieldDecorationView.js
similarity index 99%
rename from core/modules/edit/js/views/EditorDecorationView.js
rename to core/modules/edit/js/views/FieldDecorationView.js
index 5dd63833458..4dfc403fb0c 100644
--- a/core/modules/edit/js/views/EditorDecorationView.js
+++ b/core/modules/edit/js/views/FieldDecorationView.js
@@ -7,7 +7,7 @@
 
 "use strict";
 
-Drupal.edit.EditorDecorationView = Backbone.View.extend({
+Drupal.edit.FieldDecorationView = Backbone.View.extend({
 
   _widthAttributeIsEmpty: null,