From 448093b6dcd7bc26629d3e314613bf83cdc252b0 Mon Sep 17 00:00:00 2001
From: Serhii Kulykov <Skamandr@yandex.ru>
Date: Thu, 6 Sep 2018 13:07:57 +0300
Subject: [PATCH] Cleanup modulizer conversion leftovers (#5347)

---
 lib/elements/dom-if.js                 |  4 +-
 lib/elements/dom-repeat.js             |  4 +-
 lib/legacy/legacy-element-mixin.js     | 12 ++---
 lib/legacy/templatizer-behavior.js     |  6 +--
 lib/mixins/element-mixin.js            | 20 ++++----
 lib/mixins/gesture-event-listeners.js  |  8 ++-
 lib/mixins/property-accessors.js       |  8 ++-
 test/smoke/data-table.html             |  4 +-
 test/smoke/html-tag.html               |  6 +--
 test/unit/case-map.html                | 20 +++-----
 test/unit/gestures.html                | 27 +++++-----
 test/unit/importHref.html              |  4 +-
 test/unit/path.html                    | 68 ++++++++++++--------------
 test/unit/render-status.html           | 10 ++--
 test/unit/shady-content.html           | 12 ++---
 test/unit/styling-cross-scope-var.html |  6 +--
 test/unit/templatize-elements.js       |  4 +-
 17 files changed, 102 insertions(+), 121 deletions(-)

diff --git a/lib/elements/dom-if.js b/lib/elements/dom-if.js
index 52b6a10d84..f7f41c24f4 100644
--- a/lib/elements/dom-if.js
+++ b/lib/elements/dom-if.js
@@ -13,7 +13,7 @@ import { templatize } from '../utils/templatize.js';
 import { Debouncer } from '../utils/debounce.js';
 import { enqueueDebouncer, flush } from '../utils/flush.js';
 import { microTask } from '../utils/async.js';
-import { root as root$0 } from '../utils/path.js';
+import { root } from '../utils/path.js';
 
 /**
  * The `<dom-if>` element will stamp a light-dom `<template>` child when
@@ -211,7 +211,7 @@ export class DomIf extends PolymerElement {
                 // properties so `__syncHostProperties` can sync them the next
                 // time `if` becomes true
                 this.__invalidProps = this.__invalidProps || Object.create(null);
-                this.__invalidProps[root$0(prop)] = true;
+                this.__invalidProps[root(prop)] = true;
               }
             }
           }
diff --git a/lib/elements/dom-repeat.js b/lib/elements/dom-repeat.js
index 0f07443292..eda5eb15c1 100644
--- a/lib/elements/dom-repeat.js
+++ b/lib/elements/dom-repeat.js
@@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 */
 import { PolymerElement } from '../../polymer-element.js';
 
-import { TemplateInstanceBase, templatize, modelForElement as modelForElement$0 } from '../utils/templatize.js'; // eslint-disable-line no-unused-vars
+import { TemplateInstanceBase, templatize, modelForElement } from '../utils/templatize.js'; // eslint-disable-line no-unused-vars
 import { Debouncer } from '../utils/debounce.js';
 import { enqueueDebouncer, flush } from '../utils/flush.js';
 import { OptionalMutableData } from '../mixins/mutable-data.js';
@@ -722,7 +722,7 @@ export class DomRepeat extends domRepeatBase {
    *   the element.
    */
   modelForElement(el) {
-    return modelForElement$0(this.template, el);
+    return modelForElement(this.template, el);
   }
 
 }
diff --git a/lib/legacy/legacy-element-mixin.js b/lib/legacy/legacy-element-mixin.js
index 5b9a769c86..9940aa203c 100644
--- a/lib/legacy/legacy-element-mixin.js
+++ b/lib/legacy/legacy-element-mixin.js
@@ -15,11 +15,11 @@ import { DirMixin } from '../mixins/dir-mixin.js';
 import { dedupingMixin } from '../utils/mixin.js';
 import '../utils/render-status.js';
 import '../utils/unresolved.js';
-import { dom as dom$0, matchesSelector } from './polymer.dom.js';
+import { dom, matchesSelector } from './polymer.dom.js';
 import { setTouchAction } from '../utils/gestures.js';
 import { Debouncer } from '../utils/debounce.js';
 import { timeOut, microTask } from '../utils/async.js';
-import { get as get$0 } from '../utils/path.js';
+import { get } from '../utils/path.js';
 
 let styleInterface = window.ShadyCSS;
 
@@ -516,7 +516,7 @@ export const LegacyElementMixin = dedupingMixin((base) => {
      */
     getEffectiveChildNodes() {
       const thisEl = /** @type {Element} */ (this);
-      const domApi = /** @type {DomApi} */(dom$0(thisEl));
+      const domApi = /** @type {DomApi} */(dom(thisEl));
       return domApi.getEffectiveChildNodes();
     }
 
@@ -530,7 +530,7 @@ export const LegacyElementMixin = dedupingMixin((base) => {
      */
     queryDistributedElements(selector) {
       const thisEl = /** @type {Element} */ (this);
-      const domApi = /** @type {DomApi} */(dom$0(thisEl));
+      const domApi = /** @type {DomApi} */(dom(thisEl));
       return domApi.queryDistributedElements(selector);
     }
 
@@ -602,7 +602,7 @@ export const LegacyElementMixin = dedupingMixin((base) => {
      */
     getContentChildNodes(slctr) {
       let content = this.root.querySelector(slctr || 'slot');
-      return content ? /** @type {DomApi} */(dom$0(content)).getDistributedNodes() : [];
+      return content ? /** @type {DomApi} */(dom(content)).getDistributedNodes() : [];
     }
 
     /**
@@ -906,7 +906,7 @@ export const LegacyElementMixin = dedupingMixin((base) => {
           return arrayOrPath.splice(index, 1);
         }
       } else {
-        let arr = get$0(this, arrayOrPath);
+        let arr = get(this, arrayOrPath);
         index = arr.indexOf(item);
         if (index >= 0) {
           return this.splice(arrayOrPath, index, 1);
diff --git a/lib/legacy/templatizer-behavior.js b/lib/legacy/templatizer-behavior.js
index e8c90e2d4d..2dfbbc3a09 100644
--- a/lib/legacy/templatizer-behavior.js
+++ b/lib/legacy/templatizer-behavior.js
@@ -7,7 +7,7 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
 Code distributed by Google as part of the polymer project is also
 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
 */
-import { TemplateInstanceBase, templatize as templatize$0, modelForElement as modelForElement$0 } from '../utils/templatize.js'; // eslint-disable-line no-unused-vars
+import { TemplateInstanceBase, templatize, modelForElement } from '../utils/templatize.js'; // eslint-disable-line no-unused-vars
 
 /**
  * @typedef {{
@@ -99,7 +99,7 @@ export const Templatizer = {
    */
   templatize(template, mutableData) {
     this._templatizerTemplate = template;
-    this.ctor = templatize$0(template, this, {
+    this.ctor = templatize(template, this, {
       mutableData: Boolean(mutableData),
       parentModel: this._parentModel,
       instanceProps: this._instanceProps,
@@ -137,6 +137,6 @@ export const Templatizer = {
    * @this {TemplatizerUser}
    */
   modelForElement(el) {
-    return modelForElement$0(this._templatizerTemplate, el);
+    return modelForElement(this._templatizerTemplate, el);
   }
 };
diff --git a/lib/mixins/element-mixin.js b/lib/mixins/element-mixin.js
index abeb2bde90..27318a766f 100644
--- a/lib/mixins/element-mixin.js
+++ b/lib/mixins/element-mixin.js
@@ -9,10 +9,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 */
 import '../utils/boot.js';
 
-import { rootPath as rootPath$0 } from '../utils/settings.js';
+import { rootPath } from '../utils/settings.js';
 import { dedupingMixin } from '../utils/mixin.js';
 import { stylesFromTemplate, stylesFromModuleImports } from '../utils/style-gather.js';
-import { pathFromUrl, resolveCss, resolveUrl as resolveUrl$0 } from '../utils/resolve-url.js';
+import { pathFromUrl, resolveCss, resolveUrl } from '../utils/resolve-url.js';
 import { DomModule } from '../elements/dom-module.js';
 import { PropertyEffects } from './property-effects.js';
 import { PropertiesMixin } from './properties-mixin.js';
@@ -279,7 +279,7 @@ export const ElementMixin = dedupingMixin(base => {
 
   /**
    * Look up template from dom-module for element
-   * 
+   *
    * @param {!string} is Element name to look up
    * @return {!HTMLTemplateElement} Template found in dom module, or
    *   undefined if not found
@@ -424,14 +424,14 @@ export const ElementMixin = dedupingMixin(base => {
       // - constructor._template: memoized version of constructor.template
       // - prototype._template: working template for the element, which will be
       //     parsed and modified in place. It is a cloned version of
-      //     constructor.template, saved in _finalizeClass(). Note that before 
+      //     constructor.template, saved in _finalizeClass(). Note that before
       //     this getter is called, for legacy elements this could be from a
       //     _template field on the info object passed to Polymer(), a behavior,
       //     or set in registered(); once the static getter runs, a clone of it
-      //     will overwrite it on the prototype as the working template. 
+      //     will overwrite it on the prototype as the working template.
       if (!this.hasOwnProperty(JSCompiler_renameProperty('_template', this))) {
         this._template =
-          // If user has put template on prototype (e.g. in legacy via registered 
+          // If user has put template on prototype (e.g. in legacy via registered
           // callback or info object), prefer that first
           this.prototype.hasOwnProperty(JSCompiler_renameProperty('_template', this.prototype)) ?
           this.prototype._template :
@@ -522,7 +522,7 @@ export const ElementMixin = dedupingMixin(base => {
       this.constructor._finalizeTemplate(/** @type {!HTMLElement} */(this).localName);
       super._initializeProperties();
       // set path defaults
-      this.rootPath = rootPath$0;
+      this.rootPath = rootPath;
       this.importPath = this.constructor.importPath;
       // apply property defaults...
       let p$ = propertyDefaults(this.constructor);
@@ -576,7 +576,7 @@ export const ElementMixin = dedupingMixin(base => {
       if (template && !template.__polymerFinalized) {
         template.__polymerFinalized = true;
         const importPath = this.importPath;
-        const baseURI = importPath ? resolveUrl$0(importPath) : '';
+        const baseURI = importPath ? resolveUrl(importPath) : '';
         // e.g. support `include="module-name"`, and ShadyCSS
         processElementStyles(this, template, is, baseURI);
         this.prototype._bindTemplate(template);
@@ -710,9 +710,9 @@ export const ElementMixin = dedupingMixin(base => {
      */
     resolveUrl(url, base) {
       if (!base && this.importPath) {
-        base = resolveUrl$0(this.importPath);
+        base = resolveUrl(this.importPath);
       }
-      return resolveUrl$0(url, base);
+      return resolveUrl(url, base);
     }
 
     /**
diff --git a/lib/mixins/gesture-event-listeners.js b/lib/mixins/gesture-event-listeners.js
index 984036aaf5..04ad6efed8 100644
--- a/lib/mixins/gesture-event-listeners.js
+++ b/lib/mixins/gesture-event-listeners.js
@@ -10,9 +10,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 import '../utils/boot.js';
 
 import { dedupingMixin } from '../utils/mixin.js';
-import * as gestures$0 from '../utils/gestures.js';
-
-const gestures = gestures$0;
+import { addListener, removeListener } from '../utils/gestures.js';
 
 /**
  * Element class mixin that provides API for adding Polymer's cross-platform
@@ -52,7 +50,7 @@ export const GestureEventListeners = dedupingMixin(
          * @override
          */
         _addEventListenerToNode(node, eventName, handler) {
-          if (!gestures.addListener(node, eventName, handler)) {
+          if (!addListener(node, eventName, handler)) {
             super._addEventListenerToNode(node, eventName, handler);
           }
         }
@@ -67,7 +65,7 @@ export const GestureEventListeners = dedupingMixin(
          * @override
          */
         _removeEventListenerFromNode(node, eventName, handler) {
-          if (!gestures.removeListener(node, eventName, handler)) {
+          if (!removeListener(node, eventName, handler)) {
             super._removeEventListenerFromNode(node, eventName, handler);
           }
         }
diff --git a/lib/mixins/property-accessors.js b/lib/mixins/property-accessors.js
index a7683516ad..002939ad59 100644
--- a/lib/mixins/property-accessors.js
+++ b/lib/mixins/property-accessors.js
@@ -10,11 +10,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 import '../utils/boot.js';
 
 import { dedupingMixin } from '../utils/mixin.js';
-import * as caseMap$0 from '../utils/case-map.js';
+import { camelToDashCase, dashToCamelCase } from '../utils/case-map.js';
 import { PropertiesChanged } from './properties-changed.js';
 
-let caseMap = caseMap$0;
-
 // Save map of native properties; this forms a blacklist or properties
 // that won't have their values "saved" by `saveAccessorValue`, since
 // reading from an HTMLElement accessor from the context of a prototype throws
@@ -124,7 +122,7 @@ export const PropertyAccessors = dedupingMixin(superClass => {
     static createPropertiesForAttributes() {
       let a$ = this.observedAttributes;
       for (let i=0; i < a$.length; i++) {
-        this.prototype._createPropertyAccessor(caseMap.dashToCamelCase(a$[i]));
+        this.prototype._createPropertyAccessor(dashToCamelCase(a$[i]));
       }
     }
 
@@ -137,7 +135,7 @@ export const PropertyAccessors = dedupingMixin(superClass => {
      * @protected
      */
     static attributeNameForProperty(property) {
-      return caseMap.camelToDashCase(property);
+      return camelToDashCase(property);
     }
 
     /**
diff --git a/test/smoke/data-table.html b/test/smoke/data-table.html
index ebc2b550bc..d2590a10f4 100644
--- a/test/smoke/data-table.html
+++ b/test/smoke/data-table.html
@@ -214,7 +214,7 @@ <h3>Table {{index}}:</h3>
       </div>
     </template>
     <script type="module">
-import { Polymer, version as version$0 } from '../../lib/utils/boot.js';
+import { Polymer, version } from '../../lib/utils/boot.js';
 var params = document.location.search.substring(1).split('&').map(p=>p.split('='))
   .reduce((m, p)=>{return m[p[0]] = p[1], m;}, {});
 Polymer({
@@ -295,7 +295,7 @@ <h3>Table {{index}}:</h3>
     return value.toFixed(decimals);
   },
   ready: function() {
-    this.version = version$0 || 'alacarte';
+    this.version = version || 'alacarte';
     if (!this.setProperties) {
       this.setProperties = function(props) {
         for (var p in props) {
diff --git a/test/smoke/html-tag.html b/test/smoke/html-tag.html
index b416eb37b5..b292437eeb 100644
--- a/test/smoke/html-tag.html
+++ b/test/smoke/html-tag.html
@@ -16,8 +16,8 @@
 <body>
   <script type="module">
 import { PolymerElement } from '../../polymer-element.js';
-import { html as html$0 } from '../../lib/utils/html-tag.js';
-const html = html$0;
+import { html } from '../../lib/utils/html-tag.js';
+
 class SuperClass extends PolymerElement {
   static get is() {return 'super-class';}
   static get template() {
@@ -64,4 +64,4 @@ <h3 id="name">${this.is}</h3>
   <super-class></super-class>
   <sub-class></sub-class>
   <x-string></x-string>
-</body>
\ No newline at end of file
+</body>
diff --git a/test/unit/case-map.html b/test/unit/case-map.html
index 46f02ba8ff..9b7c5259c5 100644
--- a/test/unit/case-map.html
+++ b/test/unit/case-map.html
@@ -19,27 +19,21 @@
 <body>
 
 <script type="module">
-import * as caseMap$0 from '../../lib/utils/case-map.js';
+import { camelToDashCase, dashToCamelCase } from '../../lib/utils/case-map.js';
 suite('case-map', function() {
-  var caseMap;
-
-  setup(function() {
-    caseMap = caseMap$0;
-  });
-
   test('camelToDashCase converts to dashes', function() {
-    assert.equal(caseMap.camelToDashCase('camelCase'), 'camel-case');
-    assert.equal(caseMap.camelToDashCase('camelCCase'), 'camel-c-case');
+    assert.equal(camelToDashCase('camelCase'), 'camel-case');
+    assert.equal(camelToDashCase('camelCCase'), 'camel-c-case');
   });
 
   test('dashToCamelCase converts to camelCase', function() {
-    assert.equal(caseMap.dashToCamelCase('camel-case'), 'camelCase');
-    assert.equal(caseMap.dashToCamelCase('camel-c-case'), 'camelCCase');
+    assert.equal(dashToCamelCase('camel-case'), 'camelCase');
+    assert.equal(dashToCamelCase('camel-c-case'), 'camelCCase');
   });
 
   test('camelToDashCase and dashToCamelCase reverse the other function', function() {
-    var camelCase = caseMap.dashToCamelCase('camel-c-case');
-    assert.equal(caseMap.camelToDashCase(camelCase), 'camel-c-case');
+    var camelCase = dashToCamelCase('camel-c-case');
+    assert.equal(camelToDashCase(camelCase), 'camel-c-case');
   });
 });
 </script>
diff --git a/test/unit/gestures.html b/test/unit/gestures.html
index 89f642ad74..ddfb1fa20d 100644
--- a/test/unit/gestures.html
+++ b/test/unit/gestures.html
@@ -24,8 +24,7 @@
   <script type="module">
 import './gestures-elements.js';
 import { afterNextRender } from '../../lib/utils/render-status.js';
-import * as gestures from '../../lib/utils/gestures.js';
-import { resetMouseCanceller, deepTargetFind, recognizers as recognizers$0, addListener, removeListener } from '../../lib/utils/gestures.js';
+import { resetMouseCanceller, deepTargetFind, recognizers, addListener, removeListener } from '../../lib/utils/gestures.js';
 
 suite('simulate events', function() {
 
@@ -474,14 +473,14 @@
     el.dispatchEvent(ev);
 
     // some recognizers do not track the document, like tap
-    var recognizers = recognizers$0.filter(function(r) {
+    var recs = recognizers.filter(function(r) {
       return r.info.hasOwnProperty('movefn') &&
         r.info.hasOwnProperty('upfn');
     });
 
-    assert.isAbove(recognizers.length, 0, 'some recognizers track the document');
+    assert.isAbove(recs.length, 0, 'some recognizers track the document');
 
-    recognizers.forEach(function(r) {
+    recs.forEach(function(r) {
       assert.isFunction(r.info.movefn, r.name + ' movefn');
       assert.isFunction(r.info.upfn, r.name + ' upfn');
     });
@@ -489,7 +488,7 @@
     ev = new CustomEvent('mouseup', {bubbles: true, composed: true});
     el.dispatchEvent(ev);
 
-    recognizers.forEach(function(r) {
+    recs.forEach(function(r) {
       assert.isNull(r.info.movefn, r.name + ' movefn');
       assert.isNull(r.info.upfn, r.name + ' upfn');
     });
@@ -509,7 +508,7 @@
 
   test('add listeners with addListener', function() {
     addListener(el, 'down', fn);
-    gestures.add(el, 'up', fn);
+    addListener(el, 'up', fn);
     var ev = new CustomEvent('mousedown', {bubbles: true, composed: true});
     el.dispatchEvent(ev);
     assert.equal(el.stream.length, 1);
@@ -521,7 +520,7 @@
   });
 
   test('remove listeners with removeListener', function() {
-    gestures.remove(el, 'down', fn);
+    removeListener(el, 'down', fn);
     removeListener(el, 'up', fn);
     var ev = new CustomEvent('mousedown', {bubbles: true, composed: true});
     el.dispatchEvent(ev);
@@ -548,20 +547,20 @@
 
 suite('Regression Testing', function() {
   test('#4459', function() {
-    gestures.add(document, 'tap', null);
+    addListener(document, 'tap', null);
     document.dispatchEvent(new MouseEvent('mousedown', { detail: 1, clientX: -100, bubbles: true, composed: true }));
     document.dispatchEvent(new MouseEvent('mouseup', { detail: 1, clientX: 100, bubbles: true, composed: true }));
     document.dispatchEvent(new MouseEvent('click', { detail: 1, clientX: 100, bubbles: true, composed: true }));
-    gestures.remove(document, 'tap', null);
+    removeListener(document, 'tap', null);
   });
 
   test('#5030', function() {
     let count = 0;
     const increment = function() { count++; };
-    gestures.add(window, 'tap', increment);
+    addListener(window, 'tap', increment);
     window.dispatchEvent(new MouseEvent('click', {bubbles: true}));
     assert.equal(count, 1);
-    gestures.remove(window, 'tap', increment);
+    removeListener(window, 'tap', increment);
   });
 
   suite('native label click', function() {
@@ -637,7 +636,7 @@
       document.body.removeChild(div);
     });
     setup(function() {
-      gestures.resetMouseCanceller();
+      resetMouseCanceller();
     });
 
     test('click() function works as expected on disabled elements', function() {
@@ -695,7 +694,7 @@
       target.dispatchEvent(touchend);
       assert.deepEqual(el.taps, ['button#nested']);
 
-      gestures.resetMouseCanceller();
+      resetMouseCanceller();
 
       // tap a custom element with a `disabled` property
       target = el.$.disabledEl;
diff --git a/test/unit/importHref.html b/test/unit/importHref.html
index 746db8687d..9d5df44b67 100644
--- a/test/unit/importHref.html
+++ b/test/unit/importHref.html
@@ -20,7 +20,7 @@
 <x-test></x-test>
 
 <script type="module">
-import { importHref as importHref$0 } from '../../lib/utils/import-href.js';
+import { importHref } from '../../lib/utils/import-href.js';
 import { PolymerElement } from '../../polymer-element.js';
 import { Base } from '../../polymer-legacy.js';
 
@@ -30,7 +30,7 @@
 
   test('importing polymer via Polymer.importHref', function(done) {
     assert.notOk(PolymerElement);
-    importHref$0('../../polymer.html', function() {
+    importHref('../../polymer.html', function() {
       assert.ok(PolymerElement);
       done();
     });
diff --git a/test/unit/path.html b/test/unit/path.html
index a008a4e08a..29eb67a81c 100644
--- a/test/unit/path.html
+++ b/test/unit/path.html
@@ -14,24 +14,16 @@
   <script src="../../node_modules/@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
   <script src="wct-browser-config.js"></script>
   <script src="../../node_modules/wct-browser-legacy/browser.js"></script>
-  <script type="module" src="../../lib/utils/path.js"></script>
 </head>
 <body>
 
 <script type="module">
-import * as path from '../../lib/utils/path.js';
-import { isDeep } from '../../lib/utils/path.js';
+import { isAncestor, isDeep, isDescendant, root, matches, translate } from '../../lib/utils/path.js';
 suite('path utilities', function() {
 
-  var Path;
-
-  setup(function() {
-    Path = path;
-  });
-
   test('root()', function() {
-    assert.equal(Path.root('foo'), 'foo');
-    assert.equal(Path.root('foo.bar'), 'foo');
+    assert.equal(root('foo'), 'foo');
+    assert.equal(root('foo.bar'), 'foo');
   });
 
   test('isDeep()', function() {
@@ -40,50 +32,50 @@
   });
 
   test('isAncestor()', function() {
-    assert.equal(Path.isAncestor('foo.bar', 'foo'),          true);
+    assert.equal(isAncestor('foo.bar', 'foo'),          true);
 
-    assert.equal(Path.isAncestor('foo.bar', 'foo.bar'),      false);
-    assert.equal(Path.isAncestor('foo.bar', 'foo.baz'),      false);
-    assert.equal(Path.isAncestor('foo.bar', 'fooz'),         false);
-    assert.equal(Path.isAncestor('foo.bar', 'bar'),          false);
-    assert.equal(Path.isAncestor('foo.bar', 'foo.bars'),     false);
-    assert.equal(Path.isAncestor('foo.bar', 'foo.bar.quux'), false);
+    assert.equal(isAncestor('foo.bar', 'foo.bar'),      false);
+    assert.equal(isAncestor('foo.bar', 'foo.baz'),      false);
+    assert.equal(isAncestor('foo.bar', 'fooz'),         false);
+    assert.equal(isAncestor('foo.bar', 'bar'),          false);
+    assert.equal(isAncestor('foo.bar', 'foo.bars'),     false);
+    assert.equal(isAncestor('foo.bar', 'foo.bar.quux'), false);
 
 
-    assert.equal(Path.isAncestor('foo.bar.baz', 'foo'),      true);
-    assert.equal(Path.isAncestor('foo.bar.baz', 'foo.bar'),  true);
+    assert.equal(isAncestor('foo.bar.baz', 'foo'),      true);
+    assert.equal(isAncestor('foo.bar.baz', 'foo.bar'),  true);
 
-    assert.equal(Path.isAncestor('foo.bar.baz', 'foo.baz'),  false);
-    assert.equal(Path.isAncestor('foo.bar.baz', 'foo.bars'), false);
+    assert.equal(isAncestor('foo.bar.baz', 'foo.baz'),  false);
+    assert.equal(isAncestor('foo.bar.baz', 'foo.bars'), false);
   });
 
   test('isDescendant()', function() {
-    assert.equal(Path.isDescendant('foo.bar', 'foo.bar.baz'),  true);
-    assert.equal(Path.isDescendant('foo.bar', 'foo.bar'),      false);
-    assert.equal(Path.isDescendant('foo.bar', 'foo.bars'),     false);
-    assert.equal(Path.isDescendant('foo.bar', 'foo'),          false);
-    assert.equal(Path.isDescendant('foo.bar', 'bar'),          false);
+    assert.equal(isDescendant('foo.bar', 'foo.bar.baz'),  true);
+    assert.equal(isDescendant('foo.bar', 'foo.bar'),      false);
+    assert.equal(isDescendant('foo.bar', 'foo.bars'),     false);
+    assert.equal(isDescendant('foo.bar', 'foo'),          false);
+    assert.equal(isDescendant('foo.bar', 'bar'),          false);
 
-    assert.equal(Path.isDescendant('foo', 'foo.bar'), true);
-    assert.equal(Path.isDescendant('foo', 'foo'),     false);
+    assert.equal(isDescendant('foo', 'foo.bar'), true);
+    assert.equal(isDescendant('foo', 'foo'),     false);
   });
 
   test('translate()', function() {
-    assert.equal(Path.translate('foo', 'baz', 'foo.bar'),
+    assert.equal(translate('foo', 'baz', 'foo.bar'),
                  'baz.bar');
-    assert.equal(Path.translate('foo', 'quux', 'foo.bar.baz'),
+    assert.equal(translate('foo', 'quux', 'foo.bar.baz'),
                  'quux.bar.baz');
-    assert.equal(Path.translate('foo.bar', 'quux', 'foo.bar.baz'),
+    assert.equal(translate('foo.bar', 'quux', 'foo.bar.baz'),
                  'quux.baz');
   });
 
   test('matches()', function() {
-    assert.equal(Path.matches('foo.bar','foo'),          true);
-    assert.equal(Path.matches('foo.bar','foo.bar'),      true);
-    assert.equal(Path.matches('foo.bar','foo.bar.baz'),  true);
-    assert.equal(Path.matches('foo.bar','fooz'),         false);
-    assert.equal(Path.matches('foo.bar','foo.baz'),      false);
-    assert.equal(Path.matches('foo.bar','foo.bars'),     false);
+    assert.equal(matches('foo.bar','foo'),          true);
+    assert.equal(matches('foo.bar','foo.bar'),      true);
+    assert.equal(matches('foo.bar','foo.bar.baz'),  true);
+    assert.equal(matches('foo.bar','fooz'),         false);
+    assert.equal(matches('foo.bar','foo.baz'),      false);
+    assert.equal(matches('foo.bar','foo.bars'),     false);
   });
 });
 </script>
diff --git a/test/unit/render-status.html b/test/unit/render-status.html
index 3f43129395..3bff0dee3a 100644
--- a/test/unit/render-status.html
+++ b/test/unit/render-status.html
@@ -18,19 +18,19 @@
 <body>
 
 <script type="module">
-import { beforeNextRender as beforeNextRender$0, afterNextRender as afterNextRender$0 } from '../../lib/utils/render-status.js';
+import { beforeNextRender, afterNextRender } from '../../lib/utils/render-status.js';
 import { LegacyElementMixin } from '../../lib/legacy/legacy-element-mixin.js';
 class XFoo extends LegacyElementMixin(HTMLElement) {
   ready() {
     super.ready();
     sinon.spy(this, 'beforeNextRender');
     sinon.spy(this, 'stillBeforeNextRender');
-    beforeNextRender$0(this, this.beforeNextRender,
+    beforeNextRender(this, this.beforeNextRender,
       ['before']);
   }
 
   beforeNextRender() {
-    beforeNextRender$0(this, this.stillBeforeNextRender,
+    beforeNextRender(this, this.stillBeforeNextRender,
       ['still-before']);
   }
   stillBeforeNextRender() {
@@ -46,13 +46,13 @@
     super.ready();
     sinon.spy(this, 'afterNextRender');
     sinon.spy(this, 'afterAfterNextRender');
-    afterNextRender$0(this, (a) => {
+    afterNextRender(this, (a) => {
       this.afterNextRender(a);
     }, ['after']);
   }
 
   afterNextRender() {
-    afterNextRender$0(this, (a) => {
+    afterNextRender(this, (a) => {
       this.afterAfterNextRender(a);
     }, ['after-after']);
   }
diff --git a/test/unit/shady-content.html b/test/unit/shady-content.html
index a5804be1f1..969c65888a 100644
--- a/test/unit/shady-content.html
+++ b/test/unit/shady-content.html
@@ -299,7 +299,7 @@
 </script>
 <script type="module">
 import { Polymer } from '../../polymer-legacy.js';
-import { flush as flush$0 } from '../../lib/utils/flush.js';
+import { flush } from '../../lib/utils/flush.js';
 function createPatchedDocumentFragment() {
   var frag = document.createDocumentFragment();
   return frag;
@@ -1223,7 +1223,7 @@
     var div = document.createElement('div');
     document.body.appendChild(x1);
     document.body.appendChild(div);
-    flush$0();
+    flush();
     assert.equal(x1.$.dist.children.length, 4);
 
     div.appendChild(x1);
@@ -1441,26 +1441,26 @@
     var c1 = document.createElement('div');
     c1.slot = 'one';
     el.appendChild(c1);
-    flush$0();
+    flush();
     assert.equal(el.querySelector('[slot="one"]'), c1);
     assert.notOk(el.root.querySelector('#static'));
     assert.notOk(el.root.querySelector('slot'));
     el.$.contentIf.if = true;
     el.$.staticIf.if = true;
-    flush$0();
+    flush();
     assert.ok(el.root.querySelector('#static'));
     var ip = el.root.querySelector('slot');
     assert.ok(ip);
     assert.equal(ip.assignedNodes({flatten: true})[0], c1);
     el.$.contentIf.if = false;
     el.$.staticIf.if = false;
-    flush$0();
+    flush();
     assert.equal(el.querySelector('[slot="one"]'), c1);
     assert.notOk(el.root.querySelector('#static'));
     assert.notOk(el.root.querySelector('slot'));
     el.$.contentIf.if = true;
     el.$.staticIf.if = true;
-    flush$0();
+    flush();
     assert.ok(el.root.querySelector('#static'));
     ip = el.root.querySelector('slot');
     assert.ok(ip);
diff --git a/test/unit/styling-cross-scope-var.html b/test/unit/styling-cross-scope-var.html
index eb1c60b8d5..c628ab68b6 100644
--- a/test/unit/styling-cross-scope-var.html
+++ b/test/unit/styling-cross-scope-var.html
@@ -726,7 +726,7 @@
 </dom-module>
 
 <script type="module">
-import { updateStyles as updateStyles$0 } from '../../lib/mixins/element-mixin.js';
+import { updateStyles } from '../../lib/mixins/element-mixin.js';
 import { dom } from '../../lib/legacy/polymer.dom.js';
 suite('scoped-styling-var', function() {
 
@@ -959,9 +959,9 @@
 
 test('styles update based on root customStyle changes', function() {
   assertComputed(styled.$.dynamic, '0px');
-  updateStyles$0({'--dynamic': '4px solid navy'});
+  updateStyles({'--dynamic': '4px solid navy'});
   assertComputed(styled.$.dynamic, '4px');
-  updateStyles$0({'--dynamic': '6px solid gray'});
+  updateStyles({'--dynamic': '6px solid gray'});
   assertComputed(styled.$.dynamic, '6px');
 });
 
diff --git a/test/unit/templatize-elements.js b/test/unit/templatize-elements.js
index e9b7c6d57c..0132ffa05b 100644
--- a/test/unit/templatize-elements.js
+++ b/test/unit/templatize-elements.js
@@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 */
 import { Polymer } from '../../lib/legacy/polymer-fn.js';
 
-import { templatize as templatize$0 } from '../../lib/utils/templatize.js';
+import { templatize } from '../../lib/utils/templatize.js';
 import { Templatizer } from '../../lib/legacy/templatizer-behavior.js';
 import { html } from '../../lib/utils/html-tag.js';
 
@@ -72,7 +72,7 @@ Polymer({
   },
   go: function(withProps) {
     var template = this.querySelector('template');
-    var ctor = templatize$0(template, this, {
+    var ctor = templatize(template, this, {
       parentModel: true,
       instanceProps: {
         obj: true,