diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 299049115..0968ee621 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4974,7 +4974,7 @@ a.badge:hover {
   margin-bottom: 0;
 }
 
-.hero-unit {
+.jumbotron {
   padding: 60px;
   margin-bottom: 30px;
   font-size: 18px;
@@ -4985,7 +4985,7 @@ a.badge:hover {
   border-radius: 6px;
 }
 
-.hero-unit h1 {
+.jumbotron h1 {
   margin-bottom: 0;
   font-size: 60px;
   line-height: 1;
@@ -4993,7 +4993,7 @@ a.badge:hover {
   color: inherit;
 }
 
-.hero-unit li {
+.jumbotron li {
   line-height: 30px;
 }
 
diff --git a/docs/components.html b/docs/components.html
index 873bff63d..3c070e2e4 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1610,17 +1610,17 @@
             <h1>Typographic components</h1>
           </div>
 
-          <h2>Hero unit</h2>
+          <h2>Jumbotron</h2>
           <p>A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.</p>
           <div class="bs-docs-example">
-            <div class="hero-unit">
+            <div class="jumbotron">
               <h1>Hello, world!</h1>
               <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
               <p><a class="btn btn-primary btn-large">Learn more</a></p>
             </div>
           </div>
 <pre class="prettyprint linenums">
-&lt;div class="hero-unit"&gt;
+&lt;div class="jumbotron"&gt;
   &lt;h1&gt;Heading&lt;/h1&gt;
   &lt;p&gt;Tagline&lt;/p&gt;
   &lt;p&gt;
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index f9fbaf4cb..a97a97b20 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1542,17 +1542,17 @@
             <h1>Typographic components</h1>
           </div>
 
-          <h2>Hero unit</h2>
+          <h2>Jumbotron</h2>
           <p>A lightweight, flexible component to showcase key content on your site. It works well on marketing and content-heavy sites.</p>
           <div class="bs-docs-example">
-            <div class="hero-unit">
+            <div class="jumbotron">
               <h1>Hello, world!</h1>
               <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
               <p><a class="btn btn-primary btn-large">Learn more</a></p>
             </div>
           </div>
 <pre class="prettyprint linenums">
-&lt;div class="hero-unit"&gt;
+&lt;div class="jumbotron"&gt;
   &lt;h1&gt;Heading&lt;/h1&gt;
   &lt;p&gt;Tagline&lt;/p&gt;
   &lt;p&gt;
diff --git a/less/bootstrap.less b/less/bootstrap.less
index 1ed13496b..68d595c2c 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -56,7 +56,7 @@
 @import "progress-bars.less";
 @import "accordion.less";
 @import "carousel.less";
-@import "hero-unit.less";
+@import "jumbotron.less";
 
 // Utility classes
 @import "utilities.less"; // Has to be last to override when necessary
diff --git a/less/hero-unit.less b/less/jumbotron.less
similarity index 74%
rename from less/hero-unit.less
rename to less/jumbotron.less
index 1e61033ad..add431969 100644
--- a/less/hero-unit.less
+++ b/less/jumbotron.less
@@ -1,22 +1,22 @@
 //
-// Hero unit
+// Jumbotron
 // --------------------------------------------------
 
 
-.hero-unit {
+.jumbotron {
   padding: 60px;
   margin-bottom: 30px;
   font-size: 18px;
   font-weight: 200;
   line-height: @line-height-base * 1.5;
-  color: @hero-lead-color;
-  background-color: @hero-background;
+  color: @jumbotron-lead-color;
+  background-color: @jumbotron-background;
   border-radius: 6px;
   h1 {
     margin-bottom: 0;
     font-size: 60px;
     line-height: 1;
-    color: @hero-heading-color;
+    color: @jumbotron-heading-color;
     letter-spacing: -1px;
   }
   li {
diff --git a/less/variables.less b/less/variables.less
index 4841d485f..058792eff 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -199,12 +199,12 @@
 @pagination-border:                    #ddd;
 
 
-// Hero unit
+// Jumbotron
 // -------------------------
 
-@hero-background:              @grayLighter;
-@hero-heading-color:            inherit;
-@hero-lead-color:               inherit;
+@jumbotron-background:           @grayLighter;
+@jumbotron-heading-color:        inherit;
+@jumbotron-lead-color:           inherit;
 
 
 // Form states and alerts