diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7a2cddc352..8a49197829 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5a90688297..82b7dc2498 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2928,7 +2928,7 @@ button.btn.small, input[type="submit"].btn.small {
   width: 0;
   height: 0;
 }
-.popover .inner {
+.popover-inner {
   padding: 3px;
   width: 280px;
   overflow: hidden;
@@ -2941,7 +2941,7 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
   box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
 }
-.popover .title {
+.popover-title {
   padding: 9px 15px;
   line-height: 1;
   background-color: #f5f5f5;
@@ -2950,7 +2950,7 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-border-radius: 3px 3px 0 0;
   border-radius: 3px 3px 0 0;
 }
-.popover .content {
+.popover-content {
   padding: 14px;
   background-color: #ffffff;
   -webkit-border-radius: 0 0 3px 3px;
@@ -2960,7 +2960,7 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.popover .content p, .popover .content ul, .popover .content ol {
+.popover-content p, .popover-content ul, .popover-content ol {
   margin-bottom: 0;
 }
 .thumbnails {
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 57864fc6e9..35ff9d0ab6 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -38,8 +38,8 @@
         , title = this.getTitle()
         , content = this.getContent()
 
-      $tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
-      $tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
+      $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
+      $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
 
       $tip.removeClass('fade top bottom left right in')
     }
@@ -89,7 +89,7 @@
   $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
     placement: 'right'
   , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
+  , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
   })
 
 }( window.jQuery )
diff --git a/less/popovers.less b/less/popovers.less
index 6de314d860..558d99ec99 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -21,29 +21,29 @@
     width: 0;
     height: 0;
   }
-  .inner {
-    padding: 3px;
-    width: 280px;
-    overflow: hidden;
-    background: @black; // has to be full background declaration for IE fallback
-    background: rgba(0,0,0,.8);
-    .border-radius(6px);
-    .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-inner {
+  padding: 3px;
+  width: 280px;
+  overflow: hidden;
+  background: @black; // has to be full background declaration for IE fallback
+  background: rgba(0,0,0,.8);
+  .border-radius(6px);
+  .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-title {
+  padding: 9px 15px;
+  line-height: 1;
+  background-color: #f5f5f5;
+  border-bottom:1px solid #eee;
+  .border-radius(3px 3px 0 0);
+}
+.popover-content {
+  padding: 14px;
+  background-color: @white;
+  .border-radius(0 0 3px 3px);
+  .background-clip(padding-box);
+  p, ul, ol {
+    margin-bottom: 0;
   }
-  .title {
-    padding: 9px 15px;
-    line-height: 1;
-    background-color: #f5f5f5;
-    border-bottom:1px solid #eee;
-    .border-radius(3px 3px 0 0);
-  }
-  .content {
-    padding: 14px;
-    background-color: @white;
-    .border-radius(0 0 3px 3px);
-    .background-clip(padding-box);
-    p, ul, ol {
-      margin-bottom: 0;
-    }
-  }
-}
\ No newline at end of file
+}