diff --git a/core/modules/edit/edit.routing.yml b/core/modules/edit/edit.routing.yml
deleted file mode 100644
index b709d0a..0000000
--- a/core/modules/edit/edit.routing.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-edit_metadata:
-  pattern: '/edit/metadata'
-  defaults:
-    _controller: '\Drupal\edit\EditController::metadata'
-  requirements:
-    _permission: 'access in-place editing'
-
-edit_attachments:
-  pattern: '/edit/attachments'
-  defaults:
-    _controller: '\Drupal\edit\EditController::attachments'
-  requirements:
-    _permission: 'access in-place editing'
-
-edit_field_form:
-  pattern: '/edit/form/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
-  defaults:
-    _controller: '\Drupal\edit\EditController::fieldForm'
-  requirements:
-    _permission: 'access in-place editing'
-    _access_edit_entity_field: 'TRUE'
-
-
-edit_entity_save:
-  pattern: '/edit/entity/{entity_type}/{entity}'
-  defaults:
-    _controller: '\Drupal\edit\EditController::entitySave'
-  requirements:
-    _permission: 'access in-place editing'
-    _access_edit_entity: 'TRUE'
diff --git a/core/modules/edit/edit.services.yml b/core/modules/edit/edit.services.yml
deleted file mode 100644
index eb8677e..0000000
--- a/core/modules/edit/edit.services.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-services:
-  plugin.manager.edit.editor:
-    class: Drupal\edit\Plugin\InPlaceEditorManager
-    arguments: ['@container.namespaces']
-  access_check.edit.entity_field:
-    class: Drupal\edit\Access\EditEntityFieldAccessCheck
-    tags:
-      - { name: access_check }
-  access_check.edit.entity:
-    class: Drupal\edit\Access\EditEntityAccessCheck
-    tags:
-      - { name: access_check }
-  edit.editor.selector:
-    class: Drupal\edit\EditorSelector
-    arguments: ['@plugin.manager.edit.editor']
-  edit.metadata.generator:
-    class: Drupal\edit\MetadataGenerator
-    arguments: ['@access_check.edit.entity_field', '@edit.editor.selector', '@plugin.manager.edit.editor']
diff --git a/core/modules/edit/tests/modules/edit_test.info.yml b/core/modules/edit/tests/modules/edit_test.info.yml
deleted file mode 100644
index 5f6e406..0000000
--- a/core/modules/edit/tests/modules/edit_test.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-name: 'Edit test'
-type: module
-description: 'Support module for the Edit module tests.'
-core: 8.x
-package: Testing
-version: VERSION
-hidden: true
diff --git a/core/modules/edit/tests/modules/edit_test.module b/core/modules/edit/tests/modules/edit_test.module
deleted file mode 100644
index d74528d..0000000
--- a/core/modules/edit/tests/modules/edit_test.module
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Helper module for the Edit tests.
- */
diff --git a/core/modules/edit/css/edit.icons.css b/core/modules/quickedit/css/quickedit.icons.css
similarity index 67%
rename from core/modules/edit/css/edit.icons.css
rename to core/modules/quickedit/css/quickedit.icons.css
index 66d4098..8f06ecb 100644
--- a/core/modules/edit/css/edit.icons.css
+++ b/core/modules/quickedit/css/quickedit.icons.css
@@ -1,23 +1,23 @@
 /**
- * @file edit.icons.css
+ * @file quickedit.icons.css
  */
 
