diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 55b71b927e..e5a745be6f 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 ec8a5f3ff6..60e54ce9d8 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2084,65 +2084,65 @@ button.btn.small, input[type="submit"].btn.small {
   text-decoration: none;
   background-color: #eeeeee;
 }
-.nav.list {
+.nav-list {
   padding-left: 14px;
   padding-right: 14px;
   margin-bottom: 0;
 }
-.nav.list > li > a, .nav.list .nav-header {
+.nav-list > li > a, .nav-list .nav-header {
   display: block;
   padding: 3px 15px;
   margin-left: -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
-.nav.list .nav-header {
+.nav-list .nav-header {
   font-size: 11px;
   font-weight: bold;
   line-height: 18px;
   color: #999999;
   text-transform: uppercase;
 }
-.nav.list > li + .nav-header {
+.nav-list > li + .nav-header {
   margin-top: 9px;
 }
-.nav.list .active > a {
+.nav-list .active > a {
   color: #ffffff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
   background-color: #0088cc;
 }
-.nav.list .icon {
+.nav-list .icon {
   margin-right: 2px;
 }
-.tabs, .pills {
+.nav-tabs, .nav-pills {
   *zoom: 1;
 }
-.tabs:before,
-.pills:before,
-.tabs:after,
-.pills:after {
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
   display: table;
   content: "";
 }
-.tabs:after, .pills:after {
+.nav-tabs:after, .nav-pills:after {
   clear: both;
 }
-.tabs > li, .pills > li {
+.nav-tabs > li, .nav-pills > li {
   float: left;
 }
-.tabs > li > a, .pills > li > a {
+.nav-tabs > li > a, .nav-pills > li > a {
   padding-right: 12px;
   padding-left: 12px;
   margin-right: 2px;
   line-height: 14px;
 }
-.tabs {
+.nav-tabs {
   border-bottom: 1px solid #ddd;
 }
-.tabs > li {
+.nav-tabs > li {
   margin-bottom: -1px;
 }
-.tabs > li > a {
+.nav-tabs > li > a {
   padding-top: 9px;
   padding-bottom: 9px;
   border: 1px solid transparent;
@@ -2150,17 +2150,17 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
-.tabs > li > a:hover {
+.nav-tabs > li > a:hover {
   border-color: #eeeeee #eeeeee #dddddd;
 }
-.tabs > .active > a, .tabs > .active > a:hover {
+.nav-tabs > .active > a, .nav-tabs > .active > a:hover {
   color: #555555;
   background-color: #ffffff;
   border: 1px solid #ddd;
   border-bottom-color: transparent;
   cursor: default;
 }
-.pills > li > a {
+.nav-pills > li > a {
   padding-top: 8px;
   padding-bottom: 8px;
   margin-top: 2px;
@@ -2169,69 +2169,69 @@ button.btn.small, input[type="submit"].btn.small {
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
-.pills .active > a, .pills .active > a:hover {
+.nav-pills .active > a, .nav-pills .active > a:hover {
   color: #ffffff;
   background-color: #0088cc;
 }
-.nav.stacked > li {
+.nav-stacked > li {
   float: none;
 }
-.nav.stacked > li > a {
+.nav-stacked > li > a {
   margin-right: 0;
 }
-.tabs.stacked {
+.nav-tabs.nav-stacked {
   border-bottom: 0;
 }
-.tabs.stacked > li > a {
+.nav-tabs.nav-stacked > li > a {
   border: 1px solid #ddd;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
 }
-.tabs.stacked > li:first-child > a {
+.nav-tabs.nav-stacked > li:first-child > a {
   -webkit-border-radius: 4px 4px 0 0;
   -moz-border-radius: 4px 4px 0 0;
   border-radius: 4px 4px 0 0;
 }
-.tabs.stacked > li:last-child > a {
+.nav-tabs.nav-stacked > li:last-child > a {
   -webkit-border-radius: 0 0 4px 4px;
   -moz-border-radius: 0 0 4px 4px;
   border-radius: 0 0 4px 4px;
 }
-.tabs.stacked > li > a:hover {
+.nav-tabs.nav-stacked > li > a:hover {
   border-color: #ddd;
   z-index: 2;
 }
-.pills.stacked > li > a {
+.nav-pills.nav-stacked > li > a {
   margin-bottom: 3px;
 }
-.pills.stacked > li:last-child > a {
+.nav-pills.nav-stacked > li:last-child > a {
   margin-bottom: 1px;
 }
-.pills .dropdown-menu, .tabs .dropdown-menu {
+.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu {
   margin-top: 1px;
   border-width: 1px;
 }
-.pills .dropdown-menu {
+.nav-pills .dropdown-menu {
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
+.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret {
   border-top-color: #0088cc;
   margin-top: 6px;
 }
-.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret {
+.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret {
   border-top-color: #005580;
 }
-.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret {
+.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret {
   border-top-color: #333333;
 }
 .nav > .dropdown.active > a:hover {
   color: #000000;
   cursor: pointer;
 }
-.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover {
+.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover {
   color: #ffffff;
   background-color: #999999;
   border-color: #999999;
@@ -2241,7 +2241,7 @@ button.btn.small, input[type="submit"].btn.small {
   opacity: 1;
   filter: alpha(opacity=100);
 }
-.tabs.stacked .open > a:hover {
+.tabs-stacked .open > a:hover {
   border-color: #999999;
 }
 .tabbable {
@@ -2254,7 +2254,7 @@ button.btn.small, input[type="submit"].btn.small {
 .tabbable:after {
   clear: both;
 }
-.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs {
+.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
   border-bottom: 0;
 }
 .tab-content > .tab-pane, .pill-content > .pill-pane {
@@ -2263,66 +2263,66 @@ button.btn.small, input[type="submit"].btn.small {
 .tab-content > .active, .pill-content > .active {
   display: block;
 }
-.tabs-below .tabs {
+.tabs-below .nav-tabs {
   border-top: 1px solid #ddd;
 }
-.tabs-below .tabs > li {
+.tabs-below .nav-tabs > li {
   margin-top: -1px;
   margin-bottom: 0;
 }
-.tabs-below .tabs > li > a {
+.tabs-below .nav-tabs > li > a {
   -webkit-border-radius: 0 0 4px 4px;
   -moz-border-radius: 0 0 4px 4px;
   border-radius: 0 0 4px 4px;
 }
-.tabs-below .tabs > li > a:hover {
+.tabs-below .nav-tabs > li > a:hover {
   border-bottom-color: transparent;
   border-top-color: #ddd;
 }
-.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover {
+.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover {
   border-color: transparent #ddd #ddd #ddd;
 }
-.tabs-left .tabs > li, .tabs-right .tabs > li {
+.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li {
   float: none;
 }
-.tabs-left .tabs > li > a, .tabs-right .tabs > li > a {
+.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a {
   min-width: 74px;
   margin-right: 0;
   margin-bottom: 3px;
 }
-.tabs-left .tabs {
+.tabs-left .nav-tabs {
   float: left;
   margin-right: 19px;
   border-right: 1px solid #ddd;
 }
-.tabs-left .tabs > li > a {
+.tabs-left .nav-tabs > li > a {
   margin-right: -1px;
   -webkit-border-radius: 4px 0 0 4px;
   -moz-border-radius: 4px 0 0 4px;
   border-radius: 4px 0 0 4px;
 }
-.tabs-left .tabs > li > a:hover {
+.tabs-left .nav-tabs > li > a:hover {
   border-color: #eeeeee #dddddd #eeeeee #eeeeee;
 }
-.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover {
+.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover {
   border-color: #ddd transparent #ddd #ddd;
   *border-right-color: #ffffff;
 }
-.tabs-right .tabs {
+.tabs-right .nav-tabs {
   float: right;
   margin-left: 19px;
   border-left: 1px solid #ddd;
 }
-.tabs-right .tabs > li > a {
+.tabs-right .nav-tabs > li > a {
   margin-left: -1px;
   -webkit-border-radius: 0 4px 4px 0;
   -moz-border-radius: 0 4px 4px 0;
   border-radius: 0 4px 4px 0;
 }
-.tabs-right .tabs > li > a:hover {
+.tabs-right .nav-tabs > li > a:hover {
   border-color: #eeeeee #eeeeee #eeeeee #dddddd;
 }
-.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
+.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
   *border-left-color: #ffffff;
 }
diff --git a/docs/base-css.html b/docs/base-css.html
index ddbbad174c..0f97a036ac 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -80,7 +80,7 @@
   <h1>Base CSS</h1>
   <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
   <div class="subnav">
-    <ul class="nav pills">
+    <ul class="nav nav-pills">
       <li><a href="#typography">Typography</a></li>
       <li><a href="#code">Code</a></li>
       <li><a href="#tables">Tables</a></li>
diff --git a/docs/components.html b/docs/components.html
index eb876572d6..02b50211e7 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -80,7 +80,7 @@
   <h1>Components</h1>
   <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
   <div class="subnav">
-    <ul class="nav pills">
+    <ul class="nav nav-pills">
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">Buttons <b class="caret"></b></a>
         <ul class="dropdown-menu">
@@ -361,13 +361,13 @@
     <div class="span4">
       <h3>Basic tabs</h3>
       <p>Take a regular <code>&lt;ul&gt;</code> of links and add <code>.tabs</code>:</p>
-      <ul class="nav tabs">
+      <ul class="nav nav-tabs">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav tabs"&gt;
+&lt;ul class="nav nav-tabs"&gt;
   &lt;li class="active"&gt;
     &lt;a href="#"&gt;Home&lt;/a&gt;
   &lt;/li&gt;
@@ -379,13 +379,13 @@
     <div class="span4">
       <h3>Basic pills</h3>
       <p>Take that same HTML, but use <code>.pills</code> instead:</p>
-      <ul class="nav pills">
+      <ul class="nav nav-pills">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav pills"&gt;
+&lt;ul class="nav nav-pills"&gt;
   &lt;li class="active"&gt;
     &lt;a href="#"&gt;Home&lt;/a&gt;
   &lt;/li&gt;
@@ -404,26 +404,26 @@
     </div>
     <div class="span4">
       <h3>Stacked tabs</h3>
-      <ul class="nav tabs stacked">
+      <ul class="nav nav-tabs nav-stacked">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav tabs stacked"&gt;
+&lt;ul class="nav nav-tabs nav-stacked"&gt;
   ...
 &lt;/ul&gt;
 </pre>
     </div>
     <div class="span4">
       <h3>Stacked pills</h3>
-      <ul class="nav pills stacked">
+      <ul class="nav nav-pills nav-stacked">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav pills stacked"&gt;
+&lt;ul class="nav nav-pills nav-stacked"&gt;
   ...
 &lt;/ul&gt;
 </pre>
@@ -439,7 +439,7 @@
     </div>
     <div class="span4">
       <h3>Tabs with dropdowns</h3>
-      <ul class="nav tabs">
+      <ul class="nav nav-tabs">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li class="dropdown">
@@ -454,7 +454,7 @@
         </li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav tabs"&gt;
+&lt;ul class="nav nav-tabs"&gt;
   &lt;li class="dropdown"&gt;
     &lt;a class="dropdown-toggle"
        data-toggle="dropdown"
@@ -471,7 +471,7 @@
     </div>
     <div class="span4">
       <h3>Pills with dropdowns</h3>
-      <ul class="nav pills">
+      <ul class="nav nav-pills">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li class="dropdown">
@@ -486,7 +486,7 @@
         </li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav pills"&gt;
+&lt;ul class="nav nav-pills"&gt;
   &lt;li class="dropdown"&gt;
     &lt;a class="dropdown-toggle"
        data-toggle="dropdown"
@@ -516,7 +516,7 @@
       <h3>Example nav list</h3>
       <p>Take a list of links and add <code>class="nav list"</code>:</p>
       <div class="well" style="padding: 8px 0;">
-        <ul class="nav list">
+        <ul class="nav nav-list">
           <li class="nav-header">List header</li>
           <li class="active"><a href="#">Home</a></li>
           <li><a href="#">Library</a></li>
@@ -528,7 +528,7 @@
         </ul>
       </div> <!-- /well -->
 <pre class="prettyprint linenums">
-&lt;ul class="nav list"&gt;
+&lt;ul class="nav nav-list"&gt;
   &lt;li class="nav-header"&gt;
     List header
   &lt;/li&gt;
@@ -546,7 +546,7 @@
       <h3>Example with icons</h3>
       <p>Same example, but with <code>&lt;i&gt;</code> tags for icons.</p>
       <div class="well" style="padding: 8px 0;">
-        <ul class="nav list">
+        <ul class="nav nav-list">
           <li class="nav-header">List header</li>
           <li class="active"><a href="#"><i class="icon white home"></i> Home</a></li>
           <li><a href="#"><i class="icon book"></i> Library</a></li>
@@ -558,7 +558,7 @@
         </ul>
       </div> <!-- /well -->
 <pre class="prettyprint linenums">
-&lt;ul class="nav list"&gt;
+&lt;ul class="nav nav-list"&gt;
   ...
   &lt;li&gt;
     &lt;a href="#"&gt;
@@ -584,7 +584,7 @@
       <h3>Tabbable example</h3>
       <p>To make tabs tabbable, wrap the <code>.tabs</code> in another div with class <code>.tabbable</code>.</p>
       <div class="tabbable" style="margin-bottom: 9px;">
-        <ul class="nav tabs">
+        <ul class="nav nav-tabs">
           <li class="active"><a href="#1" data-toggle="tab">Section 1</a></li>
           <li><a href="#2" data-toggle="tab">Section 2</a></li>
           <li><a href="#3" data-toggle="tab">Section 3</a></li>
@@ -613,7 +613,7 @@
   <p>Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.</p>
 <pre class="prettyprint linenums">
 &lt;div class="tabbable"&gt;
-  &lt;ul class="nav tabs"&gt;
+  &lt;ul class="nav nav-tabs"&gt;
     &lt;li class="active"&gt;&lt;a href="#1" data-toggle="tab"&gt;Section 1&lt;/a&gt;&lt;/li&gt;
     &lt;li&gt;&lt;a href="#2" data-toggle="tab"&gt;Section 2&lt;/a&gt;&lt;/li&gt;
   &lt;/ul&gt;
@@ -645,7 +645,7 @@
             <p>What up girl, this is Section C.</p>
           </div>
         </div>
-        <ul class="nav tabs">
+        <ul class="nav nav-tabs">
           <li class="active"><a href="#A" data-toggle="tab">Section 1</a></li>
           <li><a href="#B" data-toggle="tab">Section 2</a></li>
           <li><a href="#C" data-toggle="tab">Section 3</a></li>
@@ -653,12 +653,12 @@
       </div> <!-- /tabbable -->
 <pre class="prettyprint linenums" style="margin-top: 11px;">
 &lt;div class="tabbable tabs-below"&gt;
-  &lt;ul class="nav tabs"&gt;
-    ...
-  &lt;/ul&gt;
   &lt;div class="tab-content"&gt;
     ...
   &lt;/div&gt;
+  &lt;ul class="nav nav-tabs"&gt;
+    ...
+  &lt;/ul&gt;
 &lt;/div&gt;
 </pre>
     </div>
@@ -666,7 +666,7 @@
       <h4>Tabs on the left</h4>
       <p>Swap the class to put tabs on the left.</p>
       <div class="tabbable tabs-left">
-        <ul class="nav tabs">
+        <ul class="nav nav-tabs">
           <li class="active"><a href="#lA" data-toggle="tab">Section 1</a></li>
           <li><a href="#lB" data-toggle="tab">Section 2</a></li>
           <li><a href="#lC" data-toggle="tab">Section 3</a></li>
@@ -685,7 +685,7 @@
       </div> <!-- /tabbable -->
 <pre class="prettyprint linenums">
 &lt;div class="tabbable tabs-left"&gt;
-  &lt;ul class="nav tabs"&gt;
+  &lt;ul class="nav nav-tabs"&gt;
     ...
   &lt;/ul&gt;
   &lt;div class="tab-content"&gt;
@@ -698,7 +698,7 @@
       <h4>Tabs on the right</h4>
       <p>Swap the class to put tabs on the right.</p>
       <div class="tabbable tabs-right">
-        <ul class="nav tabs">
+        <ul class="nav nav-tabs">
           <li class="active"><a href="#rA" data-toggle="tab">Section 1</a></li>
           <li><a href="#rB" data-toggle="tab">Section 2</a></li>
           <li><a href="#rC" data-toggle="tab">Section 3</a></li>
@@ -717,7 +717,7 @@
       </div> <!-- /tabbable -->
 <pre class="prettyprint linenums">
 &lt;div class="tabbable tabs-right"&gt;
-  &lt;ul class="nav tabs"&gt;
+  &lt;ul class="nav nav-tabs"&gt;
     ...
   &lt;/ul&gt;
   &lt;div class="tab-content"&gt;
diff --git a/docs/download.html b/docs/download.html
index 38ebee85f7..ea096d2906 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -80,7 +80,7 @@
   <h1>Customize and download</h1>
   <p class="lead"><a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.</p>
   <div class="subnav">
-    <ul class="nav pills">
+    <ul class="nav nav-pills">
       <li><a href="#components">1. Choose components</a></li>
       <li><a href="#plugins">2. Select jQuery plugins</a></li>
       <li><a href="#variables">3. Customize variables</a></li>
diff --git a/docs/javascript.html b/docs/javascript.html
index 2789198e65..9781f3bc07 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -80,7 +80,7 @@
         <h1>Javascript for Bootstrap</h1>
         <p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
         <div class="subnav">
-          <ul class="nav pills">
+          <ul class="nav nav-pills">
             <li><a href="#javascript">All plugins</a></li>
             <li><a href="#modals">Modal</a></li>
             <li><a href="#dropdowns">Dropdown</a></li>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 9bb5d303b3..0d5a83d64d 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -80,7 +80,7 @@
         <h1>Scaffolding</h1>
         <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
         <div class="subnav">
-          <ul class="nav pills">
+          <ul class="nav nav-pills">
             <li><a href="#grid-system">Grid system</a></li>
             <li><a href="#layouts">Layouts</a></li>
             <li><a href="#responsive">Responsive design</a></li>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c000c9c88c..2da59f0ef9 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Base CSS{{/i}}</h1>
   <p class="lead">{{_i}}On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav pills">
+    <ul class="nav nav-pills">
       <li><a href="#typography">{{_i}}Typography{{/i}}</a></li>
       <li><a href="#code">{{_i}}Code{{/i}}</a></li>
       <li><a href="#tables">{{_i}}Tables{{/i}}</a></li>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index e61d83152d..c9f740b4a4 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Components{{/i}}</h1>
   <p class="lead">{{_i}}Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav pills">
+    <ul class="nav nav-pills">
       <li class="dropdown">
         <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{_i}}Buttons{{/i}} <b class="caret"></b></a>
         <ul class="dropdown-menu">
@@ -285,13 +285,13 @@
     <div class="span4">
       <h3>{{_i}}Basic tabs{{/i}}</h3>
       <p>{{_i}}Take a regular <code>&lt;ul&gt;</code> of links and add <code>.tabs</code>:{{/i}}</p>
-      <ul class="nav tabs">
+      <ul class="nav nav-tabs">
         <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
         <li><a href="#">{{_i}}Profile{{/i}}</a></li>
         <li><a href="#">{{_i}}Messages{{/i}}</a></li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav tabs"&gt;
+&lt;ul class="nav nav-tabs"&gt;
   &lt;li class="active"&gt;
     &lt;a href="#"&gt;{{_i}}Home{{/i}}&lt;/a&gt;
   &lt;/li&gt;
@@ -303,13 +303,13 @@
     <div class="span4">
       <h3>{{_i}}Basic pills{{/i}}</h3>
       <p>{{_i}}Take that same HTML, but use <code>.pills</code> instead:{{/i}}</p>
-      <ul class="nav pills">
+      <ul class="nav nav-pills">
         <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
         <li><a href="#">{{_i}}Profile{{/i}}</a></li>
         <li><a href="#">{{_i}}Messages{{/i}}</a></li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav pills"&gt;
+&lt;ul class="nav nav-pills"&gt;
   &lt;li class="active"&gt;
     &lt;a href="#"&gt;{{_i}}Home{{/i}}&lt;/a&gt;
   &lt;/li&gt;
@@ -328,26 +328,26 @@
     </div>
     <div class="span4">
       <h3>{{_i}}Stacked tabs{{/i}}</h3>
-      <ul class="nav tabs stacked">
+      <ul class="nav nav-tabs nav-stacked">
         <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
         <li><a href="#">{{_i}}Profile{{/i}}</a></li>
         <li><a href="#">{{_i}}Messages{{/i}}</a></li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav tabs stacked"&gt;
+&lt;ul class="nav nav-tabs nav-stacked"&gt;
   ...
 &lt;/ul&gt;
 </pre>
     </div>
     <div class="span4">
       <h3>{{_i}}Stacked pills{{/i}}</h3>
-      <ul class="nav pills stacked">
+      <ul class="nav nav-pills nav-stacked">
         <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
         <li><a href="#">{{_i}}Profile{{/i}}</a></li>
         <li><a href="#">{{_i}}Messages{{/i}}</a></li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav pills stacked"&gt;
+&lt;ul class="nav nav-pills nav-stacked"&gt;
   ...
 &lt;/ul&gt;
 </pre>
@@ -363,7 +363,7 @@
     </div>
     <div class="span4">
       <h3>{{_i}}Tabs with dropdowns{{/i}}</h3>
-      <ul class="nav tabs">
+      <ul class="nav nav-tabs">
         <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
         <li><a href="#">{{_i}}Profile{{/i}}</a></li>
         <li class="dropdown">
@@ -378,7 +378,7 @@
         </li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav tabs"&gt;
+&lt;ul class="nav nav-tabs"&gt;
   &lt;li class="dropdown"&gt;
     &lt;a class="dropdown-toggle"
        data-toggle="dropdown"
@@ -395,7 +395,7 @@
     </div>
     <div class="span4">
       <h3>{{_i}}Pills with dropdowns{{/i}}</h3>
-      <ul class="nav pills">
+      <ul class="nav nav-pills">
         <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
         <li><a href="#">{{_i}}Profile{{/i}}</a></li>
         <li class="dropdown">
@@ -410,7 +410,7 @@
         </li>
       </ul>
 <pre class="prettyprint linenums">
-&lt;ul class="nav pills"&gt;
+&lt;ul class="nav nav-pills"&gt;
   &lt;li class="dropdown"&gt;
     &lt;a class="dropdown-toggle"
        data-toggle="dropdown"
@@ -440,7 +440,7 @@
       <h3>{{_i}}Example nav list{{/i}}</h3>
       <p>{{_i}}Take a list of links and add <code>class="nav list"</code>:{{/i}}</p>
       <div class="well" style="padding: 8px 0;">
-        <ul class="nav list">
+        <ul class="nav nav-list">
           <li class="nav-header">{{_i}}List header{{/i}}</li>
           <li class="active"><a href="#">{{_i}}Home{{/i}}</a></li>
           <li><a href="#">{{_i}}Library{{/i}}</a></li>
@@ -452,7 +452,7 @@
         </ul>
       </div> <!-- /well -->
 <pre class="prettyprint linenums">
-&lt;ul class="nav list"&gt;
+&lt;ul class="nav nav-list"&gt;
   &lt;li class="nav-header"&gt;
     {{_i}}List header{{/i}}
   &lt;/li&gt;
@@ -470,7 +470,7 @@
       <h3>{{_i}}Example with icons{{/i}}</h3>
       <p>{{_i}}Same example, but with <code>&lt;i&gt;</code> tags for icons.{{/i}}</p>
       <div class="well" style="padding: 8px 0;">
-        <ul class="nav list">
+        <ul class="nav nav-list">
           <li class="nav-header">{{_i}}List header{{/i}}</li>
           <li class="active"><a href="#"><i class="icon white home"></i> {{_i}}Home{{/i}}</a></li>
           <li><a href="#"><i class="icon book"></i> {{_i}}Library{{/i}}</a></li>
@@ -482,7 +482,7 @@
         </ul>
       </div> <!-- /well -->
 <pre class="prettyprint linenums">
-&lt;ul class="nav list"&gt;
+&lt;ul class="nav nav-list"&gt;
   ...
   &lt;li&gt;
     &lt;a href="#"&gt;
@@ -508,7 +508,7 @@
       <h3>{{_i}}Tabbable example{{/i}}</h3>
       <p>{{_i}}To make tabs tabbable, wrap the <code>.tabs</code> in another div with class <code>.tabbable</code>.{{/i}}</p>
       <div class="tabbable" style="margin-bottom: 9px;">
-        <ul class="nav tabs">
+        <ul class="nav nav-tabs">
           <li class="active"><a href="#1" data-toggle="tab">{{_i}}Section 1{{/i}}</a></li>
           <li><a href="#2" data-toggle="tab">{{_i}}Section 2{{/i}}</a></li>
           <li><a href="#3" data-toggle="tab">{{_i}}Section 3{{/i}}</a></li>
@@ -537,7 +537,7 @@
   <p>{{_i}}Using tabbable tabs requires a wrapping div, a set of tabs, and a set of tabbable panes of content.{{/i}}</p>
 <pre class="prettyprint linenums">
 &lt;div class="tabbable"&gt;
-  &lt;ul class="nav tabs"&gt;
+  &lt;ul class="nav nav-tabs"&gt;
     &lt;li class="active"&gt;&lt;a href="#1" data-toggle="tab"&gt;{{_i}}Section 1{{/i}}&lt;/a&gt;&lt;/li&gt;
     &lt;li&gt;&lt;a href="#2" data-toggle="tab"&gt;{{_i}}Section 2{{/i}}&lt;/a&gt;&lt;/li&gt;
   &lt;/ul&gt;
@@ -569,7 +569,7 @@
             <p>{{_i}}What up girl, this is Section C.{{/i}}</p>
           </div>
         </div>
-        <ul class="nav tabs">
+        <ul class="nav nav-tabs">
           <li class="active"><a href="#A" data-toggle="tab">{{_i}}Section 1{{/i}}</a></li>
           <li><a href="#B" data-toggle="tab">{{_i}}Section 2{{/i}}</a></li>
           <li><a href="#C" data-toggle="tab">{{_i}}Section 3{{/i}}</a></li>
@@ -577,12 +577,12 @@
       </div> <!-- /tabbable -->
 <pre class="prettyprint linenums" style="margin-top: 11px;">
 &lt;div class="tabbable tabs-below"&gt;
-  &lt;ul class="nav tabs"&gt;
-    ...
-  &lt;/ul&gt;
   &lt;div class="tab-content"&gt;
     ...
   &lt;/div&gt;
+  &lt;ul class="nav nav-tabs"&gt;
+    ...
+  &lt;/ul&gt;
 &lt;/div&gt;
 </pre>
     </div>
@@ -590,7 +590,7 @@
       <h4>{{_i}}Tabs on the left{{/i}}</h4>
       <p>{{_i}}Swap the class to put tabs on the left.{{/i}}</p>
       <div class="tabbable tabs-left">
-        <ul class="nav tabs">
+        <ul class="nav nav-tabs">
           <li class="active"><a href="#lA" data-toggle="tab">{{_i}}Section 1{{/i}}</a></li>
           <li><a href="#lB" data-toggle="tab">{{_i}}Section 2{{/i}}</a></li>
           <li><a href="#lC" data-toggle="tab">{{_i}}Section 3{{/i}}</a></li>
@@ -609,7 +609,7 @@
       </div> <!-- /tabbable -->
 <pre class="prettyprint linenums">
 &lt;div class="tabbable tabs-left"&gt;
-  &lt;ul class="nav tabs"&gt;
+  &lt;ul class="nav nav-tabs"&gt;
     ...
   &lt;/ul&gt;
   &lt;div class="tab-content"&gt;
@@ -622,7 +622,7 @@
       <h4>{{_i}}Tabs on the right{{/i}}</h4>
       <p>{{_i}}Swap the class to put tabs on the right.{{/i}}</p>
       <div class="tabbable tabs-right">
-        <ul class="nav tabs">
+        <ul class="nav nav-tabs">
           <li class="active"><a href="#rA" data-toggle="tab">{{_i}}Section 1{{/i}}</a></li>
           <li><a href="#rB" data-toggle="tab">{{_i}}Section 2{{/i}}</a></li>
           <li><a href="#rC" data-toggle="tab">{{_i}}Section 3{{/i}}</a></li>
@@ -641,7 +641,7 @@
       </div> <!-- /tabbable -->
 <pre class="prettyprint linenums">
 &lt;div class="tabbable tabs-right"&gt;
-  &lt;ul class="nav tabs"&gt;
+  &lt;ul class="nav nav-tabs"&gt;
     ...
   &lt;/ul&gt;
   &lt;div class="tab-content"&gt;
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 9160e895bd..da91b1159f 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -4,7 +4,7 @@
   <h1>{{_i}}Customize and download{{/i}}</h1>
   <p class="lead">{{_i}}<a href="https://github.com/twitter/bootstrap/zipball/master">Download the full repository</a> or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.{{/i}}</p>
   <div class="subnav">
-    <ul class="nav pills">
+    <ul class="nav nav-pills">
       <li><a href="#components">{{_i}}1. Choose components{{/i}}</a></li>
       <li><a href="#plugins">{{_i}}2. Select jQuery plugins{{/i}}</a></li>
       <li><a href="#variables">{{_i}}3. Customize variables{{/i}}</a></li>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 9b787fb1ba..716a2b3fa8 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -4,7 +4,7 @@
         <h1>{{_i}}Javascript for Bootstrap{{/i}}</h1>
         <p class="lead">{{_i}}Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.{{/i}}
         <div class="subnav">
-          <ul class="nav pills">
+          <ul class="nav nav-pills">
             <li><a href="#javascript">{{_i}}All plugins{{/i}}</a></li>
             <li><a href="#modals">{{_i}}Modal{{/i}}</a></li>
             <li><a href="#dropdowns">{{_i}}Dropdown{{/i}}</a></li>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 15c438b975..40d368c66b 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -4,7 +4,7 @@
         <h1>{{_i}}Scaffolding{{/i}}</h1>
         <p class="lead">{{_i}}Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.{{/i}}</p>
         <div class="subnav">
-          <ul class="nav pills">
+          <ul class="nav nav-pills">
             <li><a href="#grid-system">{{_i}}Grid system{{/i}}</a></li>
             <li><a href="#layouts">{{_i}}Layouts{{/i}}</a></li>
             <li><a href="#responsive">{{_i}}Responsive design{{/i}}</a></li>
diff --git a/less/navs.less b/less/navs.less
index aa718cd746..dfb2996f09 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -26,35 +26,35 @@
 // NAV LIST
 // --------
 
-.nav.list {
+.nav-list {
   padding-left: 14px;
   padding-right: 14px;
   margin-bottom: 0;
 }
-.nav.list > li > a,
-.nav.list .nav-header {
+.nav-list > li > a,
+.nav-list .nav-header {
   display: block;
   padding: 3px 15px;
   margin-left:  -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
-.nav.list .nav-header {
+.nav-list .nav-header {
   font-size: 11px;
   font-weight: bold;
   line-height: @baseLineHeight;
   color: @grayLight;
   text-transform: uppercase;
 }
-.nav.list > li + .nav-header {
+.nav-list > li + .nav-header {
   margin-top: 9px;
 }
-.nav.list .active > a {
+.nav-list .active > a {
   color: @white;
   text-shadow: 0 -1px 0 rgba(0,0,0,.2);
   background-color: @linkColor;
 }
-.nav.list .icon {
+.nav-list .icon {
   margin-right: 2px;
 }
 
@@ -64,16 +64,16 @@
 // -------------
 
 // Common styles
-.tabs,
-.pills {
+.nav-tabs,
+.nav-pills {
   .clearfix();
 }
-.tabs > li,
-.pills > li {
+.nav-tabs > li,
+.nav-pills > li {
   float: left;
 }
-.tabs > li > a,
-.pills > li > a {
+.nav-tabs > li > a,
+.nav-pills > li > a {
   padding-right: 12px;
   padding-left: 12px;
   margin-right: 2px;
@@ -84,17 +84,17 @@
 // ----
 
 // Give the tabs something to sit on
-.tabs {
+.nav-tabs {
   border-bottom: 1px solid #ddd;
 }
 
 // Make the list-items overlay the bottom border
-.tabs > li {
+.nav-tabs > li {
   margin-bottom: -1px;
 }
 
 // Actual tabs (as links)
-.tabs > li > a {
+.nav-tabs > li > a {
   padding-top: 9px;
   padding-bottom: 9px;
   border: 1px solid transparent;
@@ -104,8 +104,8 @@
   }
 }
 // Active state, and it's :hover to override normal :hover
-.tabs > .active > a,
-.tabs > .active > a:hover {
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
   color: @gray;
   background-color: @white;
   border: 1px solid #ddd;
@@ -117,7 +117,7 @@
 // -----
 
 // Links rendered as pills
-.pills > li > a {
+.nav-pills > li > a {
   padding-top: 8px;
   padding-bottom: 8px;
   margin-top: 2px;
@@ -126,8 +126,8 @@
 }
 
 // Active state
-.pills .active > a,
-.pills .active > a:hover {
+.nav-pills .active > a,
+.nav-pills .active > a:hover {
   color: @white;
   background-color: @linkColor;
 }
@@ -138,37 +138,37 @@
 // -----------
 
 // Stacked tabs and pills
-.nav.stacked > li {
+.nav-stacked > li {
   float: none;
 }
-.nav.stacked > li > a {
+.nav-stacked > li > a {
   margin-right: 0; // no need for the gap between nav items
 }
 
 // Tabs
-.tabs.stacked {
+.nav-tabs.nav-stacked {
   border-bottom: 0;
 }
-.tabs.stacked > li > a {
+.nav-tabs.nav-stacked > li > a {
   border: 1px solid #ddd;
   .border-radius(0);
 }
-.tabs.stacked > li:first-child > a {
+.nav-tabs.nav-stacked > li:first-child > a {
   .border-radius(4px 4px 0 0);
 }
-.tabs.stacked > li:last-child > a {
+.nav-tabs.nav-stacked > li:last-child > a {
   .border-radius(0 0 4px 4px);
 }
-.tabs.stacked > li > a:hover {
+.nav-tabs.nav-stacked > li > a:hover {
   border-color: #ddd;
   z-index: 2;
 }
 
 // Pills
-.pills.stacked > li > a {
+.nav-pills.nav-stacked > li > a {
   margin-bottom: 3px;
 }
-.pills.stacked > li:last-child > a {
+.nav-pills.nav-stacked > li:last-child > a {
   margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
 }
 
@@ -178,32 +178,32 @@
 // ---------
 
 // Position the menu
-.pills .dropdown-menu,
-.tabs .dropdown-menu {
+.nav-tabs .dropdown-menu,
+.nav-pills .dropdown-menu {
   margin-top: 1px;
   border-width: 1px;
 }
-.pills .dropdown-menu {
+.nav-pills .dropdown-menu {
   .border-radius(4px);
 }
 
 // Default dropdown links
 // -------------------------
 // Make carets use linkColor to start
-.tabs .dropdown-toggle .caret,
-.pills .dropdown-toggle .caret {
+.nav-tabs .dropdown-toggle .caret,
+.nav-pills .dropdown-toggle .caret {
   border-top-color: @linkColor;
   margin-top: 6px;
 }
-.tabs .dropdown-toggle:hover .caret,
-.pills .dropdown-toggle:hover .caret {
+.nav-tabs .dropdown-toggle:hover .caret,
+.nav-pills .dropdown-toggle:hover .caret {
   border-top-color: @linkColorHover;
 }
 
 // Active dropdown links
 // -------------------------
-.tabs .active .dropdown-toggle .caret,
-.pills .active .dropdown-toggle .caret {
+.nav-tabs .active .dropdown-toggle .caret,
+.nav-pills .active .dropdown-toggle .caret {
   border-top-color: @grayDark;
 }
 
@@ -216,8 +216,8 @@
 
 // Open dropdowns
 // -------------------------
-.tabs .open .dropdown-toggle,
-.pills .open .dropdown-toggle,
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
 .nav > .open.active > a:hover {
   color: @white;
   background-color: @grayLight;
@@ -231,7 +231,7 @@
 }
 
 // Dropdowns in stacked tabs
-.tabs.stacked .open > a:hover {
+.tabs-stacked .open > a:hover {
   border-color: @grayLight;
 }
 
@@ -250,9 +250,9 @@
 }
 
 // Remove border on bottom, left, right
-.tabs-below .tabs,
-.tabs-right .tabs,
-.tabs-left .tabs {
+.tabs-below .nav-tabs,
+.tabs-right .nav-tabs,
+.tabs-left .nav-tabs {
   border-bottom: 0;
 }
 
@@ -270,22 +270,22 @@
 // BOTTOM
 // ------
 
-.tabs-below .tabs {
+.tabs-below .nav-tabs {
   border-top: 1px solid #ddd;
 }
-.tabs-below .tabs > li {
+.tabs-below .nav-tabs > li {
   margin-top: -1px;
   margin-bottom: 0;
 }
-.tabs-below .tabs > li > a {
+.tabs-below .nav-tabs > li > a {
   .border-radius(0 0 4px 4px);
   &:hover {
     border-bottom-color: transparent;
     border-top-color: #ddd;
   }
 }
-.tabs-below .tabs .active > a,
-.tabs-below .tabs .active > a:hover {
+.tabs-below .nav-tabs .active > a,
+.tabs-below .nav-tabs .active > a:hover {
   border-color: transparent #ddd #ddd #ddd;
 }
 
@@ -293,51 +293,51 @@
 // ------------
 
 // Common styles
-.tabs-left .tabs > li,
-.tabs-right .tabs > li {
+.tabs-left .nav-tabs > li,
+.tabs-right .nav-tabs > li {
   float: none;
 }
-.tabs-left .tabs > li > a,
-.tabs-right .tabs > li > a {
+.tabs-left .nav-tabs > li > a,
+.tabs-right .nav-tabs > li > a {
   min-width: 74px;
   margin-right: 0;
   margin-bottom: 3px;
 }
 
 // Tabs on the left
-.tabs-left .tabs {
+.tabs-left .nav-tabs {
   float: left;
   margin-right: 19px;
   border-right: 1px solid #ddd;
 }
-.tabs-left .tabs > li > a {
+.tabs-left .nav-tabs > li > a {
   margin-right: -1px;
   .border-radius(4px 0 0 4px);
 }
-.tabs-left .tabs > li > a:hover {
+.tabs-left .nav-tabs > li > a:hover {
   border-color: @grayLighter #ddd @grayLighter @grayLighter;
 }
-.tabs-left .tabs .active > a,
-.tabs-left .tabs .active > a:hover {
+.tabs-left .nav-tabs .active > a,
+.tabs-left .nav-tabs .active > a:hover {
   border-color: #ddd transparent #ddd #ddd;
   *border-right-color: @white;
 }
 
 // Tabs on the right
-.tabs-right .tabs {
+.tabs-right .nav-tabs {
   float: right;
   margin-left: 19px;
   border-left: 1px solid #ddd;
 }
-.tabs-right .tabs > li > a {
+.tabs-right .nav-tabs > li > a {
   margin-left: -1px;
   .border-radius(0 4px 4px 0);
 }
-.tabs-right .tabs > li > a:hover {
+.tabs-right .nav-tabs > li > a:hover {
   border-color: @grayLighter @grayLighter @grayLighter #ddd;
 }
-.tabs-right .tabs .active > a,
-.tabs-right .tabs .active > a:hover {
+.tabs-right .nav-tabs .active > a,
+.tabs-right .nav-tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
   *border-left-color: @white;
 }