diff --git a/docs/javascript.html b/docs/javascript.html
index 8a9a203e74..8dc3ba9d8d 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -579,7 +579,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             </thead>
             <tbody>
              <tr>
-               <td>animate</td>
+               <td>animation</td>
                <td>boolean</td>
                <td>true</td>
                <td>apply a css fade transition to the tooltip</td>
@@ -669,7 +669,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             </thead>
             <tbody>
              <tr>
-               <td>animate</td>
+               <td>animation</td>
                <td>boolean</td>
                <td>true</td>
                <td>apply a css fade transition to the tooltip</td>
diff --git a/js/README.md b/js/README.md
index 04dfb75df6..0d8d163a28 100644
--- a/js/README.md
+++ b/js/README.md
@@ -83,9 +83,9 @@ Each plugin stores a copy of the invoked class on an object. This class instance
 
 Data attributes should take the following form:
 
-- data-*(verb)* - defines main interaction
+- data-{{verb}}={{plugin}} - defines main interaction
 - data-target || href^=# - defined on "control" element (if element controls an element other than self)
-- data-*(noun)* - defines class instance options
+- data-{{noun}} - defines class instance options
 
 examples:
 
diff --git a/js/bootstrap-twipsy.js b/js/bootstrap-twipsy.js
index 4868671bf3..018edb97e5 100644
--- a/js/bootstrap-twipsy.js
+++ b/js/bootstrap-twipsy.js
@@ -109,7 +109,7 @@
         $tip = this.tip()
         this.setContent()
 
-        if (this.options.animate) {
+        if (this.options.animation) {
           $tip.addClass('fade')
         }
 
@@ -250,7 +250,7 @@
   $.fn.twipsy.Constructor = Twipsy
 
   $.fn.twipsy.defaults = {
-    animate: true
+    animation: true
   , delay: 0
   , selector: false
   , placement: 'above'