diff --git a/lib/elements/array-selector.html b/lib/elements/array-selector.html
index 85603aaed6..7dec336293 100644
--- a/lib/elements/array-selector.html
+++ b/lib/elements/array-selector.html
@@ -390,7 +390,8 @@
    * });
    * ```
    *
-   * @polymerElement
+   * @customElement
+   * @polymer
    * @extends Polymer.Element
    * @mixes Polymer.ArraySelectorMixin
    * @memberof Polymer
diff --git a/lib/elements/dom-if.html b/lib/elements/dom-if.html
index 842e5a6593..1353dbdefd 100644
--- a/lib/elements/dom-if.html
+++ b/lib/elements/dom-if.html
@@ -33,7 +33,8 @@
    * Set the `restamp` property to true to force the stamped content to be
    * created / destroyed when the `if` condition changes.
    *
-   * @polymerElement
+   * @customElement
+   * @polymer
    * @extends Polymer.Element
    * @memberof Polymer
    * @summary Custom element that conditionally stamps and hides or removes
diff --git a/lib/elements/dom-repeat.html b/lib/elements/dom-repeat.html
index 5efa30a43d..113b7082f2 100644
--- a/lib/elements/dom-repeat.html
+++ b/lib/elements/dom-repeat.html
@@ -112,7 +112,8 @@
    *           filter="isEngineer" observe="type manager.type">
    * ```
    *
-   * @polymerElement
+   * @customElement
+   * @polymer
    * @memberof Polymer
    * @extends Polymer.Element
    * @mixes Polymer.MutableData
diff --git a/polymer-element.html b/polymer-element.html
index 1dac595c13..d576fbd81e 100644
--- a/polymer-element.html
+++ b/polymer-element.html
@@ -17,7 +17,8 @@
    * features including template stamping, data-binding, attribute deserialization,
    * and property change observation.
    *
-   * @polymerElement
+   * @customElement
+   * @polymer
    * @memberof Polymer
    * @constructor
    * @implements {Polymer_ElementMixin}