diff --git a/core/modules/editor/lib/Drupal/editor/EditorInterface.php b/core/modules/editor/lib/Drupal/editor/EditorInterface.php
index de69488..8bcc61e 100644
--- a/core/modules/editor/lib/Drupal/editor/EditorInterface.php
+++ b/core/modules/editor/lib/Drupal/editor/EditorInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\editor\Plugin\Core\Entity\EditPluginInterface.
+ * Contains \Drupal\editor\Plugin\Core\Entity\EditorInterface.
  */
 
 namespace Drupal\editor;
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
index 6993ed6..2a881c7 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
@@ -14,8 +14,8 @@
 /**
  * Defines a base class from which other modules providing editors may extend.
  *
- * This class provides default implementations of the EditPluginInterface so that
- * classes extending this one do not need to implement every method.
+ * This class provides default implementations of the EditorPluginInterface so
+ * that classes extending this one do not need to implement every method.
  *
  * Plugins extending this class need to define a plugin definition array through
  * annotation. These definition arrays may be altered through
@@ -38,27 +38,27 @@
 abstract class EditorBase extends PluginBase implements EditorPluginInterface {
 
   /**
-   * Implements \Drupal\editor\Plugin\EditPluginInterface::getDefaultSettings().
+   * {@inheritdoc}
    */
   public function getDefaultSettings() {
     return array();
   }
 
   /**
-   * Implements \Drupal\editor\Plugin\EditPluginInterface::settingsForm().
+   * {@inheritdoc}
    */
   public function settingsForm(array $form, array &$form_state, Editor $editor) {
     return $form;
   }
 
   /**
-   * Implements \Drupal\editor\Plugin\EditPluginInterface::settingsFormValidate().
+   * {@inheritdoc}
    */
   public function settingsFormValidate(array $form, array &$form_state) {
   }
 
   /**
-   * Implements \Drupal\editor\Plugin\EditPluginInterface::settingsFormSubmit().
+   * {@inheritdoc}
    */
   public function settingsFormSubmit(array $form, array &$form_state) {
   }
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
index c64a303..bce303b 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\editor\Plugin\EditPluginInterface.
+ * Contains \Drupal\editor\Plugin\EditorPluginInterface.
  */
 
 namespace Drupal\editor\Plugin;
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
index dafc177..fa982cc 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
@@ -10,7 +10,7 @@
 use Drupal\Component\Plugin\PluginBase;
 use Drupal\quickedit\Annotation\InPlaceEditor;
 use Drupal\Core\Annotation\Translation;
-use Drupal\quickedit\EditPluginInterface;
+use Drupal\quickedit\QuickEditPluginInterface;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
 
 /**
@@ -21,7 +21,7 @@
  *   alternativeTo = {"direct"}
  * )
  */
