diff --git a/ckeditor.admin.inc b/ckeditor.admin.inc
index e6b46b7..3342e1b 100644
--- a/ckeditor.admin.inc
+++ b/ckeditor.admin.inc
@@ -32,7 +32,7 @@ function template_preprocess_ckeditor_settings_toolbar(&$variables) {
     }
   }
   $variables['active_buttons'] = array();
-  foreach ($editor->settings['toolbar']['toolbar'] as $row_number => $row) {
+  foreach ($editor->settings['toolbar']['buttons'] as $row_number => $row) {
     foreach ($row as $button_name) {
       if (isset($buttons[$button_name])) {
         $variables['active_buttons'][$row_number][] = $buttons[$button_name];
diff --git a/ckeditor.module b/ckeditor.module
index f8b8d47..93009e6 100644
--- a/ckeditor.module
+++ b/ckeditor.module
@@ -310,7 +310,7 @@ function ckeditor_ckeditor_plugins() {
  */
 function ckeditor_image_plugin_check($editor) {
   // Automatically enable caption support if the DrupalImage button is enabled.
-  foreach ($editor->settings['toolbar'] as $row) {
+  foreach ($editor->settings['toolbar']['buttons'] as $row) {
     if (in_array('DrupalImage', $row)) {
       return TRUE;
     }
diff --git a/js/ckeditor.admin.js b/js/ckeditor.admin.js
index 190e789..d22ac6e 100644
--- a/js/ckeditor.admin.js
+++ b/js/ckeditor.admin.js
@@ -9,7 +9,7 @@ Drupal.behaviors.ckeditorAdmin = {
     var $context = $(context);
     $(context).find('.ckeditor-toolbar-configuration').once('ckeditor-toolbar', function() {
       var $wrapper = $(this);
-      var $textareaWrapper = $(this).find('.form-item-editor-settings-toolbar-toolbar').hide();
+      var $textareaWrapper = $(this).find('.form-item-editor-settings-toolbar-buttons').hide();
       var $textarea = $textareaWrapper.find('textarea');
       var $toolbarAdmin = $(settings.ckeditor.toolbarAdmin);
       var sortableSettings = {
diff --git a/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php b/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php
index 0b516d5..7955914 100644
--- a/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php
+++ b/lib/Drupal/ckeditor/Plugin/editor/editor/CKEditor.php
@@ -12,8 +12,6 @@ use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 use Drupal\editor\Plugin\Core\Entity\Editor;
 
-
-
 /**
  * Defines a CKEditor-based text editor for Drupal.
  *
@@ -31,7 +29,7 @@ class CKEditor extends EditorBase {
   function getDefaultSettings() {
     return array(
       'toolbar' => array(
-        'toolbar' => array(
+        'buttons' => array(
           array(
             'Source', '|', 'Bold', 'Italic', '|',
             'NumberedList', 'BulletedList', 'Blockquote', '|',
@@ -63,10 +61,10 @@ class CKEditor extends EditorBase {
       ),
       '#attributes' => array('class' => array('ckeditor-toolbar-configuration')),
     );
-    $form['toolbar']['toolbar'] = array(
+    $form['toolbar']['buttons'] = array(
       '#type' => 'textarea',
-      '#title' => t('Toolbar configuration'),
-      '#default_value' => json_encode($editor->settings['toolbar']['toolbar']),
+      '#title' => t('Toolbar buttons'),
+      '#default_value' => json_encode($editor->settings['toolbar']['buttons']),
       '#attributes' => array('class' => array('ckeditor-toolbar-textarea')),
     );
     $form['toolbar']['format_list'] = array(
@@ -90,9 +88,12 @@ class CKEditor extends EditorBase {
    * Implements \Drupal\editor\Plugin\EditorInterface::settingsFormSubmit().
    */
   function settingsFormSubmit(array $form, array &$form_state) {
+    // Modify the toolbar settings by reference. The values in
+    // $form_state['values']['editor_settings'] will be saved directly by
+    // editor_form_filter_admin_format_submit().
     $toolbar_settings = &$form_state['values']['editor_settings']['toolbar'];
 
-    $toolbar_settings['toolbar'] = json_decode($toolbar_settings['toolbar'], FALSE);
+    $toolbar_settings['buttons'] = json_decode($toolbar_settings['buttons'], FALSE);
 
     $format_list = array();
     foreach (explode(',', $toolbar_settings['format_list']) as $format) {
@@ -148,7 +149,7 @@ class CKEditor extends EditorBase {
     // Change the toolbar separators into groups and record needed plugins based
     // on use in the toolbar.
     $toolbar = array();
-    foreach ($editor->settings['toolbar']['toolbar'] as $row_number => $row) {
+    foreach ($editor->settings['toolbar']['buttons'] as $row_number => $row) {
       $button_group = array();
       foreach ($row as $button_name) {
         if ($button_name === '|') {
@@ -190,7 +191,7 @@ class CKEditor extends EditorBase {
       $css[$key] = base_path() . $css_path;
     }
 
-    // Initialize reasonable defaults that provide expected basic bahvior.
+    // Initialize reasonable defaults that provide expected basic behavior.
     $settings = array(
       'toolbar' => $toolbar,
       'extraPlugins' => implode(',', array_keys($external_plugins)),