-.edit .icon {
+.quickedit .icon {
   min-height: 1em;
   min-width: 2.5em;
   position: relative;
 }
-.edit .icon.icon-only {
+.quickedit .icon.icon-only {
   text-indent: -9999px;
 }
-.edit .icon.icon-end {
+.quickedit .icon.icon-end {
   padding-right: 2.5em; /* LTR */
 }
-[dir="rtl"] .edit .icon.icon-end {
+[dir="rtl"] .quickedit .icon.icon-end {
   padding-left: 2.5em;
   padding-right: 0;
 }
-.edit .icon:before {
+.quickedit .icon:before {
   background-attachment: scroll;
   background-color: transparent;
   background-position: center center;
@@ -30,36 +30,36 @@
   top: 0;
   width: 100%;
 }
-[dir="rtl"] .edit .icon:before {
+[dir="rtl"] .quickedit .icon:before {
   left: auto;
   right: 0;
 }
-.edit .icon-end:before {
+.quickedit .icon-end:before {
   left: auto; /* LTR */
   right: 0.5em; /* LTR */
   width: 18px;
 }
-[dir="rtl"] .edit .icon-end:before {
+[dir="rtl"] .quickedit .icon-end:before {
   left: 0.5em;
   right: auto;
 }
-.edit button.icon {
+.quickedit button.icon {
   font-size: 1em;
 }
 
 /**
  * Images.
  */
-.edit .icon-close:before {
+.quickedit .icon-close:before {
   background-image: url("../images/icon-close.png");
   background-position: center top;
   height: 12px;
   top: 10px;
 }
-.edit .icon-close:hover:before {
+.quickedit .icon-close:hover:before {
   background-image: url("../images/icon-close.png");
   background-position: center bottom;
 }
-.edit .icon-throbber:before {
+.quickedit .icon-throbber:before {
   background-image: url("../images/icon-throbber.gif");
 }
diff --git a/core/modules/edit/css/edit.module.css b/core/modules/quickedit/css/quickedit.module.css
similarity index 57%
rename from core/modules/edit/css/edit.module.css
rename to core/modules/quickedit/css/quickedit.module.css
index 195c563..f37d57f 100644
--- a/core/modules/edit/css/edit.module.css
+++ b/core/modules/quickedit/css/quickedit.module.css
@@ -1,32 +1,32 @@
 /**
- * @file edit.module.css
+ * @file quickedit.module.css
  *
- * Note: every class is prefixed with "edit-" to prevent collisions with modules
+ * Note: every class is prefixed with "quickedit-" to prevent collisions with modules
  * or themes. In IPE-specific DOM subtrees, this is not necessary.
  */
 
 /**
  * Editable.
  */
-.edit-editable {
+.quickedit-editable {
   z-index: 98;
   position: relative;
 }
-.edit-editable:focus {
+.quickedit-editable:focus {
   outline: none;
 }
 
 /**
  * Highlighted (hovered) editable.
  */
-.edit-editable.edit-highlighted {
+.quickedit-editable.quickedit-highlighted {
   z-index: 99;
 }
-.edit-validation-errors > .messages {
+.quickedit-validation-errors > .messages {
   margin-left: 0;
   margin-right: 0;
 }
-.edit-validation-errors > .messages > ul {
+.quickedit-validation-errors > .messages > ul {
   list-style: none;
   margin: 0;
   padding: 0;
@@ -35,13 +35,13 @@
 /**
  * Edit mode: modal.
  */
-#edit_modal {
+#quickedit_modal {
   z-index: 350;
   position: fixed;
   top: 40%;
   left: 40%; /* LTR */
 }
-[dir="rtl"] #edit_modal {
+[dir="rtl"] #quickedit_modal {
   left: auto;
   right: 40%;
 }
@@ -49,18 +49,18 @@
 /**
  * Edit mode: type=direct.
  */
-.edit-validation-errors {
+.quickedit-validation-errors {
   z-index: 300;
   position: relative;
 }
-.edit-validation-errors .messages.error {
+.quickedit-validation-errors .messages.error {
   position: absolute;
   top: 6px;
   left: -5px; /* LTR */
   margin: 0;
   border: none;
 }
-[dir="rtl"] .edit-validation-errors .messages.error {
+[dir="rtl"] .quickedit-validation-errors .messages.error {
   left: auto;
   right: -5px;
 }
@@ -68,46 +68,46 @@
 /**
  * Edit mode: type=form.
  */
-#edit_backstage {
+#quickedit_backstage {
   display: none;
 }
-.edit-form {
+.quickedit-form {
   position: absolute;
   z-index: 300;
   max-width: 35em;
 }
-.edit-form .placeholder {
+.quickedit-form .placeholder {
   min-height: 22px;
 }
 
 /**
  * Default form styling overrides.
  */
-.edit-form .form-wrapper .form-wrapper {
+.quickedit-form .form-wrapper .form-wrapper {
   margin: inherit;
 }
-.edit-form .form-actions {
+.quickedit-form .form-actions {
   display: none;
 }
-.edit-form input {
+.quickedit-form input {
   max-width: 100%;
 }
 
 /**
  * Entity toolbar.
  */
-.edit-toolbar-container {
+.quickedit-toolbar-container {
   max-width: 100%;
   position: absolute;
   max-width: 320px;
   width: 320px;
   z-index: 350;
 }
-.edit-toolbar-container > .edit-toolbar-pointer,
-.edit-toolbar-container > .edit-toolbar-lining {
+.quickedit-toolbar-container > .quickedit-toolbar-pointer,
+.quickedit-toolbar-container > .quickedit-toolbar-lining {
   display: none;
 }
-.edit-form-container {
+.quickedit-form-container {
   position: relative;
   padding: 0;
   border: 0;
@@ -115,16 +115,16 @@
   vertical-align: baseline;
   z-index: 100;
 }
-.edit-toolgroup.ops {
+.quickedit-toolgroup.ops {
   float: right; /* LTR */
 }
-[dir="rtl"] .edit-toolgroup.ops {
+[dir="rtl"] .quickedit-toolgroup.ops {
   float: left;
 }
-.edit-toolbar-label {
+.quickedit-toolbar-label {
   overflow: hidden;
 }
-#edit-toolbar-fence {
+#quickedit-toolbar-fence {
   bottom: 0;
   left: 0;
   right: 0;
diff --git a/core/modules/edit/css/edit.theme.css b/core/modules/quickedit/css/quickedit.theme.css
similarity index 65%
rename from core/modules/edit/css/edit.theme.css
rename to core/modules/quickedit/css/quickedit.theme.css
index efd348d..fe31fe7 100644
--- a/core/modules/edit/css/edit.theme.css
+++ b/core/modules/quickedit/css/quickedit.theme.css
@@ -1,82 +1,82 @@
 /**
- * @file edit.theme.css
+ * @file quickedit.theme.css
  */
 
 /**
  * Hide comments on entities
  */
-.edit-entity-active .comment-wrapper {
+.quickedit-entity-active .comment-wrapper {
   display: none ;
 }
 /**
  * Editable.
  */
-.edit-field.edit-editable,
-.edit-field .edit-editable {
+.quickedit-field.quickedit-editable,
+.quickedit-field .quickedit-editable {
   box-shadow: 0 0 0 2px #4d9de9;
 }
 
 /**
  * Highlighted (hovered) editable.
  */
-.edit-field.edit-highlighted,
-.edit-form.edit-highlighted,
-.edit-field .edit-highlighted {
+.quickedit-field.quickedit-highlighted,
+.quickedit-form.quickedit-highlighted,
+.quickedit-field .quickedit-highlighted {
   box-shadow: 0 0 0 2px #0199ff, 0 1px 0 3px rgba(153, 153, 153, .5);
 }
-.edit-field.edit-changed,
-.edit-form.edit-changed,
-.edit-field .edit-changed {
+.quickedit-field.quickedit-changed,
+.quickedit-form.quickedit-changed,
+.quickedit-field .quickedit-changed {
   box-shadow: 0 0 0px 2px orange, 0px 1px 0px 3px rgba(153, 153, 153, .5);
 }
-.edit-editing.edit-validation-error,
-.edit-form.edit-validation-error {
+.quickedit-editing.quickedit-validation-error,
+.quickedit-form.quickedit-validation-error {
   box-shadow: 0 0 1px 2px red, 0 0 3px 5px rgba(153, 153, 153, .5);
 }
-.edit-form .form-item .error {
+.quickedit-form .form-item .error {
   border: 1px solid #eea0a0;
 }
 
 /**
  * Default form styling overrides.
  */
-.edit-form form {
+.quickedit-form form {
   padding: 0.5em;
 }
-.edit-form .form-item {
+.quickedit-form .form-item {
   margin: 0;
 }
-.edit-form .form-wrapper {
+.quickedit-form .form-wrapper {
   margin: .5em;
 }
 
 /**
  * Animations.
  */
-.edit-animate-invisible {
+.quickedit-animate-invisible {
   opacity: 0;
 }
-.edit-animate-default {
+.quickedit-animate-default {
   -webkit-transition: all .4s ease;
   transition: all .4s ease;
 }
-.edit-animate-slow {
+.quickedit-animate-slow {
   -webkit-transition: all .6s ease;
   transition: all .6s ease;
 }
-.edit-animate-delay-veryfast {
+.quickedit-animate-delay-veryfast {
   -webkit-transition-delay: .05s;
   transition-delay: .05s;
 }
-.edit-animate-delay-fast {
+.quickedit-animate-delay-fast {
   -webkit-transition-delay: .2s;
   transition-delay: .2s;
 }
-.edit-animate-disable-width {
+.quickedit-animate-disable-width {
   -webkit-transition: width 0s;
   transition: width 0s;
 }
-.edit-animate-only-visibility {
+.quickedit-animate-only-visibility {
   -webkit-transition: opacity .2s ease;
   transition: opacity .2s ease;
 }
@@ -84,36 +84,36 @@
 /**
  * Edit mode: modal.
  */
-#edit_modal {
+#quickedit_modal {
   background-color: white;
   border: 1px solid #0199ff;
   box-shadow: 3px 3px 5px #333;
   font-family: 'Droid sans', 'Lucida Grande', sans-serif;
 }
-#edit_modal .main {
+#quickedit_modal .main {
   font-size: 130%;
   margin: 25px;
   padding-left: 40px; /* LTR */
   background: transparent url('../images/attention.png') no-repeat;
 }
-[dir="rtl"] #edit_modal .main {
+[dir="rtl"] #quickedit_modal .main {
   padding-left: 0;
   padding-right: 40px;
 }
-#edit_modal .actions {
+#quickedit_modal .actions {
   border-top: 1px solid #ddd;
   padding: 0.25em 0.2em;
   text-align: right; /* LTR */
   background: #f5f5f5;
 }
-[dir="rtl"] #edit_modal .actions {
+[dir="rtl"] #quickedit_modal .actions {
   text-align: left;
 }
 
 /**
  * Edit mode: type=direct.
  */
-.edit-validation-errors .messages.error {
+.quickedit-validation-errors .messages.error {
   box-shadow: 0 0 1px 1px red, 0 0 3px 3px rgba(153, 153, 153, .5);
   background-color: white;
 }
@@ -121,7 +121,7 @@
 /**
  * Edit mode: type=form.
  */
-.edit-form {
+.quickedit-form {
   box-shadow: 0 0 30px 4px #4f4f4f;
   background-color: white;
 }
@@ -129,7 +129,7 @@
 /**
  * Toolbars.
  */
-.edit-toolbar-container {
+.quickedit-toolbar-container {
   font-family: 'Source Sans Pro','Lucida Grande', sans-serif;
   font-size: 1.1em;
   padding-bottom: 7px;
@@ -137,7 +137,7 @@
   -webkit-transition: all 1s;
   transition: all 1s;
 }
-.edit-toolbar-container > .edit-toolbar-content {
+.quickedit-toolbar-container > .quickedit-toolbar-content {
   background-color: #45545E;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -151,7 +151,7 @@
   user-select: none;
   z-index: 2;
 }
-.edit-toolbar-container > .edit-toolbar-pointer {
+.quickedit-toolbar-container > .quickedit-toolbar-pointer {
   background-color: #45545E;
   bottom: 2px;
   box-shadow: 0px 0px 0 4px rgba(150, 150, 150, 0.5);
@@ -165,15 +165,15 @@
   width: 16px;
   z-index: 1;
 }
-[dir="rtl"] .edit-toolbar-container > .edit-toolbar-pointer {
+[dir="rtl"] .quickedit-toolbar-container > .quickedit-toolbar-pointer {
   left: auto;
   right: 18px;
 }
-.edit-toolbar-container.edit-toolbar-pointer-top > .edit-toolbar-pointer {
+.quickedit-toolbar-container.quickedit-toolbar-pointer-top > .quickedit-toolbar-pointer {
   bottom: auto;
   top: 2px;
 }
-.edit-toolbar-container > .edit-toolbar-lining {
+.quickedit-toolbar-container > .quickedit-toolbar-lining {
   bottom: 7px;
   box-shadow: 0px 1px 0px 3px rgba(150, 150, 150, 0.5);
   display: block;
@@ -184,38 +184,38 @@
   z-index: 0;
 }
 
-.edit-toolbar-label {
+.quickedit-toolbar-label {
   overflow: hidden;
   padding: 0.333em 0.5em;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 /* The toolbar; these are not necessarily visible. */
-.edit-toolbar {
+.quickedit-toolbar {
   font-family: 'Droid sans', 'Lucida Grande', sans-serif;
 }
-.edit-toolbar-entity {
+.quickedit-toolbar-entity {
   padding: 0.1667em 0.2em;
 }
 
  /**
   * Info toolgroup.
   */
-.edit-toolbar-fullwidth {
+.quickedit-toolbar-fullwidth {
   width: 100%;
 }
-.edit-toolgroup.wysiwyg-floated {
+.quickedit-toolgroup.wysiwyg-floated {
   float: right; /* LTR */
 }
-[dir="rtl"] .edit-toolgroup.wysiwyg-floated {
+[dir="rtl"] .quickedit-toolgroup.wysiwyg-floated {
   float: left;
 }
-.edit-toolgroup.wysiwyg-main {
+.quickedit-toolgroup.wysiwyg-main {
   clear: both;
   width: 100%;
   padding-left: 0; /* LTR */
 }
-[dir="rtl"] .edit-toolgroup.wysiwyg-main {
+[dir="rtl"] .quickedit-toolgroup.wysiwyg-main {
   padding-left: 0;
   padding-right: 0;
 }
@@ -223,7 +223,7 @@
 /**
  * Buttons.
  */
-.edit-button {
+.quickedit-button {
   background-color: #e4e4e4;
   border: 1px solid #d2d2d2;
   color: #5a5a5a;
@@ -235,33 +235,33 @@
   -webkit-transition: all .1s ease;
   transition: all .1s ease;
 }
-.edit-button[aria-hidden="true"] {
+.quickedit-button[aria-hidden="true"] {
   visibility: hidden;
   opacity: 0;
 }
-.edit-button + .edit-button {
+.quickedit-button + .quickedit-button {
   margin-left: 0.2em; /* LTR */
 }
-[dir="rtl"] .edit-button + .edit-button {
+[dir="rtl"] .quickedit-button + .quickedit-button {
   margin-left: auto;
   margin-right: 0.25em;
 }
 /* Button with icons. */
-.edit-button:hover,
-.edit-button:active {
+.quickedit-button:hover,
+.quickedit-button:active {
   background-color: #c8c8c8;
   border: 1px solid #a0a0a0;
   color: #2e2e2e;
 }
-.edit-toolbar-container .edit-button.action-cancel {
+.quickedit-toolbar-container .quickedit-button.action-cancel {
   background-color: transparent;
   border: 1px solid transparent;
 }
-.edit-toolbar-container .edit-button.action-cancel:hover {
+.quickedit-toolbar-container .quickedit-button.action-cancel:hover {
   background-color: transparent;
   border: 1px solid #686868;
 }
-.edit-button.action-save {
+.quickedit-button.action-save {
   color: white;
   background-color: #50a0e9;
   background-image: -moz-linear-gradient(-90deg, #50a0e9, #4481dc);
@@ -270,14 +270,14 @@
   background-image: linear-gradient(180deg, #50a0e9, #4481dc);
   border: 1px solid transparent;
 }
-.edit-button.action-save:hover,
-.edit-button.action-save:active {
+.quickedit-button.action-save:hover,
+.quickedit-button.action-save:active {
   border: 1px solid #a0a0a0;
   color: white;
 }
-.edit-button.action-saving,
-.edit-button.action-saving:hover,
-.edit-button.action-saving:active {
+.quickedit-button.action-saving,
+.quickedit-button.action-saving:hover,
+.quickedit-button.action-saving:active {
   background-color: #e4e4e4;
   background-image: none;
   border-color: #d2d2d2;
diff --git a/core/modules/edit/images/attention.png b/core/modules/quickedit/images/attention.png
similarity index 100%
rename from core/modules/edit/images/attention.png
rename to core/modules/quickedit/images/attention.png
diff --git a/core/modules/edit/images/icon-close.png b/core/modules/quickedit/images/icon-close.png
similarity index 100%
rename from core/modules/edit/images/icon-close.png
rename to core/modules/quickedit/images/icon-close.png
diff --git a/core/modules/edit/images/icon-throbber.gif b/core/modules/quickedit/images/icon-throbber.gif
similarity index 100%
rename from core/modules/edit/images/icon-throbber.gif
rename to core/modules/quickedit/images/icon-throbber.gif
diff --git a/core/modules/edit/js/editors/directEditor.js b/core/modules/quickedit/js/editors/directEditor.js
similarity index 94%
rename from core/modules/edit/js/editors/directEditor.js
rename to core/modules/quickedit/js/editors/directEditor.js
index 5fed240..670b0c7 100644
--- a/core/modules/edit/js/editors/directEditor.js
+++ b/core/modules/quickedit/js/editors/directEditor.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-Drupal.edit.editors.direct = Drupal.edit.EditorView.extend({
+Drupal.quickedit.editors.direct = Drupal.quickedit.EditorView.extend({
 
   // Stores the textual DOM element that is being in-place edited.
   $textElement: null,
@@ -15,7 +15,7 @@ Drupal.edit.editors.direct = Drupal.edit.EditorView.extend({
    * {@inheritdoc}
    */
   initialize: function (options) {
-    Drupal.edit.EditorView.prototype.initialize.call(this, options);
+    Drupal.quickedit.EditorView.prototype.initialize.call(this, options);
 
     var editorModel = this.model;
     var fieldModel = this.fieldModel;
diff --git a/core/modules/edit/js/editors/formEditor.js b/core/modules/quickedit/js/editors/formEditor.js
similarity index 89%
rename from core/modules/edit/js/editors/formEditor.js
rename to core/modules/quickedit/js/editors/formEditor.js
index 27069b8..a06e24d 100644
--- a/core/modules/edit/js/editors/formEditor.js
+++ b/core/modules/quickedit/js/editors/formEditor.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
+Drupal.quickedit.editors.form = Drupal.quickedit.EditorView.extend({
 
   // Tracks the form container DOM element that is used while in-place editing.
   $formContainer: null,
@@ -58,7 +58,7 @@ Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
     var fieldModel = this.fieldModel;
 
     // Generate a DOM-compatible ID for the form container DOM element.
-    var id = 'edit-form-for-' + fieldModel.id.replace(/\//g, '_');
+    var id = 'quickedit-form-for-' + fieldModel.id.replace(/\//g, '_');
 
     // Render form container.
     var $formContainer = this.$formContainer = $(Drupal.theme('editFormContainer', {
@@ -66,8 +66,8 @@ Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
       loadingMsg: Drupal.t('Loading…')}
     ));
     $formContainer
-      .find('.edit-form')
-      .addClass('edit-editable edit-highlighted edit-editing')
+      .find('.quickedit-form')
+      .addClass('quickedit-editable quickedit-highlighted quickedit-editing')
       .attr('role', 'dialog');
 
     // Insert form container in DOM.
@@ -94,7 +94,7 @@ Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
       // for an entity that this needs to happen: precisely now!
       reset: !fieldModel.get('entity').get('inTempStore')
     };
-    Drupal.edit.util.form.load(formOptions, function (form, ajax) {
+    Drupal.quickedit.util.form.load(formOptions, function (form, ajax) {
       Drupal.AjaxCommands.prototype.insert(ajax, {
         data: form,
         selector: '#' + id + ' .placeholder'
@@ -149,17 +149,17 @@ Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
    */
   save: function () {
     var $formContainer = this.$formContainer;
-    var $submit = $formContainer.find('.edit-form-submit');
+    var $submit = $formContainer.find('.quickedit-form-submit');
     var editorModel = this.model;
     var fieldModel = this.fieldModel;
 
     function cleanUpAjax () {
-      Drupal.edit.util.form.unajaxifySaving(formSaveAjax);
+      Drupal.quickedit.util.form.unajaxifySaving(formSaveAjax);
       formSaveAjax = null;
     }
 
     // Create an AJAX object for the form associated with the field.
-    var formSaveAjax = Drupal.edit.util.form.ajaxifySaving({
+    var formSaveAjax = Drupal.quickedit.util.form.ajaxifySaving({
       nocssjs: false
     }, $submit);
 
@@ -179,7 +179,7 @@ Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
       fieldModel.set('state', 'invalid');
     };
 
-    // The edit_field_form AJAX command is called upon attempting to save
+    // The quickedit_field_form AJAX command is called upon attempting to save
     // the form; Form API will mark which form items have errors, if any. This
     // command is invoked only if validation errors exist and then it runs
     // before editFieldFormValidationErrors().
@@ -200,8 +200,8 @@ Drupal.edit.editors.form = Drupal.edit.EditorView.extend({
    */
   showValidationErrors: function () {
     this.$formContainer
-      .find('.edit-form')
-      .addClass('edit-validation-error')
+      .find('.quickedit-form')
+      .addClass('quickedit-validation-error')
       .find('form')
       .prepend(this.model.get('validationErrors'));
   }
diff --git a/core/modules/edit/js/models/AppModel.js b/core/modules/quickedit/js/models/AppModel.js
similarity index 84%
rename from core/modules/edit/js/models/AppModel.js
rename to core/modules/quickedit/js/models/AppModel.js
index 2489949..2c75ddc 100644
--- a/core/modules/edit/js/models/AppModel.js
+++ b/core/modules/quickedit/js/models/AppModel.js
@@ -2,7 +2,7 @@
 
 "use strict";
 
-Drupal.edit.AppModel = Backbone.Model.extend({
+Drupal.quickedit.AppModel = Backbone.Model.extend({
   defaults: {
     highlightedEditor: null,
     activeEditor: null,
diff --git a/core/modules/edit/js/models/EditorModel.js b/core/modules/quickedit/js/models/EditorModel.js
similarity index 90%
rename from core/modules/edit/js/models/EditorModel.js
rename to core/modules/quickedit/js/models/EditorModel.js
index bb48c0a..0fc2b3d 100644
--- a/core/modules/edit/js/models/EditorModel.js
+++ b/core/modules/quickedit/js/models/EditorModel.js
@@ -5,7 +5,7 @@
 /**
  * State of an in-place editor.
  */
-Drupal.edit.EditorModel = Backbone.Model.extend({
+Drupal.quickedit.EditorModel = Backbone.Model.extend({
 
   defaults: {
     // Not the full HTML representation of this field, but the "actual"
diff --git a/core/modules/edit/js/models/EntityModel.js b/core/modules/quickedit/js/models/EntityModel.js
similarity index 93%
rename from core/modules/edit/js/models/EntityModel.js
rename to core/modules/quickedit/js/models/EntityModel.js
index a4d101f..974757e 100644
--- a/core/modules/edit/js/models/EntityModel.js
+++ b/core/modules/quickedit/js/models/EntityModel.js
@@ -5,7 +5,7 @@
 /**
  * State of an in-place editable entity in the DOM.
  */
-Drupal.edit.EntityModel = Backbone.Model.extend({
+Drupal.quickedit.EntityModel = Backbone.Model.extend({
 
   defaults: {
     // The DOM element that represents this entity. It may seem bizarre to
@@ -16,7 +16,7 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
     id: null,
     // The label of the entity.
     label: null,
-    // A Drupal.edit.FieldCollection for all fields of this entity.
+    // A Drupal.quickedit.FieldCollection for all fields of this entity.
     fields: null,
 
     // The attributes below are stateful. The ones above will never change
@@ -51,7 +51,7 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
    * @inheritdoc
    */
   initialize: function () {
-    this.set('fields', new Drupal.edit.FieldCollection());
+    this.set('fields', new Drupal.quickedit.FieldCollection());
 
     // Respond to entity state changes.
     this.on('change:state', this.stateChange, this);
@@ -64,9 +64,9 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
   /**
    * Updates FieldModels' states when an EntityModel change occurs.
    *
-   * @param Drupal.edit.EntityModel entityModel
+   * @param Drupal.quickedit.EntityModel entityModel
    * @param String state
-   *   The state of the associated entity. One of Drupal.edit.EntityModel.states.
+   *   The state of the associated entity. One of Drupal.quickedit.EntityModel.states.
    * @param Object options
    */
   stateChange: function (entityModel, state, options) {
@@ -100,7 +100,7 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
         // committing.
         this.get('fields').chain()
           .filter(function (fieldModel) {
-            return _.intersection([fieldModel.get('state')], Drupal.edit.app.fieldReadyStates).length;
+            return _.intersection([fieldModel.get('state')], Drupal.quickedit.app.fieldReadyStates).length;
           })
           .each(function (fieldModel) {
             fieldModel.trigger('change:state', fieldModel, fieldModel.get('state'), options);
@@ -117,7 +117,7 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
         // stored in TempStore.
         this.get('fields').chain()
           .filter(function (fieldModel) {
-            return _.intersection([fieldModel.get('state')], Drupal.edit.app.changedEditorStates).length;
+            return _.intersection([fieldModel.get('state')], Drupal.quickedit.app.changedEditorStates).length;
           })
           .each(function (fieldModel) {
             fieldModel.set('state', 'saving');
@@ -144,7 +144,7 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
           this.set('state', 'opened', {confirming: true});
           // An action in reaction to state change must be deferred.
           _.defer(function () {
-            Drupal.edit.app.confirmEntityDeactivation(entityModel);
+            Drupal.quickedit.app.confirmEntityDeactivation(entityModel);
           });
         }
         else {
@@ -187,10 +187,10 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
   /**
    * Reacts to state changes in this entity's fields.
    *
-   * @param Drupal.edit.FieldModel fieldModel
+   * @param Drupal.quickedit.FieldModel fieldModel
    *   The model of the field whose state property changed.
    * @param String state
-   *   The state of the associated field. One of Drupal.edit.FieldModel.states.
+   *   The state of the associated field. One of Drupal.quickedit.FieldModel.states.
    */
   fieldStateChange: function (fieldModel, state) {
     var entityModel = this;
@@ -220,7 +220,7 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
         // A state change in reaction to another state change must be deferred.
         _.defer(function () {
           entityModel.set('state', 'opened', {
-            'accept-field-states': Drupal.edit.app.fieldReadyStates
+            'accept-field-states': Drupal.quickedit.app.fieldReadyStates
           });
         });
         break;
@@ -279,7 +279,7 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
         // Attempt to save the entity. If the entity's fields are not yet all in
         // a ready state, the save will not be processed.
         var options = {
-          'accept-field-states': Drupal.edit.app.fieldReadyStates
+          'accept-field-states': Drupal.quickedit.app.fieldReadyStates
         };
         if (entityModel.set('isCommitting', true, options)) {
           entityModel.save({
@@ -299,7 +299,7 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
         // A state change in reaction to another state change must be deferred.
         _.defer(function() {
           entityModel.set('state', 'closing', {
-            'accept-field-states': Drupal.edit.app.fieldReadyStates
+            'accept-field-states': Drupal.quickedit.app.fieldReadyStates
           });
         });
         break;
@@ -330,19 +330,19 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
 
     // @todo Simplify this once https://drupal.org/node/1533366 lands.
     // @see https://drupal.org/node/2029999.
-    var id = 'edit-save-entity';
+    var id = 'quickedit-save-entity';
     // Create a temporary element to be able to use Drupal.ajax.
-    var $el = $('#edit-entity-toolbar').find('.action-save'); // This is the span element inside the button.
+    var $el = $('#quickedit-entity-toolbar').find('.action-save'); // This is the span element inside the button.
     // Create a Drupal.ajax instance to save the entity.
     var entitySaverAjax = new Drupal.ajax(id, $el, {
-      url: Drupal.url('edit/entity/' + entityModel.id),
-      event: 'edit-save.edit',
+      url: Drupal.url('quickedit/entity/' + entityModel.id),
+      event: 'quickedit-save.edit',
       progress: { type: 'none' }
     });
     // Entity saved successfully.
     entitySaverAjax.commands.editEntitySaved = function(ajax, response, status) {
       // Clean up.
-      $(ajax.element).off('edit-save.edit');
+      $(ajax.element).off('quickedit-save.edit');
       // All fields have been moved from TempStore to permanent storage, update
       // the "inTempStore" attribute on FieldModels, on the EntityModel and
       // clear EntityModel's "fieldInTempStore" attribute.
@@ -359,7 +359,7 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
     };
     // Trigger the AJAX request, which will will return the editEntitySaved AJAX
     // command to which we then react.
-    $el.trigger('edit-save.edit');
+    $el.trigger('quickedit-save.edit');
   },
 
   /**
@@ -554,9 +554,9 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
    * Indicates whether the 'from' state comes before the 'to' state.
    *
    * @param String from
-   *   One of Drupal.edit.EntityModel.states.
+   *   One of Drupal.quickedit.EntityModel.states.
    * @param String to
-   *   One of Drupal.edit.EntityModel.states.
+   *   One of Drupal.quickedit.EntityModel.states.
    * @return Boolean
    */
   followsStateSequence: function (from, to) {
@@ -565,8 +565,8 @@ Drupal.edit.EntityModel = Backbone.Model.extend({
 
 });
 
-Drupal.edit.EntityCollection = Backbone.Collection.extend({
-  model: Drupal.edit.EntityModel
+Drupal.quickedit.EntityCollection = Backbone.Collection.extend({
+  model: Drupal.quickedit.EntityModel
 });
 
 }(_, jQuery, Backbone, Drupal));
diff --git a/core/modules/edit/js/models/FieldModel.js b/core/modules/quickedit/js/models/FieldModel.js
similarity index 93%
rename from core/modules/edit/js/models/FieldModel.js
rename to core/modules/quickedit/js/models/FieldModel.js
index 8b06521..a1c0300 100644
--- a/core/modules/edit/js/models/FieldModel.js
+++ b/core/modules/quickedit/js/models/FieldModel.js
@@ -5,7 +5,7 @@
 /**
  * State of an in-place editable field in the DOM.
  */
-Drupal.edit.FieldModel = Backbone.Model.extend({
+Drupal.quickedit.FieldModel = Backbone.Model.extend({
 
   defaults: {
     // The DOM element that represents this field. It may seem bizarre to have
@@ -16,7 +16,7 @@ Drupal.edit.FieldModel = Backbone.Model.extend({
     // "<entity type>/<id>/<field name>/<language>/<view mode>", e.g.
     // "node/1/field_tags/und/full".
     id: null,
-    // A Drupal.edit.EntityModel. Its "fields" attribute, which is a
+    // A Drupal.quickedit.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().
@@ -29,7 +29,7 @@ Drupal.edit.FieldModel = Backbone.Model.extend({
     // during the life of a FieldModel instance.
 
     // In-place editing state of this field. Defaults to the initial state.
-    // Possible values: @see Drupal.edit.FieldModel.states.
+    // Possible values: @see Drupal.quickedit.FieldModel.states.
     state: 'inactive',
     // The field is currently in the 'changed' state or one of the following
     // states in which the field is still changed.
@@ -38,7 +38,7 @@ Drupal.edit.FieldModel = Backbone.Model.extend({
     // purposes: so that EditorDecorationView.renderChanged() can react to it.
     inTempStore: false,
     // The full HTML representation of this field (with the element that has
-    // the data-edit-id as the outer element). Used to propagate changes from
+    // the data-quickedit-id as the outer element). Used to propagate changes from
     // this field instance to other instances of the same field.
     html: null
   },
@@ -183,9 +183,9 @@ Drupal.edit.FieldModel = Backbone.Model.extend({
    * Indicates whether the 'from' state comes before the 'to' state.
    *
    * @param String from
-   *   One of Drupal.edit.FieldModel.states.
+   *   One of Drupal.quickedit.FieldModel.states.
    * @param String to
-   *   One of Drupal.edit.FieldModel.states.
+   *   One of Drupal.quickedit.FieldModel.states.
    * @return Boolean
    */
   followsStateSequence: function (from, to) {
@@ -194,8 +194,8 @@ Drupal.edit.FieldModel = Backbone.Model.extend({
 
 });
 
-Drupal.edit.FieldCollection = Backbone.Collection.extend({
-  model: Drupal.edit.FieldModel
+Drupal.quickedit.FieldCollection = Backbone.Collection.extend({
+  model: Drupal.quickedit.FieldModel
 });
 
 }(_, Backbone, Drupal));
diff --git a/core/modules/edit/js/edit.js b/core/modules/quickedit/js/quickedit.js
similarity index 80%
rename from core/modules/edit/js/edit.js
rename to core/modules/quickedit/js/quickedit.js
index 498865e..4b3ce0a 100644
--- a/core/modules/edit/js/edit.js
+++ b/core/modules/quickedit/js/quickedit.js
@@ -1,6 +1,6 @@
 /**
  * @file
- * Attaches behavior for the Edit module.
+ * Attaches behavior for the Quick Edit module.
  *
  * Everything happens asynchronously, to allow for:
  *   - dynamically rendered contextual links
@@ -24,7 +24,7 @@ var options = $.extend({
   strings: {
     quickEdit: Drupal.t('Quick edit')
   }
-}, drupalSettings.edit);
+}, drupalSettings.quickedit);
 
 /**
  * Tracks fields without metadata. Contains objects with the following keys:
@@ -51,17 +51,17 @@ var fieldsAvailableQueue = [];
  */
 var contextualLinksQueue = [];
 
-Drupal.behaviors.edit = {
+Drupal.behaviors.quickedit = {
   attach: function (context) {
-    // Initialize the Edit app once per page load.
-    $('body').once('edit-init', initEdit);
+    // Initialize the Quick Edit app once per page load.
+    $('body').once('quickedit-init', initEdit);
 
     // Process each field element: queue to be used or to fetch metadata.
     // When a field is being rerendered after editing, it will be processed
     // immediately. New fields will be unable to be processed immediately, but
     // will instead be queued to have their metadata fetched, which occurs below
     // in fetchMissingMetaData().
-    $(context).find('[data-edit-id]').once('edit').each(function (index, fieldElement) {
+    $(context).find('[data-quickedit-id]').once('edit').each(function (index, fieldElement) {
       processField(fieldElement);
     });
 
@@ -83,14 +83,14 @@ Drupal.behaviors.edit = {
   }
 };
 
-Drupal.edit = {
-  // A Drupal.edit.AppView instance.
+Drupal.quickedit = {
+  // A Drupal.quickedit.AppView instance.
   app: null,
 
   collections: {
-    // All in-place editable entities (Drupal.edit.EntityModel) on the page.
+    // All in-place editable entities (Drupal.quickedit.EntityModel) on the page.
     entities: null,
-    // All in-place editable fields (Drupal.edit.FieldModel) on the page.
+    // All in-place editable fields (Drupal.quickedit.FieldModel) on the page.
     fields: null
   },
 
@@ -112,13 +112,13 @@ Drupal.edit = {
 };
 
 /**
- * Detect contextual links on entities annotated by Edit; queue these to be
+ * Detect contextual links on entities annotated by Quick Edit; queue these to be
  * processed.
  */
 $(document).on('drupalContextualLinkAdded', function (event, data) {
-  if (data.$region.is('[data-edit-entity]')) {
+  if (data.$region.is('[data-quickedit-entity]')) {
     var contextualLink = {
-      entityID: data.$region.attr('data-edit-entity'),
+      entityID: data.$region.attr('data-quickedit-entity'),
       el: data.$el[0],
       region: data.$region[0]
     };
@@ -143,22 +143,22 @@ function extractEntityID (fieldID) {
 }
 
 /**
- * Initialize the Edit app.
+ * Initialize the Quick Edit app.
  *
  * @param DOM bodyElement
  *   This document's body element.
  */
 function initEdit (bodyElement) {
-  Drupal.edit.collections.entities = new Drupal.edit.EntityCollection();
-  Drupal.edit.collections.fields = new Drupal.edit.FieldCollection();
+  Drupal.quickedit.collections.entities = new Drupal.quickedit.EntityCollection();
+  Drupal.quickedit.collections.fields = new Drupal.quickedit.FieldCollection();
 
   // Instantiate AppModel (application state) and AppView, which is the
   // controller of the whole in-place editing experience.
-  Drupal.edit.app = new Drupal.edit.AppView({
+  Drupal.quickedit.app = new Drupal.quickedit.AppView({
     el: bodyElement,
-    model: new Drupal.edit.AppModel(),
-    entitiesCollection: Drupal.edit.collections.entities,
-    fieldsCollection: Drupal.edit.collections.fields
+    model: new Drupal.quickedit.AppModel(),
+    entitiesCollection: Drupal.quickedit.collections.entities,
+    fieldsCollection: Drupal.quickedit.collections.fields
   });
 }
 
@@ -166,11 +166,11 @@ function initEdit (bodyElement) {
  * Fetch the field's metadata; queue or initialize it (if EntityModel exists).
  *
  * @param DOM fieldElement
- *   A Drupal Field API field's DOM element with a data-edit-id attribute.
+ *   A Drupal Field API field's DOM element with a data-quickedit-id attribute.
  */
 function processField (fieldElement) {
-  var metadata = Drupal.edit.metadata;
-  var fieldID = fieldElement.getAttribute('data-edit-id');
+  var metadata = Drupal.quickedit.metadata;
+  var fieldID = fieldElement.getAttribute('data-quickedit-id');
   var entityID = extractEntityID(fieldID);
 
   // Early-return if metadata for this field is missing.
@@ -189,7 +189,7 @@ function processField (fieldElement) {
 
   // If an EntityModel for this field already exists (and hence also a "Quick
   // edit" contextual link), then initialize it immediately.
-  if (Drupal.edit.collections.entities.where({ id: entityID }).length > 0) {
+  if (Drupal.quickedit.collections.entities.where({ id: entityID }).length > 0) {
     initializeField(fieldElement, fieldID);
   }
   // Otherwise: queue the field. It is now available to be set up when its
@@ -209,21 +209,21 @@ function processField (fieldElement) {
  */
 function initializeField (fieldElement, fieldID) {
   var entityId = extractEntityID(fieldID);
-  var entity = Drupal.edit.collections.entities.where({ id: entityId })[0];
+  var entity = Drupal.quickedit.collections.entities.where({ id: entityId })[0];
 
-  $(fieldElement).addClass('edit-field');
+  $(fieldElement).addClass('quickedit-field');
 
   // The FieldModel stores the state of an in-place editable entity field.
-  var field = new Drupal.edit.FieldModel({
+  var field = new Drupal.quickedit.FieldModel({
     el: fieldElement,
     id: fieldID,
     entity: entity,
-    metadata: Drupal.edit.metadata.get(fieldID),
-    acceptStateChange: _.bind(Drupal.edit.app.acceptEditorStateChange, Drupal.edit.app)
+    metadata: Drupal.quickedit.metadata.get(fieldID),
+    acceptStateChange: _.bind(Drupal.quickedit.app.acceptEditorStateChange, Drupal.quickedit.app)
   });
 
   // Track all fields on the page.
-  Drupal.edit.collections.fields.add(field);
+  Drupal.quickedit.collections.fields.add(field);
 }
 
 /**
@@ -241,11 +241,11 @@ function fetchMissingMetadata (callback) {
     var fieldElementsWithoutMetadata = _.pluck(fieldsMetadataQueue, 'el');
     var entityIDs = _.uniq(_.pluck(fieldsMetadataQueue, 'entityID'), true);
     // Ensure we only request entityIDs for which we don't have metadata yet.
-    entityIDs = _.difference(entityIDs, _.keys(Drupal.edit.metadata.data));
+    entityIDs = _.difference(entityIDs, _.keys(Drupal.quickedit.metadata.data));
     fieldsMetadataQueue = [];
 
     $.ajax({
-      url: Drupal.url('edit/metadata'),
+      url: Drupal.url('quickedit/metadata'),
       type: 'POST',
       data: {
         'fields[]': fieldIDs,
@@ -255,7 +255,7 @@ function fetchMissingMetadata (callback) {
       success: function(results) {
         // Store the metadata.
         _.each(results, function (fieldMetadata, fieldID) {
-          Drupal.edit.metadata.add(fieldID, fieldMetadata);
+          Drupal.quickedit.metadata.add(fieldID, fieldMetadata);
         });
 
         callback(fieldElementsWithoutMetadata);
@@ -275,11 +275,11 @@ function fetchMissingMetadata (callback) {
  *   have been inserted into the DOM. i.e. they may still be loading.
  */
 function loadMissingEditors (callback) {
-  var loadedEditors = _.keys(Drupal.edit.editors);
+  var loadedEditors = _.keys(Drupal.quickedit.editors);
   var missingEditors = [];
-  Drupal.edit.collections.fields.each(function (fieldModel) {
+  Drupal.quickedit.collections.fields.each(function (fieldModel) {
     var id = fieldModel.id;
-    var metadata = Drupal.edit.metadata.get(id);
+    var metadata = Drupal.quickedit.metadata.get(id);
     if (metadata.access && _.indexOf(loadedEditors, metadata.editor) === -1) {
       missingEditors.push(metadata.editor);
     }
@@ -291,13 +291,13 @@ function loadMissingEditors (callback) {
 
   // @todo Simplify this once https://drupal.org/node/1533366 lands.
   // @see https://drupal.org/node/2029999.
-  var id = 'edit-load-editors';
+  var id = 'quickedit-load-editors';
   // Create a temporary element to be able to use Drupal.ajax.
   var $el = $('<div id="' + id + '" class="element-hidden"></div>').appendTo('body');
   // Create a Drupal.ajax instance to load the form.
   var loadEditorsAjax = new Drupal.ajax(id, $el, {
-    url: Drupal.url('edit/attachments'),
-    event: 'edit-internal.edit',
+    url: Drupal.url('quickedit/attachments'),
+    event: 'quickedit-internal.edit',
     submit: { 'editors[]': missingEditors },
     // No progress indicator.
     progress: { type: null }
@@ -308,12 +308,12 @@ function loadMissingEditors (callback) {
   loadEditorsAjax.commands.insert = function (ajax, response, status) {
     _.defer(callback);
     realInsert(ajax, response, status);
-    $el.off('edit-internal.edit');
+    $el.off('quickedit-internal.edit');
     $el.remove();
   };
   // Trigger the AJAX request, which will should return AJAX commands to insert
   // any missing attachments.
-  $el.trigger('edit-internal.edit');
+  $el.trigger('quickedit-internal.edit');
 }
 
 /**
@@ -321,7 +321,7 @@ function loadMissingEditors (callback) {
  *
  * @param Object contextualLink
  *   An object with the following properties:
- *     - String entity: an Edit entity identifier, e.g. "node/1" or
+ *     - String entity: a Quick Edit entity identifier, e.g. "node/1" or
  *       "custom_block/5".
  *     - DOM el: element pointing to the contextual links placeholder for this
  *       entity.
@@ -334,7 +334,7 @@ function loadMissingEditors (callback) {
  *   Returns false otherwise.
  */
 function initializeEntityContextualLink (contextualLink) {
-  var metadata = Drupal.edit.metadata;
+  var metadata = Drupal.quickedit.metadata;
   // Check if the user has permission to edit at least one of them.
   function hasFieldWithPermission (fieldIDs) {
     for (var i = 0; i < fieldIDs.length; i++) {
@@ -363,14 +363,14 @@ function initializeEntityContextualLink (contextualLink) {
   // the current user may edit in-place; instantiate EntityModel, EntityView and
   // ContextualLinkView.
   else if (hasFieldWithPermission(fieldIDs)) {
-    var entityModel = new Drupal.edit.EntityModel({
+    var entityModel = new Drupal.quickedit.EntityModel({
       el: contextualLink.region,
       id: contextualLink.entityID,
-      label: Drupal.edit.metadata.get(contextualLink.entityID, 'label')
+      label: Drupal.quickedit.metadata.get(contextualLink.entityID, 'label')
     });
-    Drupal.edit.collections.entities.add(entityModel);
+    Drupal.quickedit.collections.entities.add(entityModel);
     // Create an EntityView associated with the root DOM node of the entity.
-    var entityView = new Drupal.edit.EntityView({
+    var entityView = new Drupal.quickedit.EntityView({
       el: contextualLink.region,
       model: entityModel
     });
@@ -385,10 +385,10 @@ function initializeEntityContextualLink (contextualLink) {
     // Set up contextual link view after loading any missing in-place editors.
     loadMissingEditors(function () {
       var $links = $(contextualLink.el).find('.contextual-links');
-      var contextualLinkView = new Drupal.edit.ContextualLinkView($.extend({
+      var contextualLinkView = new Drupal.quickedit.ContextualLinkView($.extend({
         el: $('<li class="quick-edit"><a href=""></a></li>').prependTo($links),
         model: entityModel,
-        appModel: Drupal.edit.app.model
+        appModel: Drupal.quickedit.app.model
       }, options));
       entityModel.set('contextualLinkView', contextualLinkView);
     });
@@ -421,11 +421,11 @@ function initializeEntityContextualLink (contextualLink) {
  *   The context within which to delete.
  */
 function deleteContainedModelsAndQueues($context) {
-  $context.find('[data-edit-entity]').addBack('[data-edit-entity]').each(function (index, entityElement) {
+  $context.find('[data-quickedit-entity]').addBack('[data-quickedit-entity]').each(function (index, entityElement) {
     // Delete entity model.
     // @todo change to findWhere() as soon as we have Backbone 1.0 in Drupal
     // core. @see https://drupal.org/node/1800022
-    var entityModels = Drupal.edit.collections.entities.where({el: entityElement});
+    var entityModels = Drupal.quickedit.collections.entities.where({el: entityElement});
     if (entityModels.length) {
       var contextualLinkView = entityModels[0].get('contextualLinkView');
       contextualLinkView.undelegateEvents();
@@ -443,9 +443,9 @@ function deleteContainedModelsAndQueues($context) {
     contextualLinksQueue = _.filter(contextualLinksQueue, hasOtherRegion);
   });
 
-  $context.find('[data-edit-id]').addBack('[data-edit-id]').each(function (index, fieldElement) {
+  $context.find('[data-quickedit-id]').addBack('[data-quickedit-id]').each(function (index, fieldElement) {
     // Delete field models.
-    Drupal.edit.collections.fields.chain()
+    Drupal.quickedit.collections.fields.chain()
       .filter(function (fieldModel) { return fieldModel.get('el') === fieldElement; })
       .invoke('destroy');
 
diff --git a/core/modules/edit/js/theme.js b/core/modules/quickedit/js/theme.js
similarity index 71%
rename from core/modules/edit/js/theme.js
rename to core/modules/quickedit/js/theme.js
index 459eb3a..5eda983 100644
--- a/core/modules/edit/js/theme.js
+++ b/core/modules/quickedit/js/theme.js
@@ -1,13 +1,13 @@
 /**
  * @file
- * Provides overridable theme functions for all of Edit's client-side HTML.
+ * Provides overridable theme functions for Quick Edit's client-side HTML.
  */
 (function ($, Drupal) {
 
 "use strict";
 
 /**
- * Theme function for a "backstage" for the Edit module.
+ * Theme function for a "backstage" for the Quick Edit module.
  *
  * @param Object settings
  *   An object with the following keys:
@@ -22,15 +22,15 @@ Drupal.theme.editBackstage = function (settings) {
 };
 
 /**
- * Theme function for a modal of the Edit module.
+ * Theme function for a modal of the Quick Edit module.
  *
  * @return String
  *   The corresponding HTML.
  */
 Drupal.theme.editModal = function () {
-  var classes = 'edit-animate-slow edit-animate-invisible edit-animate-delay-veryfast';
+  var classes = 'quickedit-animate-slow quickedit-animate-invisible quickedit-animate-delay-veryfast';
   var html = '';
-  html += '<div id="edit_modal" class="' + classes + '" role="dialog">';
+  html += '<div id="quickedit_modal" class="' + classes + '" role="dialog">';
   html += '  <div class="main"><p></p></div>';
   html += '  <div class="actions"></div>';
   html += '</div>';
@@ -38,7 +38,7 @@ Drupal.theme.editModal = function () {
 };
 
 /**
- * Theme function for a toolbar container of the Edit module.
+ * Theme function for a toolbar container of the Quick Edit module.
  *
  * @param Object settings
  *   An object with the following keys:
@@ -48,19 +48,19 @@ Drupal.theme.editModal = function () {
  */
 Drupal.theme.editEntityToolbar = function (settings) {
   var html = '';
-  html += '<div id="' + settings.id + '" class="edit edit-toolbar-container clearfix">';
-  html += '<i class="edit-toolbar-pointer"></i>';
-  html += '<div class="edit-toolbar-content">';
-  html += '<div class="edit-toolbar edit-toolbar-entity clearfix">';
-  html += '<div class="edit-toolbar-label" />';
+  html += '<div id="' + settings.id + '" class="quickedit quickedit-toolbar-container clearfix">';
+  html += '<i class="quickedit-toolbar-pointer"></i>';
+  html += '<div class="quickedit-toolbar-content">';
+  html += '<div class="quickedit-toolbar quickedit-toolbar-entity clearfix">';
+  html += '<div class="quickedit-toolbar-label" />';
   html += '</div>';
-  html += '<div class="edit-toolbar edit-toolbar-field clearfix" />';
-  html += '</div><div class="edit-toolbar-lining"></div></div>';
+  html += '<div class="quickedit-toolbar quickedit-toolbar-field clearfix" />';
+  html += '</div><div class="quickedit-toolbar-lining"></div></div>';
   return html;
 };
 
 /**
- * Theme function for a toolbar container of the Edit module.
+ * Theme function for a toolbar container of the Quick Edit module.
  *
  * @param Object settings
  *   An object with the following keys:
@@ -80,11 +80,11 @@ Drupal.theme.editEntityToolbarLabel = function (settings) {
  *   The corresponding HTML.
  */
 Drupal.theme.editEntityToolbarFence = function () {
-  return '<div id="edit-toolbar-fence" />';
+  return '<div id="quickedit-toolbar-fence" />';
 };
 
 /**
- * Theme function for a toolbar container of the Edit module.
+ * Theme function for a toolbar container of the Quick Edit module.
  *
  * @param settings
  *   An object with the following keys:
@@ -97,7 +97,7 @@ Drupal.theme.editFieldToolbar = function (settings) {
 };
 
 /**
- * Theme function for a toolbar toolgroup of the Edit module.
+ * Theme function for a toolbar toolgroup of the Quick Edit module.
  *
  * @param Object settings
  *   An object with the following keys:
@@ -110,7 +110,7 @@ Drupal.theme.editFieldToolbar = function (settings) {
 Drupal.theme.editToolgroup = function (settings) {
   // Classes.
   var classes = (settings.classes || []);
-  classes.unshift('edit-toolgroup');
+  classes.unshift('quickedit-toolgroup');
   var html = '';
   html += '<div class="' + classes.join(' ') + '"';
   if (settings.id) {
@@ -123,7 +123,7 @@ Drupal.theme.editToolgroup = function (settings) {
 };
 
 /**
- * Theme function for buttons of the Edit module.
+ * Theme function for buttons of the Quick Edit module.
  *
  * Can be used for the buttons both in the toolbar toolgroups and in the modal.
  *
@@ -133,7 +133,7 @@ Drupal.theme.editToolgroup = function (settings) {
  *     - String type: the type of the button (defaults to 'button')
  *     - Array classes: the classes of the button.
  *     - String label: the label of the button.
- *     - String action: sets a data-edit-modal-action attribute.
+ *     - String action: sets a data-quickedit-modal-action attribute.
  * @return String
  *   The corresponding HTML.
  */
@@ -153,7 +153,7 @@ Drupal.theme.editButtons = function (settings) {
       }
     }
     html += '<button type="' + button.type + '" class="' + button.classes + '"'  + ' ' + attributes.join(' ');
-    html += ((button.action) ? ' data-edit-modal-action="' + button.action + '"' : '') + '>';
+    html += ((button.action) ? ' data-quickedit-modal-action="' + button.action + '"' : '') + '>';
     html += button.label;
     html += '</button>';
   }
@@ -161,7 +161,7 @@ Drupal.theme.editButtons = function (settings) {
 };
 
 /**
- * Theme function for a form container of the Edit module.
+ * Theme function for a form container of the Quick Edit module.
  *
  * @param Object settings
  *   An object with the following keys:
@@ -172,8 +172,8 @@ Drupal.theme.editButtons = function (settings) {
  */
 Drupal.theme.editFormContainer = function (settings) {
   var html = '';
-  html += '<div id="' + settings.id + '" class="edit-form-container">';
-  html += '  <div class="edit-form">';
+  html += '<div id="' + settings.id + '" class="quickedit-form-container">';
+  html += '  <div class="quickedit-form">';
   html += '    <div class="placeholder">';
   html +=        settings.loadingMsg;
   html += '    </div>';
diff --git a/core/modules/edit/js/util.js b/core/modules/quickedit/js/util.js
similarity index 82%
rename from core/modules/edit/js/util.js
rename to core/modules/quickedit/js/util.js
index 9d4bc45..47a1581 100644
--- a/core/modules/edit/js/util.js
+++ b/core/modules/quickedit/js/util.js
@@ -1,15 +1,15 @@
 /**
  * @file
- * Provides utility functions for Edit.
+ * Provides utility functions for Quick Edit.
  */
 (function ($, _, Drupal, drupalSettings) {
 
 "use strict";
 
-Drupal.edit.util = Drupal.edit.util || {};
+Drupal.quickedit.util = Drupal.quickedit.util || {};
 
-Drupal.edit.util.constants = {};
-Drupal.edit.util.constants.transitionEnd = "transitionEnd.edit webkitTransitionEnd.edit transitionend.edit msTransitionEnd.edit oTransitionEnd.edit";
+Drupal.quickedit.util.constants = {};
+Drupal.quickedit.util.constants.transitionEnd = "transitionEnd.edit webkitTransitionEnd.edit transitionend.edit msTransitionEnd.edit oTransitionEnd.edit";
 
 /**
  * Converts a field id into a formatted url path.
@@ -18,9 +18,9 @@ Drupal.edit.util.constants.transitionEnd = "transitionEnd.edit webkitTransitionE
  *   The id of an editable field. For example, 'node/1/body/und/full'.
  * @param String urlFormat
  *   The Controller route for field processing. For example,
- *   '/edit/form/%21entity_type/%21id/%21field_name/%21langcode/%21view_mode'.
+ *   '/quickedit/form/%21entity_type/%21id/%21field_name/%21langcode/%21view_mode'.
  */
-Drupal.edit.util.buildUrl = function (id, urlFormat) {
+Drupal.quickedit.util.buildUrl = function (id, urlFormat) {
   var parts = id.split('/');
   return Drupal.formatString(decodeURIComponent(urlFormat), {
     '!entity_type': parts[0],
@@ -31,7 +31,7 @@ Drupal.edit.util.buildUrl = function (id, urlFormat) {
   });
 };
 
-Drupal.edit.util.form = {
+Drupal.quickedit.util.form = {
   /**
    * Loads a form, calls a callback to insert.
    *
@@ -59,8 +59,8 @@ Drupal.edit.util.form = {
 
     // Create a Drupal.ajax instance to load the form.
     var formLoaderAjax = new Drupal.ajax(fieldID, $el, {
-      url: Drupal.edit.util.buildUrl(fieldID, drupalSettings.edit.fieldFormURL),
-      event: 'edit-internal.edit',
+      url: Drupal.quickedit.util.buildUrl(fieldID, drupalSettings.quickedit.fieldFormURL),
+      event: 'quickedit-internal.edit',
       submit: {
         nocssjs : options.nocssjs,
         reset : options.reset
@@ -70,11 +70,11 @@ Drupal.edit.util.form = {
     // Implement a scoped editFieldForm AJAX command: calls the callback.
     formLoaderAjax.commands.editFieldForm = function (ajax, response, status) {
       callback(response.data, ajax);
-      $el.off('edit-internal.edit');
+      $el.off('quickedit-internal.edit');
       formLoaderAjax = null;
     };
     // This will ensure our scoped editFieldForm AJAX command gets called.
-    $el.trigger('edit-internal.edit');
+    $el.trigger('quickedit-internal.edit');
   },
 
   /**
@@ -113,7 +113,7 @@ Drupal.edit.util.form = {
    * Cleans up the Drupal.ajax instance that is used to save the form.
    *
    * @param Drupal.ajax ajax
-   *   A Drupal.ajax that was returned by Drupal.edit.form.ajaxifySaving().
+   *   A Drupal.ajax that was returned by Drupal.quickedit.form.ajaxifySaving().
    */
   unajaxifySaving: function (ajax) {
     $(ajax.element).off('click.edit');
diff --git a/core/modules/edit/js/views/AppView.js b/core/modules/quickedit/js/views/AppView.js
similarity index 91%
rename from core/modules/edit/js/views/AppView.js
rename to core/modules/quickedit/js/views/AppView.js
index 5a5c2d3..144a865 100644
--- a/core/modules/edit/js/views/AppView.js
+++ b/core/modules/quickedit/js/views/AppView.js
@@ -7,26 +7,26 @@
 // edited fields if in-place editing has been canceled and one or more of the
 // entity's fields were saved to TempStore: one of them may have been changed to
 // the empty value and hence may have been rerendered as the empty string, which
-// makes it impossible for Edit to know where to restore the original HTML.
+// makes it impossible for Quick Edit to know where to restore the original HTML.
 var reload = false;
 
 /**
  *
  */
-Drupal.edit.AppView = Backbone.View.extend({
+Drupal.quickedit.AppView = Backbone.View.extend({
 
   /**
    * {@inheritdoc}
    *
    * @param Object options
    *   An object with the following keys:
-   *   - Drupal.edit.AppModel model: the application state model
-   *   - Drupal.edit.EntityCollection entitiesCollection: all on-page entities
-   *   - Drupal.edit.FieldCollection fieldsCollection: all on-page fields
+   *   - Drupal.quickedit.AppModel model: the application state model
+   *   - Drupal.quickedit.EntityCollection entitiesCollection: all on-page entities
+   *   - Drupal.quickedit.FieldCollection fieldsCollection: all on-page fields
    */
   initialize: function (options) {
     // AppView's configuration for handling states.
-    // @see Drupal.edit.FieldModel.states
+    // @see Drupal.quickedit.FieldModel.states
     this.activeEditorStates = ['activating', 'active'];
     this.singleEditorStates = ['highlighted', 'activating', 'active'];
     this.changedEditorStates = ['changed', 'saving', 'saved', 'invalid'];
@@ -51,10 +51,10 @@ Drupal.edit.AppView = Backbone.View.extend({
   /**
    * Handles setup/teardown and state changes when the active entity changes.
    *
-   * @param Drupal.edit.EntityModel entityModel
+   * @param Drupal.quickedit.EntityModel entityModel
    *   An instance of the EntityModel class.
    * @param String state
-   *   The state of the associated field. One of Drupal.edit.EntityModel.states.
+   *   The state of the associated field. One of Drupal.quickedit.EntityModel.states.
    */
   appStateChange: function (entityModel, state) {
     var app = this;
@@ -63,7 +63,7 @@ Drupal.edit.AppView = Backbone.View.extend({
       case 'launching':
         reload = false;
         // First, create an entity toolbar view.
-        entityToolbarView = new Drupal.edit.EntityToolbarView({
+        entityToolbarView = new Drupal.quickedit.EntityToolbarView({
           model: entityModel,
           appModel: this.model
         });
@@ -112,7 +112,7 @@ Drupal.edit.AppView = Backbone.View.extend({
    *   The new state.
    * @param null|Object context
    *   The context that is trying to trigger the state change.
-   * @param Drupal.edit.FieldModel fieldModel
+   * @param Drupal.quickedit.FieldModel fieldModel
    *   The fieldModel to which this change applies.
    */
   acceptEditorStateChange: function (from, to, context, fieldModel) {
@@ -130,7 +130,7 @@ Drupal.edit.AppView = Backbone.View.extend({
       // In general, enforce the states sequence. Disallow going back from a
       // "later" state to an "earlier" state, except in explicitly allowed
       // cases.
-      if (!Drupal.edit.FieldModel.followsStateSequence(from, to)) {
+      if (!Drupal.quickedit.FieldModel.followsStateSequence(from, to)) {
         accept = false;
         // Allow: activating/active -> candidate.
         // Necessary to stop editing a field.
@@ -239,7 +239,7 @@ Drupal.edit.AppView = Backbone.View.extend({
    *
    * Must happen before the fieldModel's state is changed to 'candidate'.
    *
-   * @param Drupal.edit.FieldModel fieldModel
+   * @param Drupal.quickedit.FieldModel fieldModel
    *   The field for which an in-place editor must be set up.
    */
   setupEditor: function (fieldModel) {
@@ -250,8 +250,8 @@ Drupal.edit.AppView = Backbone.View.extend({
     var fieldToolbarRoot = entityToolbarView.getToolbarRoot();
     // Create in-place editor.
     var editorName = fieldModel.get('metadata').editor;
-    var editorModel = new Drupal.edit.EditorModel();
-    var editorView = new Drupal.edit.editors[editorName]({
+    var editorModel = new Drupal.quickedit.EditorModel();
+    var editorView = new Drupal.quickedit.editors[editorName]({
       el: $(fieldModel.get('el')),
       model: editorModel,
       fieldModel: fieldModel
@@ -259,7 +259,7 @@ Drupal.edit.AppView = Backbone.View.extend({
 
     // Create in-place editor's toolbar — positions appropriately above the
     // edited element.
-    var toolbarView = new Drupal.edit.FieldToolbarView({
+    var toolbarView = new Drupal.quickedit.FieldToolbarView({
       el: fieldToolbarRoot,
       model: fieldModel,
       $editedElement: $(editorView.getEditedElement()),
@@ -269,7 +269,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.quickedit.EditorDecorationView({
       el: $(editorView.getEditedElement()),
       model: fieldModel,
       editorView: editorView
@@ -287,7 +287,7 @@ Drupal.edit.AppView = Backbone.View.extend({
    *
    * Must happen after the fieldModel's state is changed to 'inactive'.
    *
-   * @param Drupal.edit.FieldModel fieldModel
+   * @param Drupal.quickedit.FieldModel fieldModel
    *   The field for which an in-place editor must be torn down.
    */
   teardownEditor: function (fieldModel) {
@@ -320,19 +320,19 @@ Drupal.edit.AppView = Backbone.View.extend({
     // Only instantiate if there isn't a modal instance visible yet.
     if (!this.model.get('activeModal')) {
       var that = this;
-      var modal = new Drupal.edit.ModalView({
+      var modal = new Drupal.quickedit.ModalView({
         model: this.model,
         message: Drupal.t('You have unsaved changes'),
         buttons: [
           {
             action: 'save',
             type: 'submit',
-            classes: 'action-save edit-button',
+            classes: 'action-save quickedit-button',
             label: Drupal.t('Save')
           },
           {
             action: 'discard',
-            classes: 'action-cancel edit-button',
+            classes: 'action-cancel quickedit-button',
             label: Drupal.t('Discard changes')
           }
         ],
@@ -366,9 +366,9 @@ Drupal.edit.AppView = Backbone.View.extend({
   /**
    * Reacts to field state changes; tracks global state.
    *
-   * @param Drupal.edit.FieldModel fieldModel
+   * @param Drupal.quickedit.FieldModel fieldModel
    * @param String state
-   *   The state of the associated field. One of Drupal.edit.FieldModel.states.
+   *   The state of the associated field. One of Drupal.quickedit.FieldModel.states.
    */
   editorStateChange: function (fieldModel, state) {
     var from = fieldModel.previous('state');
@@ -428,7 +428,7 @@ Drupal.edit.AppView = Backbone.View.extend({
   /**
    * Render an updated field (a field whose 'html' attribute changed).
    *
-   * @param Drupal.edit.FieldModel fieldModel
+   * @param Drupal.quickedit.FieldModel fieldModel
    *   The FieldModel whose 'html' attribute changed.
    */
   renderUpdatedField: function (fieldModel) {
@@ -463,11 +463,11 @@ Drupal.edit.AppView = Backbone.View.extend({
    *
    * This happens when a field was modified, saved and hence rerendered.
    *
-   * @param Drupal.edit.FieldModel fieldModel
+   * @param Drupal.quickedit.FieldModel fieldModel
    *   A field that was just added to the collection of fields.
    */
   rerenderedFieldToCandidate: function (fieldModel) {
-    var activeEntity = Drupal.edit.collections.entities.where({isActive: true})[0];
+    var activeEntity = Drupal.quickedit.collections.entities.where({isActive: true})[0];
 
     // Early-return if there is no active entity.
     if (activeEntity === null) {
@@ -485,7 +485,7 @@ Drupal.edit.AppView = Backbone.View.extend({
    * EntityModel Collection change handler, called on change:isActive, enforces
    * a single active entity.
    *
-   * @param Drupal.edit.EntityModel
+   * @param Drupal.quickedit.EntityModel
    *   The entityModel instance whose active state has changed.
    */
   enforceSingleActiveEntity: function (changedEntityModel) {
diff --git a/core/modules/edit/js/views/ContextualLinkView.js b/core/modules/quickedit/js/views/ContextualLinkView.js
similarity index 85%
rename from core/modules/edit/js/views/ContextualLinkView.js
rename to core/modules/quickedit/js/views/ContextualLinkView.js
index 2b48b46..d926921 100644
--- a/core/modules/edit/js/views/ContextualLinkView.js
+++ b/core/modules/quickedit/js/views/ContextualLinkView.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-Drupal.edit.ContextualLinkView = Backbone.View.extend({
+Drupal.quickedit.ContextualLinkView = Backbone.View.extend({
 
    events: function () {
     // Prevents delay and simulated mouse events.
@@ -28,8 +28,8 @@ Drupal.edit.ContextualLinkView = Backbone.View.extend({
    *
    * @param Object options
    *   An object with the following keys:
-   *   - Drupal.edit.EntityModel model: the associated entity's model
-   *   - Drupal.edit.AppModel appModel: the application state model
+   *   - Drupal.quickedit.EntityModel model: the associated entity's model
+   *   - Drupal.quickedit.AppModel appModel: the application state model
    *   - strings: the strings for the "Quick edit" link
    */
   initialize: function (options) {
diff --git a/core/modules/edit/js/views/EditorDecorationView.js b/core/modules/quickedit/js/views/EditorDecorationView.js
similarity index 87%
rename from core/modules/edit/js/views/EditorDecorationView.js
rename to core/modules/quickedit/js/views/EditorDecorationView.js
index 17e5ee2..0eb52a3 100644
--- a/core/modules/edit/js/views/EditorDecorationView.js
+++ b/core/modules/quickedit/js/views/EditorDecorationView.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-Drupal.edit.EditorDecorationView = Backbone.View.extend({
+Drupal.quickedit.EditorDecorationView = Backbone.View.extend({
 
   _widthAttributeIsEmpty: null,
 
@@ -23,7 +23,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
    *
    * @param Object options
    *   An object with the following keys:
-   *   - Drupal.edit.EditorView editorView: the editor object view.
+   *   - Drupal.quickedit.EditorView editorView: the editor object view.
    */
   initialize: function (options) {
     this.editorView = options.editorView;
@@ -45,9 +45,9 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
   /**
    * Determines the actions to take given a change of state.
    *
-   * @param Drupal.edit.FieldModel model
+   * @param Drupal.quickedit.FieldModel model
    * @param String state
-   *   The state of the associated field. One of Drupal.edit.FieldModel.states.
+   *   The state of the associated field. One of Drupal.quickedit.FieldModel.states.
    */
   stateChange: function (model, state) {
     var from = model.previous('state');
@@ -101,7 +101,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
    * changed and stored before by the user (i.e. remotely, stored in TempStore).
    */
   renderChanged: function () {
-    this.$el.toggleClass('edit-changed', this.model.get('isChanged') || this.model.get('inTempStore'));
+    this.$el.toggleClass('quickedit-changed', this.model.get('isChanged') || this.model.get('inTempStore'));
   },
 
   /**
@@ -141,14 +141,14 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
    * Adds classes used to indicate an elements editable state.
    */
   decorate: function () {
-    this.$el.addClass('edit-candidate edit-editable');
+    this.$el.addClass('quickedit-candidate quickedit-editable');
   },
 
   /**
    * Removes classes used to indicate an elements editable state.
    */
   undecorate: function () {
-    this.$el.removeClass('edit-candidate edit-editable edit-highlighted edit-editing');
+    this.$el.removeClass('quickedit-candidate quickedit-editable quickedit-highlighted quickedit-editing');
   },
 
   /**
@@ -158,21 +158,21 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
     // Animations.
     var that = this;
     // Use a timeout to grab the next available animation frame.
-    that.$el.addClass('edit-highlighted');
+    that.$el.addClass('quickedit-highlighted');
   },
 
   /**
    * Removes the class that indicates that an element is highlighted.
    */
   stopHighlight: function () {
-    this.$el.removeClass('edit-highlighted');
+    this.$el.removeClass('quickedit-highlighted');
   },
 
   /**
    * Removes the class that indicates that an element as editable.
    */
   prepareEdit: function () {
-    this.$el.addClass('edit-editing');
+    this.$el.addClass('quickedit-editing');
   },
 
   /**
@@ -182,10 +182,10 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
    * again available to be edited.
    */
   stopEdit: function () {
-    this.$el.removeClass('edit-highlighted edit-editing');
+    this.$el.removeClass('quickedit-highlighted quickedit-editing');
 
     // Make the other editors show up again.
-    $('.edit-candidate').addClass('edit-editable');
+    $('.quickedit-candidate').addClass('quickedit-editable');
   },
 
   /**
@@ -193,7 +193,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
    */
   _pad: function () {
     // Early return if the element has already been padded.
-    if (this.$el.data('edit-padded')) {
+    if (this.$el.data('quickedit-padded')) {
       return;
     }
     var self = this;
@@ -205,7 +205,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
     if (this.$el[0].style.width === "") {
       this._widthAttributeIsEmpty = true;
       this.$el
-        .addClass('edit-animate-disable-width')
+        .addClass('quickedit-animate-disable-width')
         .css('width', this.$el.width())
         .css('background-color', this._getBgColor(this.$el));
     }
@@ -214,7 +214,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
     var posProp = this._getPositionProperties(this.$el);
     setTimeout(function () {
       // Re-enable width animations (padding changes affect width too!).
-      self.$el.removeClass('edit-animate-disable-width');
+      self.$el.removeClass('quickedit-animate-disable-width');
 
       // Pad the editable.
       self.$el
@@ -228,7 +228,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
         'padding-bottom': posProp['padding-bottom'] + 5 + 'px',
         'margin-bottom':  posProp['margin-bottom'] - 10 + 'px'
       })
-      .data('edit-padded', true);
+      .data('quickedit-padded', true);
     }, 0);
   },
 
@@ -237,7 +237,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
    */
   _unpad: function () {
     // Early return if the element has not been padded.
-    if (!this.$el.data('edit-padded')) {
+    if (!this.$el.data('quickedit-padded')) {
       return;
     }
     var self = this;
@@ -245,7 +245,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
     // 1) Set the empty width again.
     if (this._widthAttributeIsEmpty) {
       this.$el
-        .addClass('edit-animate-disable-width')
+        .addClass('quickedit-animate-disable-width')
         .css('width', '')
         .css('background-color', '');
     }
@@ -255,7 +255,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
     var posProp = this._getPositionProperties(this.$el);
     setTimeout(function () {
       // Re-enable width animations (padding changes affect width too!).
-      self.$el.removeClass('edit-animate-disable-width');
+      self.$el.removeClass('quickedit-animate-disable-width');
 
       // Unpad the editable.
       self.$el
@@ -274,7 +274,7 @@ Drupal.edit.EditorDecorationView = Backbone.View.extend({
     // done outside the timed out function above so that we don't get numerous
     // queued functions that will remove padding before the data marker has
     // been removed.
-    this.$el.removeData('edit-padded');
+    this.$el.removeData('quickedit-padded');
   },
 
   /**
diff --git a/core/modules/edit/js/views/EditorView.js b/core/modules/quickedit/js/views/EditorView.js
similarity index 84%
rename from core/modules/edit/js/views/EditorView.js
rename to core/modules/quickedit/js/views/EditorView.js
index d8d4c18..96df54f 100644
--- a/core/modules/edit/js/views/EditorView.js
+++ b/core/modules/quickedit/js/views/EditorView.js
@@ -8,10 +8,10 @@
  * Specific in-place editor implementations should subclass (extend) this View
  * and override whichever method they deem necessary to override.
  *
- * Look at Drupal.edit.editors.form and Drupal.edit.editors.direct for
+ * Look at Drupal.quickedit.editors.form and Drupal.quickedit.editors.direct for
  * examples.
  */
-Drupal.edit.EditorView = Backbone.View.extend({
+Drupal.quickedit.EditorView = Backbone.View.extend({
 
   /**
    * {@inheritdoc}
@@ -22,14 +22,14 @@ Drupal.edit.EditorView = Backbone.View.extend({
    *
    * If you override this method, you should call this method (the parent
    * class' initialize()) first, like this:
-   *   Drupal.edit.EditorView.prototype.initialize.call(this, options);
+   *   Drupal.quickedit.EditorView.prototype.initialize.call(this, options);
    *
-   * For an example, @see Drupal.edit.editors.direct.
+   * For an example, @see Drupal.quickedit.editors.direct.
    *
    * @param Object options
    *   An object with the following keys:
-   *   - Drupal.edit.EditorModel model: the in-place editor state model
-   *   - Drupal.edit.FieldModel fieldModel: the field model
+   *   - Drupal.quickedit.EditorModel model: the in-place editor state model
+   *   - Drupal.quickedit.FieldModel fieldModel: the field model
    */
   initialize: function (options) {
     this.fieldModel = options.fieldModel;
@@ -52,12 +52,12 @@ Drupal.edit.EditorView = Backbone.View.extend({
    *
    * For some single cardinality fields, it may be necessary or useful to
    * not in-place edit (and hence decorate) the DOM element with the
-   * data-edit-id attribute (which is the field's wrapper), but a specific
+   * data-quickedit-id attribute (which is the field's wrapper), but a specific
    * element within the field's wrapper.
    * e.g. using a WYSIWYG editor on a body field should happen on the DOM
    * element containing the text itself, not on the field wrapper.
    *
-   * For example, @see Drupal.edit.editors.direct.
+   * For example, @see Drupal.quickedit.editors.direct.
    *
    * @return jQuery
    *   A jQuery-wrapped DOM element.
@@ -67,14 +67,14 @@ Drupal.edit.EditorView = Backbone.View.extend({
   },
 
   /**
-   * Returns 3 Edit UI settings that depend on the in-place editor:
+   * Returns 3 Quick Edit UI settings that depend on the in-place editor:
    *  - Boolean padding: indicates whether padding should be applied to the
    *    edited element, to guarantee legibility of text.
    *  - Boolean unifiedToolbar: provides the in-place editor with the ability to
-   *    insert its own toolbar UI into Edit's tightly integrated toolbar.
-   *  - Boolean fullWidthToolbar: indicates whether Edit's tightly integrated
-   *    toolbar should consume the full width of the element, rather than being
-   *    just long enough to accomodate a label.
+   *    insert its own toolbar UI into Quick Edit's tightly integrated toolbar.
+   *  - Boolean fullWidthToolbar: indicates whether Quick Edit's tightly
+   *    integrated toolbar should consume the full width of the element,
+   *    rather than being just long enough to accomodate a label.
    */
   getEditUISettings: function () {
     return { padding: false, unifiedToolbar: false, fullWidthToolbar: false };
@@ -83,9 +83,9 @@ Drupal.edit.EditorView = Backbone.View.extend({
   /**
    * Determines the actions to take given a change of state.
    *
-   * @param Drupal.edit.FieldModel fieldModel
+   * @param Drupal.quickedit.FieldModel fieldModel
    * @param String state
-   *   The state of the associated field. One of Drupal.edit.FieldModel.states.
+   *   The state of the associated field. One of Drupal.quickedit.FieldModel.states.
    */
   stateChange: function (fieldModel, state) {
     var from = fieldModel.previous('state');
@@ -172,7 +172,7 @@ Drupal.edit.EditorView = Backbone.View.extend({
   save: function () {
     var fieldModel = this.fieldModel;
     var editorModel = this.model;
-    var backstageId = 'edit_backstage-' + this.fieldModel.id.replace(/[\/\_\s]/g, '-');
+    var backstageId = 'quickedit_backstage-' + this.fieldModel.id.replace(/[\/\_\s]/g, '-');
 
     function fillAndSubmitForm (value) {
       var $form = $('#' + backstageId).find('form');
@@ -182,7 +182,7 @@ Drupal.edit.EditorView = Backbone.View.extend({
         // Don't mess with the node summary.
         .not('[name$="\\[summary\\]"]').val(value);
       // Submit the form.
-      $form.find('.edit-form-submit').trigger('click.edit');
+      $form.find('.quickedit-form-submit').trigger('click.edit');
     }
 
     var formOptions = {
@@ -199,7 +199,7 @@ Drupal.edit.EditorView = Backbone.View.extend({
     };
 
     var self = this;
-    Drupal.edit.util.form.load(formOptions, function (form, ajax) {
+    Drupal.quickedit.util.form.load(formOptions, function (form, ajax) {
       // Create a backstage area for storing forms that are hidden from view
       // (hence "backstage" — since the editing doesn't happen in the form, it
       // happens "directly" in the content, the form is only used for saving).
@@ -211,11 +211,11 @@ Drupal.edit.EditorView = Backbone.View.extend({
       // because browsers don't like to set HTML5 validation errors on hidden
       // forms.)
       $form.prop('novalidate', true);
-      var $submit = $form.find('.edit-form-submit');
-      self.formSaveAjax = Drupal.edit.util.form.ajaxifySaving(formOptions, $submit);
+      var $submit = $form.find('.quickedit-form-submit');
+      self.formSaveAjax = Drupal.quickedit.util.form.ajaxifySaving(formOptions, $submit);
 
       function removeHiddenForm () {
-        Drupal.edit.util.form.unajaxifySaving(self.formSaveAjax);
+        Drupal.quickedit.util.form.unajaxifySaving(self.formSaveAjax);
         delete self.formSaveAjax;
         $backstage.remove();
       }
@@ -254,10 +254,10 @@ Drupal.edit.EditorView = Backbone.View.extend({
    * Should be called when the state is changed to 'invalid'.
    */
   showValidationErrors: function () {
-    var $errors = $('<div class="edit-validation-errors"></div>')
+    var $errors = $('<div class="quickedit-validation-errors"></div>')
       .append(this.model.get('validationErrors'));
     this.getEditedElement()
-      .addClass('edit-validation-error')
+      .addClass('quickedit-validation-error')
       .after($errors);
   },
 
@@ -271,8 +271,8 @@ Drupal.edit.EditorView = Backbone.View.extend({
    */
   removeValidationErrors: function () {
     this.getEditedElement()
-      .removeClass('edit-validation-error')
-      .next('.edit-validation-errors')
+      .removeClass('quickedit-validation-error')
+      .next('.quickedit-validation-errors')
       .remove();
   }
 
diff --git a/core/modules/edit/js/views/EntityToolbarView.js b/core/modules/quickedit/js/views/EntityToolbarView.js
similarity index 90%
rename from core/modules/edit/js/views/EntityToolbarView.js
rename to core/modules/quickedit/js/views/EntityToolbarView.js
index 00e0a9d..acfad8e 100644
--- a/core/modules/edit/js/views/EntityToolbarView.js
+++ b/core/modules/quickedit/js/views/EntityToolbarView.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-Drupal.edit.EntityToolbarView = Backbone.View.extend({
+Drupal.quickedit.EntityToolbarView = Backbone.View.extend({
 
   _fieldToolbarRoot: null,
 
@@ -49,7 +49,7 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
     // Set the entity toolbar DOM element as the el for this view.
     var $toolbar = this.buildToolbarEl();
     this.setElement($toolbar);
-    this._fieldToolbarRoot = $toolbar.find('.edit-toolbar-field').get(0);
+    this._fieldToolbarRoot = $toolbar.find('.quickedit-toolbar-field').get(0);
 
     // Initial render.
     this.render();
@@ -62,12 +62,12 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
     if (this.model.get('isActive')) {
       // If the toolbar container doesn't exist, create it.
       var $body = $('body');
-      if ($body.children('#edit-entity-toolbar').length === 0) {
+      if ($body.children('#quickedit-entity-toolbar').length === 0) {
         $body.append(this.$el);
       }
       // The fence will define a area on the screen that the entity toolbar
       // will be position within.
-      if ($body.children('#edit-toolbar-fence').length === 0) {
+      if ($body.children('#quickedit-toolbar-fence').length === 0) {
         this.$fence = $(Drupal.theme('editEntityToolbarFence'))
           .css(Drupal.displace())
           .appendTo($body);
@@ -83,7 +83,7 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
     }
 
     // The save button text and state varies with the state of the entity model.
-    var $button = this.$el.find('.edit-button.action-save');
+    var $button = this.$el.find('.quickedit-button.action-save');
     var isDirty = this.model.get('isDirty');
     // Adjust the save button according to the state of the model.
     switch (this.model.get('state')) {
@@ -132,9 +132,9 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
   /**
    * Determines the actions to take given a change of state.
    *
-   * @param Drupal.edit.FieldModel model
+   * @param Drupal.quickedit.FieldModel model
    * @param String state
-   *   The state of the associated field. One of Drupal.edit.FieldModel.states.
+   *   The state of the associated field. One of Drupal.quickedit.FieldModel.states.
    */
   fieldStateChange: function (model, state) {
     switch (state) {
@@ -175,8 +175,8 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
           break;
         case 1:
           // Position against a form container.
-          activeField = Drupal.edit.app.model.get('activeEditor');
-          of = activeField && activeField.editorView && activeField.editorView.$formContainer && activeField.editorView.$formContainer.find('.edit-form');
+          activeField = Drupal.quickedit.app.model.get('activeEditor');
+          of = activeField && activeField.editorView && activeField.editorView.$formContainer && activeField.editorView.$formContainer.find('.quickedit-form');
           break;
         case 2:
           // Position against an active field.
@@ -184,7 +184,7 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
           break;
         case 3:
           // Position against a highlighted field.
-          highlightedField = Drupal.edit.app.model.get('highlightedEditor');
+          highlightedField = Drupal.quickedit.app.model.get('highlightedEditor');
           of = highlightedField && highlightedField.editorView && highlightedField.editorView.getEditedElement();
           delay = 250;
           break;
@@ -223,7 +223,7 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
         top: Math.floor(suggested.top)
       });
       // Determine if the pointer should be on the top or bottom.
-      info.element.element.toggleClass('edit-toolbar-pointer-top', info.element.top > info.target.top);
+      info.element.element.toggleClass('quickedit-toolbar-pointer-top', info.element.top > info.target.top);
     }
 
     /**
@@ -302,11 +302,11 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
    */
   buildToolbarEl: function () {
     var $toolbar = $(Drupal.theme('editEntityToolbar', {
-      id: 'edit-entity-toolbar'
+      id: 'quickedit-entity-toolbar'
     }));
 
     $toolbar
-      .find('.edit-toolbar-entity')
+      .find('.quickedit-toolbar-entity')
       // Append the "ops" toolgroup into the toolbar.
       .prepend(Drupal.theme('editToolgroup', {
         classes: ['ops'],
@@ -314,14 +314,14 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
           {
             label: Drupal.t('Save'),
             type: 'submit',
-            classes: 'action-save edit-button icon',
+            classes: 'action-save quickedit-button icon',
             attributes: {
               'aria-hidden': true
             }
           },
           {
             label: Drupal.t('Close'),
-            classes: 'action-cancel edit-button icon icon-close icon-only'
+            classes: 'action-cancel quickedit-button icon icon-close icon-only'
           }
         ]
       }));
@@ -356,10 +356,10 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
     var entityLabel = this.model.get('label');
 
     // Label of an active field, if it exists.
-    var activeEditor = Drupal.edit.app.model.get('activeEditor');
+    var activeEditor = Drupal.quickedit.app.model.get('activeEditor');
     var activeFieldLabel = activeEditor && activeEditor.get('metadata').label;
     // Label of a highlighted field, if it exists.
-    var highlightedEditor = Drupal.edit.app.model.get('highlightedEditor');
+    var highlightedEditor = Drupal.quickedit.app.model.get('highlightedEditor');
     var highlightedFieldLabel = highlightedEditor && highlightedEditor.get('metadata').label;
     // The label is constructed in a priority order.
     if (activeFieldLabel) {
@@ -379,7 +379,7 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
     }
 
     this.$el
-      .find('.edit-toolbar-label')
+      .find('.quickedit-toolbar-label')
       .html(label);
   },
 
@@ -418,7 +418,7 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
    *   The toolgroup DOM element.
    */
   _find: function (toolgroup) {
-    return this.$el.find('.edit-toolbar .edit-toolgroup.' + toolgroup);
+    return this.$el.find('.quickedit-toolbar .quickedit-toolgroup.' + toolgroup);
   },
 
   /**
@@ -428,7 +428,7 @@ Drupal.edit.EntityToolbarView = Backbone.View.extend({
    *   A toolgroup name.
    */
   show: function (toolgroup) {
-    this.$el.removeClass('edit-animate-invisible');
+    this.$el.removeClass('quickedit-animate-invisible');
   }
 });
 
diff --git a/core/modules/edit/js/views/EntityView.js b/core/modules/quickedit/js/views/EntityView.js
similarity index 76%
rename from core/modules/edit/js/views/EntityView.js
rename to core/modules/quickedit/js/views/EntityView.js
index a2e771a..09ce9ff 100644
--- a/core/modules/edit/js/views/EntityView.js
+++ b/core/modules/quickedit/js/views/EntityView.js
@@ -2,7 +2,7 @@
 
 "use strict";
 
-Drupal.edit.EntityView = Backbone.View.extend({
+Drupal.quickedit.EntityView = Backbone.View.extend({
   /**
    * {@inheritdoc}
    *
@@ -16,7 +16,7 @@ Drupal.edit.EntityView = Backbone.View.extend({
    * {@inheritdoc}
    */
   render: function () {
-    this.$el.toggleClass('edit-entity-active', this.model.get('isActive'));
+    this.$el.toggleClass('quickedit-entity-active', this.model.get('isActive'));
   },
 
   /**
diff --git a/core/modules/edit/js/views/FieldToolbarView.js b/core/modules/quickedit/js/views/FieldToolbarView.js
similarity index 80%
rename from core/modules/edit/js/views/FieldToolbarView.js
rename to core/modules/quickedit/js/views/FieldToolbarView.js
index 497ac67..04b98b7 100644
--- a/core/modules/edit/js/views/FieldToolbarView.js
+++ b/core/modules/quickedit/js/views/FieldToolbarView.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-Drupal.edit.FieldToolbarView = Backbone.View.extend({
+Drupal.quickedit.FieldToolbarView = Backbone.View.extend({
 
   // The edited element, as indicated by EditorView.getEditedElement().
   $editedElement: null,
@@ -25,7 +25,7 @@ Drupal.edit.FieldToolbarView = Backbone.View.extend({
     this.$root = this.$el;
 
     // Generate a DOM-compatible ID for the form container DOM element.
-    this._id = 'edit-toolbar-for-' + this.model.id.replace(/\//g, '_');
+    this._id = 'quickedit-toolbar-for-' + this.model.id.replace(/\//g, '_');
 
     this.model.on('change:state', this.stateChange, this);
   },
@@ -48,9 +48,9 @@ Drupal.edit.FieldToolbarView = Backbone.View.extend({
   /**
    * Determines the actions to take given a change of state.
    *
-   * @param Drupal.edit.FieldModel model
+   * @param Drupal.quickedit.FieldModel model
    * @param String state
-   *   The state of the associated field. One of Drupal.edit.FieldModel.states.
+   *   The state of the associated field. One of Drupal.quickedit.FieldModel.states.
    */
   stateChange: function (model, state) {
     var from = model.previous('state');
@@ -73,7 +73,7 @@ Drupal.edit.FieldToolbarView = Backbone.View.extend({
         this.render();
 
         if (this.editorView.getEditUISettings().fullWidthToolbar) {
-          this.$el.addClass('edit-toolbar-fullwidth');
+          this.$el.addClass('quickedit-toolbar-fullwidth');
         }
 
         if (this.editorView.getEditUISettings().unifiedToolbar) {
@@ -100,12 +100,12 @@ Drupal.edit.FieldToolbarView = Backbone.View.extend({
     this.$el
       .append(Drupal.theme('editToolgroup', {
         id: this.getFloatedWysiwygToolgroupId(),
-        classes: ['wysiwyg-floated', 'edit-animate-slow', 'edit-animate-invisible', 'edit-animate-delay-veryfast'],
+        classes: ['wysiwyg-floated', 'quickedit-animate-slow', 'quickedit-animate-invisible', 'quickedit-animate-delay-veryfast'],
         buttons: []
       }))
       .append(Drupal.theme('editToolgroup', {
         id: this.getMainWysiwygToolgroupId(),
-        classes: ['wysiwyg-main', 'edit-animate-slow', 'edit-animate-invisible', 'edit-animate-delay-veryfast'],
+        classes: ['wysiwyg-main', 'quickedit-animate-slow', 'quickedit-animate-invisible', 'quickedit-animate-delay-veryfast'],
         buttons: []
       }));
 
@@ -123,7 +123,7 @@ Drupal.edit.FieldToolbarView = Backbone.View.extend({
    *   A string that can be used as the ID for this toolbar's container.
    */
   getId: function () {
-    return 'edit-toolbar-for-' + this._id;
+    return 'quickedit-toolbar-for-' + this._id;
   },
 
   /**
@@ -135,7 +135,7 @@ Drupal.edit.FieldToolbarView = Backbone.View.extend({
    *   A string that can be used as the ID.
    */
   getFloatedWysiwygToolgroupId: function () {
-    return 'edit-wysiwyg-floated-toolgroup-for-' + this._id;
+    return 'quickedit-wysiwyg-floated-toolgroup-for-' + this._id;
   },
 
   /**
@@ -147,7 +147,7 @@ Drupal.edit.FieldToolbarView = Backbone.View.extend({
    *   A string that can be used as the ID.
    */
   getMainWysiwygToolgroupId: function () {
-    return 'edit-wysiwyg-main-toolgroup-for-' + this._id;
+    return 'quickedit-wysiwyg-main-toolgroup-for-' + this._id;
   },
 
   /**
@@ -158,7 +158,7 @@ Drupal.edit.FieldToolbarView = Backbone.View.extend({
    * @return jQuery
    */
   _find: function (toolgroup) {
-    return this.$el.find('.edit-toolgroup.' + toolgroup);
+    return this.$el.find('.quickedit-toolgroup.' + toolgroup);
   },
 
   /**
@@ -171,14 +171,14 @@ Drupal.edit.FieldToolbarView = Backbone.View.extend({
     var $group = this._find(toolgroup);
     // Attach a transitionEnd event handler to the toolbar group so that update
     // events can be triggered after the animations have ended.
-    $group.on(Drupal.edit.util.constants.transitionEnd, function (event) {
-      $group.off(Drupal.edit.util.constants.transitionEnd);
+    $group.on(Drupal.quickedit.util.constants.transitionEnd, function (event) {
+      $group.off(Drupal.quickedit.util.constants.transitionEnd);
     });
     // The call to remove the class and start the animation must be started in
     // the next animation frame or the event handler attached above won't be
     // triggered.
     window.setTimeout(function () {
-      $group.removeClass('edit-animate-invisible');
+      $group.removeClass('quickedit-animate-invisible');
     }, 0);
    }
 });
diff --git a/core/modules/edit/js/views/ModalView.js b/core/modules/quickedit/js/views/ModalView.js
similarity index 84%
rename from core/modules/edit/js/views/ModalView.js
rename to core/modules/quickedit/js/views/ModalView.js
index 9f096ba..8a69e33 100644
--- a/core/modules/edit/js/views/ModalView.js
+++ b/core/modules/quickedit/js/views/ModalView.js
@@ -6,7 +6,7 @@
 
 "use strict";
 
-Drupal.edit.ModalView = Backbone.View.extend({
+Drupal.quickedit.ModalView = Backbone.View.extend({
 
   message: null,
   buttons: null,
@@ -51,7 +51,7 @@ Drupal.edit.ModalView = Backbone.View.extend({
     // Show the modal with an animation.
     var that = this;
     setTimeout(function () {
-      that.$el.removeClass('edit-animate-invisible');
+      that.$el.removeClass('quickedit-animate-invisible');
     }, 0);
   },
 
@@ -67,12 +67,12 @@ Drupal.edit.ModalView = Backbone.View.extend({
     // Remove after animation.
     var that = this;
     this.$el
-      .addClass('edit-animate-invisible')
-      .on(Drupal.edit.util.constants.transitionEnd, function (e) {
+      .addClass('quickedit-animate-invisible')
+      .on(Drupal.quickedit.util.constants.transitionEnd, function (e) {
         that.remove();
       });
 
-    var action = $(event.target).attr('data-edit-modal-action');
+    var action = $(event.target).attr('data-quickedit-modal-action');
     return this.callback(action);
   }
 });
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityAccessCheck.php
similarity index 90%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityAccessCheck.php
index 495c234..c8463ae 100644
--- a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheck.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityAccessCheck.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Access\EditEntityAccessCheck.
+ * Contains \Drupal\quickedit\Access\EditEntityAccessCheck.
  */
 
-namespace Drupal\edit\Access;
+namespace Drupal\quickedit\Access;
 
 use Drupal\Core\Access\StaticAccessCheckInterface;
 use Symfony\Component\Routing\Route;
@@ -22,8 +22,8 @@ class EditEntityAccessCheck implements StaticAccessCheckInterface, EditEntityAcc
    * {@inheritdoc}
    */
   public function appliesTo() {
-    // @see edit.routing.yml
-    return array('_access_edit_entity');
+    // @see quickedit.routing.yml
+    return array('_access_quickedit_entity');
   }
 
   /**
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheckInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityAccessCheckInterface.php
similarity index 73%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheckInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityAccessCheckInterface.php
index 5df39e1..5010810 100644
--- a/core/modules/edit/lib/Drupal/edit/Access/EditEntityAccessCheckInterface.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityAccessCheckInterface.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Access\EditEntityAccessCheckInterface.
+ * Contains \Drupal\quickedit\Access\EditEntityAccessCheckInterface.
  */
 
-namespace Drupal\edit\Access;
+namespace Drupal\quickedit\Access;
 
 use Drupal\Core\Entity\EntityInterface;
 
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheck.php
similarity index 90%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheck.php
index 9ec569a..c40b546 100644
--- a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheck.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheck.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Access\EditEntityFieldAccessCheck.
+ * Contains \Drupal\quickedit\Access\EditEntityFieldAccessCheck.
  */
 
-namespace Drupal\edit\Access;
+namespace Drupal\quickedit\Access;
 
 use Drupal\Core\Access\StaticAccessCheckInterface;
 use Symfony\Component\Routing\Route;
@@ -22,7 +22,7 @@ class EditEntityFieldAccessCheck implements StaticAccessCheckInterface, EditEnti
    * {@inheritdoc}
    */
   public function appliesTo() {
-    return array('_access_edit_entity_field');
+    return array('_access_quickedit_entity_field');
   }
 
   /**
@@ -41,7 +41,7 @@ public function access(Route $route, Request $request) {
    * Implements EntityFieldAccessCheckInterface::accessEditEntityField().
    */
   public function accessEditEntityField(EntityInterface $entity, $field_name) {
-    return $entity->access('update') && ($field = field_info_field($field_name)) && field_access('edit', $field, $entity->entityType(), $entity);
+    return $entity->access('update') && ($field = field_info_field($field_name)) && field_access('quickedit', $field, $entity->entityType(), $entity);
   }
 
   /**
diff --git a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheckInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheckInterface.php
similarity index 75%
rename from core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheckInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheckInterface.php
index fe6d918..f89c126 100644
--- a/core/modules/edit/lib/Drupal/edit/Access/EditEntityFieldAccessCheckInterface.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Access/EditEntityFieldAccessCheckInterface.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Access\EditEntityFieldAccessCheckInterface.
+ * Contains \Drupal\quickedit\Access\EditEntityFieldAccessCheckInterface.
  */
 
-namespace Drupal\edit\Access;
+namespace Drupal\quickedit\Access;
 
 use Drupal\Core\Entity\EntityInterface;
 
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/BaseCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/BaseCommand.php
similarity index 83%
rename from core/modules/edit/lib/Drupal/edit/Ajax/BaseCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/BaseCommand.php
index 3a07b7f..a9612d4 100644
--- a/core/modules/edit/lib/Drupal/edit/Ajax/BaseCommand.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/BaseCommand.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Ajax\BaseCommand.
+ * Contains \Drupal\quickedit\Ajax\BaseCommand.
  */
 
-namespace Drupal\edit\Ajax;
+namespace Drupal\quickedit\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;
 
 /**
- * Base AJAX command that only exists simplify Edit's actual AJAX commands.
+ * Base AJAX command to simplify Quick Edit's actual AJAX commands.
  */
 class BaseCommand implements CommandInterface {
 
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/EntitySavedCommand.php
similarity index 83%
rename from core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/EntitySavedCommand.php
index 6b6cc59..58b26d1 100644
--- a/core/modules/edit/lib/Drupal/edit/Ajax/EntitySavedCommand.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/EntitySavedCommand.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Ajax\EntitySavedCommand.
+ * Contains \Drupal\quickedit\Ajax\EntitySavedCommand.
  */
 
-namespace Drupal\edit\Ajax;
+namespace Drupal\quickedit\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;
 
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormCommand.php
similarity index 68%
rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormCommand.php
index 781e2ff..243baace 100644
--- a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormCommand.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormCommand.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Ajax\FieldFormCommand.
+ * Contains \Drupal\quickedit\Ajax\FieldFormCommand.
  */
 
-namespace Drupal\edit\Ajax;
+namespace Drupal\quickedit\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;
 
 /**
- * AJAX command for passing a rendered field form to Edit's JavaScript app.
+ * AJAX command for passing a rendered field form to Quick Edit's JS app.
  */
 class FieldFormCommand extends BaseCommand {
 
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormSavedCommand.php
similarity index 73%
rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormSavedCommand.php
index 2e89c19..ddcacac 100644
--- a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormSavedCommand.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormSavedCommand.php
@@ -2,16 +2,16 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Ajax\FieldFormSavedCommand.
+ * Contains \Drupal\quickedit\Ajax\FieldFormSavedCommand.
  */
 
-namespace Drupal\edit\Ajax;
+namespace Drupal\quickedit\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;
 
 /**
  * AJAX command to indicate a field was saved into TempStore without validation
- * errors and pass the rerendered field to Edit's JavaScript app.
+ * errors and pass the rerendered field to Quick Edit's JavaScript app.
  */
 class FieldFormSavedCommand extends BaseCommand {
 
diff --git a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormValidationErrorsCommand.php
similarity index 83%
rename from core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormValidationErrorsCommand.php
index a44be4b..025140d 100644
--- a/core/modules/edit/lib/Drupal/edit/Ajax/FieldFormValidationErrorsCommand.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Ajax/FieldFormValidationErrorsCommand.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Ajax\FieldFormValidationErrorsCommand.
+ * Contains \Drupal\quickedit\Ajax\FieldFormValidationErrorsCommand.
  */
 
-namespace Drupal\edit\Ajax;
+namespace Drupal\quickedit\Ajax;
 
 use Drupal\Core\Ajax\CommandInterface;
 
diff --git a/core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php b/core/modules/quickedit/lib/Drupal/quickedit/Annotation/InPlaceEditor.php
similarity index 85%
rename from core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Annotation/InPlaceEditor.php
index 2f889c7..eb310ca 100644
--- a/core/modules/edit/lib/Drupal/edit/Annotation/InPlaceEditor.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Annotation/InPlaceEditor.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Annotation\InPlaceEditor.
+ * Contains \Drupal\quickedit\Annotation\InPlaceEditor.
  */
 
-namespace Drupal\edit\Annotation;
+namespace Drupal\quickedit\Annotation;
 
 use Drupal\Component\Annotation\Plugin;
 
diff --git a/core/modules/edit/lib/Drupal/edit/EditController.php b/core/modules/quickedit/lib/Drupal/quickedit/EditController.php
similarity index 87%
rename from core/modules/edit/lib/Drupal/edit/EditController.php
rename to core/modules/quickedit/lib/Drupal/quickedit/EditController.php
index 3cfa3d1..01e9068 100644
--- a/core/modules/edit/lib/Drupal/edit/EditController.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/EditController.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains of \Drupal\edit\EditController.
+ * Contains of \Drupal\quickedit\EditController.
  */
 
-namespace Drupal\edit;
+namespace Drupal\quickedit;
 
 use Drupal;
 use Symfony\Component\DependencyInjection\ContainerAware;
@@ -14,15 +14,15 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\edit\Ajax\FieldFormCommand;
-use Drupal\edit\Ajax\FieldFormSavedCommand;
-use Drupal\edit\Ajax\FieldFormValidationErrorsCommand;
-use Drupal\edit\Ajax\EntitySavedCommand;
-use Drupal\edit\Ajax\MetadataCommand;
+use Drupal\quickedit\Ajax\FieldFormCommand;
+use Drupal\quickedit\Ajax\FieldFormSavedCommand;
+use Drupal\quickedit\Ajax\FieldFormValidationErrorsCommand;
+use Drupal\quickedit\Ajax\EntitySavedCommand;
+use Drupal\quickedit\Ajax\MetadataCommand;
 use Drupal\user\TempStoreFactory;
 
 /**
- * Returns responses for Edit module routes.
+ * Returns responses for Quick Edit module routes.
  */
 class EditController extends ContainerAware {
 
@@ -60,7 +60,7 @@ public function metadata(Request $request) {
     }
     $entities = $request->request->get('entities');
 
-    $metadataGenerator = $this->container->get('edit.metadata.generator');
+    $metadataGenerator = $this->container->get('quickedit.metadata.generator');
 
     $metadata = array();
     foreach ($fields as $field) {
@@ -111,7 +111,7 @@ public function attachments(Request $request) {
       throw new NotFoundHttpException();
     }
 
-    $editorSelector = $this->container->get('edit.editor.selector');
+    $editorSelector = $this->container->get('quickedit.editor.selector');
     $elements['#attached'] = $editorSelector->getEditorAttachments($editors);
     drupal_process_attached($elements);
 
@@ -140,12 +140,12 @@ public function fieldForm(EntityInterface $entity, $field_name, $langcode, $view
 
     // Replace entity with tempstore copy if available and not resetting, init
     // tempstore copy otherwise.
-    $tempstore_entity = $this->tempStoreFactory->get('edit')->get($entity->uuid());
+    $tempstore_entity = $this->tempStoreFactory->get('quickedit')->get($entity->uuid());
     if ($tempstore_entity && !(isset($_POST['reset']) && $_POST['reset'] === 'true')) {
       $entity = $tempstore_entity;
     }
     else {
-      $this->tempStoreFactory->get('edit')->set($entity->uuid(), $entity);
+      $this->tempStoreFactory->get('quickedit')->set($entity->uuid(), $entity);
     }
 
     $form_state = array(
@@ -153,12 +153,12 @@ public function fieldForm(EntityInterface $entity, $field_name, $langcode, $view
       'no_redirect' => TRUE,
       'build_info' => array('args' => array($entity, $field_name, $this->tempStoreFactory)),
     );
-    $form = drupal_build_form('edit_field_form', $form_state);
+    $form = drupal_build_form('quickedit_field_form', $form_state);
 
     if (!empty($form_state['executed'])) {
       // The form submission saved the entity in tempstore. Return the
       // updated view of the field from the tempstore copy.
-      $entity = $this->tempStoreFactory->get('edit')->get($entity->uuid());
+      $entity = $this->tempStoreFactory->get('quickedit')->get($entity->uuid());
       // @todo Remove when http://drupal.org/node/1346214 is complete.
       $entity = $entity->getBCEntity();
       $output = field_view_field($entity, $field_name, $view_mode_id, $langcode);
@@ -195,7 +195,7 @@ public function fieldForm(EntityInterface $entity, $field_name, $langcode, $view
   public function entitySave(EntityInterface $entity) {
     // Take the entity from tempstore and save in entity storage. fieldForm()
     // ensures that the tempstore copy exists ahead.
-    $tempstore = $this->tempStoreFactory->get('edit');
+    $tempstore = $this->tempStoreFactory->get('quickedit');
     $tempstore->get($entity->uuid())->save();
     $tempstore->delete($entity->uuid());
 
diff --git a/core/modules/edit/lib/Drupal/edit/EditPluginInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/EditPluginInterface.php
similarity index 90%
rename from core/modules/edit/lib/Drupal/edit/EditPluginInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/EditPluginInterface.php
index 1dcc642..d779687 100644
--- a/core/modules/edit/lib/Drupal/edit/EditPluginInterface.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/EditPluginInterface.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\EditPluginInterface.
+ * Contains \Drupal\quickedit\EditPluginInterface.
  */
 
-namespace Drupal\edit;
+namespace Drupal\quickedit;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
@@ -34,7 +34,7 @@ public function isCompatible(FieldDefinitionInterface $field_definition, array $
   /**
    * Generates metadata that is needed specifically for this editor.
    *
-   * Will only be called by \Drupal\edit\MetadataGeneratorInterface::generate()
+   * Will only be called by \Drupal\quickedit\MetadataGeneratorInterface::generate()
    * when the passed in field instance & item values will use this editor.
    *
    * @param \Drupal\Core\Entity\Field\FieldDefinitionInterface $field_definition
diff --git a/core/modules/edit/lib/Drupal/edit/EditorBase.php b/core/modules/quickedit/lib/Drupal/quickedit/EditorBase.php
similarity index 77%
rename from core/modules/edit/lib/Drupal/edit/EditorBase.php
rename to core/modules/quickedit/lib/Drupal/quickedit/EditorBase.php
index 10b2f02..a42e323 100644
--- a/core/modules/edit/lib/Drupal/edit/EditorBase.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/EditorBase.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\edit\EditorBase.
+ * Contains \Drupal\quickedit\EditorBase.
  */
 
-namespace Drupal\edit;
+namespace Drupal\quickedit;
 
 use Drupal\Component\Plugin\PluginBase;
-use Drupal\edit\EditPluginInterface;
+use Drupal\quickedit\EditPluginInterface;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
 
 /**
diff --git a/core/modules/edit/lib/Drupal/edit/EditorSelector.php b/core/modules/quickedit/lib/Drupal/quickedit/EditorSelector.php
similarity index 95%
rename from core/modules/edit/lib/Drupal/edit/EditorSelector.php
rename to core/modules/quickedit/lib/Drupal/quickedit/EditorSelector.php
index 2636f38..c4218ee 100644
--- a/core/modules/edit/lib/Drupal/edit/EditorSelector.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/EditorSelector.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\EditorSelector.
+ * Contains \Drupal\quickedit\EditorSelector.
  */
 
-namespace Drupal\edit;
+namespace Drupal\quickedit;
 
 use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Component\Utility\NestedArray;
@@ -63,7 +63,7 @@ public function getEditor($formatter_type, FieldDefinitionInterface $field_defin
     // 'form' editor, since that can work for any field. Formatter definitions
     // can use 'disabled' to explicitly opt out of in-place editing.
     $formatter_info = field_info_formatter_types($formatter_type);
-    $editor_id = $formatter_info['edit']['editor'];
+    $editor_id = $formatter_info['quickedit']['editor'];
     if ($editor_id === 'disabled') {
       return;
     }
diff --git a/core/modules/edit/lib/Drupal/edit/EditorSelectorInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/EditorSelectorInterface.php
similarity index 92%
rename from core/modules/edit/lib/Drupal/edit/EditorSelectorInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/EditorSelectorInterface.php
index d36083a..d616995 100644
--- a/core/modules/edit/lib/Drupal/edit/EditorSelectorInterface.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/EditorSelectorInterface.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\EditorSelectorInterface.
+ * Contains \Drupal\quickedit\EditorSelectorInterface.
  */
 
-namespace Drupal\edit;
+namespace Drupal\quickedit;
 
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
 
diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/quickedit/lib/Drupal/quickedit/Form/EditFieldForm.php
similarity index 95%
rename from core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Form/EditFieldForm.php
index e14e0d2..41400c3 100644
--- a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Form/EditFieldForm.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Form\EditFieldForm.
+ * Contains \Drupal\quickedit\Form\EditFieldForm.
  */
 
-namespace Drupal\edit\Form;
+namespace Drupal\quickedit\Form;
 
 use Drupal;
 use Drupal\Core\Entity\EntityInterface;
@@ -40,7 +40,7 @@ public function build(array $form, array &$form_state, EntityInterface $entity,
     $form['actions']['submit'] = array(
       '#type' => 'submit',
       '#value' => t('Save'),
-      '#attributes' => array('class' => array('edit-form-submit')),
+      '#attributes' => array('class' => array('quickedit-form-submit')),
     );
 
     // Add validation and submission handlers.
@@ -100,7 +100,7 @@ public function submit(array $form, array &$form_state) {
     $form_state['entity'] = $this->buildEntity($form, $form_state);
 
     // Store entity in tempstore with its UUID as tempstore key.
-    $this->tempStoreFactory->get('edit')->set($form_state['entity']->uuid(), $form_state['entity']);
+    $this->tempStoreFactory->get('quickedit')->set($form_state['entity']->uuid(), $form_state['entity']);
   }
 
   /**
diff --git a/core/modules/edit/lib/Drupal/edit/MetadataGenerator.php b/core/modules/quickedit/lib/Drupal/quickedit/MetadataGenerator.php
similarity index 87%
rename from core/modules/edit/lib/Drupal/edit/MetadataGenerator.php
rename to core/modules/quickedit/lib/Drupal/quickedit/MetadataGenerator.php
index 74d13f9..cc1443e 100644
--- a/core/modules/edit/lib/Drupal/edit/MetadataGenerator.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/MetadataGenerator.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\edit\MetadataGenerator.
+ * Contains \Drupal\quickedit\MetadataGenerator.
  */
 
-namespace Drupal\edit;
+namespace Drupal\quickedit;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
-use Drupal\edit\Access\EditEntityFieldAccessCheckInterface;
+use Drupal\quickedit\Access\EditEntityFieldAccessCheckInterface;
 use Drupal\field\FieldInstanceInterface;
 
 /**
@@ -21,14 +21,14 @@ class MetadataGenerator implements MetadataGeneratorInterface {
    /**
    * An object that checks if a user has access to edit a given entity field.
    *
-   * @var \Drupal\edit\Access\EditEntityFieldAccessCheckInterface
+   * @var \Drupal\quickedit\Access\EditEntityFieldAccessCheckInterface
    */
   protected $accessChecker;
 
   /**
    * An object that determines which editor to attach to a given field.
    *
-   * @var \Drupal\edit\EditorSelectorInterface
+   * @var \Drupal\quickedit\EditorSelectorInterface
    */
   protected $editorSelector;
 
@@ -42,9 +42,9 @@ class MetadataGenerator implements MetadataGeneratorInterface {
   /**
    * Constructs a new MetadataGenerator.
    *
-   * @param \Drupal\edit\Access\EditEntityFieldAccessCheckInterface $access_checker
+   * @param \Drupal\quickedit\Access\EditEntityFieldAccessCheckInterface $access_checker
    *   An object that checks if a user has access to edit a given field.
-   * @param \Drupal\edit\EditorSelectorInterface $editor_selector
+   * @param \Drupal\quickedit\EditorSelectorInterface $editor_selector
    *   An object that determines which editor to attach to a given field.
    * @param \Drupal\Component\Plugin\PluginManagerInterface
    *   The manager for editor plugins.
diff --git a/core/modules/edit/lib/Drupal/edit/MetadataGeneratorInterface.php b/core/modules/quickedit/lib/Drupal/quickedit/MetadataGeneratorInterface.php
similarity index 95%
rename from core/modules/edit/lib/Drupal/edit/MetadataGeneratorInterface.php
rename to core/modules/quickedit/lib/Drupal/quickedit/MetadataGeneratorInterface.php
index 3566cf8..628d61c 100644
--- a/core/modules/edit/lib/Drupal/edit/MetadataGeneratorInterface.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/MetadataGeneratorInterface.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\MetadataGeneratorInterface.
+ * Contains \Drupal\quickedit\MetadataGeneratorInterface.
  */
 
-namespace Drupal\edit;
+namespace Drupal\quickedit;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/DirectEditor.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/DirectEditor.php
similarity index 73%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/DirectEditor.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/DirectEditor.php
index 6a8f16b..6715ceb 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/DirectEditor.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/DirectEditor.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Plugin\InPlaceEditor\DirectEditor.
+ * Contains \Drupal\quickedit\Plugin\InPlaceEditor\DirectEditor.
  */
 
-namespace Drupal\edit\Plugin\InPlaceEditor;
+namespace Drupal\quickedit\Plugin\InPlaceEditor;
 
-use Drupal\edit\EditorBase;
-use Drupal\edit\Annotation\InPlaceEditor;
+use Drupal\quickedit\EditorBase;
+use Drupal\quickedit\Annotation\InPlaceEditor;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
 
 /**
@@ -41,12 +41,12 @@ function isCompatible(FieldDefinitionInterface $field_definition, array $items)
   }
 
   /**
-   * Implements \Drupal\edit\EditPluginInterface::getAttachments().
+   * Implements \Drupal\quickedit\EditPluginInterface::getAttachments().
    */
   public function getAttachments() {
     return array(
       'library' => array(
-        array('edit', 'edit.editorWidget.direct'),
+        array('quickedit', 'quickedit.editorWidget.direct'),
       ),
     );
   }
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/FormEditor.php
similarity index 58%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/FormEditor.php
index 4c71db2..b0c27a7 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditor/FormEditor.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Plugin\InPlaceEditor\FormEditor.
+ * Contains \Drupal\quickedit\Plugin\InPlaceEditor\FormEditor.
  */
 
-namespace Drupal\edit\Plugin\InPlaceEditor;
+namespace Drupal\quickedit\Plugin\InPlaceEditor;
 
-use Drupal\edit\EditorBase;
-use Drupal\edit\Annotation\InPlaceEditor;
+use Drupal\quickedit\EditorBase;
+use Drupal\quickedit\Annotation\InPlaceEditor;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
 
 /**
@@ -28,12 +28,12 @@ function isCompatible(FieldDefinitionInterface $field_definition, array $items)
   }
 
   /**
-   * Implements \Drupal\edit\EditPluginInterface::getAttachments().
+   * Implements \Drupal\quickedit\EditPluginInterface::getAttachments().
    */
   public function getAttachments() {
     return array(
       'library' => array(
-        array('edit', 'edit.editorWidget.form'),
+        array('quickedit', 'quickedit.editorWidget.form'),
       ),
     );
   }
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditorManager.php
similarity index 67%
rename from core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditorManager.php
index f4c544b..c448196 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorManager.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Plugin/InPlaceEditorManager.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Plugin\InPlaceEditorManager.
+ * Contains \Drupal\quickedit\Plugin\InPlaceEditorManager.
  */
 
-namespace Drupal\edit\Plugin;
+namespace Drupal\quickedit\Plugin;
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Discovery\ProcessDecorator;
@@ -29,10 +29,10 @@ class InPlaceEditorManager extends PluginManagerBase {
    *   keyed by the corresponding namespace to look for plugin implementations,
    */
   public function __construct(\Traversable $namespaces) {
-    $annotation_namespaces = array('Drupal\edit\Annotation' => $namespaces['Drupal\edit']);
-    $this->discovery = new AnnotatedClassDiscovery('InPlaceEditor', $namespaces, $annotation_namespaces, 'Drupal\edit\Annotation\InPlaceEditor');
-    $this->discovery = new AlterDecorator($this->discovery, 'edit_editor');
-    $this->discovery = new CacheDecorator($this->discovery, 'edit:editor');
+    $annotation_namespaces = array('Drupal\quickedit\Annotation' => $namespaces['Drupal\quickedit']);
+    $this->discovery = new AnnotatedClassDiscovery('InPlaceEditor', $namespaces, $annotation_namespaces, 'Drupal\quickedit\Annotation\InPlaceEditor');
+    $this->discovery = new AlterDecorator($this->discovery, 'quickedit_editor');
+    $this->discovery = new CacheDecorator($this->discovery, 'quickedit:editor');
     $this->factory = new DefaultFactory($this->discovery);
   }
 
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditLoadingTest.php
similarity index 87%
rename from core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/EditLoadingTest.php
index 4807d4e..5de6cb5 100644
--- a/core/modules/edit/lib/Drupal/edit/Tests/EditLoadingTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditLoadingTest.php
@@ -2,18 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Tests\EditLoadingTest.
+ * Contains \Drupal\quickedit\Tests\EditLoadingTest.
  */
 
-namespace Drupal\edit\Tests;
+namespace Drupal\quickedit\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\edit\Ajax\MetadataCommand;
+use Drupal\quickedit\Ajax\MetadataCommand;
 use Drupal\Core\Ajax\AppendCommand;
 use Drupal\Component\Utility\Unicode;
 
 /**
- * Tests loading of Edit and lazy-loading of in-place editors.
+ * Tests loading of Quick Edit and lazy-loading of in-place editors.
  */
 class EditLoadingTest extends WebTestBase {
 
@@ -22,13 +22,13 @@ class EditLoadingTest extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('contextual', 'edit', 'filter', 'node');
+  public static $modules = array('contextual', 'quickedit', 'filter', 'node');
 
   public static function getInfo() {
     return array(
       'name' => 'In-place editing loading',
       'description' => 'Tests loading of in-place editing functionality and lazy loading of its in-place editors.',
-      'group' => 'Edit',
+      'group' => 'Quick Edit',
     );
   }
 
@@ -77,13 +77,13 @@ function testUserWithoutPermission() {
 
     // Settings, library and in-place editors.
     $settings = $this->drupalGetSettings();
-    $this->assertFalse(isset($settings['edit']), 'Edit settings do not exist.');
-    $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/edit/js/edit.js']), 'Edit library not loaded.');
-    $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/edit/js/createjs/editingWidgets/formwidget.js']), "'form' in-place editor not loaded.");
+    $this->assertFalse(isset($settings['quickedit']), 'Quick Edit settings do not exist.');
+    $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/quickedit.js']), 'Quick Edit library not loaded.');
+    $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/createjs/editingWidgets/formwidget.js']), "'form' in-place editor not loaded.");
 
     // HTML annotation must always exist (to not break the render cache).
-    $this->assertRaw('data-edit-entity="node/1"');
-    $this->assertRaw('data-edit-id="node/1/body/und/full"');
+    $this->assertRaw('data-quickedit-entity="node/1"');
+    $this->assertRaw('data-quickedit-id="node/1/body/und/full"');
 
     // Retrieving the metadata should result in an empty 403 response.
     $response = $this->retrieveMetadata(array('node/1/body/und/full'));
@@ -92,7 +92,7 @@ function testUserWithoutPermission() {
   }
 
   /**
-   * Tests the loading of Edit when a user does have access to it.
+   * Tests the loading of Quick Edit when a user does have access to it.
    *
    * Also ensures lazy loading of in-place editors works.
    */
@@ -102,13 +102,13 @@ function testUserWithPermission() {
 
     // Settings, library and in-place editors.
     $settings = $this->drupalGetSettings();
-    $this->assertTrue(isset($settings['edit']), 'Edit settings exist.');
-    $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/edit/js/edit.js']), 'Edit library loaded.');
-    $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/edit/js/createjs/editingWidgets/formwidget.js']), "'form' in-place editor not loaded.");
+    $this->assertTrue(isset($settings['quickedit']), 'Quick Edit settings exist.');
+    $this->assertTrue(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/quickedit.js']), 'Quick Edit library loaded.');
+    $this->assertFalse(isset($settings['ajaxPageState']['js']['core/modules/quickedit/js/createjs/editingWidgets/formwidget.js']), "'form' in-place editor not loaded.");
 
     // HTML annotation must always exist (to not break the render cache).
-    $this->assertRaw('data-edit-entity="node/1"');
-    $this->assertRaw('data-edit-id="node/1/body/und/full"');
+    $this->assertRaw('data-quickedit-entity="node/1"');
+    $this->assertRaw('data-quickedit-id="node/1/body/und/full"');
 
     // Retrieving the metadata should result in a 200 JSON response.
     $htmlPageDrupalSettings = $this->drupalSettings;
@@ -137,7 +137,7 @@ function testUserWithPermission() {
     $this->assertIdentical('settings', $ajax_commands[0]['command'], 'The first AJAX command is a settings command.');
     // Second command: insert libraries into DOM.
     $this->assertIdentical('insert', $ajax_commands[1]['command'], 'The second AJAX command is an append command.');
-    $command = new AppendCommand('body', '<script src="' . file_create_url('core/modules/edit/js/editors/formEditor.js') . '?v=' . VERSION . '"></script>' . "\n");
+    $command = new AppendCommand('body', '<script src="' . file_create_url('core/modules/quickedit/js/editors/formEditor.js') . '?v=' . VERSION . '"></script>' . "\n");
     $this->assertIdentical($command->render(), $ajax_commands[1], 'The append command contains the expected data.');
 
     // Retrieving the form for this field should result in a 200 response,
@@ -157,7 +157,7 @@ function testUserWithPermission() {
 
     if ($form_tokens_found) {
       $edit = array();
-      $edit['form_id'] = 'edit_field_form';
+      $edit['form_id'] = 'quickedit_field_form';
       $edit['form_token'] = $token_match[1];
       $edit['form_build_id'] = $build_id_match[1];
       $edit['body[und][0][summary]'] = '';
@@ -194,7 +194,7 @@ function testUserWithPermission() {
   }
 
   /**
-   * Retrieve Edit metadata from the server. May also result in additional
+   * Retrieve Quick Edit metadata from the server. May also result in additional
    * JavaScript settings and CSS/JS being loaded.
    *
    * @param array $ids
@@ -221,7 +221,7 @@ protected function retrieveMetadata($ids) {
 
     // Perform HTTP request.
     return $this->curlExec(array(
-      CURLOPT_URL => url('edit/metadata', array('absolute' => TRUE)),
+      CURLOPT_URL => url('quickedit/metadata', array('absolute' => TRUE)),
       CURLOPT_POST => TRUE,
       CURLOPT_POSTFIELDS => $post . $this->getAjaxPageStatePostData(),
       CURLOPT_HTTPHEADER => array(
@@ -258,7 +258,7 @@ protected function retrieveAttachments($editors) {
 
     // Perform HTTP request.
     return $this->curlExec(array(
-      CURLOPT_URL => url('edit/attachments', array('absolute' => TRUE)),
+      CURLOPT_URL => url('quickedit/attachments', array('absolute' => TRUE)),
       CURLOPT_POST => TRUE,
       CURLOPT_POSTFIELDS => $post . $this->getAjaxPageStatePostData(),
       CURLOPT_HTTPHEADER => array(
@@ -272,7 +272,7 @@ protected function retrieveAttachments($editors) {
    * Submit field form data to the server.
    *
    * @param string $field_id
-   *   An Edit field ID.
+   *   A Quick Edit field ID.
    * @param array $post
    *   An array of post data to send.
    *
@@ -291,7 +291,7 @@ protected function submitFieldForm($field_id, $post) {
 
     // Perform HTTP request.
     return $this->curlExec(array(
-      CURLOPT_URL => url('edit/form/' . $field_id, array('absolute' => TRUE)),
+      CURLOPT_URL => url('quickedit/form/' . $field_id, array('absolute' => TRUE)),
       CURLOPT_POST => TRUE,
       CURLOPT_POSTFIELDS => $post . $this->getAjaxPageStatePostData(),
       CURLOPT_HTTPHEADER => array(
@@ -306,7 +306,7 @@ protected function submitFieldForm($field_id, $post) {
    * JavaScript settings and CSS/JS being loaded.
    *
    * @param string $field_id
-   *   An Edit field ID.
+   *   A Quick Edit field ID.
    *
    * @return string
    *   The response body.
@@ -317,7 +317,7 @@ protected function retrieveFieldForm($field_id) {
 
     // Perform HTTP request.
     return $this->curlExec(array(
-      CURLOPT_URL => url('edit/form/' . $field_id, array('absolute' => TRUE)),
+      CURLOPT_URL => url('quickedit/form/' . $field_id, array('absolute' => TRUE)),
       CURLOPT_POST => TRUE,
       CURLOPT_POSTFIELDS => $post . $this->getAjaxPageStatePostData(),
       CURLOPT_HTTPHEADER => array(
@@ -342,7 +342,7 @@ protected function saveEntity($entity_type_id) {
 
     // Perform HTTP request.
     return $this->curlExec(array(
-      CURLOPT_URL => url('edit/entity/' . $entity_type_id, array('absolute' => TRUE)),
+      CURLOPT_URL => url('quickedit/entity/' . $entity_type_id, array('absolute' => TRUE)),
       CURLOPT_POST => TRUE,
       CURLOPT_POSTFIELDS => $post . $this->getAjaxPageStatePostData(),
       CURLOPT_HTTPHEADER => array(
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditTestBase.php
similarity index 94%
rename from core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/EditTestBase.php
index 649f033..01d47f0 100644
--- a/core/modules/edit/lib/Drupal/edit/Tests/EditTestBase.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditTestBase.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Tests\EditTestBase.
+ * Contains \Drupal\quickedit\Tests\EditTestBase.
  */
 
-namespace Drupal\edit\Tests;
+namespace Drupal\quickedit\Tests;
 
 use Drupal\simpletest\DrupalUnitTestBase;
 
 /**
- * Parent class for Edit tests.
+ * Parent class for Quick Edit tests.
  */
 class EditTestBase extends DrupalUnitTestBase {
 
@@ -19,7 +19,7 @@ class EditTestBase extends DrupalUnitTestBase {
    *
    * @var array
    */
-  public static $modules = array('system', 'entity', 'entity_test', 'field', 'field_sql_storage', 'field_test', 'number', 'text', 'edit');
+  public static $modules = array('system', 'entity', 'entity_test', 'field', 'field_sql_storage', 'field_test', 'number', 'text', 'quickedit');
   /**
    * Sets the default field storage backend for fields created during tests.
    */
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php
similarity index 93%
rename from core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php
index c1982c5..c25ba8c 100644
--- a/core/modules/edit/lib/Drupal/edit/Tests/EditorSelectionTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/EditorSelectionTest.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Tests\EditorSelectionTest.
+ * Contains \Drupal\quickedit\Tests\EditorSelectionTest.
  */
 
-namespace Drupal\edit\Tests;
+namespace Drupal\quickedit\Tests;
 
-use Drupal\edit\Plugin\InPlaceEditorManager;
-use Drupal\edit\EditorSelector;
+use Drupal\quickedit\Plugin\InPlaceEditorManager;
+use Drupal\quickedit\EditorSelector;
 
 /**
  * Test in-place field editor selection.
@@ -25,7 +25,7 @@ class EditorSelectionTest extends EditTestBase {
   /**
    * The editor selector object to be tested.
    *
-   * @var \Drupal\edit\EditorSelectorInterface
+   * @var \Drupal\quickedit\EditorSelectorInterface
    */
   protected $editorSelector;
 
@@ -33,20 +33,20 @@ public static function getInfo() {
     return array(
       'name' => 'In-place field editor selection',
       'description' => 'Tests in-place field editor selection.',
-      'group' => 'Edit',
+      'group' => 'Quick Edit',
     );
   }
 
   function setUp() {
     parent::setUp();
 
-    $this->editorManager = $this->container->get('plugin.manager.edit.editor');
+    $this->editorManager = $this->container->get('plugin.manager.quickedit.editor');
     $this->editorSelector = new EditorSelector($this->editorManager);
   }
 
   /**
    * Retrieves the FieldInstance object for the given field and returns the
-   * editor that Edit selects.
+   * editor that Quick Edit selects.
    */
   protected function getSelectedEditor($items, $field_name, $view_mode = 'default') {
     $options = entity_get_display('entity_test', 'entity_test', $view_mode)->getComponent($field_name);
@@ -106,8 +106,8 @@ function testText() {
    * processing, but with varying text format compatibility.
    */
   function testTextWysiwyg() {
-    // Enable edit_test module so that the 'wysiwyg' editor becomes available.
-    $this->enableModules(array('edit_test'));
+    // Enable quickedit_test module so that the 'wysiwyg' editor becomes available.
+    $this->enableModules(array('quickedit_test'));
 
     $field_name = 'field_textarea';
     $this->createFieldWithInstance(
diff --git a/core/modules/edit/lib/Drupal/edit/Tests/MetadataGeneratorTest.php b/core/modules/quickedit/lib/Drupal/quickedit/Tests/MetadataGeneratorTest.php
similarity index 89%
rename from core/modules/edit/lib/Drupal/edit/Tests/MetadataGeneratorTest.php
rename to core/modules/quickedit/lib/Drupal/quickedit/Tests/MetadataGeneratorTest.php
index a930988..835a330 100644
--- a/core/modules/edit/lib/Drupal/edit/Tests/MetadataGeneratorTest.php
+++ b/core/modules/quickedit/lib/Drupal/quickedit/Tests/MetadataGeneratorTest.php
@@ -2,16 +2,16 @@
 
 /**
  * @file
- * Contains \Drupal\edit\Tests\MetadataGeneratorTest.
+ * Contains \Drupal\quickedit\Tests\MetadataGeneratorTest.
  */
 
-namespace Drupal\edit\Tests;
+namespace Drupal\quickedit\Tests;
 
 use Drupal\Core\Language\Language;
-use Drupal\edit\EditorSelector;
-use Drupal\edit\MetadataGenerator;
-use Drupal\edit\Plugin\InPlaceEditorManager;
-use Drupal\edit_test\MockEditEntityFieldAccessCheck;
+use Drupal\quickedit\EditorSelector;
+use Drupal\quickedit\MetadataGenerator;
+use Drupal\quickedit\Plugin\InPlaceEditorManager;
+use Drupal\quickedit_test\MockEditEntityFieldAccessCheck;
 
 /**
  * Test in-place field editing metadata.
@@ -28,21 +28,21 @@ class MetadataGeneratorTest extends EditTestBase {
   /**
    * The metadata generator object to be tested.
    *
-   * @var \Drupal\edit\MetadataGeneratorInterface.php
+   * @var \Drupal\quickedit\MetadataGeneratorInterface.php
    */
   protected $metadataGenerator;
 
   /**
    * The editor selector object to be used by the metadata generator object.
    *
-   * @var \Drupal\edit\EditorSelectorInterface
+   * @var \Drupal\quickedit\EditorSelectorInterface
    */
   protected $editorSelector;
 
   /**
    * The access checker object to be used by the metadata generator object.
    *
-   * @var \Drupal\edit\Access\EditEntityFieldAccessCheckInterface
+   * @var \Drupal\quickedit\Access\EditEntityFieldAccessCheckInterface
    */
   protected $accessChecker;
 
@@ -50,14 +50,14 @@ public static function getInfo() {
     return array(
       'name' => 'In-place field editing metadata',
       'description' => 'Tests in-place field editing metadata generation.',
-      'group' => 'Edit',
+      'group' => 'Quick Edit',
     );
   }
 
   function setUp() {
     parent::setUp();
 
-    $this->editorManager = $this->container->get('plugin.manager.edit.editor');
+    $this->editorManager = $this->container->get('plugin.manager.quickedit.editor');
     $this->accessChecker = new MockEditEntityFieldAccessCheck();
     $this->editorSelector = new EditorSelector($this->editorManager);
     $this->metadataGenerator = new MetadataGenerator($this->accessChecker, $this->editorSelector, $this->editorManager);
@@ -129,8 +129,8 @@ function testEditorWithCustomMetadata() {
     $this->installSchema('system', 'url_alias');
     $this->enableModules(array('user', 'filter'));
 
-    // Enable edit_test module so that the WYSIWYG editor becomes available.
-    $this->enableModules(array('edit_test'));
+    // Enable quickedit_test module so that the WYSIWYG editor becomes available.
+    $this->enableModules(array('quickedit_test'));
 
     // Create a rich text field.
     $field_name = 'field_rich';
diff --git a/core/modules/edit/edit.api.php b/core/modules/quickedit/quickedit.api.php
similarity index 64%
rename from core/modules/edit/edit.api.php
rename to core/modules/quickedit/quickedit.api.php
index 341220b..e199701 100644
--- a/core/modules/edit/edit.api.php
+++ b/core/modules/quickedit/quickedit.api.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Hooks provided by the Edit module.
+ * Hooks provided by the Quick Edit module.
  */
 
 /**
@@ -20,12 +20,12 @@
  *   An array of informations on existing in-place editors, as collected by the
  *   annotation discovery mechanism.
  *
- * @see \Drupal\edit\Annotation\InPlaceEditor
- * @see \Drupal\edit\Plugin\EditorManager
+ * @see \Drupal\quickedit\Annotation\InPlaceEditor
+ * @see \Drupal\quickedit\Plugin\EditorManager
  */
-function hook_edit_editor_alter(&$editors) {
+function hook_quickedit_editor_alter(&$editors) {
   // Cleanly override editor.module's in-place editor plugin.
-  $editors['editor']['class'] = 'Drupal\advanced_editor\Plugin\edit\editor\AdvancedEditor';
+  $editors['editor']['class'] = 'Drupal\advanced_editor\Plugin\quickedit\editor\AdvancedEditor';
 }
 
 /**
diff --git a/core/modules/edit/edit.info.yml b/core/modules/quickedit/quickedit.info.yml
similarity index 88%
rename from core/modules/edit/edit.info.yml
rename to core/modules/quickedit/quickedit.info.yml
index 4f07cdf..630f2fc 100644
--- a/core/modules/edit/edit.info.yml
+++ b/core/modules/quickedit/quickedit.info.yml
@@ -1,4 +1,4 @@
-name: Edit
+name: Quick Edit
 type: module
 description: 'In-place content editing.'
 package: Core
diff --git a/core/modules/edit/edit.module b/core/modules/quickedit/quickedit.module
similarity index 60%
rename from core/modules/edit/edit.module
rename to core/modules/quickedit/quickedit.module
index a7fbb5d..9b2e404 100644
--- a/core/modules/edit/edit.module
+++ b/core/modules/quickedit/quickedit.module
@@ -4,15 +4,15 @@
  * @file
  * Provides in-place content editing functionality for fields.
  *
- * The Edit module makes content editable in-place. Rather than having to visit
- * a separate page to edit content, it may be edited in-place.
+ * The Quick Edit module makes content editable in-place. Rather than having
+ * to visit a separate page to edit content, it may be edited in-place.
  *
  * Technically, this module adds classes and data- attributes to fields and
  * entities, enabling them for in-place editing.
  */
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\edit\Form\EditFieldForm;
+use Drupal\quickedit\Form\EditFieldForm;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\entity\Plugin\Core\Entity\EntityDisplay;
 use Drupal\user\TempStoreFactory;
@@ -20,15 +20,15 @@
 /**
  * Implements hook_menu().
  */
-function edit_menu() {
+function quickedit_menu() {
   // @todo Remove these menu items in http://drupal.org/node/1954892 when theme
   //   callbacks are replaced with something else.
-  $items['edit/metadata'] = array(
-    'route_name' => 'edit_metadata',
+  $items['quickedit/metadata'] = array(
+    'route_name' => 'quickedit_metadata',
     'theme callback' => 'ajax_base_page_theme',
   );
-  $items['edit/form/%/%/%/%/%'] = array(
-    'route_name' => 'edit_field_form',
+  $items['quickedit/form/%/%/%/%/%'] = array(
+    'route_name' => 'quickedit_field_form',
     'theme callback' => 'ajax_base_page_theme',
   );
 
@@ -38,7 +38,7 @@ function edit_menu() {
 /**
  * Implements hook_permission().
  */
-function edit_permission() {
+function quickedit_permission() {
   return array(
     'access in-place editing' => array(
       'title' => t('Access in-place editing'),
@@ -49,38 +49,38 @@ function edit_permission() {
 /**
  * Implements hook_page_build().
  *
- * Adds the edit library to the page for any user who has the 'access in-place
+ * Adds the quickedit library to the page for any user who has the 'access in-place
  * editing' permission.
  */
-function edit_page_build(&$page) {
+function quickedit_page_build(&$page) {
   if (!user_access('access in-place editing')) {
     return;
   }
 
   $page['#attached']['js'][] = array(
     'type' => 'setting',
-    'data' => array('edit' => array(
-      'fieldFormURL' => url('edit/form/!entity_type/!id/!field_name/!langcode/!view_mode'),
+    'data' => array('quickedit' => array(
+      'fieldFormURL' => url('quickedit/form/!entity_type/!id/!field_name/!langcode/!view_mode'),
       'context' => 'body',
     )),
   );
-  $page['#attached']['library'][] = array('edit', 'edit');
+  $page['#attached']['library'][] = array('quickedit', 'quickedit');
 }
 
 /**
  * Implements hook_library_info().
  */
-function edit_library_info() {
-  $path = drupal_get_path('module', 'edit');
+function quickedit_library_info() {
+  $path = drupal_get_path('module', 'quickedit');
   $options = array(
     'scope' => 'footer',
   );
-  $libraries['edit'] = array(
-    'title' => 'Edit: in-place editing',
+  $libraries['quickedit'] = array(
+    'title' => 'Quick Edit: in-place editing',
     'version' => VERSION,
     'js' => array(
       // Core.
-      $path . '/js/edit.js' => $options,
+      $path . '/js/quickedit.js' => $options,
       // Models.
       $path . '/js/models/AppModel.js' => $options,
       $path . '/js/models/EntityModel.js' => $options,
@@ -100,9 +100,9 @@ function edit_library_info() {
       $path . '/js/theme.js' => $options,
     ),
     'css' => array(
-      $path . '/css/edit.module.css' => array(),
-      $path . '/css/edit.theme.css' => array(),
-      $path . '/css/edit.icons.css' => array(),
+      $path . '/css/quickedit.module.css' => array(),
+      $path . '/css/quickedit.theme.css' => array(),
+      $path . '/css/quickedit.icons.css' => array(),
     ),
     'dependencies' => array(
       array('system', 'jquery'),
@@ -117,24 +117,24 @@ function edit_library_info() {
       array('system', 'drupalSettings'),
     ),
   );
-  $libraries['edit.editorWidget.form'] = array(
+  $libraries['quickedit.editorWidget.form'] = array(
     'title' => 'Form in-place editor',
     'version' => VERSION,
     'js' => array(
       $path . '/js/editors/formEditor.js' => $options,
     ),
     'dependencies' => array(
-      array('edit', 'edit'),
+      array('quickedit', 'quickedit'),
     ),
   );
-  $libraries['edit.editorWidget.direct'] = array(
+  $libraries['quickedit.editorWidget.direct'] = array(
     'title' => 'Direct in-place editor',
     'version' => VERSION,
     'js' => array(
       $path . '/js/editors/directEditor.js' => $options,
     ),
     'dependencies' => array(
-      array('edit', 'edit'),
+      array('quickedit', 'quickedit'),
     ),
   );
 
@@ -144,16 +144,16 @@ function edit_library_info() {
 /**
  * Implements hook_field_formatter_info_alter().
  *
- * Edit extends the @FieldFormatter annotation with the following keys:
- * - edit: currently only contains one subkey 'editor' which indicates which
- *   in-place editor should be used. Possible values are 'form', 'direct' or
- *   'disabled'.
+ * Quick Edit extends the @FieldFormatter annotation with the following keys:
+ * - quickedit: currently only contains one subkey 'editor' which indicates
+ *   which in-place editor should be used. Possible values are 'form',
+ *   'direct' or 'disabled'.
  */
-function edit_field_formatter_info_alter(&$info) {
+function quickedit_field_formatter_info_alter(&$info) {
   foreach ($info as $key => $settings) {
     // Set in-place editor to form if none is supplied.
-    if (empty($settings['edit'])) {
-      $info[$key]['edit'] = array('editor' => 'form');
+    if (empty($settings['quickedit'])) {
+      $info[$key]['quickedit'] = array('editor' => 'form');
     }
   }
 }
@@ -161,17 +161,17 @@ function edit_field_formatter_info_alter(&$info) {
 /**
  * Implements hook_preprocess_HOOK() for field.tpl.php.
  */
-function edit_preprocess_field(&$variables) {
+function quickedit_preprocess_field(&$variables) {
   $element = $variables['element'];
   $entity = $element['#object'];
-  $variables['attributes']['data-edit-id'] = $entity->entityType() . '/' . $entity->id() . '/' . $element['#field_name'] . '/' . $element['#language'] . '/' . $element['#view_mode'];
+  $variables['attributes']['data-quickedit-id'] = $entity->entityType() . '/' . $entity->id() . '/' . $element['#field_name'] . '/' . $element['#language'] . '/' . $element['#view_mode'];
 }
 
 /**
  * Implements hook_entity_view_alter().
  */
-function edit_entity_view_alter(&$build, EntityInterface $entity, EntityDisplay $display) {
-  $build['#attributes']['data-edit-entity'] = $entity->entityType() . '/' . $entity->id();
+function quickedit_entity_view_alter(&$build, EntityInterface $entity, EntityDisplay $display) {
+  $build['#attributes']['data-quickedit-entity'] = $entity->entityType() . '/' . $entity->id();
 }
 
 /**
@@ -179,7 +179,7 @@ function edit_entity_view_alter(&$build, EntityInterface $entity, EntityDisplay
  *
  * @ingroup forms
  */
-function edit_field_form(array $form, array &$form_state, EntityInterface $entity, $field_name, TempStoreFactory $temp_store_factory) {
+function quickedit_field_form(array $form, array &$form_state, EntityInterface $entity, $field_name, TempStoreFactory $temp_store_factory) {
   $form_handler = new EditFieldForm();
   return $form_handler->build($form, $form_state, $entity, $field_name, $temp_store_factory);
 }
diff --git a/core/modules/quickedit/quickedit.routing.yml b/core/modules/quickedit/quickedit.routing.yml
new file mode 100644
index 0000000..584721b
--- /dev/null
+++ b/core/modules/quickedit/quickedit.routing.yml
@@ -0,0 +1,30 @@
+quickedit_metadata:
+  pattern: '/quickedit/metadata'
+  defaults:
+    _controller: '\Drupal\quickedit\EditController::metadata'
+  requirements:
+    _permission: 'access in-place editing'
+
+quickedit_attachments:
+  pattern: '/quickedit/attachments'
+  defaults:
+    _controller: '\Drupal\quickedit\EditController::attachments'
+  requirements:
+    _permission: 'access in-place editing'
+
+quickedit_field_form:
+  pattern: '/quickedit/form/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
+  defaults:
+    _controller: '\Drupal\quickedit\EditController::fieldForm'
+  requirements:
+    _permission: 'access in-place editing'
+    _access_quickedit_entity_field: 'TRUE'
+
+
+quickedit_entity_save:
+  pattern: '/quickedit/entity/{entity_type}/{entity}'
+  defaults:
+    _controller: '\Drupal\quickedit\EditController::entitySave'
+  requirements:
+    _permission: 'access in-place editing'
+    _access_quickedit_entity: 'TRUE'
diff --git a/core/modules/quickedit/quickedit.services.yml b/core/modules/quickedit/quickedit.services.yml
new file mode 100644
index 0000000..5edd165
--- /dev/null
+++ b/core/modules/quickedit/quickedit.services.yml
@@ -0,0 +1,18 @@
+services:
+  plugin.manager.quickedit.editor:
+    class: Drupal\quickedit\Plugin\InPlaceEditorManager
+    arguments: ['@container.namespaces']
+  access_check.quickedit.entity_field:
+    class: Drupal\quickedit\Access\EditEntityFieldAccessCheck
+    tags:
+      - { name: access_check }
+  access_check.quickedit.entity:
+    class: Drupal\quickedit\Access\EditEntityAccessCheck
+    tags:
+      - { name: access_check }
+  quickedit.editor.selector:
+    class: Drupal\quickedit\EditorSelector
+    arguments: ['@plugin.manager.quickedit.editor']
+  quickedit.metadata.generator:
+    class: Drupal\quickedit\MetadataGenerator
+    arguments: ['@access_check.quickedit.entity_field', '@quickedit.editor.selector', '@plugin.manager.quickedit.editor']
diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/MockEditEntityFieldAccessCheck.php b/core/modules/quickedit/tests/modules/lib/Drupal/quickedit_test/MockEditEntityFieldAccessCheck.php
similarity index 74%
rename from core/modules/edit/tests/modules/lib/Drupal/edit_test/MockEditEntityFieldAccessCheck.php
rename to core/modules/quickedit/tests/modules/lib/Drupal/quickedit_test/MockEditEntityFieldAccessCheck.php
index 6dbaaa1..97b132a 100644
--- a/core/modules/edit/tests/modules/lib/Drupal/edit_test/MockEditEntityFieldAccessCheck.php
+++ b/core/modules/quickedit/tests/modules/lib/Drupal/quickedit_test/MockEditEntityFieldAccessCheck.php
@@ -2,16 +2,16 @@
 
 /**
  * @file
- * Contains \Drupal\edit_test\MockEditEntityFieldAccessCheck.
+ * Contains \Drupal\quickedit_test\MockEditEntityFieldAccessCheck.
  *
  * @todo We may want to get rid of this once http://drupal.org/node/1862750
  * is done.
  */
 
-namespace Drupal\edit_test;
+namespace Drupal\quickedit_test;
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\edit\Access\EditEntityFieldAccessCheckInterface;
+use Drupal\quickedit\Access\EditEntityFieldAccessCheckInterface;
 
 /**
  * Access check for editing entity fields.
diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php b/core/modules/quickedit/tests/modules/lib/Drupal/quickedit_test/Plugin/InPlaceEditor/WysiwygEditor.php
similarity index 78%
rename from core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php
rename to core/modules/quickedit/tests/modules/lib/Drupal/quickedit_test/Plugin/InPlaceEditor/WysiwygEditor.php
index 61be894..45f1eef 100644
--- a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php
+++ b/core/modules/quickedit/tests/modules/lib/Drupal/quickedit_test/Plugin/InPlaceEditor/WysiwygEditor.php
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Contains \Drupal\edit_test\Plugin\InPlaceEditor\WysiwygEditor.
+ * Contains \Drupal\quickedit_test\Plugin\InPlaceEditor\WysiwygEditor.
  */
 
-namespace Drupal\edit_test\Plugin\InPlaceEditor;
+namespace Drupal\quickedit_test\Plugin\InPlaceEditor;
 
-use Drupal\edit\EditorBase;
-use Drupal\edit\Annotation\InPlaceEditor;
+use Drupal\quickedit\EditorBase;
+use Drupal\quickedit\Annotation\InPlaceEditor;
 use Drupal\Core\Entity\Field\FieldDefinitionInterface;
 
 /**
@@ -51,12 +51,12 @@ function getMetadata(FieldDefinitionInterface $field_definition, array $items) {
   }
 
   /**
-   * Implements \Drupal\edit\EditPluginInterface::getAttachments().
+   * Implements \Drupal\quickedit\EditPluginInterface::getAttachments().
    */
   public function getAttachments() {
     return array(
       'library' => array(
-        array('edit_test', 'not-existing-wysiwyg'),
+        array('quickedit_test', 'not-existing-wysiwyg'),
       ),
     );
   }
diff --git a/core/modules/quickedit/tests/modules/quickedit_test.info.yml b/core/modules/quickedit/tests/modules/quickedit_test.info.yml
new file mode 100644
index 0000000..91c40bd
--- /dev/null
+++ b/core/modules/quickedit/tests/modules/quickedit_test.info.yml
@@ -0,0 +1,7 @@
+name: 'Quick Edit test'
+type: module
+description: 'Support module for the Quick Edit module tests.'
+core: 8.x
+package: Testing
+version: VERSION
+hidden: true
diff --git a/core/modules/quickedit/tests/modules/quickedit_test.module b/core/modules/quickedit/tests/modules/quickedit_test.module
new file mode 100644
index 0000000..b6106d1
--- /dev/null
+++ b/core/modules/quickedit/tests/modules/quickedit_test.module
@@ -0,0 +1,6 @@
+<?php
+
+/**
+ * @file
+ * Helper module for the Quick Edit tests.
+ */
diff --git a/core/profiles/standard/standard.info.yml b/core/profiles/standard/standard.info.yml
index 2dfadbb..e8da035 100644
--- a/core/profiles/standard/standard.info.yml
+++ b/core/profiles/standard/standard.info.yml
@@ -16,7 +16,6 @@ dependencies:
   - contact
   - datetime
   - custom_block
-  - edit
   - editor
   - help
   - image
@@ -24,6 +23,7 @@ dependencies:
   - number
   - options
   - path
+  - quickedit
   - taxonomy
   - dblog
   - search