diff --git a/lib/elements/array-selector.html b/lib/elements/array-selector.html
index 1533f2ed40..c23af7c9cb 100644
--- a/lib/elements/array-selector.html
+++ b/lib/elements/array-selector.html
@@ -394,7 +394,7 @@
    * @customElement
    * @polymer
    * @extends Polymer.Element
-   * @mixes Polymer.ArraySelectorMixin
+   * @appliesMixin Polymer.ArraySelectorMixin
    * @memberof Polymer
    * @summary Custom element that links paths between an input `items` array and
    *   an output `selected` item or array based on calls to its selection API.
diff --git a/lib/elements/dom-bind.html b/lib/elements/dom-bind.html
index 436791d85c..bf6cc804b7 100644
--- a/lib/elements/dom-bind.html
+++ b/lib/elements/dom-bind.html
@@ -41,7 +41,7 @@
      * binding scope.
      *
      * @extends HTMLElement
-     * @mixes Polymer.PropertyEffects
+     * @appliesMixin Polymer.PropertyEffects
      * @memberof Polymer
      * @summary Custom element to allow using Polymer's template features (data
      *   binding, declarative event listeners, etc.) in the main document.
diff --git a/lib/elements/dom-repeat.html b/lib/elements/dom-repeat.html
index 113b7082f2..27a3d21f2a 100644
--- a/lib/elements/dom-repeat.html
+++ b/lib/elements/dom-repeat.html
@@ -116,7 +116,7 @@
    * @polymer
    * @memberof Polymer
    * @extends Polymer.Element
-   * @mixes Polymer.MutableData
+   * @appliesMixin Polymer.MutableData
    * @summary Custom element for stamping instance of a template bound to
    *   items in an array.
    */
diff --git a/lib/legacy/legacy-element-mixin.html b/lib/legacy/legacy-element-mixin.html
index a8a1dc4ae1..18497c6763 100644
--- a/lib/legacy/legacy-element-mixin.html
+++ b/lib/legacy/legacy-element-mixin.html
@@ -32,8 +32,8 @@
    *
    * @mixinFunction
    * @polymer
-   * @mixes Polymer.ElementMixin
-   * @mixes Polymer.GestureEventListeners
+   * @appliesMixin Polymer.ElementMixin
+   * @appliesMixin Polymer.GestureEventListeners
    * @property isAttached {boolean} Set to `true` in this element's
    *   `connectedCallback` and `false` in `disconnectedCallback`
    * @memberof Polymer
diff --git a/lib/mixins/element-mixin.html b/lib/mixins/element-mixin.html
index 9f09a6f782..2e79ba6ef7 100644
--- a/lib/mixins/element-mixin.html
+++ b/lib/mixins/element-mixin.html
@@ -103,7 +103,7 @@
    *
    * @mixinFunction
    * @polymer
-   * @mixes Polymer.PropertyEffects
+   * @appliesMixin Polymer.PropertyEffects
    * @memberof Polymer
    * @property rootPath {string} Set to the value of `Polymer.rootPath`,
    *   which defaults to the main document path
diff --git a/lib/mixins/property-effects.html b/lib/mixins/property-effects.html
index 1b76b64277..75d2bc55f3 100644
--- a/lib/mixins/property-effects.html
+++ b/lib/mixins/property-effects.html
@@ -1047,8 +1047,8 @@
    *
    * @mixinFunction
    * @polymer
-   * @mixes Polymer.TemplateStamp
-   * @mixes Polymer.PropertyAccessors
+   * @appliesMixin Polymer.TemplateStamp
+   * @appliesMixin Polymer.PropertyAccessors
    * @memberof Polymer
    * @summary Element class mixin that provides meta-programming for Polymer's
    * template binding and data observation system.
diff --git a/polymer-element.html b/polymer-element.html
index d576fbd81e..cf984965fd 100644
--- a/polymer-element.html
+++ b/polymer-element.html
@@ -23,7 +23,7 @@
    * @constructor
    * @implements {Polymer_ElementMixin}
    * @extends HTMLElement
-   * @mixes Polymer.ElementMixin
+   * @appliesMixin Polymer.ElementMixin
    * @summary Custom element base class that provides the core API for Polymer's
    *   key meta-programming features including template stamping, data-binding,
    *   attribute deserialization, and property change observation