From 1fb1d9388b35734f7d126ee96956853891af41f5 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@accso.de>
Date: Sun, 20 Jun 2021 16:22:06 +0200
Subject: [PATCH 1/3] (breaking) rename ambient __sveltets_-declarations

Rename all __sveltets_* ambient declarations to __sveltets_1_* . This way, we avoid the situation where multiple ambient versions of svelte2tsx are loaded and their declarations conflict each other. #1059 for an example bug that stems from it.
The other breaking change is that svelte2tsx no longer provides a default export, svelte2tsx now is a named export. This opens up the possibility to export other utility functions alongside it.
---
 docs/internal/overview.md                     |  2 +-
 packages/language-server/package.json         |  2 +-
 .../plugins/typescript/DocumentSnapshot.ts    |  2 +-
 .../typescript/features/HoverProvider.ts      |  2 +-
 .../typescript/features/RenameProvider.ts     | 10 +-
 packages/svelte2tsx/README.md                 |  4 +-
 packages/svelte2tsx/index.d.ts                |  2 +-
 packages/svelte2tsx/package.json              |  2 +-
 packages/svelte2tsx/repl/debug.ts             |  2 +-
 .../src/htmlxtojsx/nodes/action-directive.ts  |  8 +-
 .../htmlxtojsx/nodes/animation-directive.ts   | 10 +-
 .../src/htmlxtojsx/nodes/attribute.ts         |  2 +-
 .../svelte2tsx/src/htmlxtojsx/nodes/await.ts  |  8 +-
 .../src/htmlxtojsx/nodes/binding.ts           | 10 +-
 .../src/htmlxtojsx/nodes/class-directive.ts   |  4 +-
 .../svelte2tsx/src/htmlxtojsx/nodes/each.ts   |  4 +-
 .../src/htmlxtojsx/nodes/event-handler.ts     |  4 +-
 .../htmlxtojsx/nodes/transition-directive.ts  |  6 +-
 .../src/htmlxtojsx/utils/node-utils.ts        | 12 +--
 packages/svelte2tsx/src/index.ts              |  2 +-
 .../src/svelte2tsx/addComponentExport.ts      |  8 +-
 .../src/svelte2tsx/createRenderFunction.ts    |  8 +-
 .../src/svelte2tsx/nodes/ComponentEvents.ts   |  6 +-
 .../src/svelte2tsx/nodes/ExportedNames.ts     | 12 +--
 .../svelte2tsx/nodes/ImplicitStoreValues.ts   |  6 +-
 .../svelte2tsx/nodes/ImplicitTopLevelNames.ts |  2 +-
 .../svelte2tsx/src/svelte2tsx/nodes/Stores.ts |  4 +-
 .../src/svelte2tsx/nodes/event-handler.ts     | 12 +--
 .../svelte2tsx/src/svelte2tsx/nodes/slot.ts   |  8 +-
 .../processInstanceScriptContent.ts           |  4 +-
 .../svelte2tsx/src/svelte2tsx/svelteShims.ts  | 92 +++++++++---------
 packages/svelte2tsx/svelte-shims.d.ts         | 97 ++++++++++---------
 .../samples/action-bare/expected.jsx          |  2 +-
 .../samples/action-nested/expected.jsx        | 10 +-
 .../samples/action-params/expected.jsx        |  6 +-
 .../samples/animation-bare/expected.jsx       |  2 +-
 .../samples/animation-params/expected.jsx     |  7 +-
 .../await-block-basic-catch/expected.jsx      |  4 +-
 .../samples/await-block-basic/expected.jsx    |  6 +-
 .../await-block-destruct-array/expected.jsx   |  4 +-
 .../await-block-destruct-default/expected.jsx | 10 +-
 .../await-block-destruct-object/expected.jsx  |  4 +-
 .../await-block-destruct-rest/expected.jsx    | 10 +-
 .../samples/await-block-no-then/expected.jsx  |  4 +-
 .../await-block-parentheses/expected.jsx      |  6 +-
 .../await-block-pending-catch/expected.jsx    |  4 +-
 .../samples/await-block-pending/expected.jsx  |  4 +-
 .../samples/binding-group-bare/expected.jsx   |  4 +-
 .../samples/binding-group/expected.jsx        |  2 +-
 .../samples/binding-oneway/expected.jsx       | 22 ++---
 .../binding-this-component/expected.jsx       |  2 +-
 .../binding-this-svelte-body/expected.jsx     |  2 +-
 .../expected.jsx                              |  2 +-
 .../binding-this-svelte-self/expected.jsx     |  4 +-
 .../samples/binding-this/expected.jsx         |  2 +-
 .../expected.jsx                              |  2 +-
 .../htmlx2jsx/samples/class-bare/expected.jsx |  2 +-
 .../samples/class-parentheses/expected.jsx    |  2 +-
 .../test/htmlx2jsx/samples/class/expected.jsx |  4 +-
 .../expected.jsx                              |  2 +-
 .../component-default-slot-let/expected.jsx   |  2 +-
 .../samples/component-multi-slot/expected.jsx |  8 +-
 .../samples/component-named-slot/expected.jsx |  6 +-
 .../component-slot-infer-props/expected.jsx   |  4 +-
 .../component-slot-shadowed-prop/expected.jsx |  8 +-
 .../custom-css-properties/expected.jsx        | 10 +-
 .../samples/directive-quoted/expected.jsx     | 10 +-
 .../each-block-basic-sequence/expected.jsx    |  4 +-
 .../samples/each-block-basic/expected.jsx     |  4 +-
 .../samples/each-block-index/expected.jsx     |  4 +-
 .../samples/each-block-key-else/expected.jsx  |  4 +-
 .../samples/each-block-key/expected.jsx       |  4 +-
 .../expected.jsx                              |  4 +-
 .../each-block-optional-chaining/expected.jsx |  4 +-
 .../expected.jsx                              |  2 +-
 .../event-handler-component/expected.jsx      |  2 +-
 .../expected.jsx                              |  2 +-
 .../expected.jsx                              | 22 ++---
 .../if-nested-await-block/expected.jsx        | 12 +--
 .../expected.jsx                              | 12 +--
 .../samples/if-nested-each-block/expected.jsx |  8 +-
 .../if-nested-slot-let-shadowed/expected.jsx  | 26 ++---
 .../samples/if-nested-slot-let/expected.jsx   |  8 +-
 .../expected.jsx                              |  2 +-
 .../samples/svelte-fragment/expected.jsx      |  4 +-
 .../transition-animate-fallbacks/expected.jsx | 26 ++---
 .../samples/transition-bare/expected.jsx      |  6 +-
 .../samples/transition-modifiers/expected.jsx |  2 +-
 .../samples/transition-params/expected.jsx    | 10 +-
 .../samples/action-directive/mappings.jsx     | 60 ++++++------
 .../samples/action-directive/test.jsx         | 46 ++++-----
 .../samples/await-block/mappings.jsx          | 40 ++++----
 .../sourcemaps/samples/await-block/test.jsx   | 20 ++--
 .../samples/component-props/mappings.jsx      | 10 +-
 .../samples/component-props/test.jsx          | 26 ++---
 .../samples/each-block/mappings.jsx           | 52 +++++-----
 .../sourcemaps/samples/each-block/test.jsx    | 60 ++++++------
 .../samples/element-attributes/mappings.jsx   |  2 +-
 .../samples/event-binding/mappings.jsx        | 24 ++---
 .../sourcemaps/samples/event-binding/test.jsx | 12 +--
 .../sourcemaps/samples/if-block/mappings.jsx  | 10 +-
 .../test/sourcemaps/samples/if-block/test.jsx | 18 ++--
 .../samples/large-sample-1/mappings.jsx       | 64 ++++++------
 .../test/sourcemaps/samples/let/mappings.jsx  | 10 +-
 .../test/sourcemaps/samples/let/test.jsx      |  6 +-
 .../samples/property-shorthand/mappings.jsx   |  2 +-
 .../samples/reactive-statements/mappings.jsx  | 26 ++---
 .../samples/reactive-statements/test.jsx      | 26 ++---
 .../samples/reserved-variables/mappings.jsx   | 22 ++---
 .../samples/reserved-variables/test.jsx       | 14 +--
 .../samples/simple-element/mappings.jsx       |  2 +-
 .../sourcemaps/samples/slots/mappings.jsx     |  4 +-
 .../test/sourcemaps/samples/slots/test.jsx    | 18 ++--
 .../samples/$store-as-directive/expected.tsx  | 22 ++---
 .../samples/$store-assign/expected.tsx        | 22 ++---
 .../samples/$store-index/expected.tsx         |  4 +-
 .../samples/array-binding-export/expected.tsx |  2 +-
 .../samples/ast-offset-none/expected.tsx      |  4 +-
 .../samples/ast-offset-some/expected.tsx      |  4 +-
 .../attributes-foreign-ns/expected.tsx        |  2 +-
 .../samples/await-with-$store/expected.tsx    |  8 +-
 .../samples/binding-group-store/expected.tsx  |  4 +-
 .../circle-drawer-example/expected.tsx        |  4 +-
 .../samples/commented-out-script/expected.tsx |  2 +-
 .../component-default-slot/expected.tsx       |  4 +-
 .../expected.tsx                              |  2 +-
 .../expected.tsx                              |  4 +-
 .../expected.tsx                              |  2 +-
 .../component-events-interface/expected.tsx   |  2 +-
 .../expected.tsx                              |  4 +-
 .../component-events-type/expected.tsx        |  2 +-
 .../component-multiple-slots/expected.tsx     |  4 +-
 .../expected.tsx                              |  4 +-
 .../component-slot-$$slot-type/expected.tsx   |  4 +-
 .../expected.tsx                              |  4 +-
 .../expected.tsx                              |  8 +-
 .../component-slot-inside-await/expected.tsx  | 10 +-
 .../component-slot-inside-each/expected.tsx   | 10 +-
 .../expected.tsx                              |  8 +-
 .../component-slot-let-forward/expected.tsx   |  8 +-
 .../component-slot-nest-scope/expected.tsx    | 14 +--
 .../component-slot-no-space/expected.tsx      |  4 +-
 .../component-slot-object-key/expected.tsx    | 10 +-
 .../component-slot-var-shadowing/expected.tsx |  8 +-
 .../component-with-documentation/expected.tsx |  2 +-
 .../expected.tsx                              |  2 +-
 .../expected.tsx                              |  2 +-
 .../samples/creates-dts/expected.tsx          | 96 +++++++++---------
 .../expected.tsx                              | 10 +-
 .../samples/debug-block/expected.tsx          |  6 +-
 .../samples/editing-mustache/expected.tsx     |  2 +-
 .../event-and-forwarded-event/expected.tsx    |  4 +-
 .../event-bubble-component-multi/expected.tsx |  4 +-
 .../expected.tsx                              |  4 +-
 .../event-bubble-component/expected.tsx       |  4 +-
 .../samples/event-bubble-element/expected.tsx |  4 +-
 .../event-bubble-svelte-element/expected.tsx  |  4 +-
 .../expected.tsx                              |  4 +-
 .../event-dispatcher-events/expected.tsx      |  4 +-
 .../samples/event-dispatchers/expected.tsx    |  4 +-
 .../samples/export-class/expected.tsx         |  2 +-
 .../samples/export-doc/expected.tsx           |  2 +-
 .../export-js-required-props/expected.tsx     |  2 +-
 .../samples/export-list/expected.tsx          |  2 +-
 .../export-references-local/expected.tsx      |  2 +-
 .../export-with-default-multi/expected.tsx    |  4 +-
 .../expected.tsx                              |  2 +-
 .../expected.tsx                              |  2 +-
 .../samples/import-single-quote/expected.tsx  |  2 +-
 .../svelte2tsx/samples/imports/expected.tsx   |  2 +-
 .../expected.tsx                              |  2 +-
 .../expected.tsx                              |  2 +-
 .../module-script-and-script/expected.tsx     |  2 +-
 .../module-script-and-script2/expected.tsx    |  2 +-
 .../nested-$-variables-script/expected.tsx    | 14 +--
 .../nested-$-variables-template/expected.tsx  | 10 +-
 .../object-binding-export/expected.tsx        |  2 +-
 .../expected.tsx                              | 18 ++--
 .../expected.tsx                              |  4 +-
 .../samples/reactive-block/expected.tsx       |  2 +-
 .../samples/reactive-break-$/expected.tsx     |  2 +-
 .../reactive-declare-object/expected.tsx      |  4 +-
 .../expected.tsx                              |  6 +-
 .../samples/reactive-declare/expected.tsx     |  6 +-
 .../samples/reactive-store-set/expected.tsx   |  4 +-
 .../samples/renamed-exports/expected.tsx      |  2 +-
 .../script-and-module-script/expected.tsx     |  2 +-
 .../expected.tsx                              |  2 +-
 .../samples/script-on-bottom/expected.tsx     |  2 +-
 .../script-style-like-component/expected.tsx  |  2 +-
 .../self-closing-component/expected.tsx       |  2 +-
 .../samples/single-element/expected.tsx       |  2 +-
 .../samples/single-export/expected.tsx        |  2 +-
 .../samples/slot-bind-this/expected.tsx       |  6 +-
 .../samples/store-destructuring/expected.tsx  | 18 ++--
 .../samples/store-from-module/expected.tsx    | 16 +--
 .../expected.tsx                              | 14 +--
 .../samples/store-import/expected.tsx         | 10 +-
 .../store-property-access/expected.tsx        | 40 ++++----
 .../samples/stores-mustache/expected.tsx      |  4 +-
 .../expected.tsx                              |  2 +-
 .../samples/style-attribute-bare/expected.tsx |  2 +-
 .../samples/style-attribute/expected.tsx      |  2 +-
 .../svelte2tsx/samples/style/expected.tsx     |  2 +-
 .../samples/ts-$$Props-interface/expected.tsx | 10 +-
 .../samples/ts-$$Props-type/expected.tsx      | 10 +-
 .../samples/ts-$$generics-dts/expected.tsx    | 96 +++++++++---------
 .../samples/ts-$$generics/expected.tsx        |  6 +-
 .../samples/ts-creates-dts/expected.tsx       | 96 +++++++++---------
 .../ts-event-dispatcher-typed/expected.tsx    |  4 +-
 .../expected.tsx                              |  6 +-
 .../samples/ts-event-dispatchers/expected.tsx |  6 +-
 .../ts-export-arrow-function/expected.tsx     |  2 +-
 .../samples/ts-export-boolean/expected.tsx    | 12 +--
 .../samples/ts-export-const/expected.tsx      |  2 +-
 .../ts-export-doc-typedef/expected.tsx        |  2 +-
 .../samples/ts-export-doc/expected.tsx        |  2 +-
 .../ts-export-has-initializer/expected.tsx    |  2 +-
 .../samples/ts-export-has-type/expected.tsx   |  4 +-
 .../samples/ts-export-interface/expected.tsx  |  2 +-
 .../samples/ts-export-list/expected.tsx       |  8 +-
 .../ts-export-required-props/expected.tsx     |  4 +-
 .../samples/ts-multiple-export/expected.tsx   |  2 +-
 .../samples/ts-style-and-script/expected.tsx  |  2 +-
 .../samples/ts-type-assertion/expected.tsx    |  2 +-
 .../ts-typed-export-with-default/expected.tsx |  4 +-
 .../samples/ts-uses-$$props/expected.tsx      |  4 +-
 .../samples/typeof-$store/expected.tsx        |  4 +-
 .../samples/uses-$$props-script/expected.tsx  |  4 +-
 .../samples/uses-$$props/expected.tsx         |  4 +-
 .../uses-$$restProps-script/expected.tsx      |  4 +-
 .../samples/uses-$$restProps/expected.tsx     |  4 +-
 .../samples/uses-$$slots-script/expected.tsx  |  6 +-
 .../samples/uses-$$slots/expected.tsx         |  6 +-
 .../samples/uses-$property/expected.tsx       |  2 +-
 .../uses-$store-in-event-binding/expected.tsx |  6 +-
 .../expected.tsx                              | 30 +++---
 .../expected.tsx                              |  4 +-
 .../expected.tsx                              |  8 +-
 .../uses-$store-with-increments/expected.tsx  |  4 +-
 .../samples/uses-$store/expected.tsx          |  6 +-
 .../expected.tsx                              |  4 +-
 .../uses-accessors-attr-present/expected.tsx  |  4 +-
 .../expected.tsx                              |  4 +-
 .../expected.tsx                              |  4 +-
 .../expected.tsx                              |  4 +-
 .../expected.tsx                              | 10 +-
 .../uses-svelte-components/expected.tsx       |  2 +-
 packages/typescript-plugin/package.json       |  2 +-
 .../typescript-plugin/src/svelte-snapshots.ts |  2 +-
 250 files changed, 1145 insertions(+), 1141 deletions(-)

diff --git a/docs/internal/overview.md b/docs/internal/overview.md
index b9ff47fe2..7013de537 100644
--- a/docs/internal/overview.md
+++ b/docs/internal/overview.md
@@ -88,7 +88,7 @@ function render() {
     return { props: { world }, slots: {}, events: {} };
 }
 // -- generate a class
