diff --git a/js/bootstrap.admin.js b/js/bootstrap.admin.js
index b614173..cfd94ce 100644
--- a/js/bootstrap.admin.js
+++ b/js/bootstrap.admin.js
@@ -56,10 +56,10 @@
       // Javascript.
       $context.find('#edit-javascript').drupalSetSummary(function () {
         var summary = [];
-        if ($context.find('input[name="bootstrap_javascript_popover"]').is(':checked')) {
+        if ($context.find('input[name="bootstrap_popover"]').is(':checked')) {
           summary.push(Drupal.t('Popover'));
         }
-        if ($context.find('input[name="bootstrap_javascript_tooltip"]').is(':checked')) {
+        if ($context.find('input[name="bootstrap_tooltip"]').is(':checked')) {
           summary.push(Drupal.t('Tooltip'));
         }
         return summary.join(', ');
diff --git a/js/bootstrap.js b/js/bootstrap.js
index b26aa34..0f47027 100644
--- a/js/bootstrap.js
+++ b/js/bootstrap.js
@@ -61,14 +61,14 @@ var Drupal = Drupal || {};
 
       });
       // Init popovers on pageload when settings is set.
-      if (settings.bootstrap.javascript.popover) {
-        $(context).one('click.drupal.popover.data-api', '[data-toggle="popover"]', function(e) {
+      if (settings.bootstrap.popover) {
+        $(context).one('click.drupal.popover.data-api', '[data-toggle="popover"]', function (e) {
           e.preventDefault();
           $(this).popover('show');
         });
       }
       // Init tooltips on pageload when settings is set.
-      if (settings.bootstrap.javascript.tooltip) {
+      if (settings.bootstrap.tooltip) {
         $(context).one('mouseenter.drupal.tooltip.data-api focus.drupal.tooltip.data-api', '[data-toggle="tooltip"]', function (e) {
           e.preventDefault();
           $(this).tooltip('show');
diff --git a/theme/settings.inc b/theme/settings.inc
index 3ea7756..09c45f5 100644
--- a/theme/settings.inc
+++ b/theme/settings.inc
@@ -207,23 +207,23 @@ function _bootstrap_settings_form(&$form, $form_state) {
     );
   }
 
-  // Advanced settings.
+  // JavaScript settings.
   $form['javascript'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Javascript'),
+    '#title' => t('JavaScript'),
     '#group' => 'bootstrap',
   );
-  $form['javascript']['bootstrap_javascript_popover'] = array(
+  $form['javascript']['bootstrap_popover'] = array(
     '#type' => 'checkbox',
     '#title' => t('Load popovers.'),
     '#description' => t('Check if you want to load all popovers on click defined by ') . '<i>data-toggle="popover"</i>.',
-    '#default_value' => theme_get_setting('bootstrap_javascript_popover'),
+    '#default_value' => theme_get_setting('bootstrap_popover'),
   );
-  $form['javascript']['bootstrap_javascript_tooltip'] = array(
+  $form['javascript']['bootstrap_tooltip'] = array(
     '#type' => 'checkbox',
     '#title' => t('Load tooltips.'),
     '#description' => t('Check if you want to load all tooltips on mouseenter or focus defined by ') . '<i>data-toggle="tooltip"</i>.',
-    '#default_value' => theme_get_setting('bootstrap_javascript_tooltip'),
+    '#default_value' => theme_get_setting('bootstrap_tooltip'),
   );
 
 
diff --git a/theme/system/html.vars.php b/theme/system/html.vars.php
index 01d106e..8559520 100644
--- a/theme/system/html.vars.php
+++ b/theme/system/html.vars.php
@@ -43,10 +43,8 @@ function bootstrap_preprocess_html(&$variables) {
 
   drupal_add_js(array(
     'bootstrap' => array(
-      'javascript' => array(
-        'popover' => theme_get_setting('bootstrap_javascript_popover'),
-        'tooltip' => theme_get_setting('bootstrap_javascript_tooltip'),
-      ),
+      'popover' => theme_get_setting('bootstrap_popover'),
+      'tooltip' => theme_get_setting('bootstrap_tooltip'),
     ),
     ), 'setting');
 }