diff --git a/core/modules/quickedit/js/theme.js b/core/modules/quickedit/js/theme.js
index 459eb3a..9a7477b 100644
--- a/core/modules/quickedit/js/theme.js
+++ b/core/modules/quickedit/js/theme.js
@@ -15,7 +15,7 @@
  * @return String
  *   The corresponding HTML.
  */
-Drupal.theme.editBackstage = function (settings) {
+Drupal.theme.quickeditBackstage = function (settings) {
   var html = '';
   html += '<div id="' + settings.id + '" />';
   return html;
@@ -27,7 +27,7 @@ Drupal.theme.editBackstage = function (settings) {
  * @return String
  *   The corresponding HTML.
  */
-Drupal.theme.editModal = function () {
+Drupal.theme.quickeditModal = function () {
   var classes = 'edit-animate-slow edit-animate-invisible edit-animate-delay-veryfast';
   var html = '';
   html += '<div id="edit_modal" class="' + classes + '" role="dialog">';
@@ -46,7 +46,7 @@ Drupal.theme.editModal = function () {
  * @return String
  *   The corresponding HTML.
  */
-Drupal.theme.editEntityToolbar = function (settings) {
+Drupal.theme.quickeditEntityToolbar = function (settings) {
   var html = '';
   html += '<div id="' + settings.id + '" class="edit edit-toolbar-container clearfix">';
   html += '<i class="edit-toolbar-pointer"></i>';
@@ -69,7 +69,7 @@ Drupal.theme.editEntityToolbar = function (settings) {
  * @return String
  *   The corresponding HTML.
  */
-Drupal.theme.editEntityToolbarLabel = function (settings) {
+Drupal.theme.quickeditEntityToolbarLabel = function (settings) {
   return settings.entityLabel + ': <b>' + settings.fieldLabel + '</b>';
 };
 
@@ -79,7 +79,7 @@ Drupal.theme.editEntityToolbarLabel = function (settings) {
  * @return String
  *   The corresponding HTML.
  */
-Drupal.theme.editEntityToolbarFence = function () {
+Drupal.theme.quickeditEntityToolbarFence = function () {
   return '<div id="edit-toolbar-fence" />';
 };
 
@@ -92,7 +92,7 @@ Drupal.theme.editEntityToolbarFence = function () {
  * @return
  *   The corresponding HTML.
  */
-Drupal.theme.editFieldToolbar = function (settings) {
+Drupal.theme.quickeditFieldToolbar = function (settings) {
   return '<div id="' + settings.id + '" />';
 };
 
@@ -103,11 +103,11 @@ Drupal.theme.editFieldToolbar = function (settings) {
  *   An object with the following keys:
  *   - String id: (optional) the id of the toolgroup
  *   - String classes: the class of the toolgroup.
- *   - Array buttons: @see Drupal.theme.prototype.editButtons().
+ *   - Array buttons: @see Drupal.theme.prototype.quickeditButtons().
  * @return String
  *   The corresponding HTML.
  */
-Drupal.theme.editToolgroup = function (settings) {
+Drupal.theme.quickeditToolgroup = function (settings) {
   // Classes.
   var classes = (settings.classes || []);
   classes.unshift('edit-toolgroup');
@@ -117,7 +117,7 @@ Drupal.theme.editToolgroup = function (settings) {
     html += ' id="' + settings.id + '"';
   }
   html += '>';
-  html += Drupal.theme('editButtons', { buttons: settings.buttons });
+  html += Drupal.theme('quickeditButtons', { buttons: settings.buttons });
   html += '</div>';
   return html;
 };
@@ -137,7 +137,7 @@ Drupal.theme.editToolgroup = function (settings) {
  * @return String
  *   The corresponding HTML.
  */
-Drupal.theme.editButtons = function (settings) {
+Drupal.theme.quickeditButtons = function (settings) {
   var html = '';
   for (var i = 0; i < settings.buttons.length; i++) {
     var button = settings.buttons[i];
diff --git a/core/modules/quickedit/js/views/EditorView.js b/core/modules/quickedit/js/views/EditorView.js
index a8c5f7f..68ecc75 100644
--- a/core/modules/quickedit/js/views/EditorView.js
+++ b/core/modules/quickedit/js/views/EditorView.js
@@ -203,7 +203,7 @@ Drupal.quickedit.EditorView = Backbone.View.extend({
       // 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).
-      var $backstage = $(Drupal.theme('editBackstage', { id: backstageId })).appendTo('body');
+      var $backstage = $(Drupal.theme('quickeditBackstage', { id: backstageId })).appendTo('body');
       // Direct forms are stuffed into the backstage container for this field.
       var $form = $(form).appendTo($backstage);
       // Disable the browser's HTML5 validation; we only care about server-
diff --git a/core/modules/quickedit/js/views/EntityToolbarView.js b/core/modules/quickedit/js/views/EntityToolbarView.js
index c6707c2..e4485fb 100644
--- a/core/modules/quickedit/js/views/EntityToolbarView.js
+++ b/core/modules/quickedit/js/views/EntityToolbarView.js
@@ -68,7 +68,7 @@ Drupal.quickedit.EntityToolbarView = Backbone.View.extend({
       // 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) {
-        this.$fence = $(Drupal.theme('editEntityToolbarFence'))
+        this.$fence = $(Drupal.theme('quickeditEntityToolbarFence'))
           .css(Drupal.displace())
           .appendTo($body);
       }
@@ -301,14 +301,14 @@ Drupal.quickedit.EntityToolbarView = Backbone.View.extend({
    * Builds the entity toolbar HTML; attaches to DOM; sets starting position.
    */
   buildToolbarEl: function () {
-    var $toolbar = $(Drupal.theme('editEntityToolbar', {
+    var $toolbar = $(Drupal.theme('quickeditEntityToolbar', {
       id: 'edit-entity-toolbar'
     }));
 
     $toolbar
       .find('.edit-toolbar-entity')
       // Append the "ops" toolgroup into the toolbar.
-      .prepend(Drupal.theme('editToolgroup', {
+      .prepend(Drupal.theme('quickeditToolgroup', {
         classes: ['ops'],
         buttons: [
           {
@@ -363,13 +363,13 @@ Drupal.quickedit.EntityToolbarView = Backbone.View.extend({
     var highlightedFieldLabel = highlightedEditor && highlightedEditor.get('metadata').label;
     // The label is constructed in a priority order.
     if (activeFieldLabel) {
-      label = Drupal.theme('editEntityToolbarLabel', {
+      label = Drupal.theme('quickeditEntityToolbarLabel', {
         entityLabel: entityLabel,
         fieldLabel: activeFieldLabel
       });
     }
     else if (highlightedFieldLabel) {
-      label = Drupal.theme('editEntityToolbarLabel', {
+      label = Drupal.theme('quickeditEntityToolbarLabel', {
         entityLabel: entityLabel,
         fieldLabel: highlightedFieldLabel
       });
diff --git a/core/modules/quickedit/js/views/FieldToolbarView.js b/core/modules/quickedit/js/views/FieldToolbarView.js
index 99127a4..964f98d 100644
--- a/core/modules/quickedit/js/views/FieldToolbarView.js
+++ b/core/modules/quickedit/js/views/FieldToolbarView.js
@@ -35,7 +35,7 @@ Drupal.quickedit.FieldToolbarView = Backbone.View.extend({
    */
   render: function () {
     // Render toolbar and set it as the view's element.
-    this.setElement($(Drupal.theme('editFieldToolbar', {
+    this.setElement($(Drupal.theme('quickeditFieldToolbar', {
       id: this._id
     })));
 
@@ -98,12 +98,12 @@ Drupal.quickedit.FieldToolbarView = Backbone.View.extend({
    */
   insertWYSIWYGToolGroups: function () {
     this.$el
-      .append(Drupal.theme('editToolgroup', {
+      .append(Drupal.theme('quickeditToolgroup', {
         id: this.getFloatedWysiwygToolgroupId(),
         classes: ['wysiwyg-floated', 'edit-animate-slow', 'edit-animate-invisible', 'edit-animate-delay-veryfast'],
         buttons: []
       }))
-      .append(Drupal.theme('editToolgroup', {
+      .append(Drupal.theme('quickeditToolgroup', {
         id: this.getMainWysiwygToolgroupId(),
         classes: ['wysiwyg-main', 'edit-animate-slow', 'edit-animate-invisible', 'edit-animate-delay-veryfast'],
         buttons: []
diff --git a/core/modules/quickedit/js/views/ModalView.js b/core/modules/quickedit/js/views/ModalView.js
index a25b8d9..c533dbe 100644
--- a/core/modules/quickedit/js/views/ModalView.js
+++ b/core/modules/quickedit/js/views/ModalView.js
@@ -24,12 +24,12 @@ Drupal.quickedit.ModalView = Backbone.View.extend({
    *   An object with the following keys:
    *   - String message: a message to show in the modal.
    *   - Array buttons: a set of buttons with 'action's defined, ready to be
-         passed to Drupal.theme.editButtons().
+         passed to Drupal.theme.quickeditButtons().
    *   - Function callback: a callback that will receive the 'action' of the
    *     clicked button.
    *
-   * @see Drupal.theme.editModal()
-   * @see Drupal.theme.editButtons()
+   * @see Drupal.theme.quickeditModal()
+   * @see Drupal.theme.quickeditButtons()
    */
   initialize: function (options) {
     this.message = options.message;
@@ -41,11 +41,11 @@ Drupal.quickedit.ModalView = Backbone.View.extend({
    * {@inheritdoc}
    */
   render: function () {
-    this.setElement(Drupal.theme('editModal', {}));
+    this.setElement(Drupal.theme('quickeditModal', {}));
     this.$el.appendTo('body');
     // Template.
     this.$('.main p').text(this.message);
-    var $actions = $(Drupal.theme('editButtons', { 'buttons' : this.buttons}));
+    var $actions = $(Drupal.theme('quickeditButtons', { 'buttons' : this.buttons}));
     this.$('.actions').append($actions);
 
     // Show the modal with an animation.