-export default class _World_ extends createSvelte2TsxComponent(__sveltets_partial(render)) {}
+export default class _World_ extends createSvelte2TsxComponent(__sveltets_1_partial(render)) {}
 ```
 
 3. Pass that result to the TypeScript language service
diff --git a/packages/language-server/package.json b/packages/language-server/package.json
index d6415753e..12a8629ff 100644
--- a/packages/language-server/package.json
+++ b/packages/language-server/package.json
@@ -58,7 +58,7 @@
         "source-map": "^0.7.3",
         "svelte": "~3.38.2",
         "svelte-preprocess": "~4.7.3",
-        "svelte2tsx": "~0.2.0",
+        "svelte2tsx": "~0.3.0",
         "typescript": "*",
         "vscode-css-languageservice": "5.0.0",
         "vscode-emmet-helper": "2.1.2",
diff --git a/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts b/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
index eb9b05b79..2b1e22019 100644
--- a/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
+++ b/packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
@@ -1,5 +1,5 @@
 import { RawSourceMap, SourceMapConsumer } from 'source-map';
-import svelte2tsx, { IExportedNames } from 'svelte2tsx';
+import { svelte2tsx, IExportedNames } from 'svelte2tsx';
 import ts from 'typescript';
 import { Position, Range, TextDocumentContentChangeEvent } from 'vscode-languageserver';
 import {
diff --git a/packages/language-server/src/plugins/typescript/features/HoverProvider.ts b/packages/language-server/src/plugins/typescript/features/HoverProvider.ts
index c8185b779..cae5834a9 100644
--- a/packages/language-server/src/plugins/typescript/features/HoverProvider.ts
+++ b/packages/language-server/src/plugins/typescript/features/HoverProvider.ts
@@ -31,7 +31,7 @@ export class HoverProviderImpl implements HoverProvider {
         // show docs of $store instead of store if necessary
         const is$store = fragment.text
             .substring(0, info.textSpan.start)
-            .endsWith('(__sveltets_store_get(');
+            .endsWith('(__sveltets_1_store_get(');
         if (is$store) {
             const infoFor$store = lang.getQuickInfoAtPosition(
                 tsDoc.filePath,
diff --git a/packages/language-server/src/plugins/typescript/features/RenameProvider.ts b/packages/language-server/src/plugins/typescript/features/RenameProvider.ts
index 0808183a4..83ada1bae 100644
--- a/packages/language-server/src/plugins/typescript/features/RenameProvider.ts
+++ b/packages/language-server/src/plugins/typescript/features/RenameProvider.ts
@@ -317,13 +317,13 @@ export class RenameProviderImpl implements RenameProvider {
 
             const content = snapshot.getText(0, snapshot.getLength());
             // When the user renames a Svelte component, ts will also want to rename
-            // `__sveltets_instanceOf(TheComponentToRename)` or
-            // `__sveltets_ensureType(TheComponentToRename,..`. Prevent that.
+            // `__sveltets_1_instanceOf(TheComponentToRename)` or
+            // `__sveltets_1_ensureType(TheComponentToRename,..`. Prevent that.
             // Additionally, we cannot rename the hidden variable containing the store value
             return (
-                notPrecededBy('__sveltets_instanceOf(') &&
-                notPrecededBy('__sveltets_ensureType(') &&
-                notPrecededBy('= __sveltets_store_get(')
+                notPrecededBy('__sveltets_1_instanceOf(') &&
+                notPrecededBy('__sveltets_1_ensureType(') &&
+                notPrecededBy('= __sveltets_1_store_get(')
             );
 
             function notPrecededBy(str: string) {
diff --git a/packages/svelte2tsx/README.md b/packages/svelte2tsx/README.md
index 40c9b0049..7ad62dee0 100644
--- a/packages/svelte2tsx/README.md
+++ b/packages/svelte2tsx/README.md
@@ -37,8 +37,8 @@ function render() {
     return { props: { world }, slots: {}, events: {} };
 }
 
-export default class _World_ extends createSvelte2TsxComponent(
-    __sveltets_partial(__sveltets_with_any_event(render))
+export default class _World_ extends __sveltets_1_createSvelte2TsxComponent(
+    __sveltets_1_partial(__sveltets_1_with_any_event(render))
 ) {}
 ```
 
diff --git a/packages/svelte2tsx/index.d.ts b/packages/svelte2tsx/index.d.ts
index 5c895dca9..5a7b7adf1 100644
--- a/packages/svelte2tsx/index.d.ts
+++ b/packages/svelte2tsx/index.d.ts
@@ -13,7 +13,7 @@ export interface ComponentEvents {
     getAll(): { name: string; type: string; doc?: string }[];
 }
 
-export default function svelte2tsx(
+export function svelte2tsx(
     svelte: string,
     options?: {
         /**
diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json
index fac08011e..df6f60446 100644
--- a/packages/svelte2tsx/package.json
+++ b/packages/svelte2tsx/package.json
@@ -1,6 +1,6 @@
 {
     "name": "svelte2tsx",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "description": "Convert Svelte components to TSX for type checking",
     "author": "David Pershouse",
     "license": "MIT",
diff --git a/packages/svelte2tsx/repl/debug.ts b/packages/svelte2tsx/repl/debug.ts
index 724f0413e..a85e32714 100644
--- a/packages/svelte2tsx/repl/debug.ts
+++ b/packages/svelte2tsx/repl/debug.ts
@@ -1,5 +1,5 @@
 import fs from 'fs';
-import svelte2tsx from '../src';
+import { svelte2tsx } from '../src';
 const content = fs.readFileSync(`${__dirname}/index.svelte`, 'utf-8');
 svelte2tsx(content);
 /**
diff --git a/packages/svelte2tsx/src/htmlxtojsx/nodes/action-directive.ts b/packages/svelte2tsx/src/htmlxtojsx/nodes/action-directive.ts
index 2081d5191..60fad5872 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/nodes/action-directive.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/nodes/action-directive.ts
@@ -3,7 +3,7 @@ import { isQuote } from '../utils/node-utils';
 import { BaseDirective, BaseNode } from '../../interfaces';
 
 /**
- * use:xxx={params}   --->    {...__sveltets_ensureAction(xxx(__sveltets_mapElementTag('ParentNodeName'),(params)))}
+ * use:xxx={params}   --->    {...__sveltets_1_ensureAction(xxx(__sveltets_1_mapElementTag('ParentNodeName'),(params)))}
  */
 export function handleActionDirective(
     htmlx: string,
@@ -11,17 +11,17 @@ export function handleActionDirective(
     attr: BaseDirective,
     parent: BaseNode
 ): void {
-    str.overwrite(attr.start, attr.start + 'use:'.length, '{...__sveltets_ensureAction(');
+    str.overwrite(attr.start, attr.start + 'use:'.length, '{...__sveltets_1_ensureAction(');
 
     if (!attr.expression) {
-        str.appendLeft(attr.end, `(__sveltets_mapElementTag('${parent.name}')))}`);
+        str.appendLeft(attr.end, `(__sveltets_1_mapElementTag('${parent.name}')))}`);
         return;
     }
 
     str.overwrite(
         attr.start + `use:${attr.name}`.length,
         attr.expression.start,
-        `(__sveltets_mapElementTag('${parent.name}'),(`
+        `(__sveltets_1_mapElementTag('${parent.name}'),(`
     );
     str.appendLeft(attr.expression.end, ')))');
     const lastChar = htmlx[attr.end - 1];
diff --git a/packages/svelte2tsx/src/htmlxtojsx/nodes/animation-directive.ts b/packages/svelte2tsx/src/htmlxtojsx/nodes/animation-directive.ts
index 882ede55c..68296b4a3 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/nodes/animation-directive.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/nodes/animation-directive.ts
@@ -3,7 +3,7 @@ import { isQuote } from '../utils/node-utils';
 import { BaseDirective, BaseNode } from '../../interfaces';
 
 /**
- * animate:xxx(yyy)   --->   {...__sveltets_ensureAnimation(xxx(__sveltets_mapElementTag('..'),__sveltets_AnimationMove,(yyy)))}
+ * animate:xxx(yyy)   --->   {...__sveltets_1_ensureAnimation(xxx(__sveltets_1_mapElementTag('..'),__sveltets_1_AnimationMove,(yyy)))}
  */
 export function handleAnimateDirective(
     htmlx: string,
@@ -14,19 +14,19 @@ export function handleAnimateDirective(
     str.overwrite(
         attr.start,
         htmlx.indexOf(':', attr.start) + 1,
-        '{...__sveltets_ensureAnimation('
+        '{...__sveltets_1_ensureAnimation('
     );
 
-    const nodeType = `__sveltets_mapElementTag('${parent.name}')`;
+    const nodeType = `__sveltets_1_mapElementTag('${parent.name}')`;
 
     if (!attr.expression) {
-        str.appendLeft(attr.end, `(${nodeType},__sveltets_AnimationMove,{}))}`);
+        str.appendLeft(attr.end, `(${nodeType},__sveltets_1_AnimationMove,{}))}`);
         return;
     }
     str.overwrite(
         htmlx.indexOf(':', attr.start) + 1 + `${attr.name}`.length,
         attr.expression.start,
-        `(${nodeType},__sveltets_AnimationMove,(`
+        `(${nodeType},__sveltets_1_AnimationMove,(`
     );
     str.appendLeft(attr.expression.end, ')))');
     if (isQuote(htmlx[attr.end - 1])) {
diff --git a/packages/svelte2tsx/src/htmlxtojsx/nodes/attribute.ts b/packages/svelte2tsx/src/htmlxtojsx/nodes/attribute.ts
index c20995990..63c968a72 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/nodes/attribute.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/nodes/attribute.ts
@@ -89,7 +89,7 @@ export function handleAttribute(
 
     // Custom CSS property
     if (parent.type === 'InlineComponent' && attr.name.startsWith('--') && attr.value !== true) {
-        str.prependRight(attr.start, '{...__sveltets_cssProp({"');
+        str.prependRight(attr.start, '{...__sveltets_1_cssProp({"');
         buildTemplateString(attr, str, htmlx, '": `', '`})}');
         return;
     }
diff --git a/packages/svelte2tsx/src/htmlxtojsx/nodes/await.ts b/packages/svelte2tsx/src/htmlxtojsx/nodes/await.ts
index 2d65b6320..3d9f45aaf 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/nodes/await.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/nodes/await.ts
@@ -57,7 +57,7 @@ export function handleAwaitPending(
         return;
     }
     // no need to prepend ifcondition here as we know the then block is empty
-    str.appendLeft(pendingEnd, '__sveltets_awaitThen(_$$p, () => {<>');
+    str.appendLeft(pendingEnd, '__sveltets_1_awaitThen(_$$p, () => {<>');
 }
 
 export function handleAwaitThen(
@@ -71,7 +71,7 @@ export function handleAwaitThen(
     }
 
     // then value } | {:then value} | {await ..} .. {/await} ->
-    // __sveltets_awaitThen(_$$p, (value) => {(possibleIfCondition && )<>
+    // __sveltets_1_awaitThen(_$$p, (value) => {(possibleIfCondition && )<>
     let thenStart: number;
     let thenEnd: number;
     // then value } | {:then value}
@@ -93,10 +93,10 @@ export function handleAwaitThen(
     }
 
     if (awaitBlock.value) {
-        str.overwrite(thenStart, awaitBlock.value.start, '__sveltets_awaitThen(_$$p, (');
+        str.overwrite(thenStart, awaitBlock.value.start, '__sveltets_1_awaitThen(_$$p, (');
         str.overwrite(awaitBlock.value.end, thenEnd, `) => {${ifScope.addPossibleIfCondition()}<>`);
     } else {
-        const awaitThenFn = `__sveltets_awaitThen(_$$p, () => {${ifScope.addPossibleIfCondition()}<>`; // eslint-disable-line
+        const awaitThenFn = `__sveltets_1_awaitThen(_$$p, () => {${ifScope.addPossibleIfCondition()}<>`; // eslint-disable-line
         if (thenStart === thenEnd) {
             str.appendLeft(thenStart, awaitThenFn);
         } else {
diff --git a/packages/svelte2tsx/src/htmlxtojsx/nodes/binding.ts b/packages/svelte2tsx/src/htmlxtojsx/nodes/binding.ts
index 70570be17..a04394292 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/nodes/binding.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/nodes/binding.ts
@@ -25,7 +25,7 @@ export function handleBinding(
     //bind group on input
     if (attr.name == 'group' && el.name == 'input') {
         str.remove(attr.start, attr.expression.start);
-        str.appendLeft(attr.expression.start, '{...__sveltets_empty(');
+        str.appendLeft(attr.expression.start, '{...__sveltets_1_empty(');
 
         const endBrackets = ')}';
         if (isShortHandAttribute(attr)) {
@@ -49,7 +49,7 @@ export function handleBinding(
 
         if (thisType) {
             str.remove(attr.start, attr.expression.start);
-            str.appendLeft(attr.expression.start, `{...__sveltets_ensureType(${thisType}, `);
+            str.appendLeft(attr.expression.start, `{...__sveltets_1_ensureType(${thisType}, `);
             str.overwrite(attr.expression.end, attr.end, ')}');
             return;
         }
@@ -58,19 +58,19 @@ export function handleBinding(
     //one way binding
     if (oneWayBindingAttributes.has(attr.name) && el.type === 'Element') {
         str.remove(attr.start, attr.expression.start);
-        str.appendLeft(attr.expression.start, '{...__sveltets_empty(');
+        str.appendLeft(attr.expression.start, '{...__sveltets_1_empty(');
         if (isShortHandAttribute(attr)) {
             // eslint-disable-next-line max-len
             str.appendLeft(
                 attr.end,
-                `=__sveltets_instanceOf(${oneWayBindingAttributes.get(attr.name)}).${attr.name})}`
+                `=__sveltets_1_instanceOf(${oneWayBindingAttributes.get(attr.name)}).${attr.name})}`
             );
         } else {
             // eslint-disable-next-line max-len
             str.overwrite(
                 attr.expression.end,
                 attr.end,
-                `=__sveltets_instanceOf(${oneWayBindingAttributes.get(attr.name)}).${attr.name})}`
+                `=__sveltets_1_instanceOf(${oneWayBindingAttributes.get(attr.name)}).${attr.name})}`
             );
         }
         return;
diff --git a/packages/svelte2tsx/src/htmlxtojsx/nodes/class-directive.ts b/packages/svelte2tsx/src/htmlxtojsx/nodes/class-directive.ts
index 28edc264a..bdd4d2fda 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/nodes/class-directive.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/nodes/class-directive.ts
@@ -2,10 +2,10 @@ import MagicString from 'magic-string';
 import { BaseDirective } from '../../interfaces';
 
 /**
- * class:xx={yyy}   --->   {...__sveltets_ensureType(Boolean, !!(yyy))}
+ * class:xx={yyy}   --->   {...__sveltets_1_ensureType(Boolean, !!(yyy))}
  */
 export function handleClassDirective(str: MagicString, attr: BaseDirective): void {
-    str.overwrite(attr.start, attr.expression.start, '{...__sveltets_ensureType(Boolean, !!(');
+    str.overwrite(attr.start, attr.expression.start, '{...__sveltets_1_ensureType(Boolean, !!(');
     const endBrackets = '))}';
     if (attr.end !== attr.expression.end) {
         str.overwrite(attr.expression.end, attr.end, endBrackets);
diff --git a/packages/svelte2tsx/src/htmlxtojsx/nodes/each.ts b/packages/svelte2tsx/src/htmlxtojsx/nodes/each.ts
index 4293353bf..fd1ba9f82 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/nodes/each.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/nodes/each.ts
@@ -12,10 +12,10 @@ export function handleEach(
     ifScope: IfScope
 ): void {
     // {#each items as item,i (key)} ->
-    // {__sveltets_each(items, (item,i) => (key) && (possible if expression &&) <>
+    // {__sveltets_1_each(items, (item,i) => (key) && (possible if expression &&) <>
     const constRedeclares = ifScope.getConstDeclaration();
     const prefix = constRedeclares ? `{() => {${constRedeclares}() => ` : '';
-    str.overwrite(eachBlock.start, eachBlock.expression.start, `${prefix}{__sveltets_each(`);
+    str.overwrite(eachBlock.start, eachBlock.expression.start, `${prefix}{__sveltets_1_each(`);
     str.overwrite(eachBlock.expression.end, eachBlock.context.start, ', (');
 
     // {#each true, items as item}
diff --git a/packages/svelte2tsx/src/htmlxtojsx/nodes/event-handler.ts b/packages/svelte2tsx/src/htmlxtojsx/nodes/event-handler.ts
index c1c639ed9..84454a666 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/nodes/event-handler.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/nodes/event-handler.ts
@@ -5,7 +5,7 @@ import { BaseDirective, BaseNode } from '../../interfaces';
 /**
  * Transform on:xxx={yyy}
  * - For DOM elements: ---> onxxx={yyy}
- * - For Svelte components/special elements: ---> {__sveltets_instanceOf(..ComponentType..).$on("xxx", yyy)}
+ * - For Svelte components/special elements: ---> {__sveltets_1_instanceOf(..ComponentType..).$on("xxx", yyy)}
  */
 export function handleEventHandler(
     htmlx: string,
@@ -35,7 +35,7 @@ export function handleEventHandler(
     } else {
         if (attr.expression) {
             const on = 'on';
-            //for handler assignment, we change it to call to our __sveltets_ensureFunction
+            //for handler assignment, we change it to call to our __sveltets_1_ensureFunction
             str.appendRight(attr.start, `{${getInstanceType(parent, str.original)}.$`);
             const eventNameIndex = htmlx.indexOf(':', attr.start) + 1;
             str.overwrite(htmlx.indexOf(on, attr.start) + on.length, eventNameIndex, "('");
diff --git a/packages/svelte2tsx/src/htmlxtojsx/nodes/transition-directive.ts b/packages/svelte2tsx/src/htmlxtojsx/nodes/transition-directive.ts
index 3ca29e3b7..50eaaa594 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/nodes/transition-directive.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/nodes/transition-directive.ts
@@ -3,7 +3,7 @@ import { isQuote } from '../utils/node-utils';
 import { BaseDirective, BaseNode } from '../../interfaces';
 
 /**
- * transition:xxx(yyy)   --->   {...__sveltets_ensureTransition(xxx(__sveltets_mapElementTag('..'),(yyy)))}
+ * transition:xxx(yyy)   --->   {...__sveltets_1_ensureTransition(xxx(__sveltets_1_mapElementTag('..'),(yyy)))}
  */
 export function handleTransitionDirective(
     htmlx: string,
@@ -14,7 +14,7 @@ export function handleTransitionDirective(
     str.overwrite(
         attr.start,
         htmlx.indexOf(':', attr.start) + 1,
-        '{...__sveltets_ensureTransition('
+        '{...__sveltets_1_ensureTransition('
     );
 
     if (attr.modifiers.length) {
@@ -22,7 +22,7 @@ export function handleTransitionDirective(
         str.remove(local, attr.expression ? attr.expression.start : attr.end);
     }
 
-    const nodeType = `__sveltets_mapElementTag('${parent.name}')`;
+    const nodeType = `__sveltets_1_mapElementTag('${parent.name}')`;
 
     if (!attr.expression) {
         str.appendLeft(attr.end, `(${nodeType},{}))}`);
diff --git a/packages/svelte2tsx/src/htmlxtojsx/utils/node-utils.ts b/packages/svelte2tsx/src/htmlxtojsx/utils/node-utils.ts
index 73c29c392..6166bd958 100644
--- a/packages/svelte2tsx/src/htmlxtojsx/utils/node-utils.ts
+++ b/packages/svelte2tsx/src/htmlxtojsx/utils/node-utils.ts
@@ -4,7 +4,7 @@ import { surroundWithIgnoreComments } from '../../utils/ignore';
 
 export function getTypeForComponent(node: Node): string {
     if (node.name === 'svelte:component' || node.name === 'svelte:self') {
-        return '__sveltets_componentType()';
+        return '__sveltets_1_componentType()';
     } else {
         return node.name;
     }
@@ -16,7 +16,7 @@ export function getInstanceType(
     replacedPropValues: PropsShadowedByLet[] = []
 ): string {
     if (node.name === 'svelte:component' || node.name === 'svelte:self') {
-        return '__sveltets_instanceOf(__sveltets_componentType())';
+        return '__sveltets_1_instanceOf(__sveltets_1_componentType())';
     }
 
     const propsStr = getNameValuePairsFromAttributes(node, originalStr)
@@ -28,7 +28,7 @@ export function getInstanceType(
         })
         .join(', ');
     return surroundWithIgnoreComments(
-        `new ${node.name}({target: __sveltets_any(''), props: {${propsStr}}})`
+        `new ${node.name}({target: __sveltets_1_any(''), props: {${propsStr}}})`
     );
 }
 
@@ -54,7 +54,7 @@ export function getInstanceTypeForDefaultSlot(
 ): { str: string; shadowedProps: PropsShadowedByLet[] } {
     if (node.name === 'svelte:component' || node.name === 'svelte:self') {
         return {
-            str: '__sveltets_instanceOf(__sveltets_componentType())',
+            str: '__sveltets_1_instanceOf(__sveltets_1_componentType())',
             shadowedProps: []
         };
     }
@@ -77,7 +77,7 @@ export function getInstanceTypeForDefaultSlot(
         })
         .join(', ');
     const str = surroundWithIgnoreComments(
-        `new ${node.name}({target: __sveltets_any(''), props: {${propsStr}}})`
+        `new ${node.name}({target: __sveltets_1_any(''), props: {${propsStr}}})`
     );
     return { str, shadowedProps };
 }
@@ -157,7 +157,7 @@ export function getThisType(node: Node): string | undefined {
         case 'InlineComponent':
             return getTypeForComponent(node);
         case 'Element':
-            return `__sveltets_ctorOf(__sveltets_mapElementTag('${node.name}'))`;
+            return `__sveltets_1_ctorOf(__sveltets_1_mapElementTag('${node.name}'))`;
         case 'Body':
             return 'HTMLBodyElement';
         case 'Slot': // Web Components only
diff --git a/packages/svelte2tsx/src/index.ts b/packages/svelte2tsx/src/index.ts
index f147cbabb..1c32f786b 100644
--- a/packages/svelte2tsx/src/index.ts
+++ b/packages/svelte2tsx/src/index.ts
@@ -1 +1 @@
-export { svelte2tsx as default } from './svelte2tsx';
+export { svelte2tsx } from './svelte2tsx';
diff --git a/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts b/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts
index 663283051..1f9a1253d 100644
--- a/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts
@@ -141,7 +141,7 @@ function addSimpleComponentExport({
         statement =
             `\n\n${doc}export default class${
                 className ? ` ${className}` : ''
-            } extends createSvelte2TsxComponent(${propDef}) {` +
+            } extends __sveltets_1_createSvelte2TsxComponent(${propDef}) {` +
             exportedNames.createClassGetters() +
             (usesAccessors ? exportedNames.createClassAccessors() : '') +
             '\n}';
@@ -151,7 +151,7 @@ function addSimpleComponentExport({
 }
 
 function events(strictEvents: boolean, renderStr: string) {
-    return strictEvents ? renderStr : `__sveltets_with_any_event(${renderStr})`;
+    return strictEvents ? renderStr : `__sveltets_1_with_any_event(${renderStr})`;
 }
 
 function props(
@@ -161,10 +161,10 @@ function props(
     renderStr: string
 ) {
     if (isTsFile) {
-        return uses$$propsOr$$restProps ? `__sveltets_with_any(${renderStr})` : renderStr;
+        return uses$$propsOr$$restProps ? `__sveltets_1_with_any(${renderStr})` : renderStr;
     } else {
         const optionalProps = exportedNames.createOptionalPropsArray();
-        const partial = `__sveltets_partial${uses$$propsOr$$restProps ? '_with_any' : ''}`;
+        const partial = `__sveltets_1_partial${uses$$propsOr$$restProps ? '_with_any' : ''}`;
         return optionalProps.length > 0
             ? `${partial}([${optionalProps.join(',')}], ${renderStr})`
             : `${partial}(${renderStr})`;
diff --git a/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts b/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts
index 1e79de7d9..d24cbf995 100644
--- a/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts
@@ -34,15 +34,15 @@ export function createRenderFunction({
     let propsDecl = '';
 
     if (uses$$props) {
-        propsDecl += ' let $$props = __sveltets_allPropsType();';
+        propsDecl += ' let $$props = __sveltets_1_allPropsType();';
     }
     if (uses$$restProps) {
-        propsDecl += ' let $$restProps = __sveltets_restPropsType();';
+        propsDecl += ' let $$restProps = __sveltets_1_restPropsType();';
     }
 
     if (uses$$slots) {
         propsDecl +=
-            ' let $$slots = __sveltets_slotsType({' +
+            ' let $$slots = __sveltets_1_slotsType({' +
             Array.from(slots.keys())
                 .map((name) => `'${name}': ''`)
                 .join(', ') +
@@ -53,7 +53,7 @@ export function createRenderFunction({
         slots.size > 0 && mode !== 'dts'
             ? '\n' +
               surroundWithIgnoreComments(
-                  ';const __sveltets_ensureSlot = __sveltets_createEnsureSlot' +
+                  ';const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot' +
                       (uses$$SlotsInterface ? '<$$Slots>' : '') +
                       '();'
               )
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ComponentEvents.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ComponentEvents.ts
index c56b36134..4e3fe04bf 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/ComponentEvents.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/ComponentEvents.ts
@@ -140,7 +140,7 @@ class ComponentEventsFromInterface {
         if (!dispatcherTyping) {
             this.str.prependLeft(
                 dispatcherCreationExpr.expression.getEnd() + this.astOffset,
-                '<__Sveltets_CustomEvents<$$Events>>'
+                '<__sveltets_1_CustomEvents<$$Events>>'
             );
         }
     }
@@ -290,11 +290,11 @@ class ComponentEventsFromEventsMap {
                     .map(
                         (dispatcher) =>
                             dispatcher.typing &&
-                            `...__sveltets_toEventTypings<${dispatcher.typing}>()`
+                            `...__sveltets_1_toEventTypings<${dispatcher.typing}>()`
                     )
                     .filter((str) => !!str),
                 ...this.eventHandler.bubbledEventsAsStrings(),
-                ...[...this.dispatchedEvents.keys()].map((e) => `'${e}': __sveltets_customEvent`)
+                ...[...this.dispatchedEvents.keys()].map((e) => `'${e}': __sveltets_1_customEvent`)
             ].join(', ') +
             '}'
         );
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
index 3f7190de0..122e067b3 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts
@@ -94,7 +94,7 @@ export class ExportedNames {
     }
 
     /**
-     * Appends `prop = __sveltets_any(prop)`  to given declaration in order to
+     * Appends `prop = __sveltets_1_any(prop)`  to given declaration in order to
      * trick TS into widening the type. Else for example `let foo: string | undefined = undefined`
      * is narrowed to `undefined` by TS.
      */
@@ -124,7 +124,7 @@ export class ExportedNames {
             const name = identifier.getText();
             const end = declaration.end + this.astOffset;
 
-            this.str.appendLeft(end, `;${name} = __sveltets_any(${name});`);
+            this.str.appendLeft(end, `;${name} = __sveltets_1_any(${name});`);
         };
 
         const findComma = (target: ts.Node) =>
@@ -317,12 +317,12 @@ export class ExportedNames {
             //   count as optional, but semantically speaking it is still correctly implementing the interface
             // - The check if $$Props is assignable to exports is necessary to make sure no extraneous props
             //   are defined and that no props are required that should be optional
-            // __sveltets_ensureRightProps needs to be declared in a way that doesn't affect the type result of props
+            // __sveltets_1_ensureRightProps needs to be declared in a way that doesn't affect the type result of props
             return (
-                '{...__sveltets_ensureRightProps<{' +
+                '{...__sveltets_1_ensureRightProps<{' +
                 this.createReturnElementsType(lets).join(',') +
-                '}>(__sveltets_any("") as $$Props), ' +
-                '...__sveltets_ensureRightProps<Partial<$$Props>>({' +
+                '}>(__sveltets_1_any("") as $$Props), ' +
+                '...__sveltets_1_ensureRightProps<Partial<$$Props>>({' +
                 this.createReturnElements(lets, false).join(',') +
                 '}), ...{} as unknown as $$Props, ...{' +
                 this.createReturnElements(others, false).join(', ') +
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ImplicitStoreValues.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ImplicitStoreValues.ts
index cd6d0d36f..8931e7325 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/ImplicitStoreValues.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/ImplicitStoreValues.ts
@@ -7,7 +7,7 @@ import { extractIdentifiers, getNamesFromLabeledStatement } from '../utils/tsAst
  * Tracks all store-usages as well as all variable declarations and imports in the component.
  *
  * In the modification-step at the end, all variable declartaions and imports which
- * were used as stores are appended with `let $xx = __sveltets_store_get(xx)` to create the store variables.
+ * were used as stores are appended with `let $xx = __sveltets_1_store_get(xx)` to create the store variables.
  */
 export class ImplicitStoreValues {
     private accessedStores = new Set<string>();
@@ -26,7 +26,7 @@ export class ImplicitStoreValues {
 
     /**
      * All variable declartaions and imports which
-     * were used as stores are appended with `let $xx = __sveltets_store_get(xx)` to create the store variables.
+     * were used as stores are appended with `let $xx = __sveltets_1_store_get(xx)` to create the store variables.
      */
     public modifyCode(astOffset: number, str: MagicString) {
         this.variableDeclarations.forEach((node) =>
@@ -111,6 +111,6 @@ export class ImplicitStoreValues {
     }
 
     private createStoreDeclaration(storeName: string): string {
-        return `;let $${storeName} = __sveltets_store_get(${storeName});`;
+        return `;let $${storeName} = __sveltets_1_store_get(${storeName});`;
     }
 }
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ImplicitTopLevelNames.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ImplicitTopLevelNames.ts
index 71596cfaf..1771100de 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/ImplicitTopLevelNames.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/ImplicitTopLevelNames.ts
@@ -44,7 +44,7 @@ export class ImplicitTopLevelNames {
             this.str.appendRight(end, ')');
         }
 
-        this.str.prependLeft(start, '__sveltets_invalidate(() => ');
+        this.str.prependLeft(start, '__sveltets_1_invalidate(() => ');
         preprendStr(this.str, end, ')');
         // Not adding ';' at the end because right now this function is only invoked
         // in situations where there is a line break of ; guaranteed to be present (else the code is invalid)
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/Stores.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/Stores.ts
index 4ee4396fa..06faee332 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/Stores.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/Stores.ts
@@ -55,11 +55,11 @@ export function handleStore(node: Node, parent: Node, str: MagicString): void {
         return;
     }
 
-    // we change "$store" references into "(__sveltets_store_get(store), $store)"
+    // we change "$store" references into "(__sveltets_1_store_get(store), $store)"
     // - in order to get ts errors if store is not assignable to SvelteStore
     // - use $store variable defined above to get ts flow control
     const dollar = str.original.indexOf('$', node.start);
-    str.overwrite(dollar, dollar + 1, '(__sveltets_store_get(', { contentOnly: true });
+    str.overwrite(dollar, dollar + 1, '(__sveltets_1_store_get(', { contentOnly: true });
     str.prependLeft(node.end, `), $${storename})`);
 }
 
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/event-handler.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/event-handler.ts
index e0e776baa..05b04e17e 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/event-handler.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/event-handler.ts
@@ -51,8 +51,8 @@ export class EventHandler {
     }
 
     private handleEventHandlerBubble(parent: Node, eventName: string): void {
-        const componentEventDef = `__sveltets_instanceOf(${parent.name})`;
-        const exp = `__sveltets_bubbleEventDef(${componentEventDef}.$$events_def, '${eventName}')`;
+        const componentEventDef = `__sveltets_1_instanceOf(${parent.name})`;
+        const exp = `__sveltets_1_bubbleEventDef(${componentEventDef}.$$events_def, '${eventName}')`;
         const exist = this.bubbledEvents.get(eventName);
         this.bubbledEvents.set(eventName, exist ? [].concat(exist, exp) : exp);
     }
@@ -61,11 +61,11 @@ export class EventHandler {
 function getEventDefExpressionForNonCompoent(eventName: string, ele: Node) {
     switch (ele.type) {
         case 'Element':
-            return `__sveltets_mapElementEvent('${eventName}')`;
+            return `__sveltets_1_mapElementEvent('${eventName}')`;
         case 'Body':
-            return `__sveltets_mapBodyEvent('${eventName}')`;
+            return `__sveltets_1_mapBodyEvent('${eventName}')`;
         case 'Window':
-            return `__sveltets_mapWindowEvent('${eventName}')`;
+            return `__sveltets_1_mapWindowEvent('${eventName}')`;
         default:
             break;
     }
@@ -73,6 +73,6 @@ function getEventDefExpressionForNonCompoent(eventName: string, ele: Node) {
 
 function eventMapEntryToString([eventName, expression]: [string, string | string[]]) {
     return `'${eventName}':${
-        Array.isArray(expression) ? `__sveltets_unionType(${expression.join(',')})` : expression
+        Array.isArray(expression) ? `__sveltets_1_unionType(${expression.join(',')})` : expression
     }`;
 }
diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/slot.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/slot.ts
index ea4b3a217..fc154259f 100644
--- a/packages/svelte2tsx/src/svelte2tsx/nodes/slot.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/nodes/slot.ts
@@ -69,7 +69,7 @@ export class SlotHandler {
         const owner = scope.getOwner(name);
 
         if (owner?.type === 'CatchBlock') {
-            return '__sveltets_any({})';
+            return '__sveltets_1_any({})';
         }
 
         // list.map(list => list.someProperty)
@@ -77,11 +77,11 @@ export class SlotHandler {
         else if (owner?.type === 'ThenBlock') {
             const resolvedExpression = this.resolveExpression(initExpression, scope.parent);
 
-            return `__sveltets_unwrapPromiseLike(${resolvedExpression})`;
+            return `__sveltets_1_unwrapPromiseLike(${resolvedExpression})`;
         } else if (owner?.type === 'EachBlock') {
             const resolvedExpression = this.resolveExpression(initExpression, scope.parent);
 
-            return `__sveltets_unwrapArr(${resolvedExpression})`;
+            return `__sveltets_1_unwrapArr(${resolvedExpression})`;
         }
         return null;
     }
@@ -272,5 +272,5 @@ function getSingleSlotDef(componentNode: Node, slotName: string) {
     // in htmlx2jsx, we cannot know for sure that all properties we would generate the component with exist
     // in this scope, some could have been generated through each/await blocks or other lets.
     const componentType = getTypeForComponent(componentNode);
-    return `__sveltets_instanceOf(${componentType}).$$slot_def['${slotName}']`;
+    return `__sveltets_1_instanceOf(${componentType}).$$slot_def['${slotName}']`;
 }
diff --git a/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts b/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
index 8ef083180..7d65deed6 100644
--- a/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts
@@ -159,12 +159,12 @@ export function processInstanceScriptContent(
             }
         }
 
-        // we change "$store" references into "(__sveltets_store_get(store), $store)"
+        // we change "$store" references into "(__sveltets_1_store_get(store), $store)"
         // - in order to get ts errors if store is not assignable to SvelteStore
         // - use $store variable defined above to get ts flow control
         const dollar = str.original.indexOf('$', ident.getStart() + astOffset);
         const getPrefix = isFirstInAnExpressionStatement(ident) ? ';' : '';
-        str.overwrite(dollar, dollar + 1, getPrefix + '(__sveltets_store_get(');
+        str.overwrite(dollar, dollar + 1, getPrefix + '(__sveltets_1_store_get(');
         str.prependLeft(ident.end + astOffset, `), $${storename})`);
     };
 
diff --git a/packages/svelte2tsx/src/svelte2tsx/svelteShims.ts b/packages/svelte2tsx/src/svelte2tsx/svelteShims.ts
index 467006f93..1557ed416 100644
--- a/packages/svelte2tsx/src/svelte2tsx/svelteShims.ts
+++ b/packages/svelte2tsx/src/svelte2tsx/svelteShims.ts
@@ -101,109 +101,109 @@ type SvelteStore<T> = { subscribe: (run: (value: T) => any, invalidate?: any) =>
 type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
 
 type KeysMatching<Obj, V> = {[K in keyof Obj]-?: Obj[K] extends V ? K : never}[keyof Obj]
-declare type __Sveltets_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
+declare type __sveltets_1_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
 
 declare var process: NodeJS.Process & { browser: boolean }
-declare var __sveltets_AnimationMove: { from: DOMRect, to: DOMRect }
-
-declare function __sveltets_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
-declare function __sveltets_ensureAction(actionCall: SvelteActionReturnType): {};
-declare function __sveltets_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
-declare function __sveltets_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
-declare function __sveltets_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
-declare function __sveltets_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
-declare function __sveltets_ensureRightProps<Props>(props: Props): {};
-declare function __sveltets_cssProp(prop: Record<string, any>): {};
-declare function __sveltets_ctorOf<T>(type: T): AConstructorTypeOf<T>;
-declare function __sveltets_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
-declare function __sveltets_allPropsType(): SvelteAllProps
-declare function __sveltets_restPropsType(): SvelteRestProps
-declare function __sveltets_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
+declare var __sveltets_1_AnimationMove: { from: DOMRect, to: DOMRect }
+
+declare function __sveltets_1_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
+declare function __sveltets_1_ensureAction(actionCall: SvelteActionReturnType): {};
+declare function __sveltets_1_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
+declare function __sveltets_1_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
+declare function __sveltets_1_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
+declare function __sveltets_1_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
+declare function __sveltets_1_ensureRightProps<Props>(props: Props): {};
+declare function __sveltets_1_cssProp(prop: Record<string, any>): {};
+declare function __sveltets_1_ctorOf<T>(type: T): AConstructorTypeOf<T>;
+declare function __sveltets_1_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
+declare function __sveltets_1_allPropsType(): SvelteAllProps
+declare function __sveltets_1_restPropsType(): SvelteRestProps
+declare function __sveltets_1_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
 
 // Overload of the following two functions is necessary.
 // An empty array of optionalProps makes OptionalProps type any, which means we lose the prop typing.
 // optionalProps need to be first or its type cannot be infered correctly.
 
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props>, events: Events, slots: Slots }
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>>, events: Events, slots: Slots }
 
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props> & SvelteAllProps, events: Events, slots: Slots }
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>> & SvelteAllProps, events: Events, slots: Slots }
 
 
-declare function __sveltets_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props & SvelteAllProps, events: Events, slots: Slots }
 
-declare function __sveltets_with_any_event<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any_event<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props, events: Events & {[evt: string]: CustomEvent<any>;}, slots: Slots }
 
-declare function __sveltets_store_get<T = any>(store: SvelteStore<T>): T
-declare function __sveltets_any(dummy: any): any;
-declare function __sveltets_empty(dummy: any): {};
-declare function __sveltets_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
-declare function __sveltets_invalidate<T>(getValue: () => T): T
+declare function __sveltets_1_store_get<T = any>(store: SvelteStore<T>): T
+declare function __sveltets_1_any(dummy: any): any;
+declare function __sveltets_1_empty(dummy: any): {};
+declare function __sveltets_1_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
+declare function __sveltets_1_invalidate<T>(getValue: () => T): T
 
-declare function __sveltets_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
+declare function __sveltets_1_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
     event: K
 ): HTMLBodyElementEventMap[K];
-declare function __sveltets_mapBodyEvent<K extends keyof WindowEventMap>(
+declare function __sveltets_1_mapBodyEvent<K extends keyof WindowEventMap>(
     event: K
 ): WindowEventMap[K];
-declare function __sveltets_mapElementEvent<K extends keyof HTMLElementEventMap>(
+declare function __sveltets_1_mapElementEvent<K extends keyof HTMLElementEventMap>(
     event: K
 ): HTMLElementEventMap[K];
-declare function __sveltets_mapElementTag<K extends keyof ElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof ElementTagNameMap>(
     tag: K
 ): ElementTagNameMap[K];
-declare function __sveltets_mapElementTag<K extends keyof SVGElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof SVGElementTagNameMap>(
     tag: K
 ): SVGElementTagNameMap[K];
-declare function __sveltets_mapElementTag(
+declare function __sveltets_1_mapElementTag(
     tag: any
 ): HTMLElement;
 
-declare function __sveltets_bubbleEventDef<Events, K extends keyof Events>(
+declare function __sveltets_1_bubbleEventDef<Events, K extends keyof Events>(
     events: Events, eventKey: K
 ): Events[K];
-declare function __sveltets_bubbleEventDef(
+declare function __sveltets_1_bubbleEventDef(
     events: any, eventKey: string
 ): any;
 
-declare const __sveltets_customEvent: CustomEvent<any>;
-declare function __sveltets_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
+declare const __sveltets_1_customEvent: CustomEvent<any>;
+declare function __sveltets_1_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
 
-declare function __sveltets_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
-declare function __sveltets_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
-declare function __sveltets_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
-declare function __sveltets_unionType(...types: any[]): any;
+declare function __sveltets_1_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
+declare function __sveltets_1_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
+declare function __sveltets_1_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
+declare function __sveltets_1_unionType(...types: any[]): any;
 
-declare function __sveltets_awaitThen<T>(
+declare function __sveltets_1_awaitThen<T>(
     promise: T,
     onfulfilled: (value: T extends PromiseLike<infer U> ? U : T) => any,
     onrejected?: (value: T extends PromiseLike<any> ? any : never) => any
 ): any;
 
-declare function __sveltets_each<T>(
+declare function __sveltets_1_each<T>(
     array: ArrayLike<T>,
     callbackfn: (value: T, index: number) => any
 ): any;
 
-declare function createSvelte2TsxComponent<Props, Events, Slots>(
+declare function __sveltets_1_createSvelte2TsxComponent<Props, Events, Slots>(
     render: {props: Props, events: Events, slots: Slots }
 ): SvelteComponentConstructor<Svelte2TsxComponent<Props, Events, Slots>,Svelte2TsxComponentConstructorParameters<Props>>;
 
-declare function __sveltets_unwrapArr<T>(arr: ArrayLike<T>): T
-declare function __sveltets_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
+declare function __sveltets_1_unwrapArr<T>(arr: ArrayLike<T>): T
+declare function __sveltets_1_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
 `;
diff --git a/packages/svelte2tsx/svelte-shims.d.ts b/packages/svelte2tsx/svelte-shims.d.ts
index dfe80d151..3cc64e43e 100644
--- a/packages/svelte2tsx/svelte-shims.d.ts
+++ b/packages/svelte2tsx/svelte-shims.d.ts
@@ -1,3 +1,8 @@
+// Whenever a ambient declaration changes, its number should be increased
+// This way, we avoid the situation where multiple ambient versions of svelte2tsx
+// are loaded and their declarations conflict each other
+// See https://github.com/sveltejs/language-tools/issues/1059 for an example bug that stems from it
+
 declare module '*.svelte' {
     export default Svelte2TsxComponent
 }
@@ -102,108 +107,108 @@ type SvelteStore<T> = { subscribe: (run: (value: T) => any, invalidate?: any) =>
 type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
 
 type KeysMatching<Obj, V> = {[K in keyof Obj]-?: Obj[K] extends V ? K : never}[keyof Obj]
-declare type __Sveltets_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
+declare type __sveltets_1_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
 
 declare var process: NodeJS.Process & { browser: boolean }
-declare var __sveltets_AnimationMove: { from: DOMRect, to: DOMRect }
-
-declare function __sveltets_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
-declare function __sveltets_ensureAction(actionCall: SvelteActionReturnType): {};
-declare function __sveltets_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
-declare function __sveltets_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
-declare function __sveltets_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
-declare function __sveltets_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
-declare function __sveltets_ensureRightProps<Props>(props: Props): {};
-declare function __sveltets_cssProp(prop: Record<string, any>): {};
-declare function __sveltets_ctorOf<T>(type: T): AConstructorTypeOf<T>;
-declare function __sveltets_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
-declare function __sveltets_allPropsType(): SvelteAllProps
-declare function __sveltets_restPropsType(): SvelteRestProps
-declare function __sveltets_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
+declare var __sveltets_1_AnimationMove: { from: DOMRect, to: DOMRect }
+
+declare function __sveltets_1_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
+declare function __sveltets_1_ensureAction(actionCall: SvelteActionReturnType): {};
+declare function __sveltets_1_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
+declare function __sveltets_1_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
+declare function __sveltets_1_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
+declare function __sveltets_1_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
+declare function __sveltets_1_ensureRightProps<Props>(props: Props): {};
+declare function __sveltets_1_cssProp(prop: Record<string, any>): {};
+declare function __sveltets_1_ctorOf<T>(type: T): AConstructorTypeOf<T>;
+declare function __sveltets_1_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
+declare function __sveltets_1_allPropsType(): SvelteAllProps
+declare function __sveltets_1_restPropsType(): SvelteRestProps
+declare function __sveltets_1_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
 
 // Overload of the following two functions is necessary.
 // An empty array of optionalProps makes OptionalProps type any, which means we lose the prop typing.
 // optionalProps need to be first or its type cannot be infered correctly.
 
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props>, events: Events, slots: Slots }
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>>, events: Events, slots: Slots }
 
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props> & SvelteAllProps, events: Events, slots: Slots }
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>> & SvelteAllProps, events: Events, slots: Slots }
 
 
-declare function __sveltets_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props & SvelteAllProps, events: Events, slots: Slots }
 
-declare function __sveltets_with_any_event<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any_event<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props, events: Events & {[evt: string]: CustomEvent<any>;}, slots: Slots }
 
-declare function __sveltets_store_get<T = any>(store: SvelteStore<T>): T
-declare function __sveltets_any(dummy: any): any;
-declare function __sveltets_empty(dummy: any): {};
-declare function __sveltets_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
-declare function __sveltets_invalidate<T>(getValue: () => T): T
+declare function __sveltets_1_store_get<T = any>(store: SvelteStore<T>): T
+declare function __sveltets_1_any(dummy: any): any;
+declare function __sveltets_1_empty(dummy: any): {};
+declare function __sveltets_1_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
+declare function __sveltets_1_invalidate<T>(getValue: () => T): T
 
-declare function __sveltets_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
+declare function __sveltets_1_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
     event: K
 ): HTMLBodyElementEventMap[K];
-declare function __sveltets_mapBodyEvent<K extends keyof WindowEventMap>(
+declare function __sveltets_1_mapBodyEvent<K extends keyof WindowEventMap>(
     event: K
 ): WindowEventMap[K];
-declare function __sveltets_mapElementEvent<K extends keyof HTMLElementEventMap>(
+declare function __sveltets_1_mapElementEvent<K extends keyof HTMLElementEventMap>(
     event: K
 ): HTMLElementEventMap[K];
-declare function __sveltets_mapElementTag<K extends keyof ElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof ElementTagNameMap>(
     tag: K
 ): ElementTagNameMap[K];
-declare function __sveltets_mapElementTag<K extends keyof SVGElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof SVGElementTagNameMap>(
     tag: K
 ): SVGElementTagNameMap[K];
-declare function __sveltets_mapElementTag(
+declare function __sveltets_1_mapElementTag(
     tag: any
 ): HTMLElement;
 
-declare function __sveltets_bubbleEventDef<Events, K extends keyof Events>(
+declare function __sveltets_1_bubbleEventDef<Events, K extends keyof Events>(
     events: Events, eventKey: K
 ): Events[K];
-declare function __sveltets_bubbleEventDef(
+declare function __sveltets_1_bubbleEventDef(
     events: any, eventKey: string
 ): any;
 
-declare const __sveltets_customEvent: CustomEvent<any>;
-declare function __sveltets_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
+declare const __sveltets_1_customEvent: CustomEvent<any>;
+declare function __sveltets_1_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
 
-declare function __sveltets_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
-declare function __sveltets_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
-declare function __sveltets_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
-declare function __sveltets_unionType(...types: any[]): any;
+declare function __sveltets_1_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
+declare function __sveltets_1_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
+declare function __sveltets_1_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
+declare function __sveltets_1_unionType(...types: any[]): any;
 
-declare function __sveltets_awaitThen<T>(
+declare function __sveltets_1_awaitThen<T>(
     promise: T,
     onfulfilled: (value: T extends PromiseLike<infer U> ? U : T) => any,
     onrejected?: (value: T extends PromiseLike<any> ? any : never) => any
 ): any;
 
-declare function __sveltets_each<T>(
+declare function __sveltets_1_each<T>(
     array: ArrayLike<T>,
     callbackfn: (value: T, index: number) => any
 ): any;
 
-declare function createSvelte2TsxComponent<Props, Events, Slots>(
+declare function __sveltets_1_createSvelte2TsxComponent<Props, Events, Slots>(
     render: {props: Props, events: Events, slots: Slots }
 ): SvelteComponentConstructor<Svelte2TsxComponent<Props, Events, Slots>,Svelte2TsxComponentConstructorParameters<Props>>;
 
-declare function __sveltets_unwrapArr<T>(arr: ArrayLike<T>): T
-declare function __sveltets_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
+declare function __sveltets_1_unwrapArr<T>(arr: ArrayLike<T>): T
+declare function __sveltets_1_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/action-bare/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/action-bare/expected.jsx
index ba37fc9be..40e25f16b 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/action-bare/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/action-bare/expected.jsx
@@ -1 +1 @@
-<><h1 {...__sveltets_ensureAction(blink(__sveltets_mapElementTag('h1')))}>Hello</h1></>
+<><h1 {...__sveltets_1_ensureAction(blink(__sveltets_1_mapElementTag('h1')))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/action-nested/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/action-nested/expected.jsx
index 4be39f1f8..5f6f46aa8 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/action-nested/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/action-nested/expected.jsx
@@ -1,6 +1,6 @@
-<><svg {...__sveltets_ensureAction(svgAction(__sveltets_mapElementTag('svg')))}></svg>
-<div {...__sveltets_ensureAction(divAction(__sveltets_mapElementTag('div')))}>
-  <input {...__sveltets_ensureAction(action(__sveltets_mapElementTag('input')))} />
-  <p {...__sveltets_ensureAction(pAction(__sveltets_mapElementTag('p')))}></p>
-  <unknownTag {...__sveltets_ensureAction(unknownAction(__sveltets_mapElementTag('unknownTag')))}></unknownTag>
+<><svg {...__sveltets_1_ensureAction(svgAction(__sveltets_1_mapElementTag('svg')))}></svg>
+<div {...__sveltets_1_ensureAction(divAction(__sveltets_1_mapElementTag('div')))}>
+  <input {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('input')))} />
+  <p {...__sveltets_1_ensureAction(pAction(__sveltets_1_mapElementTag('p')))}></p>
+  <unknownTag {...__sveltets_1_ensureAction(unknownAction(__sveltets_1_mapElementTag('unknownTag')))}></unknownTag>
 </div></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/action-params/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/action-params/expected.jsx
index a02050ded..84e8ce87f 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/action-params/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/action-params/expected.jsx
@@ -1,3 +1,3 @@
-<><h1 {...__sveltets_ensureAction(blink(__sveltets_mapElementTag('h1'),(500,2)))}>Hello</h1>
-<h1 {...__sveltets_ensureAction(blink(__sveltets_mapElementTag('h1'),(500,2)))}>Hello</h1>
-<h1 {...__sveltets_ensureAction(blink(__sveltets_mapElementTag('h1'),(500,2)))}>Hello</h1></>
+<><h1 {...__sveltets_1_ensureAction(blink(__sveltets_1_mapElementTag('h1'),(500,2)))}>Hello</h1>
+<h1 {...__sveltets_1_ensureAction(blink(__sveltets_1_mapElementTag('h1'),(500,2)))}>Hello</h1>
+<h1 {...__sveltets_1_ensureAction(blink(__sveltets_1_mapElementTag('h1'),(500,2)))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/animation-bare/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/animation-bare/expected.jsx
index 224538902..cfcd82655 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/animation-bare/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/animation-bare/expected.jsx
@@ -1 +1 @@
-<><h1 {...__sveltets_ensureAnimation(blink(__sveltets_mapElementTag('h1'),__sveltets_AnimationMove,{}))}>Hello</h1></>
+<><h1 {...__sveltets_1_ensureAnimation(blink(__sveltets_1_mapElementTag('h1'),__sveltets_1_AnimationMove,{}))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/animation-params/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/animation-params/expected.jsx
index 47505c0ad..3605b3969 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/animation-params/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/animation-params/expected.jsx
@@ -1,4 +1,3 @@
-<><h1 {...__sveltets_ensureAnimation(blink(__sveltets_mapElementTag('h1'),__sveltets_AnimationMove,({y: 50, duration: 500})))}>Hello</h1>
-<h1 {...__sveltets_ensureAnimation(blink(__sveltets_mapElementTag('h1'),__sveltets_AnimationMove,({y: 50, duration: 500})))}>Hello</h1>
-<h1 {...__sveltets_ensureAnimation(blink(__sveltets_mapElementTag('h1'),__sveltets_AnimationMove,({y: 50, duration: 500})))}>Hello</h1></>
-
+<><h1 {...__sveltets_1_ensureAnimation(blink(__sveltets_1_mapElementTag('h1'),__sveltets_1_AnimationMove,({y: 50, duration: 500})))}>Hello</h1>
+<h1 {...__sveltets_1_ensureAnimation(blink(__sveltets_1_mapElementTag('h1'),__sveltets_1_AnimationMove,({y: 50, duration: 500})))}>Hello</h1>
+<h1 {...__sveltets_1_ensureAnimation(blink(__sveltets_1_mapElementTag('h1'),__sveltets_1_AnimationMove,({y: 50, duration: 500})))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-basic-catch/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-basic-catch/expected.jsx
index fcc1fb770..2ed8f6224 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-basic-catch/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-basic-catch/expected.jsx
@@ -1,5 +1,5 @@
-<>{() => {let _$$p = (somePromise); __sveltets_awaitThen(_$$p, (value) => {<>
+<>{() => {let _$$p = (somePromise); __sveltets_1_awaitThen(_$$p, (value) => {<>
     <h1>Promise Resolved</h1>
 </>}, () => {<>
     <h2>Promise Errored</h2>
-</>})}}</>
+</>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-basic/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-basic/expected.jsx
index 10fc51664..9a06c73e7 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-basic/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-basic/expected.jsx
@@ -1,9 +1,9 @@
-<>{() => {let _$$p = (somePromise); __sveltets_awaitThen(_$$p, (value) => {<>
+<>{() => {let _$$p = (somePromise); __sveltets_1_awaitThen(_$$p, (value) => {<>
     <h1>Promise Resolved</h1>
 </>})}}
 
 {() => {let _$$p = (somePromise); <>
     <h1>Loading...</h1>
-</>; __sveltets_awaitThen(_$$p, () => {<>
+</>; __sveltets_1_awaitThen(_$$p, () => {<>
     <h1>Promise Resolved</h1>
-</>})}}</>
+</>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-array/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-array/expected.jsx
index 5880240d8..c05acbe23 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-array/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-array/expected.jsx
@@ -1,7 +1,7 @@
 <>{() => {let _$$p = (thePromise); <>
     loading
-</>; __sveltets_awaitThen(_$$p, ([ a, b ]) => {<>
+</>; __sveltets_1_awaitThen(_$$p, ([ a, b ]) => {<>
     then
 </>}, ([c, [d, e]]) => {<>
     catch
-</>})}}</>
+</>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-default/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-default/expected.jsx
index 43c0ff4d5..fbcafbd1c 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-default/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-default/expected.jsx
@@ -1,19 +1,19 @@
-<>{() => {let _$$p = (object); __sveltets_awaitThen(_$$p, ({ a = 3, b = 4, c }) => {<>
+<>{() => {let _$$p = (object); __sveltets_1_awaitThen(_$$p, ({ a = 3, b = 4, c }) => {<>
     then
 </>})}}
 
-{() => {let _$$p = (array); __sveltets_awaitThen(_$$p, ([a, b, c = 3]) => {<>
+{() => {let _$$p = (array); __sveltets_1_awaitThen(_$$p, ([a, b, c = 3]) => {<>
     then
 </>})}}
 
-{() => {let _$$p = (objectReject); __sveltets_awaitThen(_$$p, (value) => {<>
+{() => {let _$$p = (objectReject); __sveltets_1_awaitThen(_$$p, (value) => {<>
     then
 </>}, ({ a = 3, b = 4, c }) => {<>
     catch
 </>})}}
 
-{() => {let _$$p = (arrayReject); __sveltets_awaitThen(_$$p, (value) => {<>
+{() => {let _$$p = (arrayReject); __sveltets_1_awaitThen(_$$p, (value) => {<>
     then
 </>}, ([a, b, c = 3]) => {<>
     catch
-</>})}}</>
+</>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-object/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-object/expected.jsx
index fd2ff3247..e6f3b93b5 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-object/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-object/expected.jsx
@@ -1,7 +1,7 @@
 <>{() => {let _$$p = (thePromise); <>
     loading
-</>; __sveltets_awaitThen(_$$p, ({ result, error }) => {<>
+</>; __sveltets_1_awaitThen(_$$p, ({ result, error }) => {<>
     then
 </>}, ({ error: { message, code } }) => {<>
     catch
-</>})}}</>
+</>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-rest/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-rest/expected.jsx
index 128ea8adc..ae5f18a9e 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-rest/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-destruct-rest/expected.jsx
@@ -1,19 +1,19 @@
-<>{() => {let _$$p = (object); __sveltets_awaitThen(_$$p, ({ a, ...rest }) => {<>
+<>{() => {let _$$p = (object); __sveltets_1_awaitThen(_$$p, ({ a, ...rest }) => {<>
     then
 </>})}}
 
-{() => {let _$$p = (array); __sveltets_awaitThen(_$$p, ([a, b, ...rest]) => {<>
+{() => {let _$$p = (array); __sveltets_1_awaitThen(_$$p, ([a, b, ...rest]) => {<>
     then
 </>})}}
 
-{() => {let _$$p = (objectReject); __sveltets_awaitThen(_$$p, (value) => {<>
+{() => {let _$$p = (objectReject); __sveltets_1_awaitThen(_$$p, (value) => {<>
     then
 </>}, ({ a, ...rest }) => {<>
     catch
 </>})}}
 
-{() => {let _$$p = (arrayReject); __sveltets_awaitThen(_$$p, (value) => {<>
+{() => {let _$$p = (arrayReject); __sveltets_1_awaitThen(_$$p, (value) => {<>
     then
 </>}, ([a, b, ...rest]) => {<>
     catch
-</>})}}</>
+</>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-no-then/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-no-then/expected.jsx
index e76443234..c4c12a073 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-no-then/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-no-then/expected.jsx
@@ -1,9 +1,9 @@
 <>{() => {let _$$p = (aPromise); <>
     <div>Spinner...</div>
-</>; __sveltets_awaitThen(_$$p, () => {<></>})}}
+</>; __sveltets_1_awaitThen(_$$p, () => {<></>})}}
 
 {() => {let _$$p = (aPromise); <>
   <div>Spinner...</div>
-</>; __sveltets_awaitThen(_$$p, () => {<></>}, (error) => {<>
+</>; __sveltets_1_awaitThen(_$$p, () => {<></>}, (error) => {<>
   <div>Ups: {error}</div>
 </>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-parentheses/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-parentheses/expected.jsx
index 10fc51664..9a06c73e7 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-parentheses/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-parentheses/expected.jsx
@@ -1,9 +1,9 @@
-<>{() => {let _$$p = (somePromise); __sveltets_awaitThen(_$$p, (value) => {<>
+<>{() => {let _$$p = (somePromise); __sveltets_1_awaitThen(_$$p, (value) => {<>
     <h1>Promise Resolved</h1>
 </>})}}
 
 {() => {let _$$p = (somePromise); <>
     <h1>Loading...</h1>
-</>; __sveltets_awaitThen(_$$p, () => {<>
+</>; __sveltets_1_awaitThen(_$$p, () => {<>
     <h1>Promise Resolved</h1>
-</>})}}</>
+</>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-pending-catch/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-pending-catch/expected.jsx
index 0f47bbca7..d95b9b49e 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-pending-catch/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-pending-catch/expected.jsx
@@ -1,7 +1,7 @@
 <>{() => {let _$$p = (somePromise); <>
     <h1>Promise Pending</h1>
-</>; __sveltets_awaitThen(_$$p, (value) => {<>
+</>; __sveltets_1_awaitThen(_$$p, (value) => {<>
     <h1>Promise Resolved {value}</h1>
 </>}, (error) => {<>
     <h1>Promise Errored {error}</h1>
-</>})}}</>
+</>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-pending/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-pending/expected.jsx
index 851104f99..6bb8a529d 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-pending/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/await-block-pending/expected.jsx
@@ -1,5 +1,5 @@
 <>{() => {let _$$p = (somePromise); <>
     <h1>Promise Pending</h1>
-</>; __sveltets_awaitThen(_$$p, (value) => {<>
+</>; __sveltets_1_awaitThen(_$$p, (value) => {<>
     <h1>Promise Resolved {value}</h1>
-</>})}}</>
+</>})}}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-group-bare/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-group-bare/expected.jsx
index b5339f596..c5c37571b 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-group-bare/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-group-bare/expected.jsx
@@ -1,2 +1,2 @@
-<><input type="radio" {...__sveltets_empty(group)} value="Plain"/>
-<input type="radio" value="Plain" {...__sveltets_empty(group)}/></>
+<><input type="radio" {...__sveltets_1_empty(group)} value="Plain"/>
+<input type="radio" value="Plain" {...__sveltets_1_empty(group)}/></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-group/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-group/expected.jsx
index b81be68d5..315436892 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-group/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-group/expected.jsx
@@ -1 +1 @@
-<><input type="radio" {...__sveltets_empty(tortilla)} value="Plain"/></>
+<><input type="radio" {...__sveltets_1_empty(tortilla)} value="Plain"/></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-oneway/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-oneway/expected.jsx
index 0ee79b3a8..d789ab185 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-oneway/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-oneway/expected.jsx
@@ -1,16 +1,16 @@
 <><div type="text" 
-    {...__sveltets_empty(width=__sveltets_instanceOf(HTMLDivElement).clientWidth)} 
-    {...__sveltets_empty(height=__sveltets_instanceOf(HTMLDivElement).clientHeight)} 
-    {...__sveltets_empty(offsetWidth=__sveltets_instanceOf(HTMLDivElement).offsetWidth)} 
-    {...__sveltets_empty(offsetHeight=__sveltets_instanceOf(HTMLDivElement).offsetHeight)}
+    {...__sveltets_1_empty(width=__sveltets_1_instanceOf(HTMLDivElement).clientWidth)} 
+    {...__sveltets_1_empty(height=__sveltets_1_instanceOf(HTMLDivElement).clientHeight)} 
+    {...__sveltets_1_empty(offsetWidth=__sveltets_1_instanceOf(HTMLDivElement).offsetWidth)} 
+    {...__sveltets_1_empty(offsetHeight=__sveltets_1_instanceOf(HTMLDivElement).offsetHeight)}
 />
 
 <video
     src={clip}
-    {...__sveltets_empty(duration=__sveltets_instanceOf(HTMLMediaElement).duration)}
-    {...__sveltets_empty(buffered=__sveltets_instanceOf(HTMLMediaElement).buffered)}
-    {...__sveltets_empty(seekable=__sveltets_instanceOf(HTMLMediaElement).seekable)}
-    {...__sveltets_empty(seeking=__sveltets_instanceOf(HTMLMediaElement).seeking)}
-    {...__sveltets_empty(played=__sveltets_instanceOf(HTMLMediaElement).played)}
-    {...__sveltets_empty(ended=__sveltets_instanceOf(HTMLMediaElement).ended)}
-></video></>
+    {...__sveltets_1_empty(duration=__sveltets_1_instanceOf(HTMLMediaElement).duration)}
+    {...__sveltets_1_empty(buffered=__sveltets_1_instanceOf(HTMLMediaElement).buffered)}
+    {...__sveltets_1_empty(seekable=__sveltets_1_instanceOf(HTMLMediaElement).seekable)}
+    {...__sveltets_1_empty(seeking=__sveltets_1_instanceOf(HTMLMediaElement).seeking)}
+    {...__sveltets_1_empty(played=__sveltets_1_instanceOf(HTMLMediaElement).played)}
+    {...__sveltets_1_empty(ended=__sveltets_1_instanceOf(HTMLMediaElement).ended)}
+></video></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expected.jsx
index cbe4cb709..73d0b6c56 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-component/expected.jsx
@@ -1 +1 @@
-<><Component type="radio" {...__sveltets_ensureType(Component, element)} value="Plain"/></>
+<><Component type="radio" {...__sveltets_1_ensureType(Component, element)} value="Plain"/></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-body/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-body/expected.jsx
index c0bb85860..8012228d2 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-body/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-body/expected.jsx
@@ -1 +1 @@
-<><sveltebody {...__sveltets_ensureType(HTMLBodyElement, element)} /></>
+<><sveltebody {...__sveltets_1_ensureType(HTMLBodyElement, element)} /></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expected.jsx
index c98642434..b0cdeb0e6 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-component/expected.jsx
@@ -1 +1 @@
-<><sveltecomponent this={A} {...__sveltets_ensureType(__sveltets_componentType(), element)} /></>
+<><sveltecomponent this={A} {...__sveltets_1_ensureType(__sveltets_1_componentType(), element)} /></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-self/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-self/expected.jsx
index 13077f8aa..55138d9cb 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-self/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this-svelte-self/expected.jsx
@@ -1,3 +1,3 @@
 <>{(false) ? <>
-    <svelteself {...__sveltets_ensureType(__sveltets_componentType(), element)} />
-</> : <></>}</>
+    <svelteself {...__sveltets_1_ensureType(__sveltets_1_componentType(), element)} />
+</> : <></>}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this/expected.jsx
index da0fb960b..f946b33a6 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/binding-this/expected.jsx
@@ -1 +1 @@
-<><input type="radio" {...__sveltets_ensureType(__sveltets_ctorOf(__sveltets_mapElementTag('input')), element)} value="Plain"/></>
+<><input type="radio" {...__sveltets_1_ensureType(__sveltets_1_ctorOf(__sveltets_1_mapElementTag('input')), element)} value="Plain"/></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/blocks-without-whitespace-inbetween/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/blocks-without-whitespace-inbetween/expected.jsx
index 9c02e72f6..ef4c00d4b 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/blocks-without-whitespace-inbetween/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/blocks-without-whitespace-inbetween/expected.jsx
@@ -1 +1 @@
-<>{(name == "world") ? <>!</> : <></>}{__sveltets_each(x, (y) => <>!</>)}{() => {let _$$p = (x); __sveltets_awaitThen(_$$p, (y) => {<>!</>})}}{(bla) ? <>*</> : <></>}</>
\ No newline at end of file
+<>{(name == "world") ? <>!</> : <></>}{__sveltets_1_each(x, (y) => <>!</>)}{() => {let _$$p = (x); __sveltets_1_awaitThen(_$$p, (y) => {<>!</>})}}{(bla) ? <>*</> : <></>}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/class-bare/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/class-bare/expected.jsx
index 3a5c9700a..de22eac5b 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/class-bare/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/class-bare/expected.jsx
@@ -1 +1 @@
-<><h1 {...__sveltets_ensureType(Boolean, !!(active))}>Hello</h1></>
+<><h1 {...__sveltets_1_ensureType(Boolean, !!(active))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/class-parentheses/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/class-parentheses/expected.jsx
index e616f4daf..1acb608c4 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/class-parentheses/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/class-parentheses/expected.jsx
@@ -1 +1 @@
-<><h1 {...__sveltets_ensureType(Boolean, !!("test"=="test"))}>Hello</h1></>
+<><h1 {...__sveltets_1_ensureType(Boolean, !!("test"=="test"))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/class/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/class/expected.jsx
index 17ca8d0d3..4f41b3f98 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/class/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/class/expected.jsx
@@ -1,2 +1,2 @@
-<><h1 {...__sveltets_ensureType(Boolean, !!("test"=="test"))}>Hello</h1>
-<h1 {...__sveltets_ensureType(Boolean, !!("test"=="test"))}>Hello</h1></>
+<><h1 {...__sveltets_1_ensureType(Boolean, !!("test"=="test"))}>Hello</h1>
+<h1 {...__sveltets_1_ensureType(Boolean, !!("test"=="test"))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let-destructure/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let-destructure/expected.jsx
index 9bfd7f8bd..0741c6a11 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let-destructure/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let-destructure/expected.jsx
@@ -1,3 +1,3 @@
-<><Component >{() => { let {thing:{ a }} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+<><Component >{() => { let {thing:{ a }} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
     <h1>Hello { a }</h1>
 </>}}</Component></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let/expected.jsx
index 284cf030a..c330b438e 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-default-slot-let/expected.jsx
@@ -1,3 +1,3 @@
-<><Component  >{() => { let {name:n, thing} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+<><Component  >{() => { let {name:n, thing} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
     <h1>Hello {thing} {n}</h1>
 </>}}</Component></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-multi-slot/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/component-multi-slot/expected.jsx
index 39df516ff..0e4a4e7b8 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-multi-slot/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-multi-slot/expected.jsx
@@ -1,10 +1,10 @@
-<><Component >{() => { let {var:new_var} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+<><Component >{() => { let {var:new_var} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
     <h1>Hello {new_var}</h1>
-    {() => { let {slotvar:newvar} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['someslot'];<><div   {...__sveltets_ensureType(Boolean, !!(newvar))}>
+    {() => { let {slotvar:newvar} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['someslot'];<><div   {...__sveltets_1_ensureType(Boolean, !!(newvar))}>
         <h2>Hi Slot {newvar}</h2>
     </div></>}}
-    {() => { let {newvar2} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['slotwithoutchildren'];<><div   {...__sveltets_ensureType(Boolean, !!(newvar2))}></div></>}}
-    {() => { let {hi1, hi2, hi3:hi3alias} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['slotwithmultiplelets'];<><div    ></div></>}}
+    {() => { let {newvar2} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['slotwithoutchildren'];<><div   {...__sveltets_1_ensureType(Boolean, !!(newvar2))}></div></>}}
+    {() => { let {hi1, hi2, hi3:hi3alias} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['slotwithmultiplelets'];<><div    ></div></>}}
     <p >
         Test
     </p>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-named-slot/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/component-named-slot/expected.jsx
index 1d4b3689c..00eb4f693 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-named-slot/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-named-slot/expected.jsx
@@ -1,8 +1,8 @@
-<><Parent  >{() => { let {foo, bar:baz} = /*Ωignore_startΩ*/new Parent({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
-    {() => { let {bla} = /*Ωignore_startΩ*/new Parent({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];<><Component  >
+<><Parent  >{() => { let {foo, bar:baz} = /*Ωignore_startΩ*/new Parent({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+    {() => { let {bla} = /*Ωignore_startΩ*/new Parent({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];<><Component  >
         {foo} {baz} {bla}
     </Component></>}}
-    <Component >{() => { let {blubb} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+    <Component >{() => { let {blubb} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
         {blubb}
     </>}}</Component>
 </>}}</Parent></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-infer-props/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-infer-props/expected.jsx
index 7259b44d4..c98ecdf42 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-infer-props/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-infer-props/expected.jsx
@@ -1,5 +1,5 @@
-<><Parent bare shorthand={shorthand} text1="val1" text2="val2" text3={`a${a}b${b}`} textEmpty="" literal={true} strLiteral={'foo'} complex={{a}} a-dashed-complex={{a}} {...__sveltets_cssProp({"--custom-cssprop": `foo`})} >{() => {/*Ωignore_startΩ*/const Ψcomplex={a},Ψa_dashed_complex={a};/*Ωignore_endΩ*/() => { let {foo} = /*Ωignore_startΩ*/new Parent({target: __sveltets_any(''), props: {'bare':true, 'shorthand':shorthand, 'text1':"", 'text2':"", 'text3':"", 'textEmpty':"", 'literal':true, 'strLiteral':"", 'complex':Ψcomplex, 'a-dashed-complex':Ψa_dashed_complex}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
-    {() => { let {bar} = /*Ωignore_startΩ*/new Parent({target: __sveltets_any(''), props: {'bare':true, 'shorthand':shorthand, 'text1':"", 'text2':"", 'text3':"", 'textEmpty':"", 'literal':true, 'strLiteral':"", 'complex':Ψcomplex, 'a-dashed-complex':Ψa_dashed_complex}})/*Ωignore_endΩ*/.$$slot_def['named'];<><Component  >
+<><Parent bare shorthand={shorthand} text1="val1" text2="val2" text3={`a${a}b${b}`} textEmpty="" literal={true} strLiteral={'foo'} complex={{a}} a-dashed-complex={{a}} {...__sveltets_1_cssProp({"--custom-cssprop": `foo`})} >{() => {/*Ωignore_startΩ*/const Ψcomplex={a},Ψa_dashed_complex={a};/*Ωignore_endΩ*/() => { let {foo} = /*Ωignore_startΩ*/new Parent({target: __sveltets_1_any(''), props: {'bare':true, 'shorthand':shorthand, 'text1':"", 'text2':"", 'text3':"", 'textEmpty':"", 'literal':true, 'strLiteral':"", 'complex':Ψcomplex, 'a-dashed-complex':Ψa_dashed_complex}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+    {() => { let {bar} = /*Ωignore_startΩ*/new Parent({target: __sveltets_1_any(''), props: {'bare':true, 'shorthand':shorthand, 'text1':"", 'text2':"", 'text3':"", 'textEmpty':"", 'literal':true, 'strLiteral':"", 'complex':Ψcomplex, 'a-dashed-complex':Ψa_dashed_complex}})/*Ωignore_endΩ*/.$$slot_def['named'];<><Component  >
         {foo} {bar}
     </Component></>}}
     <div>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-shadowed-prop/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-shadowed-prop/expected.jsx
index 6ac65dac9..2968b7e91 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-shadowed-prop/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/component-slot-shadowed-prop/expected.jsx
@@ -10,10 +10,10 @@
     
     
     
->{() => {/*Ωignore_startΩ*/const Ψsubthing=subthing,Ψshadowed1=shadowed1,Ψshadowed_2=shadowed2,Ψcomplex={complex};/*Ωignore_endΩ*/() => { let {name:n, shadowed1, shadowed2, subthing} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {'unshadowed1':unshadowed1, 'foo':unshadowed2, 'subthing':Ψsubthing, 'shadowed1':Ψshadowed1, 'shadowed-2':Ψshadowed_2, 'templateString':"", 'complex':Ψcomplex}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
-    {() => { let {subthing} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {'unshadowed1':unshadowed1, 'foo':unshadowed2, 'subthing':Ψsubthing, 'shadowed1':Ψshadowed1, 'shadowed-2':Ψshadowed_2, 'templateString':"", 'complex':Ψcomplex}})/*Ωignore_endΩ*/.$$slot_def['sub1'];<><p  >{thing}{subthing}</p></>}}
+>{() => {/*Ωignore_startΩ*/const Ψsubthing=subthing,Ψshadowed1=shadowed1,Ψshadowed_2=shadowed2,Ψcomplex={complex};/*Ωignore_endΩ*/() => { let {name:n, shadowed1, shadowed2, subthing} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {'unshadowed1':unshadowed1, 'foo':unshadowed2, 'subthing':Ψsubthing, 'shadowed1':Ψshadowed1, 'shadowed-2':Ψshadowed_2, 'templateString':"", 'complex':Ψcomplex}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+    {() => { let {subthing} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {'unshadowed1':unshadowed1, 'foo':unshadowed2, 'subthing':Ψsubthing, 'shadowed1':Ψshadowed1, 'shadowed-2':Ψshadowed_2, 'templateString':"", 'complex':Ψcomplex}})/*Ωignore_endΩ*/.$$slot_def['sub1'];<><p  >{thing}{subthing}</p></>}}
     
-    {() => { let {subthing, othersubthing} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {'unshadowed1':unshadowed1, 'foo':unshadowed2, 'subthing':Ψsubthing, 'shadowed1':Ψshadowed1, 'shadowed-2':Ψshadowed_2, 'templateString':"", 'complex':Ψcomplex}})/*Ωignore_endΩ*/.$$slot_def['sub2'];<><Sub  subthing={subthing}  >{thing}{subthing}</Sub></>}}
+    {() => { let {subthing, othersubthing} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {'unshadowed1':unshadowed1, 'foo':unshadowed2, 'subthing':Ψsubthing, 'shadowed1':Ψshadowed1, 'shadowed-2':Ψshadowed_2, 'templateString':"", 'complex':Ψcomplex}})/*Ωignore_endΩ*/.$$slot_def['sub2'];<><Sub  subthing={subthing}  >{thing}{subthing}</Sub></>}}
     
-    <Sub subthing={subthing}  >{() => {/*Ωignore_startΩ*/const Ψsubthing=subthing;/*Ωignore_endΩ*/() => { let {subthing, othersubthing} = /*Ωignore_startΩ*/new Sub({target: __sveltets_any(''), props: {'subthing':Ψsubthing}})/*Ωignore_endΩ*/.$$slot_def['default'];<>{thing}{subthing}</>}}}</Sub>
+    <Sub subthing={subthing}  >{() => {/*Ωignore_startΩ*/const Ψsubthing=subthing;/*Ωignore_endΩ*/() => { let {subthing, othersubthing} = /*Ωignore_startΩ*/new Sub({target: __sveltets_1_any(''), props: {'subthing':Ψsubthing}})/*Ωignore_endΩ*/.$$slot_def['default'];<>{thing}{subthing}</>}}}</Sub>
 </>}}}</Component></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/custom-css-properties/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/custom-css-properties/expected.jsx
index 64bc86141..8ca4283e9 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/custom-css-properties/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/custom-css-properties/expected.jsx
@@ -1,7 +1,7 @@
 <><Component 
-  {...__sveltets_cssProp({"--custom-css-property1": `${'hi'}`})}
-  {...__sveltets_cssProp({"--custom-css-property2": `hi`})}
+  {...__sveltets_1_cssProp({"--custom-css-property1": `${'hi'}`})}
+  {...__sveltets_1_cssProp({"--custom-css-property2": `hi`})}
   betweenprop
-  {...__sveltets_cssProp({"--custom-css-property3": `hi${jo}hi`})}
-  {...__sveltets_cssProp({"--custom-css-property4": `hi${jo}hi`})}
-  {...__sveltets_cssProp({"--custom-css-property5": `hi${jo}hi`})} /></>
\ No newline at end of file
+  {...__sveltets_1_cssProp({"--custom-css-property3": `hi${jo}hi`})}
+  {...__sveltets_1_cssProp({"--custom-css-property4": `hi${jo}hi`})}
+  {...__sveltets_1_cssProp({"--custom-css-property5": `hi${jo}hi`})} /></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/directive-quoted/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/directive-quoted/expected.jsx
index e3b7a2856..061354726 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/directive-quoted/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/directive-quoted/expected.jsx
@@ -1,7 +1,7 @@
 <><h1 onclick={()=>console.log("click")}>Hello</h1>
-<Component />{/*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$on('click', test)}
-<img {...__sveltets_ensureAction(action(__sveltets_mapElementTag('img'),(thing)))} />
-<img {...__sveltets_ensureTransition(fade(__sveltets_mapElementTag('img'),(params)))} />
-<img {...__sveltets_ensureType(Boolean, !!(classthing))} />
-<img {...__sveltets_ensureAnimation(thing(__sveltets_mapElementTag('img'),__sveltets_AnimationMove,(params)))} />
+<Component />{/*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$on('click', test)}
+<img {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('img'),(thing)))} />
+<img {...__sveltets_1_ensureTransition(fade(__sveltets_1_mapElementTag('img'),(params)))} />
+<img {...__sveltets_1_ensureType(Boolean, !!(classthing))} />
+<img {...__sveltets_1_ensureAnimation(thing(__sveltets_1_mapElementTag('img'),__sveltets_1_AnimationMove,(params)))} />
 <img thing={binding} /></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-basic-sequence/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-basic-sequence/expected.jsx
index 4bb6d6814..1de94684c 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-basic-sequence/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-basic-sequence/expected.jsx
@@ -1,3 +1,3 @@
-<>{__sveltets_each((true, items), (item) => <>
+<>{__sveltets_1_each((true, items), (item) => <>
     <div>{item}</div>
-</>)}</>
+</>)}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-basic/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-basic/expected.jsx
index 21770dcb3..4a868513b 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-basic/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-basic/expected.jsx
@@ -1,3 +1,3 @@
-<>{__sveltets_each(items, (item) => <>
+<>{__sveltets_1_each(items, (item) => <>
     <div>{item}</div>
-</>)}</>
+</>)}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-index/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-index/expected.jsx
index 174b0b203..bef03997b 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-index/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-index/expected.jsx
@@ -1,3 +1,3 @@
-<>{__sveltets_each(items, (item,i) => <>
+<>{__sveltets_1_each(items, (item,i) => <>
     <div>{item}{i}</div>
-</>)}</>
+</>)}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-key-else/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-key-else/expected.jsx
index c564f69c2..5ca00706f 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-key-else/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-key-else/expected.jsx
@@ -1,5 +1,5 @@
-<>{__sveltets_each(items, (item,i) => (item.id) && <>
+<>{__sveltets_1_each(items, (item,i) => (item.id) && <>
     <div>{item}{i}</div>
 </>)}
     <div>No Items</div>
-</>
+</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-key/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-key/expected.jsx
index d44038c87..3e0e95f5c 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-key/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-key/expected.jsx
@@ -1,3 +1,3 @@
-<>{__sveltets_each(items, (item,i) => (item.id) && <>
+<>{__sveltets_1_each(items, (item,i) => (item.id) && <>
     <div>{item}{i}</div>
-</>)}</>
+</>)}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-nullish-coalescing/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-nullish-coalescing/expected.jsx
index 78102ef1e..29a278277 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-nullish-coalescing/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-nullish-coalescing/expected.jsx
@@ -1,3 +1,3 @@
-<>{__sveltets_each(items ?? [], (item) => <>
+<>{__sveltets_1_each(items ?? [], (item) => <>
     <div>{item}</div>
-</>)}</>
+</>)}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-optional-chaining/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-optional-chaining/expected.jsx
index ae24027a7..08b671e41 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-optional-chaining/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/each-block-optional-chaining/expected.jsx
@@ -1,3 +1,3 @@
-<>{__sveltets_each(someObject?.items, (item) => <>
+<>{__sveltets_1_each(someObject?.items, (item) => <>
     <div>{item}</div>
-</>)}</>
+</>)}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-infer-props/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-infer-props/expected.jsx
index a76072aa2..2b5c95f0d 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-infer-props/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component-infer-props/expected.jsx
@@ -1 +1 @@
-<><Component bare shorthand={shorthand} text1="val1" text2="val2" text3={`a${a}b${b}`} textEmpty="" literal={true} strLiteral={'foo'} complex={{a}} a-dashed-complex={{a}} {...__sveltets_cssProp({"--custom-cssprop": `foo`})}  />{/*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {'bare':true, 'shorthand':shorthand, 'text1':"", 'text2':"", 'text3':"", 'textEmpty':"", 'literal':true, 'strLiteral':"", 'complex':{a}, 'a-dashed-complex':{a}}})/*Ωignore_endΩ*/.$on('click', e => e)}</>
\ No newline at end of file
+<><Component bare shorthand={shorthand} text1="val1" text2="val2" text3={`a${a}b${b}`} textEmpty="" literal={true} strLiteral={'foo'} complex={{a}} a-dashed-complex={{a}} {...__sveltets_1_cssProp({"--custom-cssprop": `foo`})}  />{/*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {'bare':true, 'shorthand':shorthand, 'text1':"", 'text2':"", 'text3':"", 'textEmpty':"", 'literal':true, 'strLiteral':"", 'complex':{a}, 'a-dashed-complex':{a}}})/*Ωignore_endΩ*/.$on('click', e => e)}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component/expected.jsx
index 681aa8f65..4516da38d 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-component/expected.jsx
@@ -1 +1 @@
-<><Component  />{/*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$on('event', () => click())}{/*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$on('UpperCaseEvent', () => log('hi'))}</>
\ No newline at end of file
+<><Component  />{/*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$on('event', () => click())}{/*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$on('UpperCaseEvent', () => log('hi'))}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-svelte-component/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-svelte-component/expected.jsx
index 5b85c1c8a..1c315de13 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-svelte-component/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/event-handler-svelte-component/expected.jsx
@@ -1 +1 @@
-<><sveltecomponent this={Whatever}  />{__sveltets_instanceOf(__sveltets_componentType()).$on('submit', handleSubmit)}</>
+<><sveltecomponent this={Whatever}  />{__sveltets_1_instanceOf(__sveltets_1_componentType()).$on('submit', handleSubmit)}</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-await-block-shadowed/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-await-block-shadowed/expected.jsx
index 4a12ea499..6ba60cf35 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-await-block-shadowed/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-await-block-shadowed/expected.jsx
@@ -1,26 +1,26 @@
 <>{(hello) ? <>
-    {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (aPromise); __sveltets_awaitThen(_$$p, (hello) => {/*Ωignore_startΩ*/((Ωhello)) && /*Ωignore_endΩ*/<>
+    {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (aPromise); __sveltets_1_awaitThen(_$$p, (hello) => {/*Ωignore_startΩ*/((Ωhello)) && /*Ωignore_endΩ*/<>
         {hello}
     </>}, () => {/*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
         {hello}
     </>})}}}
-    {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (aPromise); __sveltets_awaitThen(_$$p, (hi) => {/*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
+    {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (aPromise); __sveltets_1_awaitThen(_$$p, (hi) => {/*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
         {hello}
     </>}, (hello) => {/*Ωignore_startΩ*/((Ωhello)) && /*Ωignore_endΩ*/<>
         {hello}
     </>})}}}
-    {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (hello); __sveltets_awaitThen(_$$p, (hello) => {/*Ωignore_startΩ*/((Ωhello)) && /*Ωignore_endΩ*/<>
+    {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (hello); __sveltets_1_awaitThen(_$$p, (hello) => {/*Ωignore_startΩ*/((Ωhello)) && /*Ωignore_endΩ*/<>
         {hello}
         {(hello) ? <>
             {() => {/*Ωignore_startΩ*/if((((Ωhello))) && ((hello))) {/*Ωignore_endΩ*/let _$$p = (aPromise); /*Ωignore_startΩ*/(((Ωhello))) && ((hello)) && /*Ωignore_endΩ*/<>
                 {hello}
-            </>; __sveltets_awaitThen(_$$p, () => {<></>})}}}
+            </>; __sveltets_1_awaitThen(_$$p, () => {<></>})}}}
             {() => {/*Ωignore_startΩ*/const ΩΩhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if((((Ωhello))) && ((hello))) {/*Ωignore_endΩ*/let _$$p = (aPromise); /*Ωignore_startΩ*/(((Ωhello))) && ((hello)) && /*Ωignore_endΩ*/<>
                 {hello}
-            </>; __sveltets_awaitThen(_$$p, () => {<></>}, (hello) => {/*Ωignore_startΩ*/(((Ωhello))) && ((ΩΩhello)) && /*Ωignore_endΩ*/<>
+            </>; __sveltets_1_awaitThen(_$$p, () => {<></>}, (hello) => {/*Ωignore_startΩ*/(((Ωhello))) && ((ΩΩhello)) && /*Ωignore_endΩ*/<>
                 {hello}
             </>})}}}
-            {() => {/*Ωignore_startΩ*/const ΩΩhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if((((Ωhello))) && ((hello))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_awaitThen(_$$p, (hello) => {/*Ωignore_startΩ*/(((Ωhello))) && ((ΩΩhello)) && /*Ωignore_endΩ*/<>
+            {() => {/*Ωignore_startΩ*/const ΩΩhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if((((Ωhello))) && ((hello))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_1_awaitThen(_$$p, (hello) => {/*Ωignore_startΩ*/(((Ωhello))) && ((ΩΩhello)) && /*Ωignore_endΩ*/<>
                 {(hello) ? <>
                     {hello}
                 </> : <></>}
@@ -28,7 +28,7 @@
         </> : <></>}
     </>})}}}
     {(hi && bye) ? <>
-        {() => {/*Ωignore_startΩ*/const Ωbye=bye,Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if((((hello))) && ((hi && bye))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_awaitThen(_$$p, (bye) => {/*Ωignore_startΩ*/(((hello))) && ((hi && Ωbye)) && /*Ωignore_endΩ*/<>
+        {() => {/*Ωignore_startΩ*/const Ωbye=bye,Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if((((hello))) && ((hi && bye))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_1_awaitThen(_$$p, (bye) => {/*Ωignore_startΩ*/(((hello))) && ((hi && Ωbye)) && /*Ωignore_endΩ*/<>
             {bye}
         </>}, (hello) => {/*Ωignore_startΩ*/(((Ωhello))) && ((hi && bye)) && /*Ωignore_endΩ*/<>
             {(hello) ? <>
@@ -38,7 +38,7 @@
     </> : (cool) ? <>
         {() => {/*Ωignore_startΩ*/const Ωcool=cool;/*Ωignore_endΩ*//*Ωignore_startΩ*/if((((hello))) && (!(hi && bye) && (cool))) {/*Ωignore_endΩ*/let _$$p = (cool); /*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<>
             loading
-        </>; __sveltets_awaitThen(_$$p, (cool) => {/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (Ωcool)) && /*Ωignore_endΩ*/<>
+        </>; __sveltets_1_awaitThen(_$$p, (cool) => {/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (Ωcool)) && /*Ωignore_endΩ*/<>
             {(cool) ? <>
                 {cool}
             </> : <></>}
@@ -47,11 +47,11 @@
         </>})}}}
         {() => {/*Ωignore_startΩ*/const Ωcool=cool;/*Ωignore_endΩ*//*Ωignore_startΩ*/if((((hello))) && (!(hi && bye) && (cool))) {/*Ωignore_endΩ*/let _$$p = (aPromise); /*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<>
             loading
-        </>; __sveltets_awaitThen(_$$p, (cool) => {/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (Ωcool)) && /*Ωignore_endΩ*/<>
+        </>; __sveltets_1_awaitThen(_$$p, (cool) => {/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (Ωcool)) && /*Ωignore_endΩ*/<>
             {cool}
         </>})}}}
     </> : <>
-        {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if((((hello))) && (!(hi && bye) && !(cool))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_awaitThen(_$$p, (hello) => {/*Ωignore_startΩ*/(((Ωhello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<>
+        {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*//*Ωignore_startΩ*/if((((hello))) && (!(hi && bye) && !(cool))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_1_awaitThen(_$$p, (hello) => {/*Ωignore_startΩ*/(((Ωhello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<>
             {(hello) ? <>
                 {hello}
             </> : <></>}
@@ -65,7 +65,7 @@
     </> : (hello) ? <>
         {hello}
     </> : <></> }
-</>; __sveltets_awaitThen(_$$p, (cool) => {<>
+</>; __sveltets_1_awaitThen(_$$p, (cool) => {<>
     {(cool) ? <>
         {cool}
     </> : (hello) ? <>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-await-block/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-await-block/expected.jsx
index d37939416..4852a919a 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-await-block/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-await-block/expected.jsx
@@ -1,15 +1,15 @@
 <>{(hello) ? <>
-    {() => {/*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (hello.foo); __sveltets_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
+    {() => {/*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (hello.foo); __sveltets_1_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
         {y}
     </>})}}}
-    {() => {/*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
+    {() => {/*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_1_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
         {y}
     </>})}}}
     {() => {/*Ωignore_startΩ*/if(((hello))) {/*Ωignore_endΩ*/let _$$p = (aPromise); /*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
       {hello}
-    </>; __sveltets_awaitThen(_$$p, () => {<></>})}}}
+    </>; __sveltets_1_awaitThen(_$$p, () => {<></>})}}}
     {(hi && bye) ? <>
-        {() => {/*Ωignore_startΩ*/if((((hello))) && ((hi && bye))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/(((hello))) && ((hi && bye)) && /*Ωignore_endΩ*/<>
+        {() => {/*Ωignore_startΩ*/if((((hello))) && ((hi && bye))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_1_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/(((hello))) && ((hi && bye)) && /*Ωignore_endΩ*/<>
             {y}
         </>}, () => {/*Ωignore_startΩ*/(((hello))) && ((hi && bye)) && /*Ωignore_endΩ*/<>
             z
@@ -17,13 +17,13 @@
     </> : (cool) ? <>
         {() => {/*Ωignore_startΩ*/if((((hello))) && (!(hi && bye) && (cool))) {/*Ωignore_endΩ*/let _$$p = (x); /*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<>
             loading
-        </>; __sveltets_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<>
+        </>; __sveltets_1_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<>
             {y}
         </>}, () => {/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<>
             z
         </>})}}}
     </> : <>
-        {() => {/*Ωignore_startΩ*/if((((hello))) && (!(hi && bye) && !(cool))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<>
+        {() => {/*Ωignore_startΩ*/if((((hello))) && (!(hi && bye) && !(cool))) {/*Ωignore_endΩ*/let _$$p = (x); __sveltets_1_awaitThen(_$$p, (y) => {/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<>
             {y}
         </>})}}}
     </> }
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-each-block-shadowed/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-each-block-shadowed/expected.jsx
index 240661761..d19c2f6b5 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-each-block-shadowed/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-each-block-shadowed/expected.jsx
@@ -1,8 +1,8 @@
 <>{(hello) ? <>
-    {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*/() => {__sveltets_each(items, (hello,i) => (hello.id) && /*Ωignore_startΩ*/((Ωhello)) && /*Ωignore_endΩ*/<>
+    {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*/() => {__sveltets_1_each(items, (hello,i) => (hello.id) && /*Ωignore_startΩ*/((Ωhello)) && /*Ωignore_endΩ*/<>
         <div>{hello}{i}</div>
         {(hello) ? <>
-            {() => {/*Ωignore_startΩ*/const ΩΩhello=hello;/*Ωignore_endΩ*/() => {__sveltets_each(items, (hello) => /*Ωignore_startΩ*/(((Ωhello))) && ((ΩΩhello)) && /*Ωignore_endΩ*/<>
+            {() => {/*Ωignore_startΩ*/const ΩΩhello=hello;/*Ωignore_endΩ*/() => {__sveltets_1_each(items, (hello) => /*Ωignore_startΩ*/(((Ωhello))) && ((ΩΩhello)) && /*Ωignore_endΩ*/<>
                 {(hello) ? <>
                     {hello}
                 </> : <></>}
@@ -14,7 +14,7 @@
         </> : <></>}
     
     {(hi && bye) ? <>
-        {() => {/*Ωignore_startΩ*/const Ωbye=bye;/*Ωignore_endΩ*/() => {__sveltets_each(items, (bye) => /*Ωignore_startΩ*/(((hello))) && ((hi && Ωbye)) && /*Ωignore_endΩ*/<>
+        {() => {/*Ωignore_startΩ*/const Ωbye=bye;/*Ωignore_endΩ*/() => {__sveltets_1_each(items, (bye) => /*Ωignore_startΩ*/(((hello))) && ((hi && Ωbye)) && /*Ωignore_endΩ*/<>
             <div>{bye}</div>
         </>)}}}
             {(bye) ? <>
@@ -22,17 +22,17 @@
             </> : <></>}
         
     </> : (cool) ? <>
-        {() => {/*Ωignore_startΩ*/const Ωcool=cool;/*Ωignore_endΩ*/() => {__sveltets_each(items, (item,cool) => /*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (Ωcool)) && /*Ωignore_endΩ*/<>
+        {() => {/*Ωignore_startΩ*/const Ωcool=cool;/*Ωignore_endΩ*/() => {__sveltets_1_each(items, (item,cool) => /*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (Ωcool)) && /*Ωignore_endΩ*/<>
             <div>{item}{cool}</div>
         </>)}}}
     </> : <>
-        {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*/() => {__sveltets_each(items, (hello) => /*Ωignore_startΩ*/(((Ωhello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<>
+        {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*/() => {__sveltets_1_each(items, (hello) => /*Ωignore_startΩ*/(((Ωhello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<>
             <div>{hello}</div>
         </>)}}}
     </> }
 </> : <></>}
 
-{__sveltets_each(items, (hello,i) => <>
+{__sveltets_1_each(items, (hello,i) => <>
     {(hello && i && bye) ? <>
         {hello} {i} {bye}
     </> : (hello && i && bye) ? <>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-each-block/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-each-block/expected.jsx
index f9e7204fd..2df614ea4 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-each-block/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-each-block/expected.jsx
@@ -1,19 +1,19 @@
 <>{(hello) ? <>
-    {__sveltets_each(items, (item,i) => (item.id) && /*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
+    {__sveltets_1_each(items, (item,i) => (item.id) && /*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
         <div>{item}{i}</div>
     </>)}
     {(hi && bye) ? <>
-        {__sveltets_each(items, (item) => /*Ωignore_startΩ*/(((hello))) && ((hi && bye)) && /*Ωignore_endΩ*/<>
+        {__sveltets_1_each(items, (item) => /*Ωignore_startΩ*/(((hello))) && ((hi && bye)) && /*Ωignore_endΩ*/<>
             <div>{item}</div>
         </>)}
             <p>hi</p>
         
     </> : (cool) ? <>
-        {__sveltets_each(items, (item,i) => /*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<>
+        {__sveltets_1_each(items, (item,i) => /*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<>
             <div>{item}{i}</div>
         </>)}
     </> : <>
-        {__sveltets_each(items, (item) => /*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<>
+        {__sveltets_1_each(items, (item) => /*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<>
             <div>{item}</div>
         </>)}
     </> }
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let-shadowed/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let-shadowed/expected.jsx
index 6f8a49c0b..2cbc55f21 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let-shadowed/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let-shadowed/expected.jsx
@@ -1,33 +1,33 @@
 <>{(hello && hello1) ? <>
-    <Comp >{() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*/() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<>
+    <Comp >{() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*/() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<>
         {hello}
-        <Comp >{() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<>
+        <Comp >{() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<>
             {(hello) ? <>
                 {hello}
             </> : <></>}
         </>}}</Comp>
-        <Comp hello={hello} >{() => {/*Ωignore_startΩ*/const Ψhello=hello;/*Ωignore_endΩ*/() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {'hello':Ψhello}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<>
+        <Comp hello={hello} >{() => {/*Ωignore_startΩ*/const Ψhello=hello;/*Ωignore_endΩ*/() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {'hello':Ψhello}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<>
             {(hello) ? <>
                 {hello}
             </> : <></>}
         </>}}}</Comp>
-        {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named1'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<><sveltefragment  >
+        {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named1'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<><sveltefragment  >
             {(hello) ? <>
                 {hello}
             </> : <></>}
         </sveltefragment></>}}
-        {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named2'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<><p  >
+        {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named2'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<><p  >
             {(hello) ? <>
                 {hello}
             </> : <></>}
         </p></>}}
-        {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named3'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<><Comp  >
+        {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named3'];/*Ωignore_startΩ*/((Ωhello && hello1)) && /*Ωignore_endΩ*/<><Comp  >
             {(hello) ? <>
                 {hello}
             </> : <></>}
         </Comp></>}}
         {(hello) ? <>
-            <Comp >{() => {/*Ωignore_startΩ*/const ΩΩhello=hello;/*Ωignore_endΩ*/() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/(((Ωhello && hello1))) && ((ΩΩhello)) && /*Ωignore_endΩ*/<>
+            <Comp >{() => {/*Ωignore_startΩ*/const ΩΩhello=hello;/*Ωignore_endΩ*/() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/(((Ωhello && hello1))) && ((ΩΩhello)) && /*Ωignore_endΩ*/<>
                 {(hello) ? <>
                     {hello}
                 </> : <></>}
@@ -35,25 +35,25 @@
         </> : <></>}
     </>}}}</Comp>
     {(hi && bye) ? <>
-        <Comp >{() => {/*Ωignore_startΩ*/const Ωbye=bye;/*Ωignore_endΩ*/() => { let {foo:bye} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/(((hello && hello1))) && ((hi && Ωbye)) && /*Ωignore_endΩ*/<>
+        <Comp >{() => {/*Ωignore_startΩ*/const Ωbye=bye;/*Ωignore_endΩ*/() => { let {foo:bye} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/(((hello && hello1))) && ((hi && Ωbye)) && /*Ωignore_endΩ*/<>
             {bye}
         </>}}}</Comp>
     </> : (cool) ? <>
         <Comp>
-            {() => {/*Ωignore_startΩ*/const Ωcool=cool,Ωhello=hello;/*Ωignore_endΩ*/() => { let {cool, hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];/*Ωignore_startΩ*/(((Ωhello && hello1))) && (!(hi && bye) && (Ωcool)) && /*Ωignore_endΩ*/<><div   >
+            {() => {/*Ωignore_startΩ*/const Ωcool=cool,Ωhello=hello;/*Ωignore_endΩ*/() => { let {cool, hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];/*Ωignore_startΩ*/(((Ωhello && hello1))) && (!(hi && bye) && (Ωcool)) && /*Ωignore_endΩ*/<><div   >
                 {hello}
             </div></>}}}
         </Comp>
     </> : <>
         <Comp>
-            {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*/() => { let {foo:hello, hello1:other} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];/*Ωignore_startΩ*/(((Ωhello && hello1))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<><div   >
+            {() => {/*Ωignore_startΩ*/const Ωhello=hello;/*Ωignore_endΩ*/() => { let {foo:hello, hello1:other} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];/*Ωignore_startΩ*/(((Ωhello && hello1))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<><div   >
                 {hello}
             </div></>}}}
         </Comp>
     </> }
 </> : <></>}
 
-<Comp >{() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+<Comp >{() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
     {(hello && bye) ? <>
         {hello} {bye}
     </> : (hello && bye) ? <>
@@ -61,7 +61,7 @@
     </> : <>
         {hello} {bye}
     </> }
-    {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named1'];<><sveltefragment  >
+    {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named1'];<><sveltefragment  >
         {(hello && bye) ? <>
             {hello} {bye}
         </> : (hello && bye) ? <>
@@ -70,7 +70,7 @@
             {hello} {bye}
         </> }
     </sveltefragment></>}}
-    {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named2'];<><p  >
+    {() => { let {hello} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named2'];<><p  >
         {(hello && bye) ? <>
             {hello} {bye}
         </> : (hello && bye) ? <>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let/expected.jsx
index 969bda7ee..4a16c6bb4 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/if-nested-slot-let/expected.jsx
@@ -1,20 +1,20 @@
 <>{(hello) ? <>
-    <Comp >{() => { let {foo} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
+    <Comp >{() => { let {foo} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/((hello)) && /*Ωignore_endΩ*/<>
         {foo}
     </>}}</Comp>
     {(hi && bye) ? <>
-        <Comp >{() => { let {foo:bar} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/(((hello))) && ((hi && bye)) && /*Ωignore_endΩ*/<>
+        <Comp >{() => { let {foo:bar} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];/*Ωignore_startΩ*/(((hello))) && ((hi && bye)) && /*Ωignore_endΩ*/<>
             {bar}
         </>}}</Comp>
     </> : (cool) ? <>
         <Comp>
-            {() => { let {foo, foo1} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<><div   >
+            {() => { let {foo, foo1} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && (cool)) && /*Ωignore_endΩ*/<><div   >
                 {foo}
             </div></>}}
         </Comp>
     </> : <>
         <Comp>
-            {() => { let {foo:bar} = /*Ωignore_startΩ*/new Comp({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<><div  >
+            {() => { let {foo:bar} = /*Ωignore_startΩ*/new Comp({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];/*Ωignore_startΩ*/(((hello))) && (!(hi && bye) && !(cool)) && /*Ωignore_endΩ*/<><div  >
                 {bar}
             </div></>}}
         </Comp>
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/nested-if-else-if-and-each-block/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/nested-if-else-if-and-each-block/expected.jsx
index db202efcf..cf00ca123 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/nested-if-else-if-and-each-block/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/nested-if-else-if-and-each-block/expected.jsx
@@ -1,5 +1,5 @@
 <>{(true) ? <>
   {(true) ? <></> : (true) ? <></> : <></> }
 </> : <>
-  {__sveltets_each([], (_) => /*Ωignore_startΩ*/(!(true)) && /*Ωignore_endΩ*/<></>)}
+  {__sveltets_1_each([], (_) => /*Ωignore_startΩ*/(!(true)) && /*Ωignore_endΩ*/<></>)}
 </> }</>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/svelte-fragment/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/svelte-fragment/expected.jsx
index 9d010904e..1f4fb342f 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/svelte-fragment/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/svelte-fragment/expected.jsx
@@ -9,11 +9,11 @@
 </Component>
 
 <Component>
-    {() => { let {foo, bar:baz} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<><sveltefragment  >
+    {() => { let {foo, bar:baz} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<><sveltefragment  >
         <p>{foo} {baz}</p>
     </sveltefragment></>}}
 
-    {() => { let {foo, bar:baz} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];<><sveltefragment   >
+    {() => { let {foo, bar:baz} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['named'];<><sveltefragment   >
         <p>{foo} {baz}</p>
     </sveltefragment></>}}
 </Component></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/transition-animate-fallbacks/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/transition-animate-fallbacks/expected.jsx
index 0fe6b3a78..3499f4b33 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/transition-animate-fallbacks/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/transition-animate-fallbacks/expected.jsx
@@ -1,17 +1,17 @@
 <>
-<h1 {...__sveltets_ensureTransition(blur(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(fade(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(fly(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(slide(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(scale(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(draw(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(blur(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(fade(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(fly(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(slide(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(scale(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(draw(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
 
-<h1 {...__sveltets_ensureTransition(blur(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(blur(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(blur(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(blur(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
 
-<h1 {...__sveltets_ensureAnimation(flip(__sveltets_mapElementTag('h1'),__sveltets_AnimationMove,{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureAnimation(flip(__sveltets_1_mapElementTag('h1'),__sveltets_1_AnimationMove,{}))}>Hello</h1>
 
-<h1 {...__sveltets_ensureTransition(foo(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(foo(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(foo(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureAnimation(foo(__sveltets_mapElementTag('h1'),__sveltets_AnimationMove,{}))}>Hello</h1></>
\ No newline at end of file
+<h1 {...__sveltets_1_ensureTransition(foo(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(foo(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(foo(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureAnimation(foo(__sveltets_1_mapElementTag('h1'),__sveltets_1_AnimationMove,{}))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/transition-bare/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/transition-bare/expected.jsx
index 1eede9af9..36eafae47 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/transition-bare/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/transition-bare/expected.jsx
@@ -1,3 +1,3 @@
-<><h1 {...__sveltets_ensureTransition(blink(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(blink(__sveltets_mapElementTag('h1'),{}))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(blink(__sveltets_mapElementTag('h1'),{}))}>Hello</h1></>
+<><h1 {...__sveltets_1_ensureTransition(blink(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(blink(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(blink(__sveltets_1_mapElementTag('h1'),{}))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/transition-modifiers/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/transition-modifiers/expected.jsx
index 3b5af3f2d..4d12dc115 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/transition-modifiers/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/transition-modifiers/expected.jsx
@@ -1,3 +1,3 @@
-<><div {...__sveltets_ensureTransition(slide(__sveltets_mapElementTag('div'),{}))}>
+<><div {...__sveltets_1_ensureTransition(slide(__sveltets_1_mapElementTag('div'),{}))}>
     {item}
 </div></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/transition-params/expected.jsx b/packages/svelte2tsx/test/htmlx2jsx/samples/transition-params/expected.jsx
index 5fbd1b0dc..f97e3f8ef 100644
--- a/packages/svelte2tsx/test/htmlx2jsx/samples/transition-params/expected.jsx
+++ b/packages/svelte2tsx/test/htmlx2jsx/samples/transition-params/expected.jsx
@@ -1,5 +1,5 @@
-<><h1 {...__sveltets_ensureTransition(blink(__sveltets_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(blink(__sveltets_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(blink(__sveltets_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(blink(__sveltets_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1>
-<h1 {...__sveltets_ensureTransition(blink(__sveltets_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1></>
+<><h1 {...__sveltets_1_ensureTransition(blink(__sveltets_1_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(blink(__sveltets_1_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(blink(__sveltets_1_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(blink(__sveltets_1_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1>
+<h1 {...__sveltets_1_ensureTransition(blink(__sveltets_1_mapElementTag('h1'),({y: 50, duration: 500})))}>Hello</h1></>
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx
index d79f836e7..27e5312f9 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx
@@ -1,66 +1,66 @@
 ///<reference types="svelte" />
 <></>;function render() {                                                                                                                             {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<><element {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element')))}/>                                                                {/**
-=#                                                                                         Originless mappings                                        
-<><element•{...__sveltets_ensureAction(action(__sveltets_mapElementTag('element')))}/>↲    [generated] line 3                                         
-  <element•u                           action                                       />↲                                                               
+<><element {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element')))}/>                                                            {/**
+=#                                                                                             Originless mappings                                    
+<><element•{...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element')))}/>↲    [generated] line 3                                     
+  <element•u                             action                                         />↲                                                           
 <element•u   action/>↲                                                                                                                                
-<element•use:action/>↲                                                                     [original] line 1                                          
+<element•use:action/>↲                                                                         [original] line 1                                      
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 
 <element                                                                                                                                              {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element')))}                                                                         {/**
-   ╚{...__sveltets_ensureAction(action(__sveltets_mapElementTag('element')))}•↲    [generated] line 6                                                 
-   ╚u                           action                                       •↲                                                                       
+    {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element')))}                                                                     {/**
+   ╚{...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element')))}•↲    [generated] line 6                                             
+   ╚u                             action                                         •↲                                                                   
    ╚u   action•↲                                                                                                                                      
-   ╚use:action•↲                                                                   [original] line 4                                                  
+   ╚use:action•↲                                                                       [original] line 4                                              
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 />
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<element {...__sveltets_ensureAction(action.nested.method(__sveltets_mapElementTag('element'),(foo)))}/>                                              {/**
-<element•{...__sveltets_ensureAction(action.nested.method(__sveltets_mapElementTag('element'),(foo)))}/>↲    [generated] line 9                       
-<element•u                           action.nested.method=                                     foo   }/>↲                                             
+<element {...__sveltets_1_ensureAction(action.nested.method(__sveltets_1_mapElementTag('element'),(foo)))}/>                                          {/**
+<element•{...__sveltets_1_ensureAction(action.nested.method(__sveltets_1_mapElementTag('element'),(foo)))}/>↲    [generated] line 9                   
+<element•u                             action.nested.method=                                       foo   }/>↲                                         
 <element•u   action.nested.method= foo}/>↲                                                                                                            
-<element•use:action.nested.method={foo}/>↲                                                                   [original] line 7                        
+<element•use:action.nested.method={foo}/>↲                                                                       [original] line 7                    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 
 <element                                                                                                                                              {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element'),((__sveltets_store_get(foo), $foo))))}                                     {/**
-   ╚{...__sveltets_ensureAction(action(__sveltets_mapElementTag('element'),((__sveltets_store_get(foo),•$foo))))}↲    [generated] line 12             
-   ╚u                           action=                                     $                     foo           }↲                                    
+    {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element'),((__sveltets_1_store_get(foo), $foo))))}                               {/**
+   ╚{...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element'),((__sveltets_1_store_get(foo),•$foo))))}↲    [generated] line 12       
+   ╚u                             action=                                       $                       foo           }↲                              
    ╚u   action= $foo}↲                                                                                                                                
-   ╚use:action={$foo}↲                                                                                                [original] line 10              
+   ╚use:action={$foo}↲                                                                                                      [original] line 10        
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 />
 
 <element                                                                                                                                              {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element'),({ foo })))}                                                               {/**
-   ╚{...__sveltets_ensureAction(action(__sveltets_mapElementTag('element'),({•foo•})))}↲    [generated] line 16                                       
-   ╚u                           action=                                     {•foo•}   }↲                                                              
+    {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element'),({ foo })))}                                                           {/**
+   ╚{...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element'),({•foo•})))}↲    [generated] line 16                                   
+   ╚u                             action=                                       {•foo•}   }↲                                                          
    ╚u   action= {•foo•}}↲                                                                                                                             
-   ╚use:action={{•foo•}}↲                                                                   [original] line 14                                        
+   ╚use:action={{•foo•}}↲                                                                       [original] line 14                                    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 />
 
 <element                                                                                                                                              {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element'),({                                                                         {/**
-   ╚{...__sveltets_ensureAction(action(__sveltets_mapElementTag('element'),({•↲    [generated] line 20                                                
-   ╚u                           action=                                     {•↲                                                                       
+    {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element'),({                                                                     {/**
+   ╚{...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element'),({•↲    [generated] line 20                                            
+   ╚u                             action=                                       {•↲                                                                   
    ╚u   action= {•↲                                                                                                                                   
-   ╚use:action={{•↲                                                                [original] line 18                                                 
+   ╚use:action={{•↲                                                                    [original] line 18                                             
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
         ...leet,                                                                                                                                      {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-        foo: (__sveltets_store_get(bar), $bar)                                                                                                        {/**
-      ╚╚foo:•(__sveltets_store_get(bar),•$bar)↲    [generated] line 22                                                                                
-      ╚╚foo:•$                     bar        ↲                                                                                                       
-      ╚╚foo:•$bar↲                                 [original] line 20                                                                                 
+        foo: (__sveltets_1_store_get(bar), $bar)                                                                                                      {/**
+      ╚╚foo:•(__sveltets_1_store_get(bar),•$bar)↲    [generated] line 22                                                                              
+      ╚╚foo:•$                       bar        ↲                                                                                                     
+      ╚╚foo:•$bar↲                                   [original] line 20                                                                               
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     })))}                                                                                                                                             {/**
    ╚})))}↲    [generated] line 23                                                                                                                     
@@ -73,5 +73,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/action-directive/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/action-directive/test.jsx
index c450a24b9..3ddb7e647 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/action-directive/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/action-directive/test.jsx
@@ -1,43 +1,43 @@
 /** tested-ranges: [[13,6,"action"],[37,6,"action"],[62,6,"action"],[69,6,"nested"],[76,6,"method"],[84,3,"foo"],[116,3,"foo"],[149,3,"foo"],[174,6,"action"],[190,4,"leet"],[204,3,"bar"]] */{/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<><element {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element')))}/>                                                                {/**
-                                       #=====                                                                      [generated] line 3                  */}
+<><element {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element')))}/>                                                            {/**
+                                         #=====                                                                          [generated] line 3            */}
 <element use:action/>                                                                                                                                 {/**
-             #=====                                                                                                [original] line 1                  
+             #=====                                                                                                      [original] line 1            
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element')))}                                                                         {/**
-                                #=====                                                                             [generated] line 6                  */}
+    {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element')))}                                                                     {/**
+                                  #=====                                                                                 [generated] line 6            */}
     use:action                                                                                                                                        {/**
-        #=====                                                                                                     [original] line 4                  
+        #=====                                                                                                           [original] line 4            
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<element {...__sveltets_ensureAction(action.nested.method(__sveltets_mapElementTag('element'),(foo)))}/>                                              {/**
-                                     1===== 2===== 3=====                                      4==                 [generated] line 9                  */}
+<element {...__sveltets_1_ensureAction(action.nested.method(__sveltets_1_mapElementTag('element'),(foo)))}/>                                          {/**
+                                       1===== 2===== 3=====                                        4==                   [generated] line 9            */}
 <element use:action.nested.method={foo}/>                                                                                                             {/**
-             1===== 2===== 3=====  4==                                                                             [original] line 7                  
+             1===== 2===== 3=====  4==                                                                                   [original] line 7            
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element'),((__sveltets_store_get(foo), $foo))))}                                     {/**
-                                                                                                  #==              [generated] line 12                 */}
+    {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element'),((__sveltets_1_store_get(foo), $foo))))}                               {/**
+                                                                                                        #==              [generated] line 12           */}
     use:action={$foo}                                                                                                                                 {/**
-                 #==                                                                                               [original] line 10                 
+                 #==                                                                                                     [original] line 10           
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element'),({ foo })))}                                                               {/**
-                                                                              #==                                  [generated] line 16                 */}
+    {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element'),({ foo })))}                                                           {/**
+                                                                                  #==                                    [generated] line 16           */}
     use:action={{ foo }}                                                                                                                              {/**
-                  #==                                                                                              [original] line 14                 
+                  #==                                                                                                    [original] line 14           
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureAction(action(__sveltets_mapElementTag('element'),({                                                                         {/**
-                                #=====                                                                             [generated] line 20                 */}
+    {...__sveltets_1_ensureAction(action(__sveltets_1_mapElementTag('element'),({                                                                     {/**
+                                  #=====                                                                                 [generated] line 20           */}
     use:action={{                                                                                                                                     {/**
-        #=====                                                                                                     [original] line 18                 
+        #=====                                                                                                           [original] line 18           
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
         ...leet,                                                                                                                                      {/**
-           #===                                                                                                    [generated] line 21                 */}
+           #===                                                                                                          [generated] line 21           */}
         ...leet,                                                                                                                                      {/**
-           #===                                                                                                    [original] line 19                 
+           #===                                                                                                          [original] line 19           
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-        foo: (__sveltets_store_get(bar), $bar)                                                                                                        {/**
-                                   #==                                                                             [generated] line 22                 */}
+        foo: (__sveltets_1_store_get(bar), $bar)                                                                                                      {/**
+                                     #==                                                                                 [generated] line 22           */}
         foo: $bar                                                                                                                                     {/**
-              #==                                                                                                  [original] line 20                 
+              #==                                                                                                        [original] line 20           
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /** origin-hash: 1sz8xal */
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx
index 60fbd332a..8186261c2 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx
@@ -1,12 +1,12 @@
 ///<reference types="svelte" />
 <></>;function render() {                                                                                                                             {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<>{() => {let _$$p = (promise); __sveltets_awaitThen(_$$p, (value) => {<>                                                                             {/**
-=#                                                                            Originless mappings                                                     
-<>{()•=>•{let•_$$p•=•(promise);•__sveltets_awaitThen(_$$p,•(value)•=>•{<>↲    [generated] line 3                                                      
-  {                   promise•  t                           value}       ↲                                                                            
+<>{() => {let _$$p = (promise); __sveltets_1_awaitThen(_$$p, (value) => {<>                                                                           {/**
+=#                                                                              Originless mappings                                                   
+<>{()•=>•{let•_$$p•=•(promise);•__sveltets_1_awaitThen(_$$p,•(value)•=>•{<>↲    [generated] line 3                                                    
+  {                   promise•  t                             value}       ↲                                                                          
 {       promise•t    value}↲                                                                                                                          
-{#await•promise•then•value}↲                                                  [original] line 1                                                       
+{#await•promise•then•value}↲                                                    [original] line 1                                                     
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <element foo={value.bar}/>                                                                                                                        {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -26,12 +26,12 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <element />                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-</>; __sveltets_awaitThen(_$$p, () => {<>                                                                                                             {/**
-====#                                         Originless mappings                                                                                     
-</>;•__sveltets_awaitThen(_$$p,•()•=>•{<>↲    [generated] line 9                                                                                      
-     {                                   ↲                                                                                                            
+</>; __sveltets_1_awaitThen(_$$p, () => {<>                                                                                                           {/**
+====#                                           Originless mappings                                                                                   
+</>;•__sveltets_1_awaitThen(_$$p,•()•=>•{<>↲    [generated] line 9                                                                                    
+     {                                     ↲                                                                                                          
 {      ↲                                                                                                                                              
-{:then}↲                                      [original] line 7                                                                                       
+{:then}↲                                        [original] line 7                                                                                     
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <element />                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -43,22 +43,22 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{() => {let _$$p = ((__sveltets_store_get(promise), $promise)); <>                                                                                    {/**
-{()•=>•{let•_$$p•=•((__sveltets_store_get(promise),•$promise));•<>↲    [generated] line 13                                                            
-{                   $                     promise            }    ↲                                                                                   
+{() => {let _$$p = ((__sveltets_1_store_get(promise), $promise)); <>                                                                                  {/**
+{()•=>•{let•_$$p•=•((__sveltets_1_store_get(promise),•$promise));•<>↲    [generated] line 13                                                          
+{                   $                       promise            }    ↲                                                                                 
 {       $promise}↲                                                                                                                                    
-{#await•$promise}↲                                                     [original] line 11                                                             
+{#await•$promise}↲                                                       [original] line 11                                                           
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <element />                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-</>; __sveltets_awaitThen(_$$p, () => {<></>})}}</>                                                                                                   {/**
-========================================#               Originless mappings                                                                           
-</>;•__sveltets_awaitThen(_$$p,•()•=>•{<></>})}}</>↲    [generated] line 15                                                                           
-                                         {                                                                                                            
+</>; __sveltets_1_awaitThen(_$$p, () => {<></>})}}</>                                                                                                 {/**
+==========================================#               Originless mappings                                                                         
+</>;•__sveltets_1_awaitThen(_$$p,•()•=>•{<></>})}}</>↲    [generated] line 15                                                                         
+                                           {                                                                                                          
 {                                                                                                                                                     
-{/await}                                                [original] line 13                                                                            
+{/await}                                                  [original] line 13                                                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/await-block/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/await-block/test.jsx
index 4d4480315..a002c7147 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/await-block/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/await-block/test.jsx
@@ -1,23 +1,23 @@
 /** tested-ranges: [[8,7,"promise"],[52,3,"bar"],[77,7,"promise"],[139,7,"promise"]] */                                                               {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<>{() => {let _$$p = (promise); __sveltets_awaitThen(_$$p, (value) => {<>                                                                             {/**
-                      #======                                              [generated] line 3                                                          */}
+<>{() => {let _$$p = (promise); __sveltets_1_awaitThen(_$$p, (value) => {<>                                                                           {/**
+                      #======                                                [generated] line 3                                                        */}
 {#await promise then value}                                                                                                                           {/**
-        #======                                                            [original] line 1                                                          
+        #======                                                              [original] line 1                                                        
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <element foo={value.bar}/>                                                                                                                        {/**
-                        #==                                                [generated] line 4                                                          */}
+                        #==                                                  [generated] line 4                                                        */}
     <element foo={value.bar}/>                                                                                                                        {/**
-                        #==                                                [original] line 2                                                          
+                        #==                                                  [original] line 2                                                        
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 {() => {let _$$p = (promise); <>                                                                                                                      {/**
-                    #======                                                [generated] line 7                                                          */}
+                    #======                                                  [generated] line 7                                                        */}
 {#await promise}                                                                                                                                      {/**
-        #======                                                            [original] line 5                                                          
+        #======                                                              [original] line 5                                                        
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{() => {let _$$p = ((__sveltets_store_get(promise), $promise)); <>                                                                                    {/**
-                                          #======                          [generated] line 13                                                         */}
+{() => {let _$$p = ((__sveltets_1_store_get(promise), $promise)); <>                                                                                  {/**
+                                            #======                          [generated] line 13                                                       */}
 {#await $promise}                                                                                                                                     {/**
-         #======                                                           [original] line 11                                                         
+         #======                                                             [original] line 11                                                       
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /** origin-hash: 1isi3ox */
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx
index 793ff6099..5ff187ac7 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx
@@ -27,11 +27,11 @@
 
 <Component                                                                                                                                            {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureType(Component, bar)}                                                                                                        {/**
-   ╚{...__sveltets_ensureType(Component,•bar)}↲    [generated] line 18                                                                                
-   ╚                                     bar} ↲                                                                                                       
+    {...__sveltets_1_ensureType(Component, bar)}                                                                                                      {/**
+   ╚{...__sveltets_1_ensureType(Component,•bar)}↲    [generated] line 18                                                                              
+   ╚                                       bar} ↲                                                                                                     
    ╚           bar}↲                                                                                                                                  
-   ╚bind:this={bar}↲                               [original] line 16                                                                                 
+   ╚bind:this={bar}↲                                 [original] line 16                                                                               
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /></>                                                                                                                                                 {/**
 /></>↲    [generated] line 19                                                                                                                         
@@ -39,5 +39,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/component-props/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/component-props/test.jsx
index 4a96a6709..6d9a702d7 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/component-props/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/component-props/test.jsx
@@ -1,33 +1,33 @@
 /** tested-ranges: [[11,3,"foo"],[40,3,"bar"],[63,3,"bar"],[88,3,"bar"],[119,3,"bar"],[151,3,"bar"]] */                                               {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 <><Component foo />                                                                                                                                   {/**
-             #==                                [generated] line 3                                                                                     */}
+             #==                                  [generated] line 3                                                                                   */}
 <Component foo />                                                                                                                                     {/**
-           #==                                  [original] line 1                                                                                     
+           #==                                    [original] line 1                                                                                   
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 <Component foo="leet"bar/>                                                                                                                            {/**
-                     #==                        [generated] line 5                                                                                     */}
+                     #==                          [generated] line 5                                                                                   */}
 <Component foo="leet"bar/>                                                                                                                            {/**
-                     #==                        [original] line 3                                                                                     
+                     #==                          [original] line 3                                                                                   
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 <Component {...bar} />                                                                                                                                {/**
-               #==                              [generated] line 7                                                                                     */}
+               #==                                [generated] line 7                                                                                   */}
 <Component {...bar} />                                                                                                                                {/**
-               #==                              [original] line 5                                                                                     
+               #==                                [original] line 5                                                                                   
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     {...bar}                                                                                                                                          {/**
-        #==                                     [generated] line 10                                                                                    */}
+        #==                                       [generated] line 10                                                                                  */}
     {...bar}                                                                                                                                          {/**
-        #==                                     [original] line 8                                                                                     
+        #==                                       [original] line 8                                                                                   
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     foo={bar}                                                                                                                                         {/**
-         #==                                    [generated] line 14                                                                                    */}
+         #==                                      [generated] line 14                                                                                  */}
     bind:foo={bar}                                                                                                                                    {/**
-              #==                               [original] line 12                                                                                    
+              #==                                 [original] line 12                                                                                  
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    {...__sveltets_ensureType(Component, bar)}                                                                                                        {/**
-                                         #==    [generated] line 18                                                                                    */}
+    {...__sveltets_1_ensureType(Component, bar)}                                                                                                      {/**
+                                           #==    [generated] line 18                                                                                  */}
     bind:this={bar}                                                                                                                                   {/**
-               #==                              [original] line 16                                                                                    
+               #==                                [original] line 16                                                                                  
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /** origin-hash: 1scpo61 */
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx
index 02ddad215..70610cbea 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx
@@ -1,12 +1,12 @@
 ///<reference types="svelte" />
 <></>;function render() {                                                                                                                             {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<>{__sveltets_each(items, (item) => <>                                                                                                                {/**
-=#                                         Originless mappings                                                                                        
-<>{__sveltets_each(items,•(item)•=>•<>↲    [generated] line 3                                                                                         
-  {                items•  item    }  ↲                                                                                                               
+<>{__sveltets_1_each(items, (item) => <>                                                                                                              {/**
+=#                                           Originless mappings                                                                                      
+<>{__sveltets_1_each(items,•(item)•=>•<>↲    [generated] line 3                                                                                       
+  {                  items•  item    }  ↲                                                                                                             
 {      items•   item}↲                                                                                                                                
-{#each•items•as•item}↲                     [original] line 1                                                                                          
+{#each•items•as•item}↲                       [original] line 1                                                                                        
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li>{item.name} x {item.qty}</li>                                                                                                                 {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -18,11 +18,11 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(items, (item, i) => <>                                                                                                               {/**
-{__sveltets_each(items,•(item,•i)•=>•<>↲    [generated] line 7                                                                                        
-{                items•  item,•i    }  ↲                                                                                                              
+{__sveltets_1_each(items, (item, i) => <>                                                                                                             {/**
+{__sveltets_1_each(items,•(item,•i)•=>•<>↲    [generated] line 7                                                                                      
+{                  items•  item,•i    }  ↲                                                                                                            
 {      items•   item,•i}↲                                                                                                                             
-{#each•items•as•item,•i}↲                   [original] line 5                                                                                         
+{#each•items•as•item,•i}↲                     [original] line 5                                                                                       
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li>{i + 1}: {item.name} x {item.qty}</li>                                                                                                        {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -34,11 +34,11 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(items, ({ id, name, qty }, i) => (id) && <>                                                                                          {/**
-{__sveltets_each(items,•({•id,•name,•qty•},•i)•=>•(id)•&&•<>↲    [generated] line 11                                                                  
-{                items•  {•id,•name,•qty•},•i    •(id)}     ↲                                                                                         
+{__sveltets_1_each(items, ({ id, name, qty }, i) => (id) && <>                                                                                        {/**
+{__sveltets_1_each(items,•({•id,•name,•qty•},•i)•=>•(id)•&&•<>↲    [generated] line 11                                                                
+{                  items•  {•id,•name,•qty•},•i    •(id)}     ↲                                                                                       
 {      items•   {•id,•name,•qty•},•i•(id)}↲                                                                                                           
-{#each•items•as•{•id,•name,•qty•},•i•(id)}↲                      [original] line 9                                                                    
+{#each•items•as•{•id,•name,•qty•},•i•(id)}↲                        [original] line 9                                                                  
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li>{i + 1}: {name} x {qty}</li>                                                                                                                  {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -50,11 +50,11 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(objects, ({ id, ...rest }) => <>                                                                                                     {/**
-{__sveltets_each(objects,•({•id,•...rest•})•=>•<>↲    [generated] line 15                                                                             
-{                objects•  {•id,•...rest•}    }  ↲                                                                                                    
+{__sveltets_1_each(objects, ({ id, ...rest }) => <>                                                                                                   {/**
+{__sveltets_1_each(objects,•({•id,•...rest•})•=>•<>↲    [generated] line 15                                                                           
+{                  objects•  {•id,•...rest•}    }  ↲                                                                                                  
 {      objects•   {•id,•...rest•}}↲                                                                                                                   
-{#each•objects•as•{•id,•...rest•}}↲                   [original] line 13                                                                              
+{#each•objects•as•{•id,•...rest•}}↲                     [original] line 13                                                                            
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li><span>{id}</span><MyComponent {...rest}/></li>                                                                                                {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -66,11 +66,11 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(items, ([id, ...rest]) => <>                                                                                                         {/**
-{__sveltets_each(items,•([id,•...rest])•=>•<>↲    [generated] line 19                                                                                 
-{                items•  [id,•...rest]    }  ↲                                                                                                        
+{__sveltets_1_each(items, ([id, ...rest]) => <>                                                                                                       {/**
+{__sveltets_1_each(items,•([id,•...rest])•=>•<>↲    [generated] line 19                                                                               
+{                  items•  [id,•...rest]    }  ↲                                                                                                      
 {      items•   [id,•...rest]}↲                                                                                                                       
-{#each•items•as•[id,•...rest]}↲                   [original] line 17                                                                                  
+{#each•items•as•[id,•...rest]}↲                     [original] line 17                                                                                
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li><span>{id}</span><MyComponent values={rest}/></li>                                                                                            {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -82,11 +82,11 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(todos, (todo) => <>                                                                                                                  {/**
-{__sveltets_each(todos,•(todo)•=>•<>↲    [generated] line 23                                                                                          
-{                todos•  todo    }  ↲                                                                                                                 
+{__sveltets_1_each(todos, (todo) => <>                                                                                                                {/**
+{__sveltets_1_each(todos,•(todo)•=>•<>↲    [generated] line 23                                                                                        
+{                  todos•  todo    }  ↲                                                                                                               
 {      todos•   todo}↲                                                                                                                                
-{#each•todos•as•todo}↲                   [original] line 21                                                                                           
+{#each•todos•as•todo}↲                     [original] line 21                                                                                         
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <p>{todo.text}</p>                                                                                                                                {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -100,5 +100,5 @@
 </>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/each-block/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/each-block/test.jsx
index 422eb3933..f560c7df0 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/each-block/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/each-block/test.jsx
@@ -1,63 +1,63 @@
 /** tested-ranges: [[7,5,"items"],[33,4,"name"],[47,3,"qty"],[73,5,"items"],[111,4,"name"],[125,3,"qty"],[151,5,"items"],[162,2,"id"],[166,4,"name"],[172,3,"qty"],[182,2,"id"],[202,4,"name"],[211,3,"qty"],[237,7,"objects"],[250,2,"id"],[257,4,"rest"],[277,2,"id"],[304,4,"rest"],[333,5,"items"],[369,2,"id"],[400,4,"rest"],[429,5,"todos"],[454,4,"text"]] */{/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<>{__sveltets_each(items, (item) => <>                                                                                                                {/**
-                   #====                                      [generated] line 3                                                                       */}
+<>{__sveltets_1_each(items, (item) => <>                                                                                                              {/**
+                     #====                                      [generated] line 3                                                                     */}
 {#each items as item}                                                                                                                                 {/**
-       #====                                                  [original] line 1                                                                       
+       #====                                                    [original] line 1                                                                     
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li>{item.name} x {item.qty}</li>                                                                                                                 {/**
-              1===          2==                               [generated] line 4                                                                       */}
+              1===          2==                                 [generated] line 4                                                                     */}
     <li>{item.name} x {item.qty}</li>                                                                                                                 {/**
-              1===          2==                               [original] line 2                                                                       
+              1===          2==                                 [original] line 2                                                                     
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(items, (item, i) => <>                                                                                                               {/**
-                 #====                                        [generated] line 7                                                                       */}
+{__sveltets_1_each(items, (item, i) => <>                                                                                                             {/**
+                   #====                                        [generated] line 7                                                                     */}
 {#each items as item, i}                                                                                                                              {/**
-       #====                                                  [original] line 5                                                                       
+       #====                                                    [original] line 5                                                                     
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li>{i + 1}: {item.name} x {item.qty}</li>                                                                                                        {/**
-                       1===          2==                      [generated] line 8                                                                       */}
+                       1===          2==                        [generated] line 8                                                                     */}
     <li>{i + 1}: {item.name} x {item.qty}</li>                                                                                                        {/**
-                       1===          2==                      [original] line 6                                                                       
+                       1===          2==                        [original] line 6                                                                     
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(items, ({ id, name, qty }, i) => (id) && <>                                                                                          {/**
-                 1====     2=  3===  4==           5=         [generated] line 11                                                                      */}
+{__sveltets_1_each(items, ({ id, name, qty }, i) => (id) && <>                                                                                        {/**
+                   1====     2=  3===  4==           5=         [generated] line 11                                                                    */}
 {#each items as { id, name, qty }, i (id)}                                                                                                            {/**
-       1====      2=  3===  4==       5=                      [original] line 9                                                                       
+       1====      2=  3===  4==       5=                        [original] line 9                                                                     
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li>{i + 1}: {name} x {qty}</li>                                                                                                                  {/**
-                  1===     2==                                [generated] line 12                                                                      */}
+                  1===     2==                                  [generated] line 12                                                                    */}
     <li>{i + 1}: {name} x {qty}</li>                                                                                                                  {/**
-                  1===     2==                                [original] line 10                                                                      
+                  1===     2==                                  [original] line 10                                                                    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(objects, ({ id, ...rest }) => <>                                                                                                     {/**
-                 1======     2=     3===                      [generated] line 15                                                                      */}
+{__sveltets_1_each(objects, ({ id, ...rest }) => <>                                                                                                   {/**
+                   1======     2=     3===                      [generated] line 15                                                                    */}
 {#each objects as { id, ...rest }}                                                                                                                    {/**
-       1======      2=     3===                               [original] line 13                                                                      
+       1======      2=     3===                                 [original] line 13                                                                    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li><span>{id}</span><MyComponent {...rest}/></li>                                                                                                {/**
-               1=                         2===                [generated] line 16                                                                      */}
+               1=                         2===                  [generated] line 16                                                                    */}
     <li><span>{id}</span><MyComponent {...rest}/></li>                                                                                                {/**
-               1=                         2===                [original] line 14                                                                      
+               1=                         2===                  [original] line 14                                                                    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(items, ([id, ...rest]) => <>                                                                                                         {/**
-                 #====                                        [generated] line 19                                                                      */}
+{__sveltets_1_each(items, ([id, ...rest]) => <>                                                                                                       {/**
+                   #====                                        [generated] line 19                                                                    */}
 {#each items as [id, ...rest]}                                                                                                                        {/**
-       #====                                                  [original] line 17                                                                      
+       #====                                                    [original] line 17                                                                    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <li><span>{id}</span><MyComponent values={rest}/></li>                                                                                            {/**
-               1=                             2===            [generated] line 20                                                                      */}
+               1=                             2===              [generated] line 20                                                                    */}
     <li><span>{id}</span><MyComponent values={rest}/></li>                                                                                            {/**
-               1=                             2===            [original] line 18                                                                      
+               1=                             2===              [original] line 18                                                                    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{__sveltets_each(todos, (todo) => <>                                                                                                                  {/**
-                 #====                                        [generated] line 23                                                                      */}
+{__sveltets_1_each(todos, (todo) => <>                                                                                                                {/**
+                   #====                                        [generated] line 23                                                                    */}
 {#each todos as todo}                                                                                                                                 {/**
-       #====                                                  [original] line 21                                                                      
+       #====                                                    [original] line 21                                                                    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     <p>{todo.text}</p>                                                                                                                                {/**
-             #===                                             [generated] line 24                                                                      */}
+             #===                                               [generated] line 24                                                                    */}
     <p>{todo.text}</p>                                                                                                                                {/**
-             #===                                             [original] line 22                                                                      
+             #===                                               [original] line 22                                                                    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /** origin-hash: 1y9mv6z */
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx
index fb47c67c7..157c56044 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx
@@ -59,5 +59,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx
index 3737fb835..ceee71266 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx
@@ -1,21 +1,21 @@
 ///<reference types="svelte" />
 <></>;function render() {                                                                                                                             {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<><Component  />{/*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$on('click', (__sveltets_store_get(check), $check) ? method1 : method2)}{/**
-=#                                                                                                                                                                                     Originless mappings
-<><Component••/>{/*Ωignore_startΩ*/new•Component({target:•__sveltets_any(''),•props:•{}})/*Ωignore_endΩ*/.$on('click',•(__sveltets_store_get(check),•$check)•?•method1•:•method2)}↲    [generated] line 3
-  <Component••/>                                                                                           on: click=  $                     check          •?•method1•:•method2} ↲    
-               #===========================================================================================                                                                            Order-breaking mappings
-<Component•on:click= $check•?•method1•:•method2}•/>↲                                                                                                                                   
-<Component•on:click={$check•?•method1•:•method2}•/>↲                                                                                                                                   [original] line 1 
+<><Component  />{/*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$on('click', (__sveltets_1_store_get(check), $check) ? method1 : method2)}{/**
+=#                                                                                                                                                                                         Originless mappings
+<><Component••/>{/*Ωignore_startΩ*/new•Component({target:•__sveltets_1_any(''),•props:•{}})/*Ωignore_endΩ*/.$on('click',•(__sveltets_1_store_get(check),•$check)•?•method1•:•method2)}↲    [generated] line 3
+  <Component••/>                                                                                             on: click=  $                       check          •?•method1•:•method2} ↲    
+               #=============================================================================================                                                                              Order-breaking mappings
+<Component•on:click= $check•?•method1•:•method2}•/>↲                                                                                                                                       
+<Component•on:click={$check•?•method1•:•method2}•/>↲                                                                                                                                       [original] line 1 
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<button onclick={(__sveltets_store_get(check), $check) ? method1 : method2} >Bla</button></>                                                          {/**
-<button•onclick={(__sveltets_store_get(check),•$check)•?•method1•:•method2}•>Bla</button></>↲    [generated] line 4                                   
-<button•on:    ={$                     check          •?•method1•:•method2}•>Bla</button>                                                             
+<button onclick={(__sveltets_1_store_get(check), $check) ? method1 : method2} >Bla</button></>                                                        {/**
+<button•onclick={(__sveltets_1_store_get(check),•$check)•?•method1•:•method2}•>Bla</button></>↲    [generated] line 4                                 
+<button•on:    ={$                       check          •?•method1•:•method2}•>Bla</button>                                                           
 <button•on:     ={$check•?•method1•:•method2}•>Bla</button>                                                                                           
-<button•on:click={$check•?•method1•:•method2}•>Bla</button>                                      [original] line 2                                    
+<button•on:click={$check•?•method1•:•method2}•>Bla</button>                                        [original] line 2                                  
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/event-binding/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/event-binding/test.jsx
index 89b888f6c..0045c7225 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/event-binding/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/event-binding/test.jsx
@@ -1,13 +1,13 @@
 /** tested-ranges: [[22,5,"check"],[28,19,"? method1 : method2"],[71,5,"check"],[77,19,"? method1 : method2"]] */                                     {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<><Component  />{__sveltets_instanceOf(Component).$on('click', (__sveltets_store_get(check), $check) ? method1 : method2)}                            {/**
-                                                                                     1====           2==================    [generated] line 3         */}
+<><Component  />{/*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$on('click', (__sveltets_1_store_get(check), $check) ? method1 : method2)}{/**
+                                                                                                                                                 1====           2==================    [generated] line 3 */}
 <Component on:click={$check ? method1 : method2} />                                                                                                   {/**
-                      1==== 2==================                                                                             [original] line 1         
+                      1==== 2==================                                                                                                                                         [original] line 1
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<button onclick={(__sveltets_store_get(check), $check) ? method1 : method2} >Bla</button></>                                                          {/**
-                                       1====           2==================                                                  [generated] line 4         */}
+<button onclick={(__sveltets_1_store_get(check), $check) ? method1 : method2} >Bla</button></>                                                        {/**
+                                         1====           2==================                                                                                                            [generated] line 4 */}
 <button on:click={$check ? method1 : method2} >Bla</button>                                                                                           {/**
-                   1==== 2==================                                                                                [original] line 2         
+                   1==== 2==================                                                                                                                                            [original] line 2
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /** origin-hash: 25dzah */
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx
index a00c24fdf..54a498eb5 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx
@@ -18,11 +18,11 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{((__sveltets_store_get(foo), $foo)) ? <><element /></> : <></>}                                                                                      {/**
-{((__sveltets_store_get(foo),•$foo))•?•<><element•/></>•:•<></>}↲    [generated] line 7                                                               
-{ $                     foo        }     <element•/>{           ↲                                                                                     
+{((__sveltets_1_store_get(foo), $foo)) ? <><element /></> : <></>}                                                                                    {/**
+{((__sveltets_1_store_get(foo),•$foo))•?•<><element•/></>•:•<></>}↲    [generated] line 7                                                             
+{ $                       foo        }     <element•/>{           ↲                                                                                   
 {    $foo}<element•/>{    ↲                                                                                                                           
-{#if•$foo}<element•/>{/if}↲                                          [original] line 5                                                                
+{#if•$foo}<element•/>{/if}↲                                            [original] line 5                                                              
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -57,5 +57,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/if-block/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/if-block/test.jsx
index 13da8089e..f59f28b79 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/if-block/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/if-block/test.jsx
@@ -1,23 +1,23 @@
 /** tested-ranges: [[5,3,"foo"],[36,3,"foo"],[63,3,"foo"],[90,3,"bar"]] */                                                                            {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 <>{(foo) ? <>                                                                                                                                         {/**
-    #==                                                           [generated] line 3                                                                   */}
+    #==                                                             [generated] line 3                                                                 */}
 {#if foo}                                                                                                                                             {/**
-     #==                                                          [original] line 1                                                                   
+     #==                                                            [original] line 1                                                                 
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-{((__sveltets_store_get(foo), $foo)) ? <><element /></> : <></>}                                                                                      {/**
-                        #==                                       [generated] line 7                                                                   */}
+{((__sveltets_1_store_get(foo), $foo)) ? <><element /></> : <></>}                                                                                    {/**
+                          #==                                       [generated] line 7                                                                 */}
 {#if $foo}<element />{/if}                                                                                                                            {/**
-      #==                                                         [original] line 5                                                                   
+      #==                                                           [original] line 5                                                                 
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 {(foo) ? <>                                                                                                                                           {/**
-  #==                                                             [generated] line 9                                                                   */}
+  #==                                                               [generated] line 9                                                                 */}
 {#if foo}                                                                                                                                             {/**
-     #==                                                          [original] line 7                                                                   
+     #==                                                            [original] line 7                                                                 
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 </> : (bar) ? <>                                                                                                                                      {/**
-       #==                                                        [generated] line 11                                                                  */}
+       #==                                                          [generated] line 11                                                                */}
 {:else if bar}                                                                                                                                        {/**
-          #==                                                     [original] line 9                                                                   
+          #==                                                       [original] line 9                                                                 
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /** origin-hash: ze5mug */
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/large-sample-1/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/large-sample-1/mappings.jsx
index a67b3b8eb..32bee9cbf 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/large-sample-1/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/large-sample-1/mappings.jsx
@@ -170,17 +170,17 @@ s
     const tutorial_repo_link = 'https://github.com/sveltejs/svelte/tree/master/site/content/tutorial';
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  selected = __sveltets_invalidate(() => lookup.get(slug));                                                                                    {/**
-   ╚let••selected•=•__sveltets_invalidate(()•=>•lookup.get(slug));↲    [generated] line 73                                                            
-   ╚    •selected•=•                            lookup.get(slug); ↲                                                                                   
+    let  selected = __sveltets_1_invalidate(() => lookup.get(slug));                                                                                  {/**
+   ╚let••selected•=•__sveltets_1_invalidate(()•=>•lookup.get(slug));↲    [generated] line 73                                                          
+   ╚    •selected•=•                              lookup.get(slug); ↲                                                                                 
    ╚  •selected•=•lookup.get(slug);↲                                                                                                                  
-   ╚$:•selected•=•lookup.get(slug);↲                                   [original] line 67                                                             
+   ╚$:•selected•=•lookup.get(slug);↲                                     [original] line 67                                                           
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  improve_link = __sveltets_invalidate(() => `${tutorial_repo_link}/${selected.chapter.section_dir}/${selected.chapter.chapter_dir}`);         {/**
-   ╚let••improve_link•=•__sveltets_invalidate(()•=>•`${tutorial_repo_link}/${selected.chapter.section_dir}/${selected.chapter.chapter_dir}`);↲    [generated] line 74
-   ╚    •improve_link•=•                            `${tutorial_repo_link}/${selected.chapter.section_dir}/${selected.chapter.chapter_dir}`; ↲        
+    let  improve_link = __sveltets_1_invalidate(() => `${tutorial_repo_link}/${selected.chapter.section_dir}/${selected.chapter.chapter_dir}`);       {/**
+   ╚let••improve_link•=•__sveltets_1_invalidate(()•=>•`${tutorial_repo_link}/${selected.chapter.section_dir}/${selected.chapter.chapter_dir}`);↲    [generated] line 74
+   ╚    •improve_link•=•                              `${tutorial_repo_link}/${selected.chapter.section_dir}/${selected.chapter.chapter_dir}`; ↲      
    ╚  •improve_link•=•`${tutorial_repo_link}/${selected.chapter.section_dir}/${selected.chapter.chapter_dir}`;↲                                       
-   ╚$:•improve_link•=•`${tutorial_repo_link}/${selected.chapter.section_dir}/${selected.chapter.chapter_dir}`;↲                                   [original] line 68 
+   ╚$:•improve_link•=•`${tutorial_repo_link}/${selected.chapter.section_dir}/${selected.chapter.chapter_dir}`;↲                                     [original] line 68 
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 
     const clone = file => ({
@@ -206,11 +206,11 @@ s
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  mobile = __sveltets_invalidate(() => width < 768);                                                                                           {/**
-   ╚let••mobile•=•__sveltets_invalidate(()•=>•width•<•768);↲    [generated] line 89                                                                   
-   ╚    •mobile•=•                            width•<•768; ↲                                                                                          
+    let  mobile = __sveltets_1_invalidate(() => width < 768);                                                                                         {/**
+   ╚let••mobile•=•__sveltets_1_invalidate(()•=>•width•<•768);↲    [generated] line 89                                                                 
+   ╚    •mobile•=•                              width•<•768; ↲                                                                                        
    ╚  •mobile•=•width•<•768;↲                                                                                                                         
-   ╚$:•mobile•=•width•<•768;↲                                   [original] line 83                                                                    
+   ╚$:•mobile•=•width•<•768;↲                                     [original] line 83                                                                  
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 
     function reset() {
@@ -323,11 +323,11 @@ s
             </div>
                                                                                                                                                       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-            <div class="chapter-markup" {...__sveltets_ensureType(__sveltets_ctorOf(__sveltets_mapElementTag('div')), scrollable)}>                   {/**
-         ╚╚╚<div•class="chapter-markup"•{...__sveltets_ensureType(__sveltets_ctorOf(__sveltets_mapElementTag('div')),•scrollable)}>↲    [generated] line 139
-         ╚╚╚<div•c    ="chapter-markup"•                                                                              scrollable} >↲                  
+            <div class="chapter-markup" {...__sveltets_1_ensureType(__sveltets_1_ctorOf(__sveltets_1_mapElementTag('div')), scrollable)}>             {/**
+         ╚╚╚<div•class="chapter-markup"•{...__sveltets_1_ensureType(__sveltets_1_ctorOf(__sveltets_1_mapElementTag('div')),•scrollable)}>↲    [generated] line 139
+         ╚╚╚<div•c    ="chapter-markup"•                                                                                    scrollable} >↲            
          ╚╚╚<div•c    ="chapter-markup"•           scrollable}>↲                                                                                      
-         ╚╚╚<div•class="chapter-markup"•bind:this={scrollable}>↲                                                                        [original] line 278 
+         ╚╚╚<div•class="chapter-markup"•bind:this={scrollable}>↲                                                                              [original] line 278 
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                 { chapter.html}                                                                                                                       {/**
             ╚╚╚╚{•chapter.html}↲         [generated] line 140                                                                                         
@@ -400,11 +400,11 @@ s
         <div class="tutorial-repl">
             <Repl                                                                                                                                     {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-                {...__sveltets_ensureType(Repl, repl)}                                                                                                {/**
-            ╚╚╚╚{...__sveltets_ensureType(Repl,•repl)}↲    [generated] line 163                                                                       
-            ╚╚╚╚                                repl} ↲                                                                                               
+                {...__sveltets_1_ensureType(Repl, repl)}                                                                                              {/**
+            ╚╚╚╚{...__sveltets_1_ensureType(Repl,•repl)}↲    [generated] line 163                                                                     
+            ╚╚╚╚                                  repl} ↲                                                                                             
             ╚╚╚╚           repl}↲                                                                                                                     
-            ╚╚╚╚bind:this={repl}↲                          [original] line 303                                                                        
+            ╚╚╚╚bind:this={repl}↲                            [original] line 303                                                                      
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                 workersUrl="workers"                                                                                                                  {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -429,17 +429,17 @@ s
                 injectedJS={mapbox_setup}
                 relaxed                                                                                                                               {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-            />{/*Ωignore_startΩ*/new Repl({target: __sveltets_any(''), props: {'workersUrl':"", 'svelteUrl':svelteUrl, 'rollupUrl':rollupUrl, 'orientation':mobile ? 'columns' : 'rows', 'fixed':mobile, 'injectedJS':mapbox_setup, 'relaxed':true}})/*Ωignore_endΩ*/.$on('change', handle_change)}{/**
-         ╚╚╚/>{/*Ωignore_startΩ*/new•Repl({target:•__sveltets_any(''),•props:•{'workersUrl':"",•'svelteUrl':svelteUrl,•'rollupUrl':rollupUrl,•'orientation':mobile•?•'columns'•:•'rows',•'fixed':mobile,•'injectedJS':mapbox_setup,•'relaxed':true}})/*Ωignore_endΩ*/.$on('change',•handle_change)}↲    [generated] line 172
-                                                                                                                                                                                                                                                                       on('change',•handle_change)}     [generated] subset
-                                                                                                                                                                                                                                                                       on: change=  handle_change}      
-             on:change= handle_change}                                                                                                                                                                                                                                                                  
-         ╚╚╚╚on:change={handle_change}↲                                                                                                                                                                                                                                                                 [original] line 309 (rest generated at line 169)
-                                                                                                                                                                                                                                                                                                        
-         ╚╚╚/>{/*Ωignore_startΩ*/new•Repl({target:•__sveltets_any(''),•props:•{'workersUrl':"",•'svelteUrl':svelteUrl,•'rollupUrl':rollupUrl,•'orientation':mobile•?•'columns'•:•'rows',•'fixed':mobile,•'injectedJS':mapbox_setup,•'relaxed':true}})/*Ωignore_endΩ*/.$on('change',•handle_change)}↲    [generated] line 172
-         ╚╚╚/>{/*Ωignore_startΩ*/new•Repl({target:•__sveltets_any(''),•props:•{'workersUrl':"",•'svelteUrl':svelteUrl,•'rollupUrl':rollupUrl,•'orientation':mobile•?•'columns'•:•'rows',•'fixed':mobile,•'injectedJS':mapbox_setup,•'relaxed':true}})/*Ωignore_endΩ*/.$                            ↲    [generated] subset
-         ╚╚╚/>                                                                                                                                                                                                                                                                                     ↲    
-         ╚╚╚/>↲                                                                                                                                                                                                                                                                                         [original] line 312 
+            />{/*Ωignore_startΩ*/new Repl({target: __sveltets_1_any(''), props: {'workersUrl':"", 'svelteUrl':svelteUrl, 'rollupUrl':rollupUrl, 'orientation':mobile ? 'columns' : 'rows', 'fixed':mobile, 'injectedJS':mapbox_setup, 'relaxed':true}})/*Ωignore_endΩ*/.$on('change', handle_change)}{/**
+         ╚╚╚/>{/*Ωignore_startΩ*/new•Repl({target:•__sveltets_1_any(''),•props:•{'workersUrl':"",•'svelteUrl':svelteUrl,•'rollupUrl':rollupUrl,•'orientation':mobile•?•'columns'•:•'rows',•'fixed':mobile,•'injectedJS':mapbox_setup,•'relaxed':true}})/*Ωignore_endΩ*/.$on('change',•handle_change)}↲    [generated] line 172
+                                                                                                                                                                                                                                                                         on('change',•handle_change)}     [generated] subset
+                                                                                                                                                                                                                                                                         on: change=  handle_change}      
+             on:change= handle_change}                                                                                                                                                                                                                                                                    
+         ╚╚╚╚on:change={handle_change}↲                                                                                                                                                                                                                                                                   [original] line 309 (rest generated at line 169)
+                                                                                                                                                                                                                                                                                                          
+         ╚╚╚/>{/*Ωignore_startΩ*/new•Repl({target:•__sveltets_1_any(''),•props:•{'workersUrl':"",•'svelteUrl':svelteUrl,•'rollupUrl':rollupUrl,•'orientation':mobile•?•'columns'•:•'rows',•'fixed':mobile,•'injectedJS':mapbox_setup,•'relaxed':true}})/*Ωignore_endΩ*/.$on('change',•handle_change)}↲    [generated] line 172
+         ╚╚╚/>{/*Ωignore_startΩ*/new•Repl({target:•__sveltets_1_any(''),•props:•{'workersUrl':"",•'svelteUrl':svelteUrl,•'rollupUrl':rollupUrl,•'orientation':mobile•?•'columns'•:•'rows',•'fixed':mobile,•'injectedJS':mapbox_setup,•'relaxed':true}})/*Ωignore_endΩ*/.$                            ↲    [generated] subset
+         ╚╚╚/>                                                                                                                                                                                                                                                                                       ↲    
+         ╚╚╚/>↲                                                                                                                                                                                                                                                                                           [original] line 312 
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
         </div>
     </div>
@@ -469,5 +469,5 @@ s
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {slug: slug , chapter: chapter}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/let/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/let/mappings.jsx
index a77d866b7..fa9938a7f 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/let/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/let/mappings.jsx
@@ -12,11 +12,11 @@
         ↲                                                                                                                                             
 <script>↲    [original] line 1 (rest generated at line 2)                                                                                             
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  selected = __sveltets_invalidate(() => lookup.get(slug));                                                                                    {/**
-••••let••selected•=•__sveltets_invalidate(()•=>•lookup.get(slug));↲    [generated] line 4                                                             
-••••    •selected•=•                            lookup.get(slug); ↲                                                                                   
+    let  selected = __sveltets_1_invalidate(() => lookup.get(slug));                                                                                  {/**
+••••let••selected•=•__sveltets_1_invalidate(()•=>•lookup.get(slug));↲    [generated] line 4                                                           
+••••    •selected•=•                              lookup.get(slug); ↲                                                                                 
 ••••  •selected•=•lookup.get(slug);↲                                                                                                                  
-••••$:•selected•=•lookup.get(slug);↲                                   [original] line 2                                                              
+••••$:•selected•=•lookup.get(slug);↲                                     [original] line 2                                                            
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 ;                                                                                                                                                     {/**
 ;↲           [generated] line 5                                                                                                                       
@@ -26,5 +26,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/let/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/let/test.jsx
index d8ef486af..1d22db26a 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/let/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/let/test.jsx
@@ -1,8 +1,8 @@
 /** tested-ranges: [[16,8,"selected"],[27,16,"lookup.get(slug)"]] */                                                                                  {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  selected = __sveltets_invalidate(() => lookup.get(slug));                                                                                    {/**
-         1=======                               2===============    [generated] line 4                                                                 */}
+    let  selected = __sveltets_1_invalidate(() => lookup.get(slug));                                                                                  {/**
+         1=======                                 2===============    [generated] line 4                                                               */}
     $: selected = lookup.get(slug);                                                                                                                   {/**
-       1=======   2===============                                  [original] line 2                                                                 
+       1=======   2===============                                    [original] line 2                                                               
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /** origin-hash: 1rzn86d */
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/property-shorthand/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/property-shorthand/mappings.jsx
index 38f9dbbb7..ef23ea8c2 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/property-shorthand/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/property-shorthand/mappings.jsx
@@ -9,5 +9,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/mappings.jsx
index 3d243b414..590155920 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/mappings.jsx
@@ -12,23 +12,23 @@
         ↲                                                                                                                                             
 <script>↲    [original] line 1 (rest generated at line 2)                                                                                             
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-     let prop/*Ωignore_startΩ*/;let $prop = __sveltets_store_get(prop);/*Ωignore_endΩ*/                                                               {/**
-   ╚•let•prop/*Ωignore_startΩ*/;let•$prop•=•__sveltets_store_get(prop);/*Ωignore_endΩ*/↲    [generated] line 4                                        
-   ╚•let•prop                                                                          ↲                                                              
+     let prop/*Ωignore_startΩ*/;let $prop = __sveltets_1_store_get(prop);/*Ωignore_endΩ*/                                                             {/**
+   ╚•let•prop/*Ωignore_startΩ*/;let•$prop•=•__sveltets_1_store_get(prop);/*Ωignore_endΩ*/↲    [generated] line 4                                      
+   ╚•let•prop                                                                            ↲                                                            
    ╚      •let•prop↲                                                                                                                                  
-   ╚export•let•prop↲                                                                        [original] line 2                                         
+   ╚export•let•prop↲                                                                          [original] line 2                                       
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  foo = __sveltets_invalidate(() => prop);                                                                                                     {/**
-   ╚let••foo•=•__sveltets_invalidate(()•=>•prop);↲    [generated] line 5                                                                              
-   ╚    •foo•=•                            prop; ↲                                                                                                    
+    let  foo = __sveltets_1_invalidate(() => prop);                                                                                                   {/**
+   ╚let••foo•=•__sveltets_1_invalidate(()•=>•prop);↲    [generated] line 5                                                                            
+   ╚    •foo•=•                              prop; ↲                                                                                                  
    ╚  •foo•=•prop;↲                                                                                                                                   
-   ╚$:•foo•=•prop;↲                                   [original] line 3                                                                               
+   ╚$:•foo•=•prop;↲                                     [original] line 3                                                                             
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  bar = __sveltets_invalidate(() => (__sveltets_store_get(prop), $prop));                                                                      {/**
-   ╚let••bar•=•__sveltets_invalidate(()•=>•(__sveltets_store_get(prop),•$prop));↲    [generated] line 6                                               
-   ╚    •bar•=•                            $                     prop         ; ↲                                                                     
+    let  bar = __sveltets_1_invalidate(() => (__sveltets_1_store_get(prop), $prop));                                                                  {/**
+   ╚let••bar•=•__sveltets_1_invalidate(()•=>•(__sveltets_1_store_get(prop),•$prop));↲    [generated] line 6                                           
+   ╚    •bar•=•                              $                       prop         ; ↲                                                                 
    ╚  •bar•=•$prop;↲                                                                                                                                  
-   ╚$:•bar•=•$prop;↲                                                                 [original] line 4                                                
+   ╚$:•bar•=•$prop;↲                                                                     [original] line 4                                            
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     ;() => {$: if (bar) ++foo}                                                                                                                        {/**
    ╚;()•=>•{$:•if•(bar)•++foo}↲    [generated] line 7                                                                                                 
@@ -48,5 +48,5 @@
 () => (<></>);
 return { props: {prop: prop}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/test.jsx
index f7768d107..7e14afd8d 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/reactive-statements/test.jsx
@@ -1,28 +1,28 @@
 /** tested-ranges: [[21,4,"prop"],[30,3,"foo"],[36,4,"prop"],[46,3,"bar"],[53,4,"prop"],[67,3,"bar"],[74,3,"foo"],[88,3,"foo"],[93,3,"bar"]] */       {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-     let prop/*Ωignore_startΩ*/;let $prop = __sveltets_store_get(prop);/*Ωignore_endΩ*/                                                               {/**
-         #===                                                                            [generated] line 4                                            */}
+     let prop/*Ωignore_startΩ*/;let $prop = __sveltets_1_store_get(prop);/*Ωignore_endΩ*/                                                             {/**
+         #===                                                                              [generated] line 4                                          */}
     export let prop                                                                                                                                   {/**
-               #===                                                                      [original] line 2                                            
+               #===                                                                        [original] line 2                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  foo = __sveltets_invalidate(() => prop);                                                                                                     {/**
-         1==                               2===                                          [generated] line 5                                            */}
+    let  foo = __sveltets_1_invalidate(() => prop);                                                                                                   {/**
+         1==                                 2===                                          [generated] line 5                                          */}
     $: foo = prop;                                                                                                                                    {/**
-       1==   2===                                                                        [original] line 3                                            
+       1==   2===                                                                          [original] line 3                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  bar = __sveltets_invalidate(() => (__sveltets_store_get(prop), $prop));                                                                      {/**
-         1==                                                     2===                    [generated] line 6                                            */}
+    let  bar = __sveltets_1_invalidate(() => (__sveltets_1_store_get(prop), $prop));                                                                  {/**
+         1==                                                         2===                  [generated] line 6                                          */}
     $: bar = $prop;                                                                                                                                   {/**
-       1==    2===                                                                       [original] line 4                                            
+       1==    2===                                                                         [original] line 4                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     ;() => {$: if (bar) ++foo}                                                                                                                        {/**
-                   1==    2==                                                            [generated] line 7                                            */}
+                   1==    2==                                                              [generated] line 7                                          */}
     $: if (bar) ++foo                                                                                                                                 {/**
-           1==    2==                                                                    [original] line 5                                            
+           1==    2==                                                                      [original] line 5                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
     ;() => {$: { if (foo) bar(); }}                                                                                                                   {/**
-                     1==  2==                                                            [generated] line 8                                            */}
+                     1==  2==                                                              [generated] line 8                                          */}
     $: { if (foo) bar(); }                                                                                                                            {/**
-             1==  2==                                                                    [original] line 6                                            
+             1==  2==                                                                      [original] line 6                                          
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /** origin-hash: 1jziapq */
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/mappings.jsx
index f8a29e0b8..48fd5013f 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/mappings.jsx
@@ -1,11 +1,11 @@
 ///<reference types="svelte" />
 //----------------------------------------------------------------------------------------------------------------------------------------------------
-<></>;function render() { let $$props = __sveltets_allPropsType(); let $$restProps = __sveltets_restPropsType(); let $$slots = __sveltets_slotsType({});{/**
-=#                                                                                                                                                           Originless mappings
-<></>;function•render()•{•let•$$props•=•__sveltets_allPropsType();•let•$$restProps•=•__sveltets_restPropsType();•let•$$slots•=•__sveltets_slotsType({});↲    [generated] line 2
-  <   s                                                                                                                                                      
-<s                                                                                                                                                           
-<script>↲                                                                                                                                                    [original] line 1 (rest generated at line 3)
+<></>;function render() { let $$props = __sveltets_1_allPropsType(); let $$restProps = __sveltets_1_restPropsType(); let $$slots = __sveltets_1_slotsType({});{/**
+=#                                                                                                                                                                 Originless mappings
+<></>;function•render()•{•let•$$props•=•__sveltets_1_allPropsType();•let•$$restProps•=•__sveltets_1_restPropsType();•let•$$slots•=•__sveltets_1_slotsType({});↲    [generated] line 2
+  <   s                                                                                                                                                            
+<s                                                                                                                                                                 
+<script>↲                                                                                                                                                          [original] line 1 (rest generated at line 3)
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
                                                                                                                                                       {/**
 ↲            [generated] line 3                                                                                                                       
@@ -16,11 +16,11 @@
     $$restProps;
     $$props;                                                                                                                                          {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  foo = __sveltets_invalidate(() => ({...$$slots, ...$$restProps, ...$$props}));                                                               {/**
-   ╚let••foo•=•__sveltets_invalidate(()•=>•({...$$slots,•...$$restProps,•...$$props}));↲    [generated] line 7                                        
-   ╚    •foo•=•                             {...$$slots,•...$$restProps,•...$$props} ; ↲                                                              
+    let  foo = __sveltets_1_invalidate(() => ({...$$slots, ...$$restProps, ...$$props}));                                                             {/**
+   ╚let••foo•=•__sveltets_1_invalidate(()•=>•({...$$slots,•...$$restProps,•...$$props}));↲    [generated] line 7                                      
+   ╚    •foo•=•                               {...$$slots,•...$$restProps,•...$$props} ; ↲                                                            
    ╚  •foo•=•{...$$slots,•...$$restProps,•...$$props};↲                                                                                               
-   ╚$:•foo•=•{...$$slots,•...$$restProps,•...$$props};↲                                     [original] line 5                                         
+   ╚$:•foo•=•{...$$slots,•...$$restProps,•...$$props};↲                                       [original] line 5                                       
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 ;                                                                                                                                                     {/**
 ;↲            [generated] line 8                                                                                                                      
@@ -53,5 +53,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial_with_any(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/test.jsx
index 595c7920c..da01f21b5 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/reserved-variables/test.jsx
@@ -1,17 +1,17 @@
 /** tested-ranges: [[1,1,"$$props"],[1,1,"$$restProps"],[1,1,"$$slots"],[10,7,"$$slots"],[20,11,"$$restProps"],[34,7,"$$props"],[47,3,"foo"],[57,7,"$$slots"],[69,11,"$$restProps"],[85,7,"$$props"],[119,3,"foo"],[138,3,"bar"],[162,7,"$$props"]] */{/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<></>;function render() { let $$props = __sveltets_allPropsType(); let $$restProps = __sveltets_restPropsType(); let $$slots = __sveltets_slotsType({});{/**
+<></>;function render() { let $$props = __sveltets_1_allPropsType(); let $$restProps = __sveltets_1_restPropsType(); let $$slots = __sveltets_1_slotsType({});{/**
                               #======                                                                                                                     [generated] line 2 */}
 <script>                                                                                                                                              {/**
  #                                                                                                                                                        [original] line 1
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<></>;function render() { let $$props = __sveltets_allPropsType(); let $$restProps = __sveltets_restPropsType(); let $$slots = __sveltets_slotsType({});{/**
-                                                                       #==========                                                                        [generated] line 2 */}
+<></>;function render() { let $$props = __sveltets_1_allPropsType(); let $$restProps = __sveltets_1_restPropsType(); let $$slots = __sveltets_1_slotsType({});{/**
+                                                                         #==========                                                                        [generated] line 2 */}
 <script>                                                                                                                                              {/**
  #                                                                                                                                                        [original] line 1
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<></>;function render() { let $$props = __sveltets_allPropsType(); let $$restProps = __sveltets_restPropsType(); let $$slots = __sveltets_slotsType({});{/**
-                                                                                                                     #======                              [generated] line 2 */}
+<></>;function render() { let $$props = __sveltets_1_allPropsType(); let $$restProps = __sveltets_1_restPropsType(); let $$slots = __sveltets_1_slotsType({});{/**
+                                                                                                                         #======                              [generated] line 2 */}
 <script>                                                                                                                                              {/**
  #                                                                                                                                                        [original] line 1
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
@@ -30,8 +30,8 @@
     $$props;                                                                                                                                          {/**
     #======                                                                                                                                               [original] line 4
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    let  foo = __sveltets_invalidate(() => ({...$$slots, ...$$restProps, ...$$props}));                                                               {/**
-         1==                                    2======     3==========     4======                                                                       [generated] line 7 */}
+    let  foo = __sveltets_1_invalidate(() => ({...$$slots, ...$$restProps, ...$$props}));                                                               {/**
+         1==                                      2======     3==========     4======                                                                       [generated] line 7 */}
     $: foo = {...$$slots, ...$$restProps, ...$$props};                                                                                                {/**
        1==       2======     3==========     4======                                                                                                      [original] line 5
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/simple-element/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/simple-element/mappings.jsx
index cbc77a93e..69a499cce 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/simple-element/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/simple-element/mappings.jsx
@@ -9,5 +9,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/slots/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/slots/mappings.jsx
index 93633da6c..94e8d3ba5 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/slots/mappings.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/slots/mappings.jsx
@@ -1,6 +1,6 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/                                                       {/**
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/                                                     {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 <><slot />                                                                                                                                            {/**
 =#             Originless mappings                                                                                                                    
@@ -38,5 +38,5 @@
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 return { props: {}, slots: {'default': {}, 'foo': {}, 'bar': {foo:foo, baz:baz}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/slots/test.jsx b/packages/svelte2tsx/test/sourcemaps/samples/slots/test.jsx
index 7bf7147cb..6fd60ef0d 100644
--- a/packages/svelte2tsx/test/sourcemaps/samples/slots/test.jsx
+++ b/packages/svelte2tsx/test/sourcemaps/samples/slots/test.jsx
@@ -1,18 +1,18 @@
 /** tested-ranges: [[55,3,"foo"],[72,3,"baz"],[112,3,"foo"],[130,3,"baz"]] */                                                                         {/**
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-<slot foo={foo} name="bar" baz={baz} leet>fallback</slot>                                                                                             {/**
-           1==                  2==                        [generated] line 7                                                                          */}
+<slot foo={__sveltets_ensureSlot("bar","foo",foo)} name="bar" baz={__sveltets_ensureSlot("bar","baz",baz)} leet>fallback</slot>                       {/**
+                                             1==                                                     2==                         [generated] line 8    */}
 <slot foo={foo} name="bar" {baz} leet>fallback</slot>                                                                                                 {/**
-           1==              2==                            [original] line 5                                                                          
+           1==              2==                                                                                                  [original] line 5    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
+    foo={__sveltets_ensureSlot("bar","foo",foo)} name="bar"                                                                                           {/**
+                                           #==                                                                                   [generated] line 11   */}
     foo={foo} name="bar"                                                                                                                              {/**
-         #==                                               [generated] line 10                                                                         */}
-    foo={foo} name="bar"                                                                                                                              {/**
-         #==                                               [original] line 8                                                                          
+         #==                                                                                                                     [original] line 8    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
-    baz={baz}                                                                                                                                         {/**
-         #==                                               [generated] line 11                                                                         */}
+    baz={__sveltets_ensureSlot("bar","baz",baz)}                                                                                                      {/**
+                                           #==                                                                                   [generated] line 12   */}
     {baz}                                                                                                                                             {/**
-     #==                                                   [original] line 9                                                                          
+     #==                                                                                                                         [original] line 9    
 ------------------------------------------------------------------------------------------------------------------------------------------------------ */}
 /** origin-hash: 1pdpo7w */
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
index f5b93643a..9a57ff104 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-as-directive/expected.tsx
@@ -1,23 +1,23 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-	const transitionStore = null/*Ωignore_startΩ*/;let $transitionStore = __sveltets_store_get(transitionStore);/*Ωignore_endΩ*/;
-	const animateStore = null/*Ωignore_startΩ*/;let $animateStore = __sveltets_store_get(animateStore);/*Ωignore_endΩ*/;
-	const inStore = null/*Ωignore_startΩ*/;let $inStore = __sveltets_store_get(inStore);/*Ωignore_endΩ*/;
-	const outStore = null/*Ωignore_startΩ*/;let $outStore = __sveltets_store_get(outStore);/*Ωignore_endΩ*/;
-	const actionStore = null/*Ωignore_startΩ*/;let $actionStore = __sveltets_store_get(actionStore);/*Ωignore_endΩ*/;
+	const transitionStore = null/*Ωignore_startΩ*/;let $transitionStore = __sveltets_1_store_get(transitionStore);/*Ωignore_endΩ*/;
+	const animateStore = null/*Ωignore_startΩ*/;let $animateStore = __sveltets_1_store_get(animateStore);/*Ωignore_endΩ*/;
+	const inStore = null/*Ωignore_startΩ*/;let $inStore = __sveltets_1_store_get(inStore);/*Ωignore_endΩ*/;
+	const outStore = null/*Ωignore_startΩ*/;let $outStore = __sveltets_1_store_get(outStore);/*Ωignore_endΩ*/;
+	const actionStore = null/*Ωignore_startΩ*/;let $actionStore = __sveltets_1_store_get(actionStore);/*Ωignore_endΩ*/;
 ;
 () => (<>
 
 <div 
-    {...__sveltets_ensureTransition((__sveltets_store_get(transitionStore), $transitionStore)(__sveltets_mapElementTag('div'),({ y: 100 })))}
-    {...__sveltets_ensureAction((__sveltets_store_get(actionStore), $actionStore)(__sveltets_mapElementTag('div')))}
-    {...__sveltets_ensureTransition((__sveltets_store_get(inStore), $inStore)(__sveltets_mapElementTag('div'),{}))}
-    {...__sveltets_ensureTransition((__sveltets_store_get(outStore), $outStore)(__sveltets_mapElementTag('div'),{}))}
-    {...__sveltets_ensureAnimation((__sveltets_store_get(animateStore), $animateStore)(__sveltets_mapElementTag('div'),__sveltets_AnimationMove,{}))}
+    {...__sveltets_1_ensureTransition((__sveltets_1_store_get(transitionStore), $transitionStore)(__sveltets_1_mapElementTag('div'),({ y: 100 })))}
+    {...__sveltets_1_ensureAction((__sveltets_1_store_get(actionStore), $actionStore)(__sveltets_1_mapElementTag('div')))}
+    {...__sveltets_1_ensureTransition((__sveltets_1_store_get(inStore), $inStore)(__sveltets_1_mapElementTag('div'),{}))}
+    {...__sveltets_1_ensureTransition((__sveltets_1_store_get(outStore), $outStore)(__sveltets_1_mapElementTag('div'),{}))}
+    {...__sveltets_1_ensureAnimation((__sveltets_1_store_get(animateStore), $animateStore)(__sveltets_1_mapElementTag('div'),__sveltets_1_AnimationMove,{}))}
 >
 </div></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx
index 3aaf3b5e6..ed34684bd 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-assign/expected.tsx
@@ -1,29 +1,29 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-    const store = writable([])/*Ωignore_startΩ*/;let $store = __sveltets_store_get(store);/*Ωignore_endΩ*/;
+    const store = writable([])/*Ωignore_startΩ*/;let $store = __sveltets_1_store_get(store);/*Ωignore_endΩ*/;
 
-    ;(__sveltets_store_get(store), $store)[1] = true;
-    ;(__sveltets_store_get(store), $store).foo = true;
+    ;(__sveltets_1_store_get(store), $store)[1] = true;
+    ;(__sveltets_1_store_get(store), $store).foo = true;
 
-    ;(__sveltets_store_get(store), $store)[1] = true
-    ;(__sveltets_store_get(store), $store).foo = true
+    ;(__sveltets_1_store_get(store), $store)[1] = true
+    ;(__sveltets_1_store_get(store), $store).foo = true
 
     store.set( true)
     store.set( true);
 
-    hello[(__sveltets_store_get(store), $store)] = true;
+    hello[(__sveltets_1_store_get(store), $store)] = true;
 
     store.set( true),
     store.set( false),
-    (__sveltets_store_get(store), $store),
-    (__sveltets_store_get(store), $store).a = true
+    (__sveltets_1_store_get(store), $store),
+    (__sveltets_1_store_get(store), $store).a = true
 
-    ;(__sveltets_store_get(store), $store).a = true,
-    (__sveltets_store_get(store), $store).b = false;
+    ;(__sveltets_1_store_get(store), $store).a = true,
+    (__sveltets_1_store_get(store), $store).b = false;
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
index 2da0c576b..cf544903d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/$store-index/expected.tsx
@@ -1,9 +1,9 @@
 ///<reference types="svelte" />
 <></>;function render() {
-<>{someRecordOrArr[(__sveltets_store_get(store), $store)]}
+<>{someRecordOrArr[(__sveltets_1_store_get(store), $store)]}
 {someObject['$store']}
 {someObject.$store}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
index 02e20d83f..225773640 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/array-binding-export/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 return { props: {a: a , b: b , c: c}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['a','b','c'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['a','b','c'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
index faa667e94..791d7947f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-none/expected.tsx
@@ -1,8 +1,8 @@
 ///<reference types="svelte" />
 <></>;function render() {
-;(__sveltets_store_get(var), $var);
+;(__sveltets_1_store_get(var), $var);
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
index 663798ed2..9a86c853e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ast-offset-some/expected.tsx
@@ -1,8 +1,8 @@
 ///<reference types="svelte" />
 <></>;function render() {
-   ;(__sveltets_store_get(var), $var);
+   ;(__sveltets_1_store_get(var), $var);
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expected.tsx
index ae559d034..4823f2920 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/attributes-foreign-ns/expected.tsx
@@ -4,5 +4,5 @@
 <Component someAttr="5" otherAttr={6} /></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
index 87b853e41..d8025f98b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/await-with-$store/expected.tsx
@@ -4,16 +4,16 @@ import { readable } from 'svelte/store';
 function render() {
 
 	
-	const store = readable(Promise.resolve('test'), () => {})/*Ωignore_startΩ*/;let $store = __sveltets_store_get(store);/*Ωignore_endΩ*/;
+	const store = readable(Promise.resolve('test'), () => {})/*Ωignore_startΩ*/;let $store = __sveltets_1_store_get(store);/*Ωignore_endΩ*/;
 ;
 () => (<>
 
-{() => {let _$$p = ((__sveltets_store_get(store), $store)); <>
+{() => {let _$$p = ((__sveltets_1_store_get(store), $store)); <>
 	<p>loading</p>
-</>; __sveltets_awaitThen(_$$p, (data) => {<>
+</>; __sveltets_1_awaitThen(_$$p, (data) => {<>
 	{data}
 </>})}}</>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
index 3ccb55782..58ac9dc74 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/binding-group-store/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
-<><input id="dom-input" type="radio" {...__sveltets_empty((__sveltets_store_get(compile_options), $compile_options).generate)} value="dom"/></>
+<><input id="dom-input" type="radio" {...__sveltets_1_empty((__sveltets_1_store_get(compile_options), $compile_options).generate)} value="dom"/></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
index 6e5de3722..4b29fa677 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/circle-drawer-example/expected.tsx
@@ -70,7 +70,7 @@
 </div>
 
 <svg onclick={handleClick} >
-	{__sveltets_each(circles, (circle) => <>
+	{__sveltets_1_each(circles, (circle) => <>
 		<circle cx={circle.cx} cy={circle.cy} r={circle.r}
 			onclick={event => select(circle, event)}
 			oncontextmenu={() => {
@@ -90,5 +90,5 @@
 </> : <></>}</>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx
index 10e8f1614..e8237ff40 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/commented-out-script/expected.tsx
@@ -8,5 +8,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
index 68e4a10e6..e0e480d1d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-default-slot/expected.tsx
@@ -3,12 +3,12 @@
 
     let b = 7;
 
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/;
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/;
 () => (<>
 <div>
     <slot a={__sveltets_ensureSlot("default","a",b)}>Hello</slot>
 </div></>);
 return { props: {}, slots: {'default': {a:b}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-constant/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-constant/expected.tsx
index 82cf3c909..b70167189 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-constant/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-constant/expected.tsx
@@ -15,5 +15,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} as unknown as $$Events }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-dispatcher/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-dispatcher/expected.tsx
index e3c8e7993..760082cd4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-dispatcher/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-dispatcher/expected.tsx
@@ -14,10 +14,10 @@ function render() {
         c;
     }
 
-    const dispatch = createEventDispatcher<__Sveltets_CustomEvents<$$Events>>();
+    const dispatch = createEventDispatcher<__sveltets_1_CustomEvents<$$Events>>();
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} as unknown as $$Events }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-string-literals/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-string-literals/expected.tsx
index 399a6acdb..f8c635845 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-string-literals/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface-string-literals/expected.tsx
@@ -13,5 +13,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} as unknown as $$Events }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx
index 9ce778964..283e4d83b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-interface/expected.tsx
@@ -13,5 +13,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} as unknown as $$Events }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-strictEvents/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-strictEvents/expected.tsx
index eea38391d..85b94ec4e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-strictEvents/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-strictEvents/expected.tsx
@@ -11,7 +11,7 @@ function render() {
 () => (<>
 
 <button onclick={undefined}>d</button></>);
-return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapElementEvent('click'), 'foo': __sveltets_customEvent} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_1_mapElementEvent('click'), 'foo': __sveltets_1_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-type/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-type/expected.tsx
index ba3b64145..99830d0e2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-events-type/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-events-type/expected.tsx
@@ -13,5 +13,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} as unknown as $$Events }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
index 5625aa9af..963fe92fe 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-multiple-slots/expected.tsx
@@ -5,7 +5,7 @@
     let d = 5;
     let e = 5;
 
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/;
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/;
 () => (<>
 <div>
     <slot a={__sveltets_ensureSlot("default","a",b)}>Hello</slot>
@@ -14,5 +14,5 @@
 </div></>);
 return { props: {}, slots: {'default': {a:b}, 'test': {c:d, e:e}, 'abc-cde.113': {}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-interface/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-interface/expected.tsx
index b1ef275fc..9ebda74a4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-interface/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-interface/expected.tsx
@@ -11,7 +11,7 @@
     }
     let b = 7;
 
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot<$$Slots>();/*Ωignore_endΩ*/;
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot<$$Slots>();/*Ωignore_endΩ*/;
 () => (<>
 
 <div>
@@ -20,5 +20,5 @@
 </div></>);
 return { props: {}, slots: {} as unknown as $$Slots, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-type/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-type/expected.tsx
index 2a4e218cc..07e4ea9e1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-type/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-$$slot-type/expected.tsx
@@ -11,7 +11,7 @@
     }
     let b = 7;
 
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot<$$Slots>();/*Ωignore_endΩ*/;
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot<$$Slots>();/*Ωignore_endΩ*/;
 () => (<>
 
 <div>
@@ -20,5 +20,5 @@
 </div></>);
 return { props: {}, slots: {} as unknown as $$Slots, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected.tsx
index 1b3561124..4c298413f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-crazy-attributes/expected.tsx
@@ -3,12 +3,12 @@
 
     let b = 7;
 
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/;
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/;
 () => (<>
 <div>
     <slot a={__sveltets_ensureSlot("default","a",b)} b={__sveltets_ensureSlot("default","b",b)} c={__sveltets_ensureSlot("default","c","b")} d={__sveltets_ensureSlot("default","d",`a${b}`)} e={__sveltets_ensureSlot("default","e",b)} >Hello</slot>
 </div></>);
 return { props: {}, slots: {'default': {a:b, b:b, c:"b", d:"__svelte_ts_string", e:b}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expected.tsx
index 3e0e8438c..501fb9297 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-forward-with-props/expected.tsx
@@ -1,10 +1,10 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
-<><Parent propA propB={propB} propC="val1" propD="val2" propE={`a${a}b${b}`} >{() => { let {foo} = /*Ωignore_startΩ*/new Parent({target: __sveltets_any(''), props: {'propA':true, 'propB':propB, 'propC':"", 'propD':"", 'propE':""}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
+<><Parent propA propB={propB} propC="val1" propD="val2" propE={`a${a}b${b}`} >{() => { let {foo} = /*Ωignore_startΩ*/new Parent({target: __sveltets_1_any(''), props: {'propA':true, 'propB':propB, 'propC':"", 'propD':"", 'propE':""}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
     <slot foo={__sveltets_ensureSlot("default","foo",foo)} />
 </>}}</Parent></>
-return { props: {}, slots: {'default': {foo:__sveltets_instanceOf(Parent).$$slot_def['default'].foo}}, getters: {}, events: {} }}
+return { props: {}, slots: {'default': {foo:__sveltets_1_instanceOf(Parent).$$slot_def['default'].foo}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected.tsx
index 618d83b3b..1e4e77658 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-await/expected.tsx
@@ -1,15 +1,15 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
-<>{() => {let _$$p = (promise); __sveltets_awaitThen(_$$p, (value) => {<>
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
+<>{() => {let _$$p = (promise); __sveltets_1_awaitThen(_$$p, (value) => {<>
     <slot a={__sveltets_ensureSlot("default","a",value)}>Hello</slot>
 </>}, (err) => {<>
     <slot name="err" err={__sveltets_ensureSlot("err","err",err)}>Hello</slot>
 </>})}}
-{() => {let _$$p = (promise2); __sveltets_awaitThen(_$$p, ({ b }) => {<>
+{() => {let _$$p = (promise2); __sveltets_1_awaitThen(_$$p, ({ b }) => {<>
     <slot name="second" a={__sveltets_ensureSlot("second","a",b)}>Hello</slot>
 </>})}}</>
-return { props: {}, slots: {'default': {a:__sveltets_unwrapPromiseLike(promise)}, 'err': {err:__sveltets_any({})}, 'second': {a:(({ b }) => b)(__sveltets_unwrapPromiseLike(promise2))}}, getters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_1_unwrapPromiseLike(promise)}, 'err': {err:__sveltets_1_any({})}, 'second': {a:(({ b }) => b)(__sveltets_1_unwrapPromiseLike(promise2))}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected.tsx
index 223791819..5220667d2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-inside-each/expected.tsx
@@ -1,13 +1,13 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
-<>{__sveltets_each(items, (item) => <>
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
+<>{__sveltets_1_each(items, (item) => <>
     <slot a={__sveltets_ensureSlot("default","a",item)}>Hello</slot>
 </>)}
-{__sveltets_each(items2, ({ a }) => <>
+{__sveltets_1_each(items2, ({ a }) => <>
     <slot name="second" a={__sveltets_ensureSlot("second","a",a)}>Hello</slot>
 </>)}</>
-return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items)}, 'second': {a:(({ a }) => a)(__sveltets_unwrapArr(items2))}}, getters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_1_unwrapArr(items)}, 'second': {a:(({ a }) => a)(__sveltets_1_unwrapArr(items2))}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected.tsx
index db46e8aed..00bc9fa4b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward-named-slot/expected.tsx
@@ -1,12 +1,12 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
 <><Component>
-    {() => { let {a} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['b'];<><div  >
+    {() => { let {a} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['b'];<><div  >
         <slot a={__sveltets_ensureSlot("default","a",a)}></slot>
     </div></>}}
 </Component></>
-return { props: {}, slots: {'default': {a:__sveltets_instanceOf(Component).$$slot_def['b'].a}}, getters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_1_instanceOf(Component).$$slot_def['b'].a}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected.tsx
index ddab2d708..024bda58b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-let-forward/expected.tsx
@@ -1,10 +1,10 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
-<><Component   >{() => { let {name:n, thing, whatever:{ bla }} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
+<><Component   >{() => { let {name:n, thing, whatever:{ bla }} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>
     <slot n={__sveltets_ensureSlot("default","n",n)} thing={__sveltets_ensureSlot("default","thing",thing)} bla={__sveltets_ensureSlot("default","bla",bla)} />
 </>}}</Component></>
-return { props: {}, slots: {'default': {n:__sveltets_instanceOf(Component).$$slot_def['default'].name, thing:__sveltets_instanceOf(Component).$$slot_def['default'].thing, bla:(({ bla }) => bla)(__sveltets_instanceOf(Component).$$slot_def['default'].whatever)}}, getters: {}, events: {} }}
+return { props: {}, slots: {'default': {n:__sveltets_1_instanceOf(Component).$$slot_def['default'].name, thing:__sveltets_1_instanceOf(Component).$$slot_def['default'].thing, bla:(({ bla }) => bla)(__sveltets_1_instanceOf(Component).$$slot_def['default'].whatever)}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected.tsx
index 38d539ec2..861b78771 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-nest-scope/expected.tsx
@@ -1,18 +1,18 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
-<>{__sveltets_each(items, (item) => <>
-    {__sveltets_each(item, ({ a }) => <>
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
+<>{__sveltets_1_each(items, (item) => <>
+    {__sveltets_1_each(item, ({ a }) => <>
         <slot a={__sveltets_ensureSlot("default","a",a)}>Hello</slot>
     </>)}
     <slot name="second" a={__sveltets_ensureSlot("second","a", a )}></slot>
 </>)}
-<Component >{() => { let {c} = /*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>{ c }</>}}</Component>
-{() => {let _$$p = (promise); __sveltets_awaitThen(_$$p, (d) => {<>
+<Component >{() => { let {c} = /*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>{ c }</>}}</Component>
+{() => {let _$$p = (promise); __sveltets_1_awaitThen(_$$p, (d) => {<>
     {d}
 </>})}}
 <slot name="third" d={__sveltets_ensureSlot("third","d",d)} c={__sveltets_ensureSlot("third","c",c)}></slot></>
-return { props: {}, slots: {'default': {a:(({ a }) => a)(__sveltets_unwrapArr(__sveltets_unwrapArr(items)))}, 'second': {a:a}, 'third': {d:d, c:c}}, getters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:(({ a }) => a)(__sveltets_1_unwrapArr(__sveltets_1_unwrapArr(items)))}, 'second': {a:a}, 'third': {d:d, c:c}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expected.tsx
index b377fade2..a29dd9c1f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-no-space/expected.tsx
@@ -7,8 +7,8 @@ function render() {
 ;
 () => (<>
 
-<div><Test >{() => { let {t} = /*Ωignore_startΩ*/new Test({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>xx</>}}</Test></div></>);
+<div><Test >{() => { let {t} = /*Ωignore_startΩ*/new Test({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$$slot_def['default'];<>xx</>}}</Test></div></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected.tsx
index 06a668fcd..f1218a3d8 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-object-key/expected.tsx
@@ -1,10 +1,10 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
-<>{__sveltets_each(items, (item) => <>
-    <slot a={__sveltets_ensureSlot("default","a",item)} b={__sveltets_ensureSlot("default","b",{ item })} c={__sveltets_ensureSlot("default","c",{ item: 'abc' }.item)} d={__sveltets_ensureSlot("default","d",{ item: item })} e={__sveltets_ensureSlot("default","e",(__sveltets_store_get(item), $item))} f={__sveltets_ensureSlot("default","f",(__sveltets_store_get(item), $item))}>Hello</slot>
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
+<>{__sveltets_1_each(items, (item) => <>
+    <slot a={__sveltets_ensureSlot("default","a",item)} b={__sveltets_ensureSlot("default","b",{ item })} c={__sveltets_ensureSlot("default","c",{ item: 'abc' }.item)} d={__sveltets_ensureSlot("default","d",{ item: item })} e={__sveltets_ensureSlot("default","e",(__sveltets_1_store_get(item), $item))} f={__sveltets_ensureSlot("default","f",(__sveltets_1_store_get(item), $item))}>Hello</slot>
 </>)}</>
-return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items), b:{ item:__sveltets_unwrapArr(items) }, c:{ item: 'abc' }.item, d:{ item: __sveltets_unwrapArr(items) }, e:$item, f:$item}}, getters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_1_unwrapArr(items), b:{ item:__sveltets_1_unwrapArr(items) }, c:{ item: 'abc' }.item, d:{ item: __sveltets_1_unwrapArr(items) }, e:$item, f:$item}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected.tsx
index 7e7c2f879..784208cac 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-slot-var-shadowing/expected.tsx
@@ -1,10 +1,10 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
-<>{__sveltets_each(items, (items) => <>
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
+<>{__sveltets_1_each(items, (items) => <>
     <slot a={__sveltets_ensureSlot("default","a",items)}>Hello</slot>
 </>)}</>
-return { props: {}, slots: {'default': {a:__sveltets_unwrapArr(items)}}, getters: {}, events: {} }}
+return { props: {}, slots: {'default': {a:__sveltets_1_unwrapArr(items)}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
index 94d777c21..6f552990f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-documentation/expected.tsx
@@ -6,5 +6,5 @@
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
 /** This component does nothing at all */
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-indented-multiline-documentation/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-indented-multiline-documentation/expected.tsx
index ad1806ca2..0a468c459 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-indented-multiline-documentation/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-indented-multiline-documentation/expected.tsx
@@ -18,5 +18,5 @@ return { props: {}, slots: {}, getters: {}, events: {} }}
  *
  * The output should be indented properly!
  */
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-multiline-documentation/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-multiline-documentation/expected.tsx
index 5c29c0ba7..bb6010e32 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/component-with-multiline-documentation/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/component-with-multiline-documentation/expected.tsx
@@ -12,5 +12,5 @@ return { props: {}, slots: {}, getters: {}, events: {} }}
  * type Type = 'type'
  * ```
  */
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/creates-dts/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/creates-dts/expected.tsx
index 52bd008c0..c2b67c5c3 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/creates-dts/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/creates-dts/expected.tsx
@@ -99,111 +99,111 @@ type SvelteStore<T> = { subscribe: (run: (value: T) => any, invalidate?: any) =>
 type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
 
 type KeysMatching<Obj, V> = {[K in keyof Obj]-?: Obj[K] extends V ? K : never}[keyof Obj]
-declare type __Sveltets_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
+declare type __sveltets_1_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
 
 declare var process: NodeJS.Process & { browser: boolean }
-declare var __sveltets_AnimationMove: { from: DOMRect, to: DOMRect }
-
-declare function __sveltets_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
-declare function __sveltets_ensureAction(actionCall: SvelteActionReturnType): {};
-declare function __sveltets_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
-declare function __sveltets_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
-declare function __sveltets_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
-declare function __sveltets_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
-declare function __sveltets_ensureRightProps<Props>(props: Props): {};
-declare function __sveltets_cssProp(prop: Record<string, any>): {};
-declare function __sveltets_ctorOf<T>(type: T): AConstructorTypeOf<T>;
-declare function __sveltets_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
-declare function __sveltets_allPropsType(): SvelteAllProps
-declare function __sveltets_restPropsType(): SvelteRestProps
-declare function __sveltets_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
+declare var __sveltets_1_AnimationMove: { from: DOMRect, to: DOMRect }
+
+declare function __sveltets_1_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
+declare function __sveltets_1_ensureAction(actionCall: SvelteActionReturnType): {};
+declare function __sveltets_1_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
+declare function __sveltets_1_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
+declare function __sveltets_1_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
+declare function __sveltets_1_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
+declare function __sveltets_1_ensureRightProps<Props>(props: Props): {};
+declare function __sveltets_1_cssProp(prop: Record<string, any>): {};
+declare function __sveltets_1_ctorOf<T>(type: T): AConstructorTypeOf<T>;
+declare function __sveltets_1_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
+declare function __sveltets_1_allPropsType(): SvelteAllProps
+declare function __sveltets_1_restPropsType(): SvelteRestProps
+declare function __sveltets_1_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
 
 // Overload of the following two functions is necessary.
 // An empty array of optionalProps makes OptionalProps type any, which means we lose the prop typing.
 // optionalProps need to be first or its type cannot be infered correctly.
 
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props>, events: Events, slots: Slots }
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>>, events: Events, slots: Slots }
 
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props> & SvelteAllProps, events: Events, slots: Slots }
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>> & SvelteAllProps, events: Events, slots: Slots }
 
 
-declare function __sveltets_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props & SvelteAllProps, events: Events, slots: Slots }
 
-declare function __sveltets_with_any_event<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any_event<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props, events: Events & {[evt: string]: CustomEvent<any>;}, slots: Slots }
 
-declare function __sveltets_store_get<T = any>(store: SvelteStore<T>): T
-declare function __sveltets_any(dummy: any): any;
-declare function __sveltets_empty(dummy: any): {};
-declare function __sveltets_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
-declare function __sveltets_invalidate<T>(getValue: () => T): T
+declare function __sveltets_1_store_get<T = any>(store: SvelteStore<T>): T
+declare function __sveltets_1_any(dummy: any): any;
+declare function __sveltets_1_empty(dummy: any): {};
+declare function __sveltets_1_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
+declare function __sveltets_1_invalidate<T>(getValue: () => T): T
 
-declare function __sveltets_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
+declare function __sveltets_1_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
     event: K
 ): HTMLBodyElementEventMap[K];
-declare function __sveltets_mapBodyEvent<K extends keyof WindowEventMap>(
+declare function __sveltets_1_mapBodyEvent<K extends keyof WindowEventMap>(
     event: K
 ): WindowEventMap[K];
-declare function __sveltets_mapElementEvent<K extends keyof HTMLElementEventMap>(
+declare function __sveltets_1_mapElementEvent<K extends keyof HTMLElementEventMap>(
     event: K
 ): HTMLElementEventMap[K];
-declare function __sveltets_mapElementTag<K extends keyof ElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof ElementTagNameMap>(
     tag: K
 ): ElementTagNameMap[K];
-declare function __sveltets_mapElementTag<K extends keyof SVGElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof SVGElementTagNameMap>(
     tag: K
 ): SVGElementTagNameMap[K];
-declare function __sveltets_mapElementTag(
+declare function __sveltets_1_mapElementTag(
     tag: any
 ): HTMLElement;
 
-declare function __sveltets_bubbleEventDef<Events, K extends keyof Events>(
+declare function __sveltets_1_bubbleEventDef<Events, K extends keyof Events>(
     events: Events, eventKey: K
 ): Events[K];
-declare function __sveltets_bubbleEventDef(
+declare function __sveltets_1_bubbleEventDef(
     events: any, eventKey: string
 ): any;
 
-declare const __sveltets_customEvent: CustomEvent<any>;
-declare function __sveltets_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
+declare const __sveltets_1_customEvent: CustomEvent<any>;
+declare function __sveltets_1_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
 
-declare function __sveltets_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
-declare function __sveltets_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
-declare function __sveltets_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
-declare function __sveltets_unionType(...types: any[]): any;
+declare function __sveltets_1_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
+declare function __sveltets_1_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
+declare function __sveltets_1_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
+declare function __sveltets_1_unionType(...types: any[]): any;
 
-declare function __sveltets_awaitThen<T>(
+declare function __sveltets_1_awaitThen<T>(
     promise: T,
     onfulfilled: (value: T extends PromiseLike<infer U> ? U : T) => any,
     onrejected?: (value: T extends PromiseLike<any> ? any : never) => any
 ): any;
 
-declare function __sveltets_each<T>(
+declare function __sveltets_1_each<T>(
     array: ArrayLike<T>,
     callbackfn: (value: T, index: number) => any
 ): any;
 
-declare function createSvelte2TsxComponent<Props, Events, Slots>(
+declare function __sveltets_1_createSvelte2TsxComponent<Props, Events, Slots>(
     render: {props: Props, events: Events, slots: Slots }
 ): SvelteComponentConstructor<Svelte2TsxComponent<Props, Events, Slots>,Svelte2TsxComponentConstructorParameters<Props>>;
 
-declare function __sveltets_unwrapArr<T>(arr: ArrayLike<T>): T
-declare function __sveltets_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
+declare function __sveltets_1_unwrapArr<T>(arr: ArrayLike<T>): T
+declare function __sveltets_1_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
 
 
     export const foo = 'foo';
@@ -221,8 +221,8 @@ function render() {
   dispatch('hi');
 ;
 return { props: {
-/** @type {boolean} */bar: bar , foobar: foobar}, slots: {'default': {bar:bar}}, getters: {}, events: {'click':__sveltets_mapElementEvent('click'), 'hi': __sveltets_customEvent} }}
-const __propDef = __sveltets_partial(['foobar'], __sveltets_with_any_event(render()));
+/** @type {boolean} */bar: bar , foobar: foobar}, slots: {'default': {bar:bar}}, getters: {}, events: {'click':__sveltets_1_mapElementEvent('click'), 'hi': __sveltets_1_customEvent} }}
+const __propDef = __sveltets_1_partial(['foobar'], __sveltets_1_with_any_event(render()));
 export type InputProps = typeof __propDef.props;
 export type InputEvents = typeof __propDef.events;
 export type InputSlots = typeof __propDef.slots;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expected.tsx
index ae5f92221..b74f7a91a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/custom-css-properties-with-$store/expected.tsx
@@ -1,11 +1,11 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><Component 
-  {...__sveltets_cssProp({"--custom-css-property1": `${(__sveltets_store_get(jo), $jo)}`})}
-  {...__sveltets_cssProp({"--custom-css-property2": `hi${(__sveltets_store_get(jo), $jo)}hi`})}
-  {...__sveltets_cssProp({"--custom-css-property3": `hi${(__sveltets_store_get(jo), $jo)}hi`})}
-  {...__sveltets_cssProp({"--custom-css-property4": `hi${(__sveltets_store_get(jo), $jo)}hi`})} /></>
+  {...__sveltets_1_cssProp({"--custom-css-property1": `${(__sveltets_1_store_get(jo), $jo)}`})}
+  {...__sveltets_1_cssProp({"--custom-css-property2": `hi${(__sveltets_1_store_get(jo), $jo)}hi`})}
+  {...__sveltets_1_cssProp({"--custom-css-property3": `hi${(__sveltets_1_store_get(jo), $jo)}hi`})}
+  {...__sveltets_1_cssProp({"--custom-css-property4": `hi${(__sveltets_1_store_get(jo), $jo)}hi`})} /></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx
index d3ffce7a2..0f74d9c9a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/debug-block/expected.tsx
@@ -1,9 +1,9 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <>{myfile}
-{(__sveltets_store_get(myfile), $myfile)}{someOtherFile}
-{myfile}{(__sveltets_store_get(someOtherFile), $someOtherFile)}{someThirdFile}</>
+{(__sveltets_1_store_get(myfile), $myfile)}{someOtherFile}
+{myfile}{(__sveltets_1_store_get(someOtherFile), $someOtherFile)}{someThirdFile}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx
index 9d535785c..e18a71e0c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/editing-mustache/expected.tsx
@@ -3,5 +3,5 @@
 <>{a?.}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-and-forwarded-event/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-and-forwarded-event/expected.tsx
index 94ffa5d9c..9ce1ff77f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-and-forwarded-event/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-and-forwarded-event/expected.tsx
@@ -11,7 +11,7 @@ function render() {
 () => (<>
 
 <input onfocus={undefined} /></>);
-return { props: {}, slots: {}, getters: {}, events: {'focus':__sveltets_mapElementEvent('focus'), 'mount': __sveltets_customEvent} }}
+return { props: {}, slots: {}, getters: {}, events: {'focus':__sveltets_1_mapElementEvent('focus'), 'mount': __sveltets_1_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expected.tsx
index 2676b1409..59c8fc704 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-multi/expected.tsx
@@ -2,7 +2,7 @@
 <></>;function render() {
 <><Button ></Button>
 <Radio ></Radio></>
-return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_unionType(__sveltets_bubbleEventDef(__sveltets_instanceOf(Button).$$events_def, 'click'),__sveltets_bubbleEventDef(__sveltets_instanceOf(Radio).$$events_def, 'click'))} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_1_unionType(__sveltets_1_bubbleEventDef(__sveltets_1_instanceOf(Button).$$events_def, 'click'),__sveltets_1_bubbleEventDef(__sveltets_1_instanceOf(Radio).$$events_def, 'click'))} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expected.tsx
index 460fe9e7b..da4306c9c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component-with-props/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><Component propA propB={propB} propC="val1" propD="val2" propE={`a${a}b${b}`}  /></>
-return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_bubbleEventDef(__sveltets_instanceOf(Component).$$events_def, 'click')} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_1_bubbleEventDef(__sveltets_1_instanceOf(Component).$$events_def, 'click')} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
index ae3b900f8..bde5a6443 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-component/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><Button ></Button></>
-return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_bubbleEventDef(__sveltets_instanceOf(Button).$$events_def, 'click')} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_1_bubbleEventDef(__sveltets_1_instanceOf(Button).$$events_def, 'click')} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
index a52dc18a9..bd3e0275d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-element/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 <><button onclick={undefined}></button></>
-return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapElementEvent('click')} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_1_mapElementEvent('click')} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-svelte-element/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-svelte-element/expected.tsx
index 7f826d2b7..d719c7f9c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-svelte-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-bubble-svelte-element/expected.tsx
@@ -2,7 +2,7 @@
 <></>;function render() {
 <><sveltebody onclick={undefined}></sveltebody>
 <sveltewindow onresize={undefined}></sveltewindow></>
-return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapBodyEvent('click'), 'resize':__sveltets_mapWindowEvent('resize')} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_1_mapBodyEvent('click'), 'resize':__sveltets_1_mapWindowEvent('resize')} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events-alias/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events-alias/expected.tsx
index 910b6e8fb..c0fd5216d 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events-alias/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events-alias/expected.tsx
@@ -18,7 +18,7 @@ function render() {
 () => (<>
 
 <button onclick={() => dispatch('btn', '')}></button></>);
-return { props: {}, slots: {}, getters: {}, events: {'btn': __sveltets_customEvent, 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
+return { props: {}, slots: {}, getters: {}, events: {'btn': __sveltets_1_customEvent, 'hi': __sveltets_1_customEvent, 'bye': __sveltets_1_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx
index 001e9647a..1a106632e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatcher-events/expected.tsx
@@ -18,7 +18,7 @@ function render() {
 () => (<>
 
 <button onclick={() => dispatch('btn', '')}></button></>);
-return { props: {}, slots: {}, getters: {}, events: {'btn': __sveltets_customEvent, 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
+return { props: {}, slots: {}, getters: {}, events: {'btn': __sveltets_1_customEvent, 'hi': __sveltets_1_customEvent, 'bye': __sveltets_1_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatchers/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatchers/expected.tsx
index d6825ad08..cbd2e7813 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatchers/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/event-dispatchers/expected.tsx
@@ -15,7 +15,7 @@ function render() {
 () => (<>
 
 <button onclick={undefined}></button></>);
-return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_mapElementEvent('click'), 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
+return { props: {}, slots: {}, getters: {}, events: {'click':__sveltets_1_mapElementEvent('click'), 'hi': __sveltets_1_customEvent, 'bye': __sveltets_1_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
index 4b598ca9f..8924bbcd1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expected.tsx
@@ -6,6 +6,6 @@
 () => (<></>);
 return { props: {Foo: Foo}, slots: {}, getters: {Foo: Foo}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['Foo'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['Foo'], __sveltets_1_with_any_event(render()))) {
     get Foo() { return render().getters.Foo }
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx
index caf578dcb..5a45bef23 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-doc/expected.tsx
@@ -23,5 +23,5 @@ return { props: {
      * MORE DOCS!
      */b: b , c: c}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/expected.tsx
index 6b18c86ec..5b3dc9bc9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-js-required-props/expected.tsx
@@ -8,5 +8,5 @@
 () => (<></>);
 return { props: {a: a , b: b , c: c}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['c'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['c'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
index 594846627..8b428b184 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-list/expected.tsx
@@ -20,5 +20,5 @@
 () => (<></>);
 return { props: {name1: name1 , name2: name2 , renamed1: rename1 , renamed2: rename2 , Foo: Foo , bar: bar , baz: baz , RenamedFoo: RenameFoo , renamedbar: renamebar , renamedbaz: renamebaz}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name1','renamed1','Foo','bar','baz','RenamedFoo','renamedbar','renamedbaz'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['name1','renamed1','Foo','bar','baz','RenamedFoo','renamedbar','renamedbaz'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
index 0e802a6ae..aadd96408 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-references-local/expected.tsx
@@ -7,5 +7,5 @@
 () => (<></>);
 return { props: {name: name}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['name'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-with-default-multi/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/export-with-default-multi/expected.tsx
index 46e694b5a..2832667a9 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/export-with-default-multi/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/export-with-default-multi/expected.tsx
@@ -2,7 +2,7 @@
 <></>;function render() {
 
     /**@type { string | number }*/
-     let name = "world";name = __sveltets_any(name);;let 
+     let name = "world";name = __sveltets_1_any(name);;let 
         world = '';
 ;
 () => (<></>);
@@ -10,5 +10,5 @@ return { props: {
 /**@type { string | number }*/name: name , 
 /**@type { string | number }*/world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name','world'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['name','world'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifier/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifier/expected.tsx
index 0c20ab1b5..dfc754373 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifier/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifier/expected.tsx
@@ -3,5 +3,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class AslugTestUpperUpper3asd4__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class AslugTestUpperUpper3asd4__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifiers-only/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifiers-only/expected.tsx
index 6e245727f..35899a3fc 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifiers-only/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/filename-is-invalid-identifiers-only/expected.tsx
@@ -3,5 +3,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class A0__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class A0__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
index ec5d77a47..52dcf7d84 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/import-single-quote/expected.tsx
@@ -9,5 +9,5 @@ function render() {
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
index d9f5959ff..d87eb2b73 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/imports/expected.tsx
@@ -13,5 +13,5 @@ function render() {
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['world'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line/expected.tsx
index 9fbc5a5a4..506b04262 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line/expected.tsx
@@ -4,5 +4,5 @@
 () => (<><h1>hello {world}</h1></>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['world'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line2/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line2/expected.tsx
index 9fbc5a5a4..506b04262 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line2/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script-in-line2/expected.tsx
@@ -4,5 +4,5 @@
 () => (<><h1>hello {world}</h1></>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['world'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script/expected.tsx
index 7f1760387..4d7630265 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script/expected.tsx
@@ -11,5 +11,5 @@
 <h1>hello {world}</h1></>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['world'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script2/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script2/expected.tsx
index 804312c04..659acf9c2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script2/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/module-script-and-script2/expected.tsx
@@ -11,5 +11,5 @@
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['world'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
index 038cb9056..8148046c7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-script/expected.tsx
@@ -1,13 +1,13 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-let top1 = someStore()/*Ωignore_startΩ*/;let $top1 = __sveltets_store_get(top1);/*Ωignore_endΩ*/
-let top2 = someStore()/*Ωignore_startΩ*/;let $top2 = __sveltets_store_get(top2);/*Ωignore_endΩ*/
-let topLevelGet = (__sveltets_store_get(top1), $top1)
-topLevelGet = (__sveltets_store_get(top2), $top2)
+let top1 = someStore()/*Ωignore_startΩ*/;let $top1 = __sveltets_1_store_get(top1);/*Ωignore_endΩ*/
+let top2 = someStore()/*Ωignore_startΩ*/;let $top2 = __sveltets_1_store_get(top2);/*Ωignore_endΩ*/
+let topLevelGet = (__sveltets_1_store_get(top1), $top1)
+topLevelGet = (__sveltets_1_store_get(top2), $top2)
 
 function test(top1) {
-    let passedGet = (__sveltets_store_get(top1), $top1)
+    let passedGet = (__sveltets_1_store_get(top1), $top1)
 }
 
 function test2($top1) {
@@ -19,11 +19,11 @@ function test3() {
     let letshadowed = $top2
 }
 
-const test4 = ({a,  b: { $top1: $top2 }}) => $top2 && (__sveltets_store_get(top1), $top1)
+const test4 = ({a,  b: { $top1: $top2 }}) => $top2 && (__sveltets_1_store_get(top1), $top1)
 
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
index d86fd7d89..4a28fff90 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/nested-$-variables-template/expected.tsx
@@ -6,11 +6,11 @@
     // it's therefore okay to not append "let top1$/top2$ = __svelte_store_get(..)"
     let top1 = someStore()
     let top2 = someStore()
-    let topLevelGet = (__sveltets_store_get(top1), $top1)
-    topLevelGet = (__sveltets_store_get(top2), $top2)
+    let topLevelGet = (__sveltets_1_store_get(top1), $top1)
+    topLevelGet = (__sveltets_1_store_get(top2), $top2)
 
     function test(top1) {
-        let passedGet = (__sveltets_store_get(top1), $top1)
+        let passedGet = (__sveltets_1_store_get(top1), $top1)
     }
 
     function test2($top1) {
@@ -22,10 +22,10 @@
         let letshadowed = $top2
     }
 
-    const test4 = ({a,  b: { $top1: $top2 }}) => $top2 && (__sveltets_store_get(top1), $top1)
+    const test4 = ({a,  b: { $top1: $top2 }}) => $top2 && (__sveltets_1_store_get(top1), $top1)
 
 }}>Hi</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
index 7265f165c..4df3f85f4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/object-binding-export/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 return { props: {rename: rename}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['rename'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['rename'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx
index 0f70ca11a..908f25be5 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expected.tsx
@@ -1,24 +1,24 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-  let  { count } = __sveltets_invalidate(() => (__sveltets_store_get(data), $data));
-  let  { count2 } = __sveltets_invalidate(() => (__sveltets_store_get(data), $data))
+  let  { count } = __sveltets_1_invalidate(() => (__sveltets_1_store_get(data), $data));
+  let  { count2 } = __sveltets_1_invalidate(() => (__sveltets_1_store_get(data), $data))
   let count3;
-  $: ({ count3 } = __sveltets_invalidate(() => (__sveltets_store_get(data), $data)))
+  $: ({ count3 } = __sveltets_1_invalidate(() => (__sveltets_1_store_get(data), $data)))
   let bla4;
   let bla5;
-$: ({ bla4, bla5 } = __sveltets_invalidate(() => (__sveltets_store_get(data), $data)))
+$: ({ bla4, bla5 } = __sveltets_1_invalidate(() => (__sveltets_1_store_get(data), $data)))
 
-  let  [ count ] = __sveltets_invalidate(() => (__sveltets_store_get(data), $data));
-  let  [ count2 ] = __sveltets_invalidate(() => (__sveltets_store_get(data), $data))
+  let  [ count ] = __sveltets_1_invalidate(() => (__sveltets_1_store_get(data), $data));
+  let  [ count2 ] = __sveltets_1_invalidate(() => (__sveltets_1_store_get(data), $data))
   let count3;
-  $: ([ count3 ] = __sveltets_invalidate(() => (__sveltets_store_get(data), $data)))
+  $: ([ count3 ] = __sveltets_1_invalidate(() => (__sveltets_1_store_get(data), $data)))
   let bla4;
   let bla5;
-$: ([ bla4, bla5 ] = __sveltets_invalidate(() => (__sveltets_store_get(data), $data)))
+$: ([ bla4, bla5 ] = __sveltets_1_invalidate(() => (__sveltets_1_store_get(data), $data)))
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-assignment-type-cast/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-assignment-type-cast/expected.tsx
index 759939a62..ee62662f6 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-assignment-type-cast/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-assignment-type-cast/expected.tsx
@@ -2,10 +2,10 @@
 <></>;function render() {
 
 	type Team = any;
-	let  team = __sveltets_invalidate(() => ({ search: "Real", players: [] } as Team));
+	let  team = __sveltets_1_invalidate(() => ({ search: "Real", players: [] } as Team));
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
index f5423debb..cea18b96f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expected.tsx
@@ -9,5 +9,5 @@ let a: 1 | 2 = 1;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx
index 7293626da..0bae0304a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
index 09b9c38e9..562685b33 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expected.tsx
@@ -2,10 +2,10 @@
 <></>;function render() {
 
 
-let  b = __sveltets_invalidate(() => ({ a: 1 }));
+let  b = __sveltets_1_invalidate(() => ({ a: 1 }));
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expected.tsx
index 6e8bf68aa..21184c74c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expected.tsx
@@ -4,13 +4,13 @@ import { b as c } from "foo";
 function render() {
 
 
-let  b = __sveltets_invalidate(() => 7);
+let  b = __sveltets_1_invalidate(() => 7);
 
 let a;
-$: a = __sveltets_invalidate(() => 5);
+$: a = __sveltets_1_invalidate(() => 5);
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
index 5746c1eda..cc9440b15 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expected.tsx
@@ -2,13 +2,13 @@
 <></>;function render() {
 
 
-let  b = __sveltets_invalidate(() => 7);
+let  b = __sveltets_1_invalidate(() => 7);
 
 let a;
-$: a = __sveltets_invalidate(() => 5);
+$: a = __sveltets_1_invalidate(() => 5);
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
index 3e664de1b..c7bbf641a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expected.tsx
@@ -1,10 +1,10 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-    $: store.set( __sveltets_invalidate(() => (__sveltets_store_get(store), $store) + 1));
+    $: store.set( __sveltets_1_invalidate(() => (__sveltets_1_store_get(store), $store) + 1));
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
index 60494d96f..88afa34de 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expected.tsx
@@ -8,5 +8,5 @@
 () => (<></>);
 return { props: {name3: name , name4: name2}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name3','name4'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['name3','name4'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expected.tsx
index dc6922353..5d45dcb6f 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expected.tsx
@@ -11,5 +11,5 @@
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['world'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expected.tsx
index f35be9078..6a8f8ad49 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expected.tsx
@@ -15,5 +15,5 @@
 </sveltehead></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
index 6fa60cd0c..06935d952 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expected.tsx
@@ -7,5 +7,5 @@
 </>);
 return { props: {world: world}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['world'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['world'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected.tsx
index c4bb7de1a..84fe1a1fb 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected.tsx
@@ -11,5 +11,5 @@
 <Style /></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
index 7d9344e6e..1a62c08f4 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expected.tsx
@@ -10,5 +10,5 @@ let a = 'b';
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
index 218b65ed1..6524e7637 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expected.tsx
@@ -3,5 +3,5 @@
 <><h1>hello</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
index e6f98d2e1..ee2d267c2 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 return { props: {name: name}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['name'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['name'], __sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx
index 2fa15b916..4218bb5ce 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expected.tsx
@@ -1,8 +1,8 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
-<><slot name="s" {...__sveltets_ensureType(HTMLSlotElement, s)} /></>
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
+<><slot name="s" {...__sveltets_1_ensureType(HTMLSlotElement, s)} /></>
 return { props: {}, slots: {'s': {}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx
index 86fcccbb4..ea6588129 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expected.tsx
@@ -1,17 +1,17 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-    const store = fromSomewhere()/*Ωignore_startΩ*/;let $store = __sveltets_store_get(store);/*Ωignore_endΩ*/;
-    const { store1, store2, noStore } = fromSomewhere()/*Ωignore_startΩ*/;let $store1 = __sveltets_store_get(store1);;let $store2 = __sveltets_store_get(store2);/*Ωignore_endΩ*/;
-    const [ store3, store4, noStore ] = fromSomewhere()/*Ωignore_startΩ*/;let $store3 = __sveltets_store_get(store3);;let $store4 = __sveltets_store_get(store4);/*Ωignore_endΩ*/;
+    const store = fromSomewhere()/*Ωignore_startΩ*/;let $store = __sveltets_1_store_get(store);/*Ωignore_endΩ*/;
+    const { store1, store2, noStore } = fromSomewhere()/*Ωignore_startΩ*/;let $store1 = __sveltets_1_store_get(store1);;let $store2 = __sveltets_1_store_get(store2);/*Ωignore_endΩ*/;
+    const [ store3, store4, noStore ] = fromSomewhere()/*Ωignore_startΩ*/;let $store3 = __sveltets_1_store_get(store3);;let $store4 = __sveltets_1_store_get(store4);/*Ωignore_endΩ*/;
 ;
 () => (<>
-<p>{(__sveltets_store_get(store), $store)}</p>
-<p>{(__sveltets_store_get(store1), $store1)}</p>
-<p>{(__sveltets_store_get(store2), $store2)}</p>
-<p>{(__sveltets_store_get(store3), $store3)}</p>
-<p>{(__sveltets_store_get(store4), $store4)}</p></>);
+<p>{(__sveltets_1_store_get(store), $store)}</p>
+<p>{(__sveltets_1_store_get(store1), $store1)}</p>
+<p>{(__sveltets_1_store_get(store2), $store2)}</p>
+<p>{(__sveltets_1_store_get(store3), $store3)}</p>
+<p>{(__sveltets_1_store_get(store4), $store4)}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx
index 5a16af855..2ab16d0ea 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expected.tsx
@@ -1,20 +1,20 @@
 ///<reference types="svelte" />
 <></>;
     import {store1, store2} from './store';
-    const store3 = writable('')/*Ωignore_startΩ*/;let $store3 = __sveltets_store_get(store3);/*Ωignore_endΩ*/;
-    const store4 = writable('')/*Ωignore_startΩ*/;let $store4 = __sveltets_store_get(store4);/*Ωignore_endΩ*/;
+    const store3 = writable('')/*Ωignore_startΩ*/;let $store3 = __sveltets_1_store_get(store3);/*Ωignore_endΩ*/;
+    const store4 = writable('')/*Ωignore_startΩ*/;let $store4 = __sveltets_1_store_get(store4);/*Ωignore_endΩ*/;
 ;<></>;function render() {
-/*Ωignore_startΩ*/;let $store1 = __sveltets_store_get(store1);;let $store2 = __sveltets_store_get(store2);/*Ωignore_endΩ*/
-    ;(__sveltets_store_get(store1), $store1);
-    ;(__sveltets_store_get(store3), $store3);
+/*Ωignore_startΩ*/;let $store1 = __sveltets_1_store_get(store1);;let $store2 = __sveltets_1_store_get(store2);/*Ωignore_endΩ*/
+    ;(__sveltets_1_store_get(store1), $store1);
+    ;(__sveltets_1_store_get(store3), $store3);
 ;
 () => (<>
 
 
 
-<p>{(__sveltets_store_get(store2), $store2)}</p>
-<p>{(__sveltets_store_get(store4), $store4)}</p></>);
+<p>{(__sveltets_1_store_get(store2), $store2)}</p>
+<p>{(__sveltets_1_store_get(store4), $store4)}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expected.tsx
index 709d776c8..a73d84f28 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expected.tsx
@@ -1,15 +1,15 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-    let  store = __sveltets_invalidate(() => fromSomewhere());/*Ωignore_startΩ*/;let $store = __sveltets_store_get(store);/*Ωignore_endΩ*/
-    let  { store1, noStore } = __sveltets_invalidate(() => fromSomewhere());/*Ωignore_startΩ*/;let $store1 = __sveltets_store_get(store1);/*Ωignore_endΩ*/
-    let  [ store2, noStore ] = __sveltets_invalidate(() => fromSomewhere());/*Ωignore_startΩ*/;let $store2 = __sveltets_store_get(store2);/*Ωignore_endΩ*/
+    let  store = __sveltets_1_invalidate(() => fromSomewhere());/*Ωignore_startΩ*/;let $store = __sveltets_1_store_get(store);/*Ωignore_endΩ*/
+    let  { store1, noStore } = __sveltets_1_invalidate(() => fromSomewhere());/*Ωignore_startΩ*/;let $store1 = __sveltets_1_store_get(store1);/*Ωignore_endΩ*/
+    let  [ store2, noStore ] = __sveltets_1_invalidate(() => fromSomewhere());/*Ωignore_startΩ*/;let $store2 = __sveltets_1_store_get(store2);/*Ωignore_endΩ*/
 ;
 () => (<>
-<p>{(__sveltets_store_get(store), $store)}</p>
-<p>{(__sveltets_store_get(store1), $store1)}</p>
-<p>{(__sveltets_store_get(store2), $store2)}</p></>);
+<p>{(__sveltets_1_store_get(store), $store)}</p>
+<p>{(__sveltets_1_store_get(store1), $store1)}</p>
+<p>{(__sveltets_1_store_get(store2), $store2)}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx
index 6bc41ab7d..2e508db83 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expected.tsx
@@ -4,17 +4,17 @@ import storeA from './store';
 import { storeB } from './store';
 import { storeB as storeC } from './store';
 function render() {
-/*Ωignore_startΩ*/;let $storeA = __sveltets_store_get(storeA);;let $storeB = __sveltets_store_get(storeB);;let $storeC = __sveltets_store_get(storeC);/*Ωignore_endΩ*/
+/*Ωignore_startΩ*/;let $storeA = __sveltets_1_store_get(storeA);;let $storeB = __sveltets_1_store_get(storeB);;let $storeC = __sveltets_1_store_get(storeC);/*Ωignore_endΩ*/
     
     
     
 ;
 () => (<>
 
-<p>{(__sveltets_store_get(storeA), $storeA)}</p>
-<p>{(__sveltets_store_get(storeB), $storeB)}</p>
-<p>{(__sveltets_store_get(storeC), $storeC)}</p></>);
+<p>{(__sveltets_1_store_get(storeA), $storeA)}</p>
+<p>{(__sveltets_1_store_get(storeB), $storeB)}</p>
+<p>{(__sveltets_1_store_get(storeC), $storeC)}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx
index c72ae2d68..042dbadea 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expected.tsx
@@ -1,28 +1,28 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-    const store = someStore()/*Ωignore_startΩ*/;let $store = __sveltets_store_get(store);/*Ωignore_endΩ*/;
-    ;(__sveltets_store_get(store), $store);
-    ;(__sveltets_store_get(store), $store).prop;
-    ;(__sveltets_store_get(store), $store)['prop'];
-    ;(__sveltets_store_get(store), $store).prop.anotherProp;
-    ;(__sveltets_store_get(store), $store)['prop'].anotherProp;
-    ;(__sveltets_store_get(store), $store).prop['anotherProp'];
-    ;(__sveltets_store_get(store), $store)['prop']['anotherProp'];
-    ;(__sveltets_store_get(store), $store)?.prop.anotherProp;
-    ;(__sveltets_store_get(store), $store)?.prop?.anotherProp;
+    const store = someStore()/*Ωignore_startΩ*/;let $store = __sveltets_1_store_get(store);/*Ωignore_endΩ*/;
+    ;(__sveltets_1_store_get(store), $store);
+    ;(__sveltets_1_store_get(store), $store).prop;
+    ;(__sveltets_1_store_get(store), $store)['prop'];
+    ;(__sveltets_1_store_get(store), $store).prop.anotherProp;
+    ;(__sveltets_1_store_get(store), $store)['prop'].anotherProp;
+    ;(__sveltets_1_store_get(store), $store).prop['anotherProp'];
+    ;(__sveltets_1_store_get(store), $store)['prop']['anotherProp'];
+    ;(__sveltets_1_store_get(store), $store)?.prop.anotherProp;
+    ;(__sveltets_1_store_get(store), $store)?.prop?.anotherProp;
 ;
 () => (<>
-<p>{(__sveltets_store_get(store), $store)}</p>
-<p>{(__sveltets_store_get(store), $store).prop}</p>
-<p>{(__sveltets_store_get(store), $store)['prop']}</p>
-<p>{(__sveltets_store_get(store), $store).prop.anotherProp}</p>
-<p>{(__sveltets_store_get(store), $store)['prop'].anotherProp}</p>
-<p>{(__sveltets_store_get(store), $store).prop['anotherProp']}</p>
-<p>{(__sveltets_store_get(store), $store)['prop']['anotherProp']}</p>
-<p>{(__sveltets_store_get(store), $store)?.prop.anotherProp}</p>
-<p>{(__sveltets_store_get(store), $store)?.prop?.anotherProp}</p></>);
+<p>{(__sveltets_1_store_get(store), $store)}</p>
+<p>{(__sveltets_1_store_get(store), $store).prop}</p>
+<p>{(__sveltets_1_store_get(store), $store)['prop']}</p>
+<p>{(__sveltets_1_store_get(store), $store).prop.anotherProp}</p>
+<p>{(__sveltets_1_store_get(store), $store)['prop'].anotherProp}</p>
+<p>{(__sveltets_1_store_get(store), $store).prop['anotherProp']}</p>
+<p>{(__sveltets_1_store_get(store), $store)['prop']['anotherProp']}</p>
+<p>{(__sveltets_1_store_get(store), $store)?.prop.anotherProp}</p>
+<p>{(__sveltets_1_store_get(store), $store)?.prop?.anotherProp}</p></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
index 1227fed30..644fd6af6 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
-<><Me f={`${(__sveltets_store_get(s), $s)} `}/></>
+<><Me f={`${(__sveltets_1_store_get(s), $s)} `}/></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expected.tsx
index 8d7284c13..0e69f4ca1 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expected.tsx
@@ -4,5 +4,5 @@
 </>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
index c9fdb4ae5..ed13cf012 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expected.tsx
@@ -6,5 +6,5 @@
 {true === true}</>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
index c04e6b46e..66254df08 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expected.tsx
@@ -3,5 +3,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
index c04e6b46e..66254df08 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/style/expected.tsx
@@ -3,5 +3,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expected.tsx
index 542f10ee3..f647174a5 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expected.tsx
@@ -12,12 +12,12 @@
     }
 
      let exported1: string;
-     let exported2: string = '';exported2 = __sveltets_any(exported2);;
+     let exported2: string = '';exported2 = __sveltets_1_any(exported2);;
 
-    let name1: string = "world";name1 = __sveltets_any(name1);
+    let name1: string = "world";name1 = __sveltets_1_any(name1);
     let name2: string;
 
-    let rename1: string = '';rename1 = __sveltets_any(rename1);;
+    let rename1: string = '';rename1 = __sveltets_1_any(rename1);;
     let rename2: string;
 
     class Foo {}
@@ -31,7 +31,7 @@
     
 ;
 () => (<></>);
-return { props: {...__sveltets_ensureRightProps<{exported1: string,exported2?: string,name1?: string,name2: string,renamed1?: string,renamed2: string}>(__sveltets_any("") as $$Props), ...__sveltets_ensureRightProps<Partial<$$Props>>({exported1: exported1,exported2: exported2,name1: name1,name2: name2,renamed1: rename1,renamed2: rename2}), ...{} as unknown as $$Props, ...{Foo: Foo, bar: bar, baz: baz, RenamedFoo: RenameFoo, renamedbar: renamebar, renamedbaz: renamebaz} as {Foo?: typeof Foo,bar?: typeof bar,baz?: string,RenamedFoo?: typeof RenameFoo,renamedbar?: typeof renamebar,renamedbaz?: string}}, slots: {}, getters: {}, events: {} }}
+return { props: {...__sveltets_1_ensureRightProps<{exported1: string,exported2?: string,name1?: string,name2: string,renamed1?: string,renamed2: string}>(__sveltets_1_any("") as $$Props), ...__sveltets_1_ensureRightProps<Partial<$$Props>>({exported1: exported1,exported2: exported2,name1: name1,name2: name2,renamed1: rename1,renamed2: rename2}), ...{} as unknown as $$Props, ...{Foo: Foo, bar: bar, baz: baz, RenamedFoo: RenameFoo, renamedbar: renamebar, renamedbaz: renamebaz} as {Foo?: typeof Foo,bar?: typeof bar,baz?: string,RenamedFoo?: typeof RenameFoo,renamedbar?: typeof renamebar,renamedbaz?: string}}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expected.tsx
index 2fe135194..6f868eddb 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expected.tsx
@@ -12,12 +12,12 @@
     }
 
      let exported1: string;
-     let exported2: string = '';exported2 = __sveltets_any(exported2);;
+     let exported2: string = '';exported2 = __sveltets_1_any(exported2);;
 
-    let name1: string = "world";name1 = __sveltets_any(name1);
+    let name1: string = "world";name1 = __sveltets_1_any(name1);
     let name2: string;
 
-    let rename1: string = '';rename1 = __sveltets_any(rename1);;
+    let rename1: string = '';rename1 = __sveltets_1_any(rename1);;
     let rename2: string;
 
     class Foo {}
@@ -31,7 +31,7 @@
     
 ;
 () => (<></>);
-return { props: {...__sveltets_ensureRightProps<{exported1: string,exported2?: string,name1?: string,name2: string,renamed1?: string,renamed2: string}>(__sveltets_any("") as $$Props), ...__sveltets_ensureRightProps<Partial<$$Props>>({exported1: exported1,exported2: exported2,name1: name1,name2: name2,renamed1: rename1,renamed2: rename2}), ...{} as unknown as $$Props, ...{Foo: Foo, bar: bar, baz: baz, RenamedFoo: RenameFoo, renamedbar: renamebar, renamedbaz: renamebaz} as {Foo?: typeof Foo,bar?: typeof bar,baz?: string,RenamedFoo?: typeof RenameFoo,renamedbar?: typeof renamebar,renamedbaz?: string}}, slots: {}, getters: {}, events: {} }}
+return { props: {...__sveltets_1_ensureRightProps<{exported1: string,exported2?: string,name1?: string,name2: string,renamed1?: string,renamed2: string}>(__sveltets_1_any("") as $$Props), ...__sveltets_1_ensureRightProps<Partial<$$Props>>({exported1: exported1,exported2: exported2,name1: name1,name2: name2,renamed1: rename1,renamed2: rename2}), ...{} as unknown as $$Props, ...{Foo: Foo, bar: bar, baz: baz, RenamedFoo: RenameFoo, renamedbar: renamebar, renamedbaz: renamebaz} as {Foo?: typeof Foo,bar?: typeof bar,baz?: string,RenamedFoo?: typeof RenameFoo,renamedbar?: typeof renamebar,renamedbaz?: string}}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected.tsx
index 0c7346aca..154b4d3a3 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected.tsx
@@ -99,111 +99,111 @@ type SvelteStore<T> = { subscribe: (run: (value: T) => any, invalidate?: any) =>
 type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
 
 type KeysMatching<Obj, V> = {[K in keyof Obj]-?: Obj[K] extends V ? K : never}[keyof Obj]
-declare type __Sveltets_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
+declare type __sveltets_1_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
 
 declare var process: NodeJS.Process & { browser: boolean }
-declare var __sveltets_AnimationMove: { from: DOMRect, to: DOMRect }
-
-declare function __sveltets_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
-declare function __sveltets_ensureAction(actionCall: SvelteActionReturnType): {};
-declare function __sveltets_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
-declare function __sveltets_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
-declare function __sveltets_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
-declare function __sveltets_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
-declare function __sveltets_ensureRightProps<Props>(props: Props): {};
-declare function __sveltets_cssProp(prop: Record<string, any>): {};
-declare function __sveltets_ctorOf<T>(type: T): AConstructorTypeOf<T>;
-declare function __sveltets_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
-declare function __sveltets_allPropsType(): SvelteAllProps
-declare function __sveltets_restPropsType(): SvelteRestProps
-declare function __sveltets_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
+declare var __sveltets_1_AnimationMove: { from: DOMRect, to: DOMRect }
+
+declare function __sveltets_1_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
+declare function __sveltets_1_ensureAction(actionCall: SvelteActionReturnType): {};
+declare function __sveltets_1_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
+declare function __sveltets_1_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
+declare function __sveltets_1_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
+declare function __sveltets_1_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
+declare function __sveltets_1_ensureRightProps<Props>(props: Props): {};
+declare function __sveltets_1_cssProp(prop: Record<string, any>): {};
+declare function __sveltets_1_ctorOf<T>(type: T): AConstructorTypeOf<T>;
+declare function __sveltets_1_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
+declare function __sveltets_1_allPropsType(): SvelteAllProps
+declare function __sveltets_1_restPropsType(): SvelteRestProps
+declare function __sveltets_1_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
 
 // Overload of the following two functions is necessary.
 // An empty array of optionalProps makes OptionalProps type any, which means we lose the prop typing.
 // optionalProps need to be first or its type cannot be infered correctly.
 
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props>, events: Events, slots: Slots }
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>>, events: Events, slots: Slots }
 
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props> & SvelteAllProps, events: Events, slots: Slots }
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>> & SvelteAllProps, events: Events, slots: Slots }
 
 
-declare function __sveltets_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props & SvelteAllProps, events: Events, slots: Slots }
 
-declare function __sveltets_with_any_event<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any_event<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props, events: Events & {[evt: string]: CustomEvent<any>;}, slots: Slots }
 
-declare function __sveltets_store_get<T = any>(store: SvelteStore<T>): T
-declare function __sveltets_any(dummy: any): any;
-declare function __sveltets_empty(dummy: any): {};
-declare function __sveltets_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
-declare function __sveltets_invalidate<T>(getValue: () => T): T
+declare function __sveltets_1_store_get<T = any>(store: SvelteStore<T>): T
+declare function __sveltets_1_any(dummy: any): any;
+declare function __sveltets_1_empty(dummy: any): {};
+declare function __sveltets_1_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
+declare function __sveltets_1_invalidate<T>(getValue: () => T): T
 
-declare function __sveltets_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
+declare function __sveltets_1_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
     event: K
 ): HTMLBodyElementEventMap[K];
-declare function __sveltets_mapBodyEvent<K extends keyof WindowEventMap>(
+declare function __sveltets_1_mapBodyEvent<K extends keyof WindowEventMap>(
     event: K
 ): WindowEventMap[K];
-declare function __sveltets_mapElementEvent<K extends keyof HTMLElementEventMap>(
+declare function __sveltets_1_mapElementEvent<K extends keyof HTMLElementEventMap>(
     event: K
 ): HTMLElementEventMap[K];
-declare function __sveltets_mapElementTag<K extends keyof ElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof ElementTagNameMap>(
     tag: K
 ): ElementTagNameMap[K];
-declare function __sveltets_mapElementTag<K extends keyof SVGElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof SVGElementTagNameMap>(
     tag: K
 ): SVGElementTagNameMap[K];
-declare function __sveltets_mapElementTag(
+declare function __sveltets_1_mapElementTag(
     tag: any
 ): HTMLElement;
 
-declare function __sveltets_bubbleEventDef<Events, K extends keyof Events>(
+declare function __sveltets_1_bubbleEventDef<Events, K extends keyof Events>(
     events: Events, eventKey: K
 ): Events[K];
-declare function __sveltets_bubbleEventDef(
+declare function __sveltets_1_bubbleEventDef(
     events: any, eventKey: string
 ): any;
 
-declare const __sveltets_customEvent: CustomEvent<any>;
-declare function __sveltets_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
+declare const __sveltets_1_customEvent: CustomEvent<any>;
+declare function __sveltets_1_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
 
-declare function __sveltets_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
-declare function __sveltets_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
-declare function __sveltets_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
-declare function __sveltets_unionType(...types: any[]): any;
+declare function __sveltets_1_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
+declare function __sveltets_1_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
+declare function __sveltets_1_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
+declare function __sveltets_1_unionType(...types: any[]): any;
 
-declare function __sveltets_awaitThen<T>(
+declare function __sveltets_1_awaitThen<T>(
     promise: T,
     onfulfilled: (value: T extends PromiseLike<infer U> ? U : T) => any,
     onrejected?: (value: T extends PromiseLike<any> ? any : never) => any
 ): any;
 
-declare function __sveltets_each<T>(
+declare function __sveltets_1_each<T>(
     array: ArrayLike<T>,
     callbackfn: (value: T, index: number) => any
 ): any;
 
-declare function createSvelte2TsxComponent<Props, Events, Slots>(
+declare function __sveltets_1_createSvelte2TsxComponent<Props, Events, Slots>(
     render: {props: Props, events: Events, slots: Slots }
 ): SvelteComponentConstructor<Svelte2TsxComponent<Props, Events, Slots>,Svelte2TsxComponentConstructorParameters<Props>>;
 
-declare function __sveltets_unwrapArr<T>(arr: ArrayLike<T>): T
-declare function __sveltets_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
+declare function __sveltets_1_unwrapArr<T>(arr: ArrayLike<T>): T
+declare function __sveltets_1_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
 
 
 import { createEventDispatcher } from 'svelte';
@@ -221,13 +221,13 @@ function render/*Ωignore_startΩ*/<A,B extends keyof A,C extends boolean>/*Ωig
 
     const dispatch = createEventDispatcher<{a: A}>();
 ;
-return { props: {a: a , b: b , c: c} as {a: A, b: B, c: C}, slots: {'default': {c:c}}, getters: {}, events: {...__sveltets_toEventTypings<{a: A}>()} }}
+return { props: {a: a , b: b , c: c} as {a: A, b: B, c: C}, slots: {'default': {c:c}}, getters: {}, events: {...__sveltets_1_toEventTypings<{a: A}>()} }}
 class __sveltets_Render<A,B extends keyof A,C extends boolean> {
     props() {
         return render<A,B,C>().props;
     }
     events() {
-        return __sveltets_with_any_event(render<A,B,C>()).events;
+        return __sveltets_1_with_any_event(render<A,B,C>()).events;
     }
     slots() {
         return render<A,B,C>().slots;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected.tsx
index 720e9cd04..4b0f8a447 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected.tsx
@@ -15,17 +15,17 @@ function render/*Ωignore_startΩ*/<A,B extends keyof A,C extends boolean>/*Ωig
 
     const dispatch = createEventDispatcher<{a: A}>();
 
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/;
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/;
 () => (<>
 
 <slot c={__sveltets_ensureSlot("default","c",c)} /></>);
-return { props: {a: a , b: b , c: c} as {a: A, b: B, c: C}, slots: {'default': {c:c}}, getters: {}, events: {...__sveltets_toEventTypings<{a: A}>()} }}
+return { props: {a: a , b: b , c: c} as {a: A, b: B, c: C}, slots: {'default': {c:c}}, getters: {}, events: {...__sveltets_1_toEventTypings<{a: A}>()} }}
 class __sveltets_Render<A,B extends keyof A,C extends boolean> {
     props() {
         return render<A,B,C>().props;
     }
     events() {
-        return __sveltets_with_any_event(render<A,B,C>()).events;
+        return __sveltets_1_with_any_event(render<A,B,C>()).events;
     }
     slots() {
         return render<A,B,C>().slots;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected.tsx
index 683061994..733cd4434 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected.tsx
@@ -99,111 +99,111 @@ type SvelteStore<T> = { subscribe: (run: (value: T) => any, invalidate?: any) =>
 type Expand<T> = T extends infer O ? { [K in keyof O]: O[K] } : never;
 
 type KeysMatching<Obj, V> = {[K in keyof Obj]-?: Obj[K] extends V ? K : never}[keyof Obj]
-declare type __Sveltets_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
+declare type __sveltets_1_CustomEvents<T> = {[K in KeysMatching<T, CustomEvent>]: T[K] extends CustomEvent ? T[K]['detail']: T[K]}
 
 declare var process: NodeJS.Process & { browser: boolean }
-declare var __sveltets_AnimationMove: { from: DOMRect, to: DOMRect }
-
-declare function __sveltets_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
-declare function __sveltets_ensureAction(actionCall: SvelteActionReturnType): {};
-declare function __sveltets_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
-declare function __sveltets_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
-declare function __sveltets_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
-declare function __sveltets_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
-declare function __sveltets_ensureRightProps<Props>(props: Props): {};
-declare function __sveltets_cssProp(prop: Record<string, any>): {};
-declare function __sveltets_ctorOf<T>(type: T): AConstructorTypeOf<T>;
-declare function __sveltets_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
-declare function __sveltets_allPropsType(): SvelteAllProps
-declare function __sveltets_restPropsType(): SvelteRestProps
-declare function __sveltets_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
+declare var __sveltets_1_AnimationMove: { from: DOMRect, to: DOMRect }
+
+declare function __sveltets_1_ensureAnimation(animationCall: SvelteAnimationReturnType): {};
+declare function __sveltets_1_ensureAction(actionCall: SvelteActionReturnType): {};
+declare function __sveltets_1_ensureTransition(transitionCall: SvelteTransitionReturnType): {};
+declare function __sveltets_1_ensureFunction(expression: (e: Event & { detail?: any }) => unknown ): {};
+declare function __sveltets_1_ensureType<T>(type: AConstructorTypeOf<T>, el: T): {};
+declare function __sveltets_1_createEnsureSlot<Slots = Record<string, Record<string, any>>>(): <K1 extends keyof Slots, K2 extends keyof Slots[K1]>(k1: K1, k2: K2, val: Slots[K1][K2]) => Slots[K1][K2];
+declare function __sveltets_1_ensureRightProps<Props>(props: Props): {};
+declare function __sveltets_1_cssProp(prop: Record<string, any>): {};
+declare function __sveltets_1_ctorOf<T>(type: T): AConstructorTypeOf<T>;
+declare function __sveltets_1_instanceOf<T = any>(type: AConstructorTypeOf<T>): T;
+declare function __sveltets_1_allPropsType(): SvelteAllProps
+declare function __sveltets_1_restPropsType(): SvelteRestProps
+declare function __sveltets_1_slotsType<Slots, Key extends keyof Slots>(slots: Slots): Record<Key, boolean>;
 
 // Overload of the following two functions is necessary.
 // An empty array of optionalProps makes OptionalProps type any, which means we lose the prop typing.
 // optionalProps need to be first or its type cannot be infered correctly.
 
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props>, events: Events, slots: Slots }
-declare function __sveltets_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>>, events: Events, slots: Slots }
 
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: SveltePropsAnyFallback<Props> & SvelteAllProps, events: Events, slots: Slots }
-declare function __sveltets_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
+declare function __sveltets_1_partial_with_any<Props = {}, Events = {}, Slots = {}, OptionalProps extends keyof Props = any>(
     optionalProps: OptionalProps[],
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Expand<SvelteWithOptionalProps<SveltePropsAnyFallback<Props>, OptionalProps>> & SvelteAllProps, events: Events, slots: Slots }
 
 
-declare function __sveltets_with_any<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props & SvelteAllProps, events: Events, slots: Slots }
 
-declare function __sveltets_with_any_event<Props = {}, Events = {}, Slots = {}>(
+declare function __sveltets_1_with_any_event<Props = {}, Events = {}, Slots = {}>(
     render: {props: Props, events: Events, slots: Slots }
 ): {props: Props, events: Events & {[evt: string]: CustomEvent<any>;}, slots: Slots }
 
-declare function __sveltets_store_get<T = any>(store: SvelteStore<T>): T
-declare function __sveltets_any(dummy: any): any;
-declare function __sveltets_empty(dummy: any): {};
-declare function __sveltets_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
-declare function __sveltets_invalidate<T>(getValue: () => T): T
+declare function __sveltets_1_store_get<T = any>(store: SvelteStore<T>): T
+declare function __sveltets_1_any(dummy: any): any;
+declare function __sveltets_1_empty(dummy: any): {};
+declare function __sveltets_1_componentType(): AConstructorTypeOf<Svelte2TsxComponent<any, any, any>>
+declare function __sveltets_1_invalidate<T>(getValue: () => T): T
 
-declare function __sveltets_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
+declare function __sveltets_1_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
     event: K
 ): HTMLBodyElementEventMap[K];
-declare function __sveltets_mapBodyEvent<K extends keyof WindowEventMap>(
+declare function __sveltets_1_mapBodyEvent<K extends keyof WindowEventMap>(
     event: K
 ): WindowEventMap[K];
-declare function __sveltets_mapElementEvent<K extends keyof HTMLElementEventMap>(
+declare function __sveltets_1_mapElementEvent<K extends keyof HTMLElementEventMap>(
     event: K
 ): HTMLElementEventMap[K];
-declare function __sveltets_mapElementTag<K extends keyof ElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof ElementTagNameMap>(
     tag: K
 ): ElementTagNameMap[K];
-declare function __sveltets_mapElementTag<K extends keyof SVGElementTagNameMap>(
+declare function __sveltets_1_mapElementTag<K extends keyof SVGElementTagNameMap>(
     tag: K
 ): SVGElementTagNameMap[K];
-declare function __sveltets_mapElementTag(
+declare function __sveltets_1_mapElementTag(
     tag: any
 ): HTMLElement;
 
-declare function __sveltets_bubbleEventDef<Events, K extends keyof Events>(
+declare function __sveltets_1_bubbleEventDef<Events, K extends keyof Events>(
     events: Events, eventKey: K
 ): Events[K];
-declare function __sveltets_bubbleEventDef(
+declare function __sveltets_1_bubbleEventDef(
     events: any, eventKey: string
 ): any;
 
-declare const __sveltets_customEvent: CustomEvent<any>;
-declare function __sveltets_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
+declare const __sveltets_1_customEvent: CustomEvent<any>;
+declare function __sveltets_1_toEventTypings<Typings>(): {[Key in keyof Typings]: CustomEvent<Typings[Key]>};
 
-declare function __sveltets_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
-declare function __sveltets_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
-declare function __sveltets_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
-declare function __sveltets_unionType(...types: any[]): any;
+declare function __sveltets_1_unionType<T1, T2>(t1: T1, t2: T2): T1 | T2;
+declare function __sveltets_1_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1 | T2 | T3;
+declare function __sveltets_1_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
+declare function __sveltets_1_unionType(...types: any[]): any;
 
-declare function __sveltets_awaitThen<T>(
+declare function __sveltets_1_awaitThen<T>(
     promise: T,
     onfulfilled: (value: T extends PromiseLike<infer U> ? U : T) => any,
     onrejected?: (value: T extends PromiseLike<any> ? any : never) => any
 ): any;
 
-declare function __sveltets_each<T>(
+declare function __sveltets_1_each<T>(
     array: ArrayLike<T>,
     callbackfn: (value: T, index: number) => any
 ): any;
 
-declare function createSvelte2TsxComponent<Props, Events, Slots>(
+declare function __sveltets_1_createSvelte2TsxComponent<Props, Events, Slots>(
     render: {props: Props, events: Events, slots: Slots }
 ): SvelteComponentConstructor<Svelte2TsxComponent<Props, Events, Slots>,Svelte2TsxComponentConstructorParameters<Props>>;
 
-declare function __sveltets_unwrapArr<T>(arr: ArrayLike<T>): T
-declare function __sveltets_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
+declare function __sveltets_1_unwrapArr<T>(arr: ArrayLike<T>): T
+declare function __sveltets_1_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
 
 
     export const foo = 'foo';
@@ -220,8 +220,8 @@ function render() {
 
   const dispatch = createEventDispatcher<{swipe: string}>();
 ;
-return { props: {bar: bar , foobar: foobar} as {bar: Bar, foobar?: typeof foobar}, slots: {'default': {bar:bar}}, getters: {}, events: {...__sveltets_toEventTypings<{swipe: string}>(), 'click':__sveltets_mapElementEvent('click')} }}
-const __propDef = __sveltets_with_any_event(render());
+return { props: {bar: bar , foobar: foobar} as {bar: Bar, foobar?: typeof foobar}, slots: {'default': {bar:bar}}, getters: {}, events: {...__sveltets_1_toEventTypings<{swipe: string}>(), 'click':__sveltets_1_mapElementEvent('click')} }}
+const __propDef = __sveltets_1_with_any_event(render());
 export type InputProps = typeof __propDef.props;
 export type InputEvents = typeof __propDef.events;
 export type InputSlots = typeof __propDef.slots;
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expected.tsx
index 66e4eb746..f6adcff97 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expected.tsx
@@ -31,7 +31,7 @@ function render() {
 () => (<>
 
 <button onclick={() => dispatch('btn', '')}></button></>);
-return { props: {}, slots: {}, getters: {}, events: {...__sveltets_toEventTypings<{
+return { props: {}, slots: {}, getters: {}, events: {...__sveltets_1_toEventTypings<{
     /**
      * A DOC
      */
@@ -46,5 +46,5 @@ return { props: {}, slots: {}, getters: {}, events: {...__sveltets_toEventTyping
     // not this
     btn: string;}>()} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expected.tsx
index f4ef13645..8f49b125c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expected.tsx
@@ -20,12 +20,12 @@ function render() {
 () => (<>
 
 <button onclick={undefined}></button></>);
-return { props: {}, slots: {}, getters: {}, events: {...__sveltets_toEventTypings<{
+return { props: {}, slots: {}, getters: {}, events: {...__sveltets_1_toEventTypings<{
     /**
      * A DOC
      */
     hi: boolean;
-    }>(), ...__sveltets_toEventTypings<{hi: string;}>(), 'click':__sveltets_mapElementEvent('click'), 'hi': __sveltets_customEvent, 'bye': __sveltets_customEvent} }}
+    }>(), ...__sveltets_1_toEventTypings<{hi: string;}>(), 'click':__sveltets_1_mapElementEvent('click'), 'hi': __sveltets_1_customEvent, 'bye': __sveltets_1_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expected.tsx
index 384288ced..bfbd99ffd 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expected.tsx
@@ -20,12 +20,12 @@ function render() {
 () => (<>
 
 <button onclick={undefined}></button></>);
-return { props: {}, slots: {}, getters: {}, events: {...__sveltets_toEventTypings<{
+return { props: {}, slots: {}, getters: {}, events: {...__sveltets_1_toEventTypings<{
     /**
      * A DOC
      */
     hi: boolean;
-    }>(), ...__sveltets_toEventTypings<{btn: string;}>(), 'click':__sveltets_mapElementEvent('click'), 'bye': __sveltets_customEvent} }}
+    }>(), ...__sveltets_1_toEventTypings<{btn: string;}>(), 'click':__sveltets_1_mapElementEvent('click'), 'bye': __sveltets_1_customEvent} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expected.tsx
index c4c79b505..35859bd89 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expected.tsx
@@ -9,5 +9,5 @@
 () => (<></>);
 return { props: {f: f} as {f?: typeof f}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx
index 681c54dd1..6f9df0571 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expected.tsx
@@ -1,14 +1,14 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-     let bla = false;bla = __sveltets_any(bla);;
-     let blubb = true;blubb = __sveltets_any(blubb);;
-     let bla1: boolean = false;bla1 = __sveltets_any(bla1);;
-     let blubb1: boolean = true;blubb1 = __sveltets_any(blubb1);;
-     let a1 = true;a1 = __sveltets_any(a1);;let  a2 = false;a2 = __sveltets_any(a2);;let  b1: boolean = true;b1 = __sveltets_any(b1);;let  b2: boolean = false;b2 = __sveltets_any(b2);;
+     let bla = false;bla = __sveltets_1_any(bla);;
+     let blubb = true;blubb = __sveltets_1_any(blubb);;
+     let bla1: boolean = false;bla1 = __sveltets_1_any(bla1);;
+     let blubb1: boolean = true;blubb1 = __sveltets_1_any(blubb1);;
+     let a1 = true;a1 = __sveltets_1_any(a1);;let  a2 = false;a2 = __sveltets_1_any(a2);;let  b1: boolean = true;b1 = __sveltets_1_any(b1);;let  b2: boolean = false;b2 = __sveltets_1_any(b2);;
 ;
 () => (<></>);
 return { props: {bla: bla , blubb: blubb , bla1: bla1 , blubb1: blubb1 , a1: a1 , a2: a2 , b1: b1 , b2: b2} as {bla?: typeof bla, blubb?: typeof blubb, bla1?: boolean, blubb1?: boolean, a1?: typeof a1, a2?: typeof a2, b1?: boolean, b2?: boolean}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
index 7db5d492e..74f0f8092 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected.tsx
@@ -7,7 +7,7 @@
 () => (<></>);
 return { props: {name: name , SOME: SOME , CONSTANT: CONSTANT} as {name?: string, SOME?: typeof SOME, CONSTANT?: typeof CONSTANT}, slots: {}, getters: {name: name, SOME: SOME, CONSTANT: CONSTANT}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
     get name() { return render().getters.name }
     get SOME() { return render().getters.SOME }
     get CONSTANT() { return render().getters.CONSTANT }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expected.tsx
index 49ed46137..08760bf8a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expected.tsx
@@ -18,5 +18,5 @@ return { props: {
      * 
      */a: a}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
index ece9532f8..a1a9bf8ba 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expected.tsx
@@ -23,5 +23,5 @@ return { props: {a: a , b: b , c: c , d: d} as {
      * MORE DOCS!
      */b?: typeof b, c: typeof c, d: typeof d}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expected.tsx
index 236c7828d..8ab450897 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expected.tsx
@@ -6,5 +6,5 @@
 () => (<></>);
 return { props: {a: a} as {a?: typeof a}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expected.tsx
index c517bbac4..aea6860f5 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expected.tsx
@@ -3,10 +3,10 @@
 
     interface A {}
      let a: A;
-     let b: A = {};b = __sveltets_any(b);;
+     let b: A = {};b = __sveltets_1_any(b);;
 ;
 () => (<></>);
 return { props: {a: a , b: b} as {a: A, b?: A}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
index 2fbee87f4..8e3a4fedb 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expected.tsx
@@ -5,5 +5,5 @@
 <></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expected.tsx
index b4628b154..fd54a21de 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expected.tsx
@@ -1,11 +1,11 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-    let name1: string = "world";name1 = __sveltets_any(name1);
+    let name1: string = "world";name1 = __sveltets_1_any(name1);
     let name2: string;
-    let name3: string = '';name3 = __sveltets_any(name3);;let  name4: string;
+    let name3: string = '';name3 = __sveltets_1_any(name3);;let  name4: string;
 
-    let rename1: string = '';rename1 = __sveltets_any(rename1);;
+    let rename1: string = '';rename1 = __sveltets_1_any(rename1);;
     let rename2: string;
 
     class Foo {}
@@ -21,5 +21,5 @@
 () => (<></>);
 return { props: {name1: name1 , name2: name2 , name3: name3 , name4: name4 , renamed1: rename1 , renamed2: rename2 , Foo: Foo , bar: bar , baz: baz , RenamedFoo: RenameFoo , renamedbar: renamebar , renamedbaz: renamebaz} as {name1?: string, name2: string, name3?: string, name4: string, renamed1?: string, renamed2: string, Foo?: typeof Foo, bar?: typeof bar, baz?: string, RenamedFoo?: typeof RenameFoo, renamedbar?: typeof renamebar, renamedbaz?: string}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expected.tsx
index 9ba780031..e598c2689 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expected.tsx
@@ -3,10 +3,10 @@
 
      let a: number;
      let b: number | undefined;
-     let c: number = 123;c = __sveltets_any(c);;
+     let c: number = 123;c = __sveltets_1_any(c);;
 ;
 () => (<></>);
 return { props: {a: a , b: b , c: c} as {a: number, b: number | undefined, c?: number}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
index 49b55a70e..ea09cb387 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expected.tsx
@@ -8,5 +8,5 @@
 <h1>{number1} + {number2} = {number1 + number2}</h1></>);
 return { props: {number1: number1 , number2: number2} as {number1: number, number2: number}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expected.tsx
index ee34ed865..b94903912 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expected.tsx
@@ -7,5 +7,5 @@
 </>);
 return { props: {foo: foo} as {foo: string}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx
index d6d345fb9..ae054985e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expected.tsx
@@ -10,5 +10,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expected.tsx
index 252b5cf2b..44474bba6 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expected.tsx
@@ -1,10 +1,10 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-     let name: string | number = "world";name = __sveltets_any(name);
+     let name: string | number = "world";name = __sveltets_1_any(name);
 ;
 () => (<></>);
 return { props: {name: name} as {name?: string | number}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any_event(render())) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx
index 73088a8e2..a3cd153f7 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expected.tsx
@@ -1,9 +1,9 @@
 ///<reference types="svelte" />
-<></>;function render() { let $$props = __sveltets_allPropsType();
+<></>;function render() { let $$props = __sveltets_1_allPropsType();
  ;
 () => (<>
 <h1>{$$props['name']}</h1></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_with_any(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expected.tsx
index 8b4b87a95..cd3bdb950 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expected.tsx
@@ -4,11 +4,11 @@ import {writable} from "svelte/store";
 function render() {
 
 	
-	const foo = writable(1)/*Ωignore_startΩ*/;let $foo = __sveltets_store_get(foo);/*Ωignore_endΩ*/;
+	const foo = writable(1)/*Ωignore_startΩ*/;let $foo = __sveltets_1_store_get(foo);/*Ωignore_endΩ*/;
 	type Foo = typeof $foo;
 ;
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
index 7a52b9ad9..0d0976616 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expected.tsx
@@ -1,5 +1,5 @@
 ///<reference types="svelte" />
-<></>;function render() { let $$props = __sveltets_allPropsType();
+<></>;function render() { let $$props = __sveltets_1_allPropsType();
 
     let name = $$props['name'];
 ;
@@ -7,5 +7,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial_with_any(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
index cf5887306..7fc2cb005 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
-<></>;function render() { let $$props = __sveltets_allPropsType();
+<></>;function render() { let $$props = __sveltets_1_allPropsType();
 <><h1>{$$props['name']}</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial_with_any(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
index 73f63ba45..a5568b6fe 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expected.tsx
@@ -1,5 +1,5 @@
 ///<reference types="svelte" />
-<></>;function render() { let $$restProps = __sveltets_restPropsType();
+<></>;function render() { let $$restProps = __sveltets_1_restPropsType();
 
     let name = $$restProps['name'];
 ;
@@ -7,5 +7,5 @@
 </>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial_with_any(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
index 768c6c8bf..2c5079027 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
-<></>;function render() { let $$restProps = __sveltets_restPropsType();
+<></>;function render() { let $$restProps = __sveltets_1_restPropsType();
 <><h1>{$$restProps['name']}</h1></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial_with_any(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial_with_any(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx
index 85de923aa..a9279bc4a 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expected.tsx
@@ -1,10 +1,10 @@
 ///<reference types="svelte" />
-<></>;function render() { let $$slots = __sveltets_slotsType({'foo': '', 'dashed-name': '', 'default': ''});
+<></>;function render() { let $$slots = __sveltets_1_slotsType({'foo': '', 'dashed-name': '', 'default': ''});
 
     let name = $$slots.foo;
     let dashedName = $$slots['dashed-name'];
 
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/;
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/;
 () => (<>
 
 <h1>{name}</h1>
@@ -13,5 +13,5 @@
 <slot /></>);
 return { props: {}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx
index f326b0a69..785ccce86 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expected.tsx
@@ -1,6 +1,6 @@
 ///<reference types="svelte" />
-<></>;function render() { let $$slots = __sveltets_slotsType({'foo': '', 'dashed-name': '', 'default': ''});
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
+<></>;function render() { let $$slots = __sveltets_1_slotsType({'foo': '', 'dashed-name': '', 'default': ''});
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
 <><h1>{$$slots.foo}</h1>
 <h1>{$$slots['dashed-name']}</h1>
 
@@ -9,5 +9,5 @@
 <slot /></>
 return { props: {}, slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx
index e704ae52e..4b339349c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expected.tsx
@@ -14,5 +14,5 @@
 () => (<></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expected.tsx
index 4fbce8805..7eaf02fbc 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expected.tsx
@@ -1,8 +1,8 @@
 ///<reference types="svelte" />
 <></>;function render() {
-<><Component  />{/*Ωignore_startΩ*/new Component({target: __sveltets_any(''), props: {}})/*Ωignore_endΩ*/.$on('click', (__sveltets_store_get(check), $check) ? method1 : method2)}
-<button onclick={(__sveltets_store_get(check), $check) ? method1 : method2} >Bla</button></>
+<><Component  />{/*Ωignore_startΩ*/new Component({target: __sveltets_1_any(''), props: {}})/*Ωignore_endΩ*/.$on('click', (__sveltets_1_store_get(check), $check) ? method1 : method2)}
+<button onclick={(__sveltets_1_store_get(check), $check) ? method1 : method2} >Bla</button></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expected.tsx
index 5dc0f00df..483f57cb8 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expected.tsx
@@ -1,24 +1,24 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-    const store1 = '', store2 = ''/*Ωignore_startΩ*/;let $store1 = __sveltets_store_get(store1);/*Ωignore_endΩ*//*Ωignore_startΩ*/;let $store2 = __sveltets_store_get(store2);/*Ωignore_endΩ*/;
-    const { store3, store4 } = '', [ store5, store6 ] = ''/*Ωignore_startΩ*/;let $store3 = __sveltets_store_get(store3);;let $store4 = __sveltets_store_get(store4);/*Ωignore_endΩ*//*Ωignore_startΩ*/;let $store5 = __sveltets_store_get(store5);;let $store6 = __sveltets_store_get(store6);/*Ωignore_endΩ*/;
-    let  {store7, store8} = __sveltets_invalidate(() => '');/*Ωignore_startΩ*/;let $store7 = __sveltets_store_get(store7);;let $store8 = __sveltets_store_get(store8);/*Ωignore_endΩ*/
-    let  [store9, store10] = __sveltets_invalidate(() => '');/*Ωignore_startΩ*/;let $store9 = __sveltets_store_get(store9);;let $store10 = __sveltets_store_get(store10);/*Ωignore_endΩ*/
+    const store1 = '', store2 = ''/*Ωignore_startΩ*/;let $store1 = __sveltets_1_store_get(store1);/*Ωignore_endΩ*//*Ωignore_startΩ*/;let $store2 = __sveltets_1_store_get(store2);/*Ωignore_endΩ*/;
+    const { store3, store4 } = '', [ store5, store6 ] = ''/*Ωignore_startΩ*/;let $store3 = __sveltets_1_store_get(store3);;let $store4 = __sveltets_1_store_get(store4);/*Ωignore_endΩ*//*Ωignore_startΩ*/;let $store5 = __sveltets_1_store_get(store5);;let $store6 = __sveltets_1_store_get(store6);/*Ωignore_endΩ*/;
+    let  {store7, store8} = __sveltets_1_invalidate(() => '');/*Ωignore_startΩ*/;let $store7 = __sveltets_1_store_get(store7);;let $store8 = __sveltets_1_store_get(store8);/*Ωignore_endΩ*/
+    let  [store9, store10] = __sveltets_1_invalidate(() => '');/*Ωignore_startΩ*/;let $store9 = __sveltets_1_store_get(store9);;let $store10 = __sveltets_1_store_get(store10);/*Ωignore_endΩ*/
 ;
 () => (<>
 
-{(__sveltets_store_get(store1), $store1)}
-{(__sveltets_store_get(store2), $store2)}
-{(__sveltets_store_get(store3), $store3)}
-{(__sveltets_store_get(store4), $store4)}
-{(__sveltets_store_get(store5), $store5)}
-{(__sveltets_store_get(store6), $store6)}
-{(__sveltets_store_get(store7), $store7)}
-{(__sveltets_store_get(store8), $store8)}
-{(__sveltets_store_get(store9), $store9)}
-{(__sveltets_store_get(store10), $store10)}</>);
+{(__sveltets_1_store_get(store1), $store1)}
+{(__sveltets_1_store_get(store2), $store2)}
+{(__sveltets_1_store_get(store3), $store3)}
+{(__sveltets_1_store_get(store4), $store4)}
+{(__sveltets_1_store_get(store5), $store5)}
+{(__sveltets_1_store_get(store6), $store6)}
+{(__sveltets_1_store_get(store7), $store7)}
+{(__sveltets_1_store_get(store8), $store8)}
+{(__sveltets_1_store_get(store9), $store9)}
+{(__sveltets_1_store_get(store10), $store10)}</>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expected.tsx
index a774c5d47..dcfeb047b 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expected.tsx
@@ -4,7 +4,7 @@ import { writable } from 'svelte/store';
 function render() {
 
   
-  const count = writable(0)/*Ωignore_startΩ*/;let $count = __sveltets_store_get(count);/*Ωignore_endΩ*/;
+  const count = writable(0)/*Ωignore_startΩ*/;let $count = __sveltets_1_store_get(count);/*Ωignore_endΩ*/;
   let myvar = 42 // to show that this is different from ++ or --
   const handler1 = () => count.set( $count + myvar)
   const handler2 = () => count.set( $count - myvar)
@@ -35,5 +35,5 @@ function render() {
 <button onclick={() => count.set( $count | myvar)}>OR</button></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-exclamation-mark/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-exclamation-mark/expected.tsx
index 30b5f3753..342e83562 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-exclamation-mark/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-exclamation-mark/expected.tsx
@@ -4,13 +4,13 @@ import { writable } from 'svelte/store';
 function render() {
 
   
-  const count = writable(0)/*Ωignore_startΩ*/;let $count = __sveltets_store_get(count);/*Ωignore_endΩ*/;
-  const handler1 = () => !(__sveltets_store_get(count), $count)
+  const count = writable(0)/*Ωignore_startΩ*/;let $count = __sveltets_1_store_get(count);/*Ωignore_endΩ*/;
+  const handler1 = () => !(__sveltets_1_store_get(count), $count)
 ;
 () => (<>
 
-<button onclick={() => !(__sveltets_store_get(count), $count)}>add</button></>);
+<button onclick={() => !(__sveltets_1_store_get(count), $count)}>add</button></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expected.tsx
index 2b36f5e8c..f1b64cf12 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expected.tsx
@@ -4,7 +4,7 @@ import { writable } from 'svelte/store';
 function render() {
 
   
-  const count = writable(0)/*Ωignore_startΩ*/;let $count = __sveltets_store_get(count);/*Ωignore_endΩ*/;
+  const count = writable(0)/*Ωignore_startΩ*/;let $count = __sveltets_1_store_get(count);/*Ωignore_endΩ*/;
   const handler1 = () => count.set( $count + 1)
   const handler2 = () => count.set( $count - 1)
 ;
@@ -15,5 +15,5 @@ function render() {
 <button onclick={() => count.set( $count + 1)}>add</button></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
index 1108438d7..ec947cd37 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expected.tsx
@@ -1,9 +1,9 @@
 ///<reference types="svelte" />
 <></>;function render() {
-b.set((__sveltets_store_get(b), $b).concat(5));
+b.set((__sveltets_1_store_get(b), $b).concat(5));
 () => (<>
-<h1 onclick={() => b.set((__sveltets_store_get(b), $b).concat(5))}>{(__sveltets_store_get(b), $b)}</h1></>);
+<h1 onclick={() => b.set((__sveltets_1_store_get(b), $b).concat(5))}>{(__sveltets_1_store_get(b), $b)}</h1></>);
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected.tsx
index 45dfe34f1..650e73d56 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected.tsx
@@ -1,13 +1,13 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-	 let foo: number = undefined;foo = __sveltets_any(foo);
+	 let foo: number = undefined;foo = __sveltets_1_any(foo);
 	 const bar: string = ''
 ;
 () => (<><svelteoptions />
 </>);
 return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','bar'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','bar'], __sveltets_1_with_any_event(render()))) {
     get bar() { return render().getters.bar }
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected.tsx
index e21bdf959..1fc7276c5 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-	 let foo: number = undefined;foo = __sveltets_any(foo);
+	 let foo: number = undefined;foo = __sveltets_1_any(foo);
 	 let foo2 = undefined
 	let clazz: string
 	
@@ -11,7 +11,7 @@
 </>);
 return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','foo2','bar'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','foo2','bar'], __sveltets_1_with_any_event(render()))) {
     get bar() { return render().getters.bar }
     get foo() { return render().props.foo }
     /**accessor*/
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected.tsx
index d6949cf89..b68a9fd62 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected.tsx
@@ -1,13 +1,13 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-	 let foo: number = undefined;foo = __sveltets_any(foo);
+	 let foo: number = undefined;foo = __sveltets_1_any(foo);
 	 const bar: string = ''
 ;
 () => (<><svelteoptions accessors={false} />
 </>);
 return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','bar'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','bar'], __sveltets_1_with_any_event(render()))) {
     get bar() { return render().getters.bar }
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected.tsx
index c63e2592d..6757aa12c 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected.tsx
@@ -1,7 +1,7 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-	 let foo: number = undefined;foo = __sveltets_any(foo);
+	 let foo: number = undefined;foo = __sveltets_1_any(foo);
 	 let foo2 = undefined
 	let clazz: string
 	
@@ -11,7 +11,7 @@
 </>);
 return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','foo2','bar'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','foo2','bar'], __sveltets_1_with_any_event(render()))) {
     get bar() { return render().getters.bar }
     get foo() { return render().props.foo }
     /**accessor*/
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected.tsx
index 49f23517e..8e1bdcb6e 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected.tsx
@@ -1,12 +1,12 @@
 ///<reference types="svelte" />
 <></>;function render() {
 
-	 let foo: number = undefined;foo = __sveltets_any(foo);
+	 let foo: number = undefined;foo = __sveltets_1_any(foo);
 	 const bar: string = ''
 ;
 () => (<></>);
 return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(['foo','bar'], __sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','bar'], __sveltets_1_with_any_event(render()))) {
     get bar() { return render().getters.bar }
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected.tsx
index b60c321f1..81f1b69fb 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected.tsx
@@ -1,15 +1,15 @@
 ///<reference types="svelte" />
 <></>;function render() {
-/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_createEnsureSlot();/*Ωignore_endΩ*/
+/*Ωignore_startΩ*/;const __sveltets_ensureSlot = __sveltets_1_createEnsureSlot();/*Ωignore_endΩ*/
 <>{(true) ? <>
-<svelteself >{() => { let {prop} = __sveltets_instanceOf(__sveltets_componentType()).$$slot_def['default'];/*Ωignore_startΩ*/((true)) && /*Ωignore_endΩ*/<>
+<svelteself >{() => { let {prop} = __sveltets_1_instanceOf(__sveltets_1_componentType()).$$slot_def['default'];/*Ωignore_startΩ*/((true)) && /*Ωignore_endΩ*/<>
     <slot prop={__sveltets_ensureSlot("default","prop",prop)} />
 </>}}</svelteself>
 </> : <></>}
-<sveltecomponent this={testComponent} >{() => { let {prop} = __sveltets_instanceOf(__sveltets_componentType()).$$slot_def['default'];<>
+<sveltecomponent this={testComponent} >{() => { let {prop} = __sveltets_1_instanceOf(__sveltets_1_componentType()).$$slot_def['default'];<>
     <slot prop={__sveltets_ensureSlot("default","prop",prop)} />
 </>}}</sveltecomponent></>
-return { props: {}, slots: {'default': {prop:__sveltets_instanceOf(__sveltets_componentType()).$$slot_def['default'].prop}}, getters: {}, events: {} }}
+return { props: {}, slots: {'default': {prop:__sveltets_1_instanceOf(__sveltets_1_componentType()).$$slot_def['default'].prop}}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
index c07ee99ec..f4dae8c41 100644
--- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
+++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected.tsx
@@ -15,5 +15,5 @@
 <sveltefragment /></>
 return { props: {}, slots: {}, getters: {}, events: {} }}
 
-export default class Input__SvelteComponent_ extends createSvelte2TsxComponent(__sveltets_partial(__sveltets_with_any_event(render()))) {
+export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(__sveltets_1_with_any_event(render()))) {
 }
\ No newline at end of file
diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json
index 7e8cab695..ab4d66180 100644
--- a/packages/typescript-plugin/package.json
+++ b/packages/typescript-plugin/package.json
@@ -23,7 +23,7 @@
         "typescript": "*"
     },
     "dependencies": {
-        "svelte2tsx": "~0.2.0",
+        "svelte2tsx": "~0.3.0",
         "sourcemap-codec": "^1.4.8"
     }
 }
diff --git a/packages/typescript-plugin/src/svelte-snapshots.ts b/packages/typescript-plugin/src/svelte-snapshots.ts
index cdf20bbbf..1f4901626 100644
--- a/packages/typescript-plugin/src/svelte-snapshots.ts
+++ b/packages/typescript-plugin/src/svelte-snapshots.ts
@@ -1,4 +1,4 @@
-import svelte2tsx from 'svelte2tsx';
+import { svelte2tsx } from 'svelte2tsx';
 import type ts from 'typescript/lib/tsserverlibrary';
 import { Logger } from './logger';
 import { SourceMapper } from './source-mapper';

From 3621dfd8e78dcebd7c93d1a05e10b1ebd7bf7e21 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@accso.de>
Date: Sun, 20 Jun 2021 16:28:58 +0200
Subject: [PATCH 2/3] turn off the annoying max length eslint rule

This is handled by Prettier already
---
 .eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 03cd5ce38..b7d1c5506 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -18,7 +18,7 @@ module.exports = {
         'import/no-unused-modules': 'off',
         'import/no-deprecated': 'off',
         // project-specific settings
-        'max-len': ['error', { code: 100, ignoreComments: true, ignoreStrings: true }],
+        'max-len': 'off', // handled by prettier
         'no-trailing-spaces': 'error',
         'one-var': ['error', 'never'],
         '@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],

From 15a0104eb6265757932518d3e2451e60c68f92d6 Mon Sep 17 00:00:00 2001
From: Simon Holthausen <simon.holthausen@accso.de>
Date: Sun, 20 Jun 2021 16:53:11 +0200
Subject: [PATCH 3/3] add ambient types source to specify where to load the
 types from

---
 .../src/plugins/typescript/LSAndTSDocResolver.ts           | 5 ++++-
 packages/language-server/src/plugins/typescript/service.ts | 7 ++++---
 packages/language-server/src/svelte-check.ts               | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/language-server/src/plugins/typescript/LSAndTSDocResolver.ts b/packages/language-server/src/plugins/typescript/LSAndTSDocResolver.ts
index a43a154b3..c90f21ae5 100644
--- a/packages/language-server/src/plugins/typescript/LSAndTSDocResolver.ts
+++ b/packages/language-server/src/plugins/typescript/LSAndTSDocResolver.ts
@@ -19,12 +19,14 @@ export class LSAndTSDocResolver {
      * @param docManager
      * @param workspaceUris
      * @param configManager
+     * @param isSvelteCheck True, if used in the context of svelte-check
      * @param tsconfigPath This should only be set via svelte-check. Makes sure all documents are resolved to that tsconfig. Has to be absolute.
      */
     constructor(
         private readonly docManager: DocumentManager,
         private readonly workspaceUris: string[],
         private readonly configManager: LSConfigManager,
+        private readonly isSvelteCheck = false,
         private readonly tsconfigPath?: string
     ) {
         const handleDocumentChange = (document: Document) => {
@@ -64,8 +66,9 @@ export class LSAndTSDocResolver {
 
     private get lsDocumentContext(): LanguageServiceDocumentContext {
         return {
+            ambientTypesSource: this.isSvelteCheck ? 'svelte-check' : 'svelte2tsx',
             createDocument: this.createDocument,
-            transformOnTemplateError: !this.tsconfigPath,
+            transformOnTemplateError: !this.isSvelteCheck,
             globalSnapshotsManager: this.globalSnapshotsManager
         };
     }
diff --git a/packages/language-server/src/plugins/typescript/service.ts b/packages/language-server/src/plugins/typescript/service.ts
index d6bb214a1..bc1222782 100644
--- a/packages/language-server/src/plugins/typescript/service.ts
+++ b/packages/language-server/src/plugins/typescript/service.ts
@@ -42,6 +42,7 @@ export interface LanguageServiceContainer {
 const services = new Map<string, Promise<LanguageServiceContainer>>();
 
 export interface LanguageServiceDocumentContext {
+    ambientTypesSource: string;
     transformOnTemplateError: boolean;
     createDocument: (fileName: string, content: string) => Document;
     globalSnapshotsManager: GlobalSnapshotsManager;
@@ -110,10 +111,10 @@ async function createLanguageService(
 
     let svelteTsPath: string;
     try {
-        // For when svelte2tsx is part of node_modules, for example VS Code extension
-        svelteTsPath = dirname(require.resolve('svelte2tsx'));
+        // For when svelte2tsx/svelte-check is part of node_modules, for example VS Code extension
+        svelteTsPath = dirname(require.resolve(docContext.ambientTypesSource));
     } catch (e) {
-        // Fall back to dirname, for example for svelte-check
+        // Fall back to dirname
         svelteTsPath = __dirname;
     }
     const svelteTsxFiles = [
diff --git a/packages/language-server/src/svelte-check.ts b/packages/language-server/src/svelte-check.ts
index 4ff5313ed..042418eb0 100644
--- a/packages/language-server/src/svelte-check.ts
+++ b/packages/language-server/src/svelte-check.ts
@@ -64,6 +64,7 @@ export class SvelteCheck {
                 this.docManager,
                 [pathToUrl(workspacePath)],
                 this.configManager,
+                true,
                 options.tsconfig
             );
             this.pluginHost.register(