diff --git a/bootstrap-elements.html b/bootstrap-elements.html
index 8b81211a..69679512 100644
--- a/bootstrap-elements.html
+++ b/bootstrap-elements.html
@@ -1978,7 +1978,7 @@
           </div>
 
           <div class="form-group">
-            <input class="form-control floating-label" id="focusedInput2" type="text" placeholder="Focus to show the hint" data-hint="You should really write something here">
+            <input class="form-control floating-label" id="focusedInput2" type="text" placeholder="Focus to show the help-block" data-hint="You should really write something here">
           </div>
 
           <div class="form-group">
diff --git a/index.html b/index.html
index fac02e93..b11d4a67 100644
--- a/index.html
+++ b/index.html
@@ -373,13 +373,13 @@
                 <label for="i2" class="control-label">Static label</label>
                 <input type="email" class="form-control" id="i2" placeholder="Placeholder text">
 
-                <p class="help-block hint">This is a hint as a <code>p.help-block.hint</code></p>
+                <p class="help-block">This is a hint as a <code>p.help-block.hint</code></p>
               </div>
 
               <div class="form-group">
                 <label for="i5" class="control-label floating-label">Floating label</label>
                 <input type="email" class="form-control" id="i5">
-                <span class="help-block hint">This is a hint as a <code>span.help-block.hint</code></span>
+                <span class="help-block">This is a hint as a <code>span.help-block.hint</code></span>
               </div>
 
               <h2>Input - floating labels
@@ -388,19 +388,19 @@
               <div class="form-group form-group-sm">
                 <label for="i4" class="control-label floating-label">Email address form-group-sm</label>
                 <input type="email" class="form-control" id="i4">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <div class="form-group">
                 <label for="i5i" class="control-label floating-label">Email address default size</label>
                 <input type="email" class="form-control" id="i5i">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <div class="form-group form-group-lg">
                 <label for="i6" class="control-label floating-label">Email address form-group-lg</label>
                 <input type="email" class="form-control" id="i6">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <h2>Input - static labels
@@ -410,19 +410,19 @@
               <div class="form-group form-group-sm">
                 <label for="si4" class="control-label">Email address form-group-sm</label>
                 <input type="email" class="form-control" id="si4" placeholder="Placeholder">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <div class="form-group">
                 <label for="si5i" class="control-label">Email address default size</label>
                 <input type="email" class="form-control" id="si5i" placeholder="Placeholder">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <div class="form-group form-group-lg">
                 <label for="si6" class="control-label">Email address form-group-lg</label>
                 <input type="email" class="form-control" id="si6" placeholder="Placeholder">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <h2>Input - no labels
@@ -431,17 +431,17 @@
 
               <div class="form-group form-group-sm">
                 <input type="email" class="form-control" placeholder="Placeholder form-group-sm">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <div class="form-group">
                 <input type="email" class="form-control" placeholder="Placeholder">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <div class="form-group form-group-lg">
                 <input type="email" class="form-control" placeholder="Placeholder form-group-lg">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
 
@@ -451,19 +451,19 @@
               <div class="form-group has-success">
                 <label for="f1" class="control-label floating-label">Email address has-success</label>
                 <input type="email" class="form-control" id="f1">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <div class="form-group has-warning">
                 <label for="f2" class="control-label floating-label">Email address has-warning</label>
                 <input type="email" class="form-control" id="f2">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>
 
               <div class="form-group has-error">
                 <label for="f3" class="control-label floating-label">Email address has-error</label>
                 <input type="email" class="form-control" id="f3">
-                <span class="help-block hint">Please enter a valid email address</span>
+                <span class="help-block">Please enter a valid email address</span>
               </div>