diff --git a/components/audio/src/vwc-audio.ts b/components/audio/src/vwc-audio.ts
index c12f03a53..8f4a53942 100644
--- a/components/audio/src/vwc-audio.ts
+++ b/components/audio/src/vwc-audio.ts
@@ -24,7 +24,7 @@ const filterByValue = (filterValue: string) => (value: string) =>
  * @element vwc-audio
  *
  */
-class VwcAudio extends HTMLElement {
+class VWCAudio extends HTMLElement {
 	constructor() {
 		super();
 
@@ -175,5 +175,5 @@ class VwcAudio extends HTMLElement {
 	}
 }
 
-export default Audio;
-customElements.define('vwc-audio', VwcAudio);
+export { VWCAudio };
+customElements.define('vwc-audio', VWCAudio);
diff --git a/components/icon/src/vwc-icon.js b/components/icon/src/vwc-icon.js
index 9876a66a2..0e90c0def 100644
--- a/components/icon/src/vwc-icon.js
+++ b/components/icon/src/vwc-icon.js
@@ -26,7 +26,7 @@ const noop = ()=> {};
  * @prop {"small" | "medium" | "large"} [size="medium"] - The icon's size.
  *
  */
-class IconElement extends HTMLElement {
+class VWCIcon extends HTMLElement {
 
 	constructor() {
 		super();
@@ -129,5 +129,5 @@ class IconElement extends HTMLElement {
 	}
 }
 
-window.customElements.define('vwc-icon', IconElement);
-export { IconElement as Icon };
\ No newline at end of file
+window.customElements.define('vwc-icon', VWCIcon);
+export { VWCIcon };
\ No newline at end of file
diff --git a/components/media-controller/src/vwc-media-controller.ts b/components/media-controller/src/vwc-media-controller.ts
index 3187f61ca..809fc2c5d 100644
--- a/components/media-controller/src/vwc-media-controller.ts
+++ b/components/media-controller/src/vwc-media-controller.ts
@@ -55,7 +55,7 @@ const byType = (typeName) => ({ type }) => type === typeName,
  * @fires userScrubRequest - Fires while the user modifies the scrubber's knob location.
  * @fires {number} userPlayPauseRequest - Fires when the user clicks the play/pause button, the "detail" event field will contain a number between zero and one describing the user's relative selected position.
  */
-class MediaController extends HTMLElement {
+class VWCMediaController extends HTMLElement {
 	constructor() {
 		super();
 
@@ -343,5 +343,5 @@ class MediaController extends HTMLElement {
 	}
 }
 
-export default MediaController;
-customElements.define('vwc-media-controller', MediaController);
+export { VWCMediaController };
+customElements.define('vwc-media-controller', VWCMediaController);