diff --git a/lib/elements/array-selector.html b/lib/elements/array-selector.html
index 05e8013eec..a57c1738c5 100644
--- a/lib/elements/array-selector.html
+++ b/lib/elements/array-selector.html
@@ -30,8 +30,9 @@
    * representing the last selected item.  When `multi` is true, `selected`
    * is an array of multiply selected items.
    *
-   * @polymerMixin
-   * @mixes Polymer.ElementMixin
+   * @mixinFunction
+   * @polymer
+   * @appliesMixin Polymer.ElementMixin
    * @memberof Polymer
    * @summary Element mixin for recording dynamic associations between item paths in a
    * master `items` array and a `selected` array
@@ -46,7 +47,7 @@
     let elementBase = Polymer.ElementMixin(superClass);
 
     /**
-     * @polymerMixinClass
+     * @mixinClass
      * @implements {Polymer_ArraySelectorMixin}
      * @unrestricted
      */
@@ -401,8 +402,10 @@
    * });
    * ```
    *
-   * @polymerElement
-   * @mixes Polymer.ArraySelectorMixin
+   * @customElement
+   * @polymer
+   * @extends {baseArraySelector}
+   * @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 c4d9050fa1..cc39300524 100644
--- a/lib/elements/dom-bind.html
+++ b/lib/elements/dom-bind.html
@@ -40,9 +40,10 @@
      * document and bind elements to the `dom-bind` element itself as the
      * binding scope.
      *
-     * @mixes Polymer.PropertyEffects
-     * @mixes Polymer.OptionalMutableData
-     * @mixes Polymer.GestureEventListeners
+     * @appliesMixin Polymer.PropertyEffects
+     * @appliesMixin Polymer.OptionalMutableData
+     * @appliesMixin Polymer.GestureEventListeners
+     * @extends {domBindBase}
      * @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-if.html b/lib/elements/dom-if.html
index cf89d0eb71..fad92cadcd 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 33675b1d64..149b747416 100644
--- a/lib/elements/dom-repeat.html
+++ b/lib/elements/dom-repeat.html
@@ -114,9 +114,11 @@
    *           filter="isEngineer" observe="type manager.type">
    * ```
    *
-   * @polymerElement
+   * @customElement
+   * @polymer
    * @memberof Polymer
-   * @mixes Polymer.MutableData
+   * @extends {domRepeatBase}
+   * @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 8a379c0d42..6bf1eecfb8 100644
--- a/lib/legacy/legacy-element-mixin.html
+++ b/lib/legacy/legacy-element-mixin.html
@@ -30,9 +30,10 @@
    * found on the Polymer 1.x `Polymer.Base` prototype applied to all elements
    * defined using the `Polymer({...})` function.
    *
-   * @polymerMixin
-   * @mixes Polymer.ElementMixin
-   * @mixes Polymer.GestureEventListeners
+   * @mixinFunction
+   * @polymer
+   * @appliesMixin Polymer.ElementMixin
+   * @appliesMixin Polymer.GestureEventListeners
    * @property isAttached {boolean} Set to `true` in this element's
    *   `connectedCallback` and `false` in `disconnectedCallback`
    * @memberof Polymer
@@ -60,7 +61,8 @@
     };
 
     /**
-     * @polymerMixinClass
+     * @mixinClass
+     * @extends {legacyElementBase}
      * @implements {Polymer_LegacyElementMixin}
      * @unrestricted
      */
diff --git a/lib/mixins/element-mixin.html b/lib/mixins/element-mixin.html
index f10d652894..46efa7c251 100644
--- a/lib/mixins/element-mixin.html
+++ b/lib/mixins/element-mixin.html
@@ -77,8 +77,9 @@
    *   `observedAttributes` implementation will automatically return an array
    *   of dash-cased attributes based on `properties`)
    *
-   * @polymerMixin
-   * @mixes Polymer.PropertyEffects
+   * @mixinFunction
+   * @polymer
+   * @appliesMixin Polymer.PropertyEffects
    * @memberof Polymer
    * @property rootPath {string} Set to the value of `Polymer.rootPath`,
    *   which defaults to the main document path
@@ -429,7 +430,7 @@
     }
 
     /**
-     * @polymerMixinClass
+     * @mixinClass
      * @unrestricted
      * @implements {Polymer_ElementMixin}
      */
diff --git a/lib/mixins/gesture-event-listeners.html b/lib/mixins/gesture-event-listeners.html
index df9f52f6fb..06f03e4df2 100644
--- a/lib/mixins/gesture-event-listeners.html
+++ b/lib/mixins/gesture-event-listeners.html
@@ -30,7 +30,8 @@
    * templates will support gesture events when this mixin is applied along with
    * `Polymer.TemplateStamp`.
    *
-   * @polymerMixin
+   * @mixinFunction
+   * @polymer
    * @memberof Polymer
    * @summary Element class mixin that provides API for adding Polymer's cross-platform
    * gesture events to nodes
