diff --git a/entity_embed.ckeditor.inc b/entity_embed.ckeditor.inc
index 309cc79..5d7196a 100644
--- a/entity_embed.ckeditor.inc
+++ b/entity_embed.ckeditor.inc
@@ -28,7 +28,7 @@ function entity_embed_ckeditor_plugin() {
   foreach ($embed_buttons as $embed_button) {
     // CKEditor only supports icons relative to the plugin path.
     // @todo: Figure out how to support custom icons.
-    $buttons[$embed_button->name] = array(
+    $buttons['entity_embed_' . $embed_button->name] = array(
       'label' => check_plain($embed_button->button_label),
       'icon' => 'entity.png',
     );
diff --git a/entity_embed.install b/entity_embed.install
index 49beedc..4ab5b65 100644
--- a/entity_embed.install
+++ b/entity_embed.install
@@ -236,3 +236,53 @@ function entity_embed_update_7100() {
   // Clear the cache_entity_embed cache.
   cache_clear_all(NULL, 'cache_entity_embed');
 }
+
+/**
+ * Update internal names of editor buttons.
+ */
+function entity_embed_update_7101() {
+  ctools_include('export');
+  $embed_buttons = ctools_export_crud_load_all('entity_embed');
+  if (empty($embed_buttons)) {
+    return;
+  }
+  if (db_table_exists('ckeditor_settings')) {
+    $profiles = db_select('ckeditor_settings', 'cs')
+      ->fields('cs')
+      ->execute();
+    foreach ($profiles as $profile) {
+      $settings = unserialize($profile->settings);
+      foreach ($embed_buttons as $button_id => $button) {
+        $settings['toolbar'] = str_replace("'$button_id'", "'entity_embed_$button_id'", $settings['toolbar']);
+      }
+      db_update('ckeditor_settings')
+        ->fields(array('settings' => serialize($settings)))
+        ->condition('name', $profile->name)
+        ->execute();
+    }
+  }
+  if (db_table_exists('wysiwyg')) {
+    $profiles = db_select('wysiwyg', 'w')
+      ->fields('w')
+      ->execute();
+    foreach ($profiles as $profile) {
+      $settings = unserialize($profile->settings);
+      if (!empty($settings['buttons']['default']) && is_array($settings['buttons']['default'])) {
+        foreach ($embed_buttons as $button_id => $button) {
+          $settings['buttons']['drupalentity']['entity_embed_' . $button_id] = $settings['buttons']['drupalentity'][$button_id];
+          unset($settings['buttons']['drupalentity'][$button_id]);
+        }
+      }
+      else {
+        foreach ($embed_buttons as $button_id => $button) {
+          $settings['buttons']['entity_embed_' . $button_id] = $settings['buttons']['drupalentity'][$button_id];
+          unset($settings['buttons'][$button_id]);
+        }
+      }
+    }
+    db_update('wysiwyg')
+      ->fields(array('settings' => serialize($settings)))
+      ->condition('format', $profile->format)
+      ->execute();
+  }
+}
diff --git a/entity_embed.module b/entity_embed.module
index aca08c7..084f537 100644
--- a/entity_embed.module
+++ b/entity_embed.module
@@ -154,10 +154,10 @@ function _entity_embed_preview_format_access($format) {
  */
 function _entity_embed_button_is_enabled($filter_format, $embed_button) {
   module_load_include('inc', 'ckeditor', 'includes/ckeditor.lib');
-  $button_label = $embed_button->name;
+  $button_label = 'entity_embed_' . $embed_button->name;
   $profile = ckeditor_get_profile($filter_format->format);
   $settings = $profile->settings;
-  if (strpos($settings['toolbar'], "'" . $button_label . "'")) {
+  if (strpos($settings['toolbar'], "'entity_embed_" . $button_label . "'")) {
     return TRUE;
   }
 
diff --git a/js/plugins/drupalentity/plugin.js b/js/plugins/drupalentity/plugin.js
index ada60c8..d84e26d 100644
--- a/js/plugins/drupalentity/plugin.js
+++ b/js/plugins/drupalentity/plugin.js
@@ -52,7 +52,7 @@
           }
 
           var entity_label = data.label ? data.label : existingValues['data-entity-label'];
-          var embed_button_id = data.id ? data.id : existingValues['data-embed-button'];
+          var embed_button_id = (data.id ? data.id : existingValues['data-embed-button']).replace(/^entity_embed_/, '');
 
           var dialogSettings = {
             title: existingElement ? 'Edit ' + entity_label : 'Insert ' + entity_label,
@@ -134,7 +134,7 @@
       if (editor.ui.addButton) {
         for (var key in Drupal.settings.entity_embed.DrupalEntity_buttons) {
           var button = Drupal.settings.entity_embed.DrupalEntity_buttons[key];
-          editor.ui.addButton(button.name, {
+          editor.ui.addButton('entity_embed_' + button.name, {
             label: button.label,
             data: button,
             click: function(editor) {