diff --git a/test/js/samples/action-custom-event-handler/expected.js b/test/js/samples/action-custom-event-handler/expected.js
index 8ecabf94be..4b758da030 100644
--- a/test/js/samples/action-custom-event-handler/expected.js
+++ b/test/js/samples/action-custom-event-handler/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -59,11 +59,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { bar, foo_function };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["bar"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/action/expected.js b/test/js/samples/action/expected.js
index edc82cc67e..cbbcb0d317 100644
--- a/test/js/samples/action/expected.js
+++ b/test/js/samples/action/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -53,11 +53,11 @@ function link(node) {
   }
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/bind-online/expected.js b/test/js/samples/bind-online/expected.js
index fa38562412..0c9faa3ef6 100644
--- a/test/js/samples/bind-online/expected.js
+++ b/test/js/samples/bind-online/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	add_render_callback,
 	init,
 	listen,
@@ -43,11 +43,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { online, onlinestatuschanged };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/bind-width-height/expected.js b/test/js/samples/bind-width-height/expected.js
index 45c9e6a835..2ef190588f 100644
--- a/test/js/samples/bind-width-height/expected.js
+++ b/test/js/samples/bind-width-height/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	add_render_callback,
 	add_resize_listener,
 	detach,
@@ -58,11 +58,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { w, h, div_resize_handler };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["w", "h"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js
index e40997203b..12164d0579 100644
--- a/test/js/samples/collapses-text-around-comments/expected.js
+++ b/test/js/samples/collapses-text-around-comments/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -61,7 +61,7 @@ function instance($$self, $$props, $$invalidate) {
 	return { foo };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		if (!document.getElementById("svelte-1a7i8ec-style")) add_css();
@@ -69,4 +69,4 @@ class SvelteComponent extends SvelteComponent_1 {
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/component-static-array/expected.js b/test/js/samples/component-static-array/expected.js
index 5cb7afde75..875c741076 100644
--- a/test/js/samples/component-static-array/expected.js
+++ b/test/js/samples/component-static-array/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	mount_component,
 	noop,
@@ -48,11 +48,11 @@ function instance($$self) {
 	return { Nested };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/component-static-immutable/expected.js b/test/js/samples/component-static-immutable/expected.js
index d0335b6ba0..6612a7f1b6 100644
--- a/test/js/samples/component-static-immutable/expected.js
+++ b/test/js/samples/component-static-immutable/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	mount_component,
 	noop,
@@ -48,11 +48,11 @@ function instance($$self) {
 	return { Nested };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/component-static-immutable2/expected.js b/test/js/samples/component-static-immutable2/expected.js
index d0335b6ba0..6612a7f1b6 100644
--- a/test/js/samples/component-static-immutable2/expected.js
+++ b/test/js/samples/component-static-immutable2/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	mount_component,
 	noop,
@@ -48,11 +48,11 @@ function instance($$self) {
 	return { Nested };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/component-static/expected.js b/test/js/samples/component-static/expected.js
index faad84b26c..12ebeb28b7 100644
--- a/test/js/samples/component-static/expected.js
+++ b/test/js/samples/component-static/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	mount_component,
 	noop,
@@ -48,11 +48,11 @@ function instance($$self) {
 	return { Nested };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/computed-collapsed-if/expected.js b/test/js/samples/computed-collapsed-if/expected.js
index bc01e0dfc0..bc7c383319 100644
--- a/test/js/samples/computed-collapsed-if/expected.js
+++ b/test/js/samples/computed-collapsed-if/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	noop,
 	safe_not_equal
@@ -35,7 +35,7 @@ function instance($$self, $$props, $$invalidate) {
 	return { x, a, b };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["x", "a", "b"]);
@@ -50,4 +50,4 @@ class SvelteComponent extends SvelteComponent_1 {
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js
index 25ee94e03f..d4be134376 100644
--- a/test/js/samples/css-media-query/expected.js
+++ b/test/js/samples/css-media-query/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -42,7 +42,7 @@ function create_fragment(ctx) {
 	};
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		if (!document.getElementById("svelte-1slhpfn-style")) add_css();
@@ -50,4 +50,4 @@ class SvelteComponent extends SvelteComponent_1 {
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js
index 2e410e11dd..2cb5b9e974 100644
--- a/test/js/samples/css-shadow-dom-keyframes/expected.js
+++ b/test/js/samples/css-shadow-dom-keyframes/expected.js
@@ -35,7 +35,7 @@ function create_fragment(ctx) {
 	};
 }
 
-class SvelteComponent extends SvelteElement {
+class Component extends SvelteElement {
 	constructor(options) {
 		super();
 
@@ -55,6 +55,6 @@ class SvelteComponent extends SvelteElement {
 	}
 }
 
-customElements.define("custom-element", SvelteComponent);
+customElements.define("custom-element", Component);
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/debug-empty/expected.js b/test/js/samples/debug-empty/expected.js
index efe966c552..98c2837ab7 100644
--- a/test/js/samples/debug-empty/expected.js
+++ b/test/js/samples/debug-empty/expected.js
@@ -72,7 +72,7 @@ function instance($$self, $$props, $$invalidate) {
 	return { name };
 }
 
-class SvelteComponent extends SvelteComponentDev {
+class Component extends SvelteComponentDev {
 	constructor(options) {
 		super(options);
 		init(this, options, instance, create_fragment, safe_not_equal, ["name"]);
@@ -80,17 +80,17 @@ class SvelteComponent extends SvelteComponentDev {
 		const { ctx } = this.$$;
 		const props = options.props || {};
 		if (ctx.name === undefined && !('name' in props)) {
-			console.warn("<SvelteComponent> was created without expected prop 'name'");
+			console.warn("<Component> was created without expected prop 'name'");
 		}
 	}
 
 	get name() {
-		throw new Error("<SvelteComponent>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	set name(value) {
-		throw new Error("<SvelteComponent>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/debug-foo-bar-baz-things/expected.js b/test/js/samples/debug-foo-bar-baz-things/expected.js
index 0220664d12..c1391475b2 100644
--- a/test/js/samples/debug-foo-bar-baz-things/expected.js
+++ b/test/js/samples/debug-foo-bar-baz-things/expected.js
@@ -161,7 +161,7 @@ function instance($$self, $$props, $$invalidate) {
 	return { things, foo, bar, baz };
 }
 
-class SvelteComponent extends SvelteComponentDev {
+class Component extends SvelteComponentDev {
 	constructor(options) {
 		super(options);
 		init(this, options, instance, create_fragment, safe_not_equal, ["things", "foo", "bar", "baz"]);
@@ -169,50 +169,50 @@ class SvelteComponent extends SvelteComponentDev {
 		const { ctx } = this.$$;
 		const props = options.props || {};
 		if (ctx.things === undefined && !('things' in props)) {
-			console.warn("<SvelteComponent> was created without expected prop 'things'");
+			console.warn("<Component> was created without expected prop 'things'");
 		}
 		if (ctx.foo === undefined && !('foo' in props)) {
-			console.warn("<SvelteComponent> was created without expected prop 'foo'");
+			console.warn("<Component> was created without expected prop 'foo'");
 		}
 		if (ctx.bar === undefined && !('bar' in props)) {
-			console.warn("<SvelteComponent> was created without expected prop 'bar'");
+			console.warn("<Component> was created without expected prop 'bar'");
 		}
 		if (ctx.baz === undefined && !('baz' in props)) {
-			console.warn("<SvelteComponent> was created without expected prop 'baz'");
+			console.warn("<Component> was created without expected prop 'baz'");
 		}
 	}
 
 	get things() {
-		throw new Error("<SvelteComponent>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	set things(value) {
-		throw new Error("<SvelteComponent>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	get foo() {
-		throw new Error("<SvelteComponent>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	set foo(value) {
-		throw new Error("<SvelteComponent>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	get bar() {
-		throw new Error("<SvelteComponent>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	set bar(value) {
-		throw new Error("<SvelteComponent>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	get baz() {
-		throw new Error("<SvelteComponent>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	set baz(value) {
-		throw new Error("<SvelteComponent>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/debug-foo/expected.js b/test/js/samples/debug-foo/expected.js
index ccd5f14ec4..f5daa7dad7 100644
--- a/test/js/samples/debug-foo/expected.js
+++ b/test/js/samples/debug-foo/expected.js
@@ -159,7 +159,7 @@ function instance($$self, $$props, $$invalidate) {
 	return { things, foo };
 }
 
-class SvelteComponent extends SvelteComponentDev {
+class Component extends SvelteComponentDev {
 	constructor(options) {
 		super(options);
 		init(this, options, instance, create_fragment, safe_not_equal, ["things", "foo"]);
@@ -167,28 +167,28 @@ class SvelteComponent extends SvelteComponentDev {
 		const { ctx } = this.$$;
 		const props = options.props || {};
 		if (ctx.things === undefined && !('things' in props)) {
-			console.warn("<SvelteComponent> was created without expected prop 'things'");
+			console.warn("<Component> was created without expected prop 'things'");
 		}
 		if (ctx.foo === undefined && !('foo' in props)) {
-			console.warn("<SvelteComponent> was created without expected prop 'foo'");
+			console.warn("<Component> was created without expected prop 'foo'");
 		}
 	}
 
 	get things() {
-		throw new Error("<SvelteComponent>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	set things(value) {
-		throw new Error("<SvelteComponent>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	get foo() {
-		throw new Error("<SvelteComponent>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	set foo(value) {
-		throw new Error("<SvelteComponent>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/debug-ssr-foo/expected.js b/test/js/samples/debug-ssr-foo/expected.js
index 02bbec5fba..1b51af2592 100644
--- a/test/js/samples/debug-ssr-foo/expected.js
+++ b/test/js/samples/debug-ssr-foo/expected.js
@@ -6,7 +6,7 @@ import {
 	escape
 } from "svelte/internal";
 
-const SvelteComponent = create_ssr_component(($$result, $$props, $$bindings, $$slots) => {
+const Component = create_ssr_component(($$result, $$props, $$bindings, $$slots) => {
 	let { things, foo } = $$props;
 
 	if ($$props.things === void 0 && $$bindings.things && things !== void 0) $$bindings.things(things);
@@ -18,4 +18,4 @@ const SvelteComponent = create_ssr_component(($$result, $$props, $$bindings, $$s
 	<p>foo: ${escape(foo)}</p>`;
 });
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/deconflict-builtins/expected.js b/test/js/samples/deconflict-builtins/expected.js
index 3985faa362..3294778aa3 100644
--- a/test/js/samples/deconflict-builtins/expected.js
+++ b/test/js/samples/deconflict-builtins/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	destroy_each,
 	detach,
@@ -123,11 +123,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { createElement };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["createElement"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/deconflict-globals/expected.js b/test/js/samples/deconflict-globals/expected.js
index fe941d2b24..347d0417ec 100644
--- a/test/js/samples/deconflict-globals/expected.js
+++ b/test/js/samples/deconflict-globals/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	noop,
 	safe_not_equal
@@ -32,11 +32,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { foo };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["foo"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected.js b/test/js/samples/dev-warning-missing-data-computed/expected.js
index 3840e9544d..ff1f48e2be 100644
--- a/test/js/samples/dev-warning-missing-data-computed/expected.js
+++ b/test/js/samples/dev-warning-missing-data-computed/expected.js
@@ -78,7 +78,7 @@ function instance($$self, $$props, $$invalidate) {
 	return { foo, bar };
 }
 
-class SvelteComponent extends SvelteComponentDev {
+class Component extends SvelteComponentDev {
 	constructor(options) {
 		super(options);
 		init(this, options, instance, create_fragment, safe_not_equal, ["foo"]);
@@ -86,17 +86,17 @@ class SvelteComponent extends SvelteComponentDev {
 		const { ctx } = this.$$;
 		const props = options.props || {};
 		if (ctx.foo === undefined && !('foo' in props)) {
-			console.warn("<SvelteComponent> was created without expected prop 'foo'");
+			console.warn("<Component> was created without expected prop 'foo'");
 		}
 	}
 
 	get foo() {
-		throw new Error("<SvelteComponent>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be read directly from the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 
 	set foo(value) {
-		throw new Error("<SvelteComponent>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
+		throw new Error("<Component>: Props cannot be set directly on the component instance unless compiling with 'accessors: true' or '<svelte:options accessors/>'");
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/do-use-dataset/expected.js b/test/js/samples/do-use-dataset/expected.js
index 60a8c54869..4a1ffc4913 100644
--- a/test/js/samples/do-use-dataset/expected.js
+++ b/test/js/samples/do-use-dataset/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -57,11 +57,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { bar };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["bar"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/dont-invalidate-this/expected.js b/test/js/samples/dont-invalidate-this/expected.js
index 2b3cd63514..92033148eb 100644
--- a/test/js/samples/dont-invalidate-this/expected.js
+++ b/test/js/samples/dont-invalidate-this/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -41,11 +41,11 @@ function make_uppercase() {
 	this.value = this.value.toUpperCase();
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected.js b/test/js/samples/dont-use-dataset-in-legacy/expected.js
index 4d63cb8c73..12ba50e69f 100644
--- a/test/js/samples/dont-use-dataset-in-legacy/expected.js
+++ b/test/js/samples/dont-use-dataset-in-legacy/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	attr,
 	detach,
 	element,
@@ -58,11 +58,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { bar };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["bar"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/dont-use-dataset-in-svg/expected.js b/test/js/samples/dont-use-dataset-in-svg/expected.js
index 3f58d7f155..0862d1bbc6 100644
--- a/test/js/samples/dont-use-dataset-in-svg/expected.js
+++ b/test/js/samples/dont-use-dataset-in-svg/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	attr,
 	detach,
@@ -56,11 +56,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { bar };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["bar"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/dynamic-import/expected.js b/test/js/samples/dynamic-import/expected.js
index 85d5ed0cbe..2d51bcf60d 100644
--- a/test/js/samples/dynamic-import/expected.js
+++ b/test/js/samples/dynamic-import/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	mount_component,
 	noop,
@@ -47,11 +47,11 @@ function func() {
 	return import('./Foo.svelte');
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/each-block-array-literal/expected.js b/test/js/samples/each-block-array-literal/expected.js
index 766cfceb71..455cb2f25f 100644
--- a/test/js/samples/each-block-array-literal/expected.js
+++ b/test/js/samples/each-block-array-literal/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	destroy_each,
 	detach,
@@ -126,11 +126,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { a, b, c, d, e };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["a", "b", "c", "d", "e"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index c65cd3479a..951565bae4 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	destroy_each,
 	detach,
@@ -167,11 +167,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { comments, elapsed, time, foo };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["comments", "elapsed", "time", "foo"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/each-block-keyed-animated/expected.js b/test/js/samples/each-block-keyed-animated/expected.js
index aa9215b56d..b168fb024e 100644
--- a/test/js/samples/each-block-keyed-animated/expected.js
+++ b/test/js/samples/each-block-keyed-animated/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	blank_object,
 	create_animation,
@@ -142,11 +142,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { things };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["things"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/each-block-keyed/expected.js b/test/js/samples/each-block-keyed/expected.js
index 8688d3af9a..a24841813c 100644
--- a/test/js/samples/each-block-keyed/expected.js
+++ b/test/js/samples/each-block-keyed/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	blank_object,
 	destroy_block,
@@ -110,11 +110,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { things };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["things"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/event-handler-no-passive/expected.js b/test/js/samples/event-handler-no-passive/expected.js
index 55e22666c1..41fcbeeb2a 100644
--- a/test/js/samples/event-handler-no-passive/expected.js
+++ b/test/js/samples/event-handler-no-passive/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -43,11 +43,11 @@ function touchstart_handler(e) {
 	return e.preventDefault();
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/event-modifiers/expected.js b/test/js/samples/event-modifiers/expected.js
index 617ccff197..bd449ea5a4 100644
--- a/test/js/samples/event-modifiers/expected.js
+++ b/test/js/samples/event-modifiers/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -68,11 +68,11 @@ function handleClick() {
 	// ...
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/head-no-whitespace/expected.js b/test/js/samples/head-no-whitespace/expected.js
index 552281ba66..b95177bba7 100644
--- a/test/js/samples/head-no-whitespace/expected.js
+++ b/test/js/samples/head-no-whitespace/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -38,11 +38,11 @@ function create_fragment(ctx) {
 	};
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/hoisted-const/expected.js b/test/js/samples/hoisted-const/expected.js
index 8f061bf80b..3e711e99ab 100644
--- a/test/js/samples/hoisted-const/expected.js
+++ b/test/js/samples/hoisted-const/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -41,11 +41,11 @@ const ANSWER = 42;
 
 function get_answer() { return ANSWER; }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/hoisted-let/expected.js b/test/js/samples/hoisted-let/expected.js
index 52390c1e26..210a63e28a 100644
--- a/test/js/samples/hoisted-let/expected.js
+++ b/test/js/samples/hoisted-let/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -41,11 +41,11 @@ let ANSWER = 42;
 
 function get_answer() { return ANSWER; }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js
index 1605696736..0dca40a81e 100644
--- a/test/js/samples/if-block-no-update/expected.js
+++ b/test/js/samples/if-block-no-update/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	empty,
@@ -110,11 +110,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { foo };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["foo"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/if-block-simple/expected.js b/test/js/samples/if-block-simple/expected.js
index 44c8ed31db..94b0f37f31 100644
--- a/test/js/samples/if-block-simple/expected.js
+++ b/test/js/samples/if-block-simple/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	empty,
@@ -84,11 +84,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { foo };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["foo"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-multiple/expected.js b/test/js/samples/inline-style-optimized-multiple/expected.js
index 9766ca3738..ea1d90e831 100644
--- a/test/js/samples/inline-style-optimized-multiple/expected.js
+++ b/test/js/samples/inline-style-optimized-multiple/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -57,11 +57,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { color, x, y };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["color", "x", "y"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-url/expected.js b/test/js/samples/inline-style-optimized-url/expected.js
index ffa679c429..8dfc48447d 100644
--- a/test/js/samples/inline-style-optimized-url/expected.js
+++ b/test/js/samples/inline-style-optimized-url/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -50,11 +50,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { data };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["data"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized/expected.js b/test/js/samples/inline-style-optimized/expected.js
index 0b97d34d56..1170c25458 100644
--- a/test/js/samples/inline-style-optimized/expected.js
+++ b/test/js/samples/inline-style-optimized/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -50,11 +50,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { color };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["color"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-unoptimized/expected.js b/test/js/samples/inline-style-unoptimized/expected.js
index f2e52ebb48..8f3b668827 100644
--- a/test/js/samples/inline-style-unoptimized/expected.js
+++ b/test/js/samples/inline-style-unoptimized/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -63,11 +63,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { style, key, value };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["style", "key", "value"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/input-files/expected.js b/test/js/samples/input-files/expected.js
index dad2af168c..ed11518df2 100644
--- a/test/js/samples/input-files/expected.js
+++ b/test/js/samples/input-files/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	attr,
 	detach,
 	element,
@@ -55,11 +55,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { files, input_input_handler };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["files"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/input-range/expected.js b/test/js/samples/input-range/expected.js
index c57ef4f73b..8331e73bad 100644
--- a/test/js/samples/input-range/expected.js
+++ b/test/js/samples/input-range/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	attr,
 	detach,
 	element,
@@ -65,11 +65,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { value, input_change_input_handler };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["value"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/input-without-blowback-guard/expected.js b/test/js/samples/input-without-blowback-guard/expected.js
index d47753396f..d97326fcea 100644
--- a/test/js/samples/input-without-blowback-guard/expected.js
+++ b/test/js/samples/input-without-blowback-guard/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	attr,
 	detach,
 	element,
@@ -59,11 +59,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { foo, input_change_handler };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["foo"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/instrumentation-script-if-no-block/expected.js b/test/js/samples/instrumentation-script-if-no-block/expected.js
index 4788fc2e09..6ab3e37f1f 100644
--- a/test/js/samples/instrumentation-script-if-no-block/expected.js
+++ b/test/js/samples/instrumentation-script-if-no-block/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -67,11 +67,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { x, foo };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/instrumentation-script-x-equals-x/expected.js b/test/js/samples/instrumentation-script-x-equals-x/expected.js
index 165c4e27b0..5cec1a3623 100644
--- a/test/js/samples/instrumentation-script-x-equals-x/expected.js
+++ b/test/js/samples/instrumentation-script-x-equals-x/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -68,11 +68,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { things, foo };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/instrumentation-template-if-no-block/expected.js b/test/js/samples/instrumentation-template-if-no-block/expected.js
index 38f7f7fcd0..1b8cbb257a 100644
--- a/test/js/samples/instrumentation-template-if-no-block/expected.js
+++ b/test/js/samples/instrumentation-template-if-no-block/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -67,11 +67,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { x, click_handler };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/instrumentation-template-x-equals-x/expected.js b/test/js/samples/instrumentation-template-x-equals-x/expected.js
index 4adc229ff7..29e0c111f9 100644
--- a/test/js/samples/instrumentation-template-x-equals-x/expected.js
+++ b/test/js/samples/instrumentation-template-x-equals-x/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -65,11 +65,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { things, click_handler };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/legacy-input-type/expected.js b/test/js/samples/legacy-input-type/expected.js
index 1b3b32f6ce..4c77259a64 100644
--- a/test/js/samples/legacy-input-type/expected.js
+++ b/test/js/samples/legacy-input-type/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	element,
 	init,
@@ -35,11 +35,11 @@ function create_fragment(ctx) {
 	};
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js
index 00bee3234c..8a193f698b 100644
--- a/test/js/samples/media-bindings/expected.js
+++ b/test/js/samples/media-bindings/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	add_render_callback,
 	detach,
 	element,
@@ -144,11 +144,11 @@ function instance($$self, $$props, $$invalidate) {
 	};
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["buffered", "seekable", "played", "currentTime", "duration", "paused", "volume", "playbackRate"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/non-imported-component/expected.js b/test/js/samples/non-imported-component/expected.js
index 2fb8bb1798..20ac461c76 100644
--- a/test/js/samples/non-imported-component/expected.js
+++ b/test/js/samples/non-imported-component/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	detach,
 	init,
 	insert,
@@ -61,11 +61,11 @@ function create_fragment(ctx) {
 	};
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/non-mutable-reference/expected.js b/test/js/samples/non-mutable-reference/expected.js
index 1bad71a937..b6d63a387f 100644
--- a/test/js/samples/non-mutable-reference/expected.js
+++ b/test/js/samples/non-mutable-reference/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -43,11 +43,11 @@ function create_fragment(ctx) {
 
 let name = 'world';
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/reactive-values-non-topologically-ordered/expected.js b/test/js/samples/reactive-values-non-topologically-ordered/expected.js
index bac07ebc7c..a0a5363d6f 100644
--- a/test/js/samples/reactive-values-non-topologically-ordered/expected.js
+++ b/test/js/samples/reactive-values-non-topologically-ordered/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	noop,
 	safe_not_equal
@@ -39,11 +39,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { x };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["x"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/reactive-values-non-writable-dependencies/expected.js b/test/js/samples/reactive-values-non-writable-dependencies/expected.js
index b9aabdf76e..2e4507222f 100644
--- a/test/js/samples/reactive-values-non-writable-dependencies/expected.js
+++ b/test/js/samples/reactive-values-non-writable-dependencies/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	noop,
 	safe_not_equal
@@ -35,11 +35,11 @@ function instance($$self, $$props, $$invalidate) {
 	return {};
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/select-dynamic-value/expected.js b/test/js/samples/select-dynamic-value/expected.js
index 82698aafdc..5a0af01f99 100644
--- a/test/js/samples/select-dynamic-value/expected.js
+++ b/test/js/samples/select-dynamic-value/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -76,11 +76,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { current };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["current"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/setup-method/expected.js b/test/js/samples/setup-method/expected.js
index dbde1c9039..e9370d0e2b 100644
--- a/test/js/samples/setup-method/expected.js
+++ b/test/js/samples/setup-method/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	noop,
 	safe_not_equal
@@ -23,7 +23,7 @@ function foo(bar) {
 	console.log(bar);
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, ["foo"]);
@@ -34,5 +34,5 @@ class SvelteComponent extends SvelteComponent_1 {
 	}
 }
 
-export default SvelteComponent;
+export default Component;
 export { SOME_CONSTANT };
\ No newline at end of file
diff --git a/test/js/samples/ssr-no-oncreate-etc/expected.js b/test/js/samples/ssr-no-oncreate-etc/expected.js
index 45f86d3682..06cdf057e3 100644
--- a/test/js/samples/ssr-no-oncreate-etc/expected.js
+++ b/test/js/samples/ssr-no-oncreate-etc/expected.js
@@ -14,7 +14,7 @@ function swipe(node, callback) {
 	// TODO implement
 }
 
-const SvelteComponent = create_ssr_component(($$result, $$props, $$bindings, $$slots) => {
+const Component = create_ssr_component(($$result, $$props, $$bindings, $$slots) => {
 	onMount(() => {
 		console.log('onMount');
 	});
@@ -26,5 +26,5 @@ const SvelteComponent = create_ssr_component(($$result, $$props, $$bindings, $$s
 	return ``;
 });
 
-export default SvelteComponent;
+export default Component;
 export { preload };
\ No newline at end of file
diff --git a/test/js/samples/ssr-preserve-comments/expected.js b/test/js/samples/ssr-preserve-comments/expected.js
index e910b63df2..d9a63e6011 100644
--- a/test/js/samples/ssr-preserve-comments/expected.js
+++ b/test/js/samples/ssr-preserve-comments/expected.js
@@ -1,10 +1,10 @@
 /* generated by Svelte vX.Y.Z */
 import { create_ssr_component } from "svelte/internal";
 
-const SvelteComponent = create_ssr_component(($$result, $$props, $$bindings, $$slots) => {
+const Component = create_ssr_component(($$result, $$props, $$bindings, $$slots) => {
 	return `<div>content</div>
 	<!-- comment -->
 	<div>more content</div>`;
 });
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/svg-title/expected.js b/test/js/samples/svg-title/expected.js
index 49bd406987..57e3fa3050 100644
--- a/test/js/samples/svg-title/expected.js
+++ b/test/js/samples/svg-title/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	init,
@@ -39,11 +39,11 @@ function create_fragment(ctx) {
 	};
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, null, create_fragment, safe_not_equal, []);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/title/expected.js b/test/js/samples/title/expected.js
index 076582ac6f..884f39e246 100644
--- a/test/js/samples/title/expected.js
+++ b/test/js/samples/title/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	init,
 	noop,
 	safe_not_equal
@@ -37,11 +37,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { custom };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["custom"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/transition-local/expected.js b/test/js/samples/transition-local/expected.js
index 85979e9959..2df99a4c87 100644
--- a/test/js/samples/transition-local/expected.js
+++ b/test/js/samples/transition-local/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	add_render_callback,
 	create_in_transition,
 	detach,
@@ -147,11 +147,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { x, y };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["x", "y"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/use-elements-as-anchors/expected.js b/test/js/samples/use-elements-as-anchors/expected.js
index bb708284b4..b93817d416 100644
--- a/test/js/samples/use-elements-as-anchors/expected.js
+++ b/test/js/samples/use-elements-as-anchors/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	append,
 	detach,
 	element,
@@ -271,11 +271,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { a, b, c, d, e };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["a", "b", "c", "d", "e"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file
diff --git a/test/js/samples/window-binding-scroll/expected.js b/test/js/samples/window-binding-scroll/expected.js
index 5a6601b851..18f5210bea 100644
--- a/test/js/samples/window-binding-scroll/expected.js
+++ b/test/js/samples/window-binding-scroll/expected.js
@@ -1,6 +1,6 @@
 /* generated by Svelte vX.Y.Z */
 import {
-	SvelteComponent as SvelteComponent_1,
+	SvelteComponent,
 	add_render_callback,
 	append,
 	detach,
@@ -78,11 +78,11 @@ function instance($$self, $$props, $$invalidate) {
 	return { y, onwindowscroll };
 }
 
-class SvelteComponent extends SvelteComponent_1 {
+class Component extends SvelteComponent {
 	constructor(options) {
 		super();
 		init(this, options, instance, create_fragment, safe_not_equal, ["y"]);
 	}
 }
 
-export default SvelteComponent;
\ No newline at end of file
+export default Component;
\ No newline at end of file