diff --git a/app-media-audio.js b/app-media-audio.js
index 1e61605..74040a8 100644
--- a/app-media-audio.js
+++ b/app-media-audio.js
@@ -8,9 +8,8 @@ found at http://polymer.github.io/CONTRIBUTORS.txt 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 '@polymer/polymer/polymer-legacy.js';
+import {Polymer} from '@polymer/polymer/polymer-legacy.js';
 
-import {Polymer} from '@polymer/polymer/lib/legacy/polymer-fn.js';
 /**
 `app-media-audio` is an element that converts an audio source to an audio
 analyser suitable for generating audio visualizations such as the ones made by
diff --git a/app-media-devices.js b/app-media-devices.js
index d7e9c3f..ee4bcdc 100644
--- a/app-media-devices.js
+++ b/app-media-devices.js
@@ -8,9 +8,7 @@ found at http://polymer.github.io/CONTRIBUTORS.txt 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 '@polymer/polymer/polymer-legacy.js';
-
-import {Polymer} from '@polymer/polymer/lib/legacy/polymer-fn.js';
+import {Polymer} from '@polymer/polymer/polymer-legacy.js';
 /**
 `app-media-devices` is an element that enumerates the connected input devices
 and optionally filters them, allowing the user to cycle through categories of
diff --git a/app-media-image-capture.js b/app-media-image-capture.js
index f5202b4..37b6579 100644
--- a/app-media-image-capture.js
+++ b/app-media-image-capture.js
@@ -8,8 +8,7 @@ found at http://polymer.github.io/CONTRIBUTORS.txt 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 {Polymer} from '@polymer/polymer/lib/legacy/polymer-fn.js';
-import {Base} from '@polymer/polymer/polymer-legacy.js';
+import {Base, Polymer} from '@polymer/polymer/polymer-legacy.js';
 
 import {AppMedia as AppMedia$0} from './app-media-recorder.js';
 
diff --git a/app-media-recorder.js b/app-media-recorder.js
index cffde9b..67c5376 100644
--- a/app-media-recorder.js
+++ b/app-media-recorder.js
@@ -8,8 +8,7 @@ found at http://polymer.github.io/CONTRIBUTORS.txt 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 {Polymer as Polymer$0} from '@polymer/polymer/lib/legacy/polymer-fn.js';
-import {Base} from '@polymer/polymer/polymer-legacy.js';
+import {Base, Polymer} from '@polymer/polymer/polymer-legacy.js';
 
 var mediaRecorderSupported = true;
 if (window.MediaRecorder == null) {
@@ -17,7 +16,7 @@ if (window.MediaRecorder == null) {
   mediaRecorderSupported = false;
 }
 
-export const AppMedia = Polymer$0.AppMedia || {};
+export const AppMedia = Polymer.AppMedia || {};
 
 /** @see https://www.w3.org/TR/mediastream-recording/#enumdef-recordingstate */
 AppMedia.RecordingState = {
@@ -54,7 +53,7 @@ you consider to be a suitable substitute, load it first and ensure that
 @group App Elements
 @demo demo/index.html
 */
-Polymer$0({
+Polymer({
   is: 'app-media-recorder',
 
   properties: {
diff --git a/app-media-stream.js b/app-media-stream.js
index 4ee2220..241030d 100644
--- a/app-media-stream.js
+++ b/app-media-stream.js
@@ -8,9 +8,7 @@ found at http://polymer.github.io/CONTRIBUTORS.txt 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 '@polymer/polymer/polymer-legacy.js';
-
-import {Polymer} from '@polymer/polymer/lib/legacy/polymer-fn.js';
+import {Polymer} from '@polymer/polymer/polymer-legacy.js';
 /**
 `app-media-stream` is an element that converts a provided video device and/or
 audio device into a media stream.
diff --git a/app-media-video.js b/app-media-video.js
index 87b7a0c..39df2f4 100644
--- a/app-media-video.js
+++ b/app-media-video.js
@@ -8,11 +8,10 @@ found at http://polymer.github.io/CONTRIBUTORS.txt 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 '@polymer/polymer/polymer-legacy.js';
-
 import {IronResizableBehavior} from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
-import {Polymer} from '@polymer/polymer/lib/legacy/polymer-fn.js';
 import {html} from '@polymer/polymer/lib/utils/html-tag.js';
+import {Polymer} from '@polymer/polymer/polymer-legacy.js';
+
 /**
 `app-media-video` is an element that converts a video source into a nicely
 scaled video that is displayed to the viewer of the page.
diff --git a/app-media-waveform.js b/app-media-waveform.js
index 20ba2ec..3a6a200 100644
--- a/app-media-waveform.js
+++ b/app-media-waveform.js
@@ -8,11 +8,10 @@ found at http://polymer.github.io/CONTRIBUTORS.txt 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 '@polymer/polymer/polymer-legacy.js';
-
 import {IronResizableBehavior} from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
-import {Polymer} from '@polymer/polymer/lib/legacy/polymer-fn.js';
 import {html} from '@polymer/polymer/lib/utils/html-tag.js';
+import {Polymer} from '@polymer/polymer/polymer-legacy.js';
+
 /**
 `app-media-waveform` is an element that visualizes the data from an analyser
 node, such as one produced by `app-media-audio`.
diff --git a/demo/index.html b/demo/index.html
index 6e14051..ccb7ad1 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -186,14 +186,15 @@
 
       </template>
       <script type="module">
-        import '@polymer/polymer/polymer-legacy.js';
         import '../app-media-devices.js';
         import '../app-media-stream.js';
         import '../app-media-video.js';
         import '../app-media-audio.js';
         import '../app-media-waveform.js';
         import '../app-media-recorder.js';
-        import {Polymer} from '@polymer/polymer/lib/legacy/polymer-fn.js';
+
+        import {Polymer} from '@polymer/polymer/polymer-legacy.js';
+
         var readyToDefine = Promise.all([
           ensureMediaDevices,
           new Promise(function(resolve) {