-class Editor extends PluginBase implements EditPluginInterface {
+class Editor extends PluginBase implements QuickEditPluginInterface {
 
   /**
    * {@inheritdoc}
@@ -65,7 +65,7 @@ protected function textFormatHasTransformationFilters($format_id) {
   }
 
   /**
-   * Implements \Drupal\quickedit\EditPluginInterface::getAttachments().
+   * {@inheritdoc}
    */
   public function getAttachments() {
     global $user;
diff --git a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php b/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
index d87a4e8..5aaf127 100644
--- a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
+++ b/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
@@ -24,14 +24,14 @@
 class UnicornEditor extends EditorBase {
 
   /**
-   * Implements \Drupal\editor\Plugin\EditPluginInterface::getDefaultSettings().
+   * {@inheritdoc}
    */
   function getDefaultSettings() {
     return array('ponies too' => TRUE);
   }
 
   /**
-   * Implements \Drupal\editor\Plugin\EditPluginInterface::settingsForm().
+   * {@inheritdoc}
    */
   function settingsForm(array $form, array &$form_state, EditorEntity $editor) {
     $form['foo'] = array('#type' => 'textfield', '#default_value' => 'bar');
@@ -39,7 +39,7 @@ function settingsForm(array $form, array &$form_state, EditorEntity $editor) {
   }
 
   /**
-   * Implements \Drupal\editor\Plugin\EditPluginInterface::getJSSettings().
+   * {@inheritdoc}
    */
   function getJSSettings(EditorEntity $editor) {
     $settings = array();
@@ -50,7 +50,7 @@ function getJSSettings(EditorEntity $editor) {
   }
 
   /**
-   * Implements \Drupal\editor\Plugin\EditPluginInterface::getLibraries().
+   * {@inheritdoc}
    */
   public function getLibraries(EditorEntity $editor) {
     return array(
diff --git a/core/modules/quickedit/js/models/FieldModel.js b/core/modules/quickedit/js/models/FieldModel.js
index 8b06521..dc81ada 100644
--- a/core/modules/quickedit/js/models/FieldModel.js
+++ b/core/modules/quickedit/js/models/FieldModel.js
@@ -19,7 +19,7 @@ Drupal.edit.FieldModel = Backbone.Model.extend({
     // A Drupal.edit.EntityModel. Its "fields" attribute, which is a
     // FieldCollection, is automatically updated to include this FieldModel.
     entity: null,
-    // This field's metadata as returned by the EditController::metadata().
+    // This field's metadata as returned by the QuickEditController::metadata().
     metadata: null,
     // Callback function for validating changes between states. Receives the
     // previous state, new state, context, and a callback
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/EditorBase.php b/core/modules/quickedit/lib/Drupal/quickedit/EditorBase.php
index a42e323..a86fcbc 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/EditorBase.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/EditorBase.php
@@ -8,13 +8,13 @@
 namespace Drupal\quickedit;
 
 use Drupal\Component\Plugin\PluginBase;
-use Drupal\quickedit\EditPluginInterface;
+use Drupal\quickedit\QuickEditPluginInterface;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
 
 /**
  * Defines a base editor implementation.
  */
-abstract class EditorBase extends PluginBase implements EditPluginInterface {
+abstract class EditorBase extends PluginBase implements QuickEditPluginInterface {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/DirectEditor.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/DirectEditor.php
index f42389a..8ef38b8 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/DirectEditor.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/DirectEditor.php
@@ -41,7 +41,7 @@ function isCompatible(FieldDefinitionInterface $field_definition, array $items)
   }
 
   /**
-   * Implements \Drupal\quickedit\EditPluginInterface::getAttachments().
+   * {@inheritdoc}
    */
   public function getAttachments() {
     return array(
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/FormEditor.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/FormEditor.php
index 74eea33..43da8c1 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/FormEditor.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/FormEditor.php
@@ -28,7 +28,7 @@ function isCompatible(FieldDefinitionInterface $field_definition, array $items)
   }
 
   /**
-   * Implements \Drupal\quickedit\EditPluginInterface::getAttachments().
+   * {@inheritdoc}
    */
   public function getAttachments() {
     return array(
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/EditController.php b/core/modules/quickedit/lib/Drupal/quickedit/QuickEditController.php
similarity index 98%
rename from core/modules/quickedit/lib/Drupal/quickedit/EditController.php
rename to core/modules/quickedit/lib/Drupal/quickedit/QuickEditController.php
index ad20f66..a1dde63 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/EditController.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/QuickEditController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\quickedit\EditController.
+ * Contains \Drupal\quickedit\QuickEditController.
  */
 
 namespace Drupal\quickedit;
@@ -24,7 +24,7 @@
 /**
  * Returns responses for Quick Edit module routes.
  */
-class EditController extends ContainerAware {
+class QuickEditController extends ContainerAware {
 
   /**
    * Stores the tempstore factory.
@@ -34,7 +34,7 @@ class EditController extends ContainerAware {
   protected $tempStoreFactory;
 
   /**
-   * Constructs a new EditController.
+   * Constructs a new QuickEditController.
    *
    * @param \Drupal\user\TempStoreFactory $temp_store_factory
    *   The factory for the temp store object.
diff --git a/core/modules/quickedit/lib/Drupal/quickedit/EditPluginInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/QuickEditPluginInterface.php
similarity index 93%
rename from core/modules/quickedit/lib/Drupal/quickedit/EditPluginInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/QuickEditPluginInterface.php
index d779687..51caa8a 100644
--- a/core/modules/quickedit/lib/Drupal/quickedit/EditPluginInterface.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/QuickEditPluginInterface.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\quickedit\EditPluginInterface.
+ * Contains \Drupal\quickedit\QuickEditPluginInterface.
  */
 
 namespace Drupal\quickedit;
@@ -16,7 +16,7 @@
  * A PropertyEditor widget is a user-facing interface to edit an entity property
  * through Create.js.
  */
-interface EditPluginInterface extends PluginInspectionInterface {
+interface QuickEditPluginInterface extends PluginInspectionInterface {
 
   /**
    * Checks whether this editor is compatible with a given field instance.
diff --git a/core/modules/quickedit/quickedit.routing.yml b/core/modules/quickedit/quickedit.routing.yml
index ac55dfa..6524327 100644
--- a/core/modules/quickedit/quickedit.routing.yml
+++ b/core/modules/quickedit/quickedit.routing.yml
@@ -1,21 +1,21 @@
 quickedit_metadata:
   pattern: '/edit/metadata'
   defaults:
-    _controller: '\Drupal\quickedit\EditController::metadata'
+    _controller: '\Drupal\quickedit\QuickEditController::metadata'
   requirements:
     _permission: 'access in-place editing'
 
 quickedit_attachments:
   pattern: '/edit/attachments'
   defaults:
-    _controller: '\Drupal\quickedit\EditController::attachments'
+    _controller: '\Drupal\quickedit\QuickEditController::attachments'
   requirements:
     _permission: 'access in-place editing'
 
 quickedit_field_form:
   pattern: '/edit/form/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
   defaults:
-    _controller: '\Drupal\quickedit\EditController::fieldForm'
+    _controller: '\Drupal\quickedit\QuickEditController::fieldForm'
   requirements:
     _permission: 'access in-place editing'
     _access_edit_entity_field: 'TRUE'
@@ -23,7 +23,7 @@ quickedit_field_form:
 quickedit_entity_save:
   pattern: '/edit/entity/{entity_type}/{entity}'
   defaults:
-    _controller: '\Drupal\quickedit\EditController::entitySave'
+    _controller: '\Drupal\quickedit\QuickEditController::entitySave'
   requirements:
     _permission: 'access in-place editing'
     _access_edit_entity: 'TRUE'
diff --git a/core/modules/quickedit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php b/core/modules/quickedit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php
index 1b89af1..1bc76b9 100644
--- a/core/modules/quickedit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php
+++ b/core/modules/quickedit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php
@@ -51,7 +51,7 @@ function getMetadata(FieldDefinitionInterface $field_definition, array $items) {
   }
 
   /**
-   * Implements \Drupal\quickedit\EditPluginInterface::getAttachments().
+   * {@inheritdoc}
    */
   public function getAttachments() {
     return array(