@@ -38,7 +39,7 @@
   Polymer.GestureEventListeners = Polymer.dedupingMixin(superClass => {
 
     /**
-     * @polymerMixinClass
+     * @mixinClass
      * @implements {Polymer_GestureEventListeners}
      */
     class GestureEventListeners extends superClass {
diff --git a/lib/mixins/mutable-data.html b/lib/mixins/mutable-data.html
index 30235c17a6..9297f80a4d 100644
--- a/lib/mixins/mutable-data.html
+++ b/lib/mixins/mutable-data.html
@@ -65,7 +65,8 @@
    * will be worse as opposed to using strict dirty checking with immutable
    * patterns or Polymer's path notification API.
    *
-   * @polymerMixin
+   * @mixinFunction
+   * @polymer
    * @memberof Polymer
    * @summary Element class mixin to skip strict dirty-checking for objects
    *   and arrays
@@ -73,7 +74,7 @@
   Polymer.MutableData = Polymer.dedupingMixin(superClass => {
 
     /**
-     * @polymerMixinClass
+     * @mixinClass
      * @implements {Polymer_MutableData}
      */
     class MutableData extends superClass {
@@ -139,7 +140,8 @@
    * strict dirty checking with immutable patterns or Polymer's path notification
    * API.
    *
-   * @polymerMixin
+   * @mixinFunction
+   * @polymer
    * @memberof Polymer
    * @summary Element class mixin to optionally skip strict dirty-checking
    *   for objects and arrays
@@ -147,7 +149,7 @@
   Polymer.OptionalMutableData = Polymer.dedupingMixin(superClass => {
 
     /**
-     * @polymerMixinClass
+     * @mixinClass
      * @implements {Polymer_OptionalMutableData}
      */
     class OptionalMutableData extends superClass {
diff --git a/lib/mixins/property-accessors.html b/lib/mixins/property-accessors.html
index 810b44a0fc..71efa266ce 100644
--- a/lib/mixins/property-accessors.html
+++ b/lib/mixins/property-accessors.html
@@ -86,7 +86,8 @@
    * deserialized via `attributeChangedCallback` and set to the associated
    * property using `dash-case`-to-`camelCase` convention.
    *
-   * @polymerMixin
+   * @mixinFunction
+   * @polymer
    * @memberof Polymer
    * @summary Element class mixin for reacting to property changes from
    *   generated property accessors.
@@ -94,7 +95,7 @@
   Polymer.PropertyAccessors = Polymer.dedupingMixin(superClass => {
 
     /**
-     * @polymerMixinClass
+     * @mixinClass
      * @implements {Polymer_PropertyAccessors}
      * @extends HTMLElement
      * @unrestricted
diff --git a/lib/mixins/property-effects.html b/lib/mixins/property-effects.html
index 881f78729e..b2660637ee 100644
--- a/lib/mixins/property-effects.html
+++ b/lib/mixins/property-effects.html
@@ -1088,9 +1088,10 @@
    * whereas the default when using `PropertyAccessors` standalone is to be
    * async by default.
    *
-   * @polymerMixin
-   * @mixes Polymer.TemplateStamp
-   * @mixes Polymer.PropertyAccessors
+   * @mixinFunction
+   * @polymer
+   * @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.
@@ -1107,8 +1108,9 @@
     const propertyEffectsBase = Polymer.TemplateStamp(Polymer.PropertyAccessors(superClass));
 
     /**
-     * @polymerMixinClass
+     * @mixinClass
      * @implements {Polymer_PropertyEffects}
+     * @extends {propertyEffectsBase}
      * @unrestricted
      */
     class PropertyEffects extends propertyEffectsBase {
diff --git a/lib/mixins/template-stamp.html b/lib/mixins/template-stamp.html
index 9b76621482..4f11caa898 100644
--- a/lib/mixins/template-stamp.html
+++ b/lib/mixins/template-stamp.html
@@ -110,14 +110,15 @@
    * - Nested template content caching/removal and re-installation (performance
    *   optimization)
    *
-   * @polymerMixin
+   * @mixinFunction
+   * @polymer
    * @memberof Polymer
    * @summary Element class mixin that provides basic template parsing and stamping
    */
   Polymer.TemplateStamp = Polymer.dedupingMixin(superClass => {
 
     /**
-     * @polymerMixinClass
+     * @mixinClass
      * @implements {Polymer_TemplateStamp}
      */
     class TemplateStamp extends superClass {
diff --git a/lib/utils/debounce.html b/lib/utils/debounce.html
index f5c071259b..46096bbe49 100644
--- a/lib/utils/debounce.html
+++ b/lib/utils/debounce.html
@@ -18,6 +18,10 @@
   /** @typedef {{run: function(function(), number=):number, cancel: function(number)}} */
   let AsyncModule; // eslint-disable-line no-unused-vars
 
+  /**
+   * @summary Collapse multiple callbacks into one invocation after a timer.
+   * @memberof Polymer
+   */
   class Debouncer {
     constructor() {
       this._asyncModule = null;
@@ -107,9 +111,6 @@
     }
   }
 
-  /**
-   * @memberof Polymer
-   */
   Polymer.Debouncer = Debouncer;
 })();
 </script>
diff --git a/lib/utils/templatize.html b/lib/utils/templatize.html
index f18db4fb71..81286f751b 100644
--- a/lib/utils/templatize.html
+++ b/lib/utils/templatize.html
@@ -361,7 +361,7 @@
      * of any event handlers.
      *
      *     // Customze property forwarding and event model decoration
-     *     let TemplateClass = Polymer.Tempaltize.templatize(template, this, {
+     *     let TemplateClass = Polymer.Templatize.templatize(template, this, {
      *       parentModel: true,
      *       instanceProps: {...},
      *       forwardHostProp(property, value) {...},
diff --git a/polymer-element.html b/polymer-element.html
index bf0d07efee..9b8f911a5e 100644
--- a/polymer-element.html
+++ b/polymer-element.html
@@ -17,12 +17,13 @@
    * features including template stamping, data-binding, attribute deserialization,
    * and property change observation.
    *
-   * @polymerElement
+   * @customElement
+   * @polymer
    * @memberof Polymer
    * @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