diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fa5d69331..2860d3300 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -544,19 +544,16 @@ li {
   line-height: 20px;
 }
 
-ul.unstyled,
-ol.unstyled {
+.list-unstyled {
   margin-left: 0;
   list-style: none;
 }
 
-ul.inline,
-ol.inline {
+.list-inline {
   list-style: none;
 }
 
-ul.inline > li,
-ol.inline > li {
+.list-inline > li {
   display: inline-block;
   padding-right: 5px;
   padding-left: 5px;
diff --git a/docs/base-css.html b/docs/base-css.html
index d3e4ec307..aceb665c3 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -349,7 +349,7 @@
         <h3>Unstyled</h3>
         <p>Remove default the <code>list-style</code> and left padding on list items (immediate children only).</p>
         <div class="bs-docs-example">
-          <ul class="unstyled">
+          <ul class="list-unstyled">
             <li>Lorem ipsum dolor sit amet</li>
             <li>Consectetur adipiscing elit</li>
             <li>Integer molestie lorem at massa</li>
@@ -368,7 +368,7 @@
           </ul>
         </div>
 <pre class="prettyprint linenums">
-&lt;ul class="unstyled"&gt;
+&lt;ul class="list-unstyled"&gt;
   &lt;li&gt;...&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
@@ -376,14 +376,14 @@
         <h3>Inline</h3>
         <p>Place all list items on a single line with <code>inline-block</code> and some light padding.</p>
         <div class="bs-docs-example">
-          <ul class="inline">
+          <ul class="list-inline">
             <li>Lorem ipsum</li>
             <li>Phasellus iaculis</li>
             <li>Nulla volutpat</li>
           </ul>
         </div>
 <pre class="prettyprint linenums">
-&lt;ul class="inline"&gt;
+&lt;ul class="list-inline"&gt;
   &lt;li&gt;...&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 027c6da2a..683f1f9ad 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -289,7 +289,7 @@
         <h3>{{_i}}Unstyled{{/i}}</h3>
         <p>{{_i}}Remove default the <code>list-style</code> and left padding on list items (immediate children only).{{/i}}</p>
         <div class="bs-docs-example">
-          <ul class="unstyled">
+          <ul class="list-unstyled">
             <li>Lorem ipsum dolor sit amet</li>
             <li>Consectetur adipiscing elit</li>
             <li>Integer molestie lorem at massa</li>
@@ -308,7 +308,7 @@
           </ul>
         </div>
 <pre class="prettyprint linenums">
-&lt;ul class="unstyled"&gt;
+&lt;ul class="list-unstyled"&gt;
   &lt;li&gt;...&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
@@ -316,14 +316,14 @@
         <h3>{{_i}}Inline{{/i}}</h3>
         <p>{{_i}}Place all list items on a single line with <code>inline-block</code> and some light padding.{{/i}}</p>
         <div class="bs-docs-example">
-          <ul class="inline">
+          <ul class="list-inline">
             <li>Lorem ipsum</li>
             <li>Phasellus iaculis</li>
             <li>Nulla volutpat</li>
           </ul>
         </div>
 <pre class="prettyprint linenums">
-&lt;ul class="inline"&gt;
+&lt;ul class="list-inline"&gt;
   &lt;li&gt;...&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
diff --git a/less/type.less b/less/type.less
index a95d4b983..eded998fb 100644
--- a/less/type.less
+++ b/less/type.less
@@ -107,15 +107,13 @@ li {
 }
 
 // Remove default list styles
-ul.unstyled,
-ol.unstyled {
+.list-unstyled {
   margin-left: 0;
   list-style: none;
 }
 
 // Single-line list items
-ul.inline,
-ol.inline {
+.list-inline {
   list-style: none;
   & > li {
     display: inline-block;