From 6ffb1ea00bae49bf3b12ccf874eb095e1ffef797 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sun, 17 Mar 2019 22:20:32 -0400
Subject: [PATCH] more tidying up

---
 src/compile/Component.ts                      |   1 +
 src/compile/render-dom/Block.ts               |   6 +-
 src/compile/render-dom/index.ts               |   2 +-
 src/compile/render-dom/wrappers/AwaitBlock.ts |   6 +-
 src/compile/render-dom/wrappers/EachBlock.ts  |  30 ++---
 .../render-dom/wrappers/Element/Attribute.ts  |  12 +-
 .../render-dom/wrappers/Element/Binding.ts    |  14 +--
 .../wrappers/Element/StyleAttribute.ts        |   4 +-
 .../render-dom/wrappers/Element/index.ts      |  30 ++---
 src/compile/render-dom/wrappers/IfBlock.ts    |  10 +-
 .../wrappers/InlineComponent/index.ts         |   6 +-
 .../render-dom/wrappers/MustacheTag.ts        |   8 +-
 .../render-dom/wrappers/RawMustacheTag.ts     |  18 +--
 src/compile/render-dom/wrappers/Slot.ts       |   2 +-
 src/compile/render-dom/wrappers/Text.ts       |   6 +-
 src/compile/render-dom/wrappers/Window.ts     |   4 +-
 .../render-dom/wrappers/shared/Wrapper.ts     |   4 +-
 .../wrappers/shared/addEventHandlers.ts       |   8 +-
 src/compile/render-ssr/handlers/AwaitBlock.ts |   2 +-
 .../render-ssr/handlers/InlineComponent.ts    |   2 +-
 src/compile/wrapModule.ts                     |   7 +-
 src/internal/Component.js                     |  10 +-
 src/internal/await-block.js                   |   6 +-
 src/internal/dom.js                           |  95 ++++++---------
 src/internal/keyed-each.js                    |  12 +-
 src/internal/spread.js                        |   2 +-
 src/internal/ssr.js                           |  10 +-
 src/internal/style_manager.js                 |   4 +-
 src/internal/utils.js                         |   6 +-
 .../action-custom-event-handler/expected.js   |  18 ++-
 test/js/samples/action/expected.js            |  18 ++-
 test/js/samples/bind-width-height/expected.js |  22 +++-
 .../expected.js                               |  31 +++--
 .../component-static-array/expected.js        |  12 +-
 .../component-static-immutable/expected.js    |  12 +-
 .../component-static-immutable2/expected.js   |  12 +-
 test/js/samples/component-static/expected.js  |  12 +-
 .../samples/computed-collapsed-if/expected.js |   7 +-
 test/js/samples/css-media-query/expected.js   |  21 +++-
 .../css-shadow-dom-keyframes/expected.js      |  18 ++-
 test/js/samples/debug-empty/expected.js       |  46 +++++---
 .../debug-foo-bar-baz-things/expected.js      |  73 +++++++-----
 test/js/samples/debug-foo/expected.js         |  73 +++++++-----
 test/js/samples/debug-ssr-foo/expected.js     |   7 +-
 .../samples/deconflict-builtins/expected.js   |  49 +++++---
 .../js/samples/deconflict-globals/expected.js |   7 +-
 .../expected.js                               |  44 ++++---
 test/js/samples/do-use-dataset/expected.js    |  31 +++--
 .../samples/dont-invalidate-this/expected.js  |  21 +++-
 .../dont-use-dataset-in-legacy/expected.js    |  38 +++---
 .../dont-use-dataset-in-svg/expected.js       |  30 +++--
 test/js/samples/dynamic-import/expected.js    |  12 +-
 .../each-block-array-literal/expected.js      |  49 +++++---
 .../each-block-changed-check/expected.js      |  95 ++++++++-------
 .../each-block-keyed-animated/expected.js     |  55 ++++++---
 test/js/samples/each-block-keyed/expected.js  |  53 ++++++---
 .../event-handler-no-passive/expected.js      |  21 +++-
 test/js/samples/event-modifiers/expected.js   |  48 +++++---
 .../js/samples/head-no-whitespace/expected.js |  20 +++-
 test/js/samples/hoisted-const/expected.js     |  26 +++--
 test/js/samples/hoisted-let/expected.js       |  26 +++--
 .../js/samples/if-block-no-update/expected.js |  37 +++---
 test/js/samples/if-block-simple/expected.js   |  29 +++--
 .../expected.js                               |  27 +++--
 .../inline-style-optimized-url/expected.js    |  23 ++--
 .../inline-style-optimized/expected.js        |  23 ++--
 .../inline-style-unoptimized/expected.js      |  31 +++--
 test/js/samples/input-files/expected.js       |  24 ++--
 test/js/samples/input-range/expected.js       |  30 +++--
 .../input-without-blowback-guard/expected.js  |  24 ++--
 .../expected.js                               |  46 +++++---
 .../expected.js                               |  48 +++++---
 .../expected.js                               |  46 +++++---
 .../expected.js                               |  48 +++++---
 test/js/samples/legacy-input-type/expected.js |  21 +++-
 test/js/samples/media-bindings/expected.js    |  44 ++++---
 .../non-imported-component/expected.js        |  27 +++--
 .../samples/non-mutable-reference/expected.js |  34 ++++--
 .../expected.js                               |   7 +-
 .../expected.js                               |   7 +-
 .../samples/select-dynamic-value/expected.js  |  23 ++--
 test/js/samples/setup-method/expected.js      |   7 +-
 test/js/samples/svg-title/expected.js         |  28 +++--
 test/js/samples/title/expected.js             |   7 +-
 test/js/samples/transition-local/expected.js  |  41 ++++---
 .../use-elements-as-anchors/expected.js       | 109 ++++++++++--------
 .../samples/window-binding-scroll/expected.js |  37 ++++--
 87 files changed, 1349 insertions(+), 813 deletions(-)

diff --git a/src/compile/Component.ts b/src/compile/Component.ts
index 82998a0b93..8a6b17f96c 100644
--- a/src/compile/Component.ts
+++ b/src/compile/Component.ts
@@ -365,6 +365,7 @@ export default class Component {
 		}
 
 		reserved.forEach(add);
+		internal_exports.forEach(add);
 		this.var_lookup.forEach((value, key) => add(key));
 
 		return (name: string) => {
diff --git a/src/compile/render-dom/Block.ts b/src/compile/render-dom/Block.ts
index 148f5d3f50..2039663b81 100644
--- a/src/compile/render-dom/Block.ts
+++ b/src/compile/render-dom/Block.ts
@@ -167,10 +167,10 @@ export default class Block {
 
 		if (parentNode) {
 			this.builders.mount.add_line(`@append(${parentNode}, ${name});`);
-			if (parentNode === 'document.head') this.builders.destroy.add_line(`@detachNode(${name});`);
+			if (parentNode === 'document.head') this.builders.destroy.add_line(`@detach(${name});`);
 		} else {
 			this.builders.mount.add_line(`@insert(#target, ${name}, anchor);`);
-			if (!noDetach) this.builders.destroy.add_conditional('detach', `@detachNode(${name});`);
+			if (!noDetach) this.builders.destroy.add_conditional('detaching', `@detach(${name});`);
 		}
 	}
 
@@ -354,7 +354,7 @@ export default class Block {
 			properties.add_line(`d: @noop`);
 		} else {
 			properties.add_block(deindent`
-				${methodName('d', 'destroy')}(detach) {
+				${methodName('d', 'destroy')}(detaching) {
 					${this.builders.destroy}
 				}
 			`);
diff --git a/src/compile/render-dom/index.ts b/src/compile/render-dom/index.ts
index 2245c7d2b0..dbe21b9864 100644
--- a/src/compile/render-dom/index.ts
+++ b/src/compile/render-dom/index.ts
@@ -40,7 +40,7 @@ export default function dom(
 	if (styles && component.compileOptions.css !== false && !options.customElement) {
 		builder.add_block(deindent`
 			function @add_css() {
-				var style = @createElement("style");
+				var style = @element("style");
 				style.id = '${component.stylesheet.id}-style';
 				style.textContent = ${styles};
 				@append(document.head, style);
diff --git a/src/compile/render-dom/wrappers/AwaitBlock.ts b/src/compile/render-dom/wrappers/AwaitBlock.ts
index ca1c01a103..e632cef86c 100644
--- a/src/compile/render-dom/wrappers/AwaitBlock.ts
+++ b/src/compile/render-dom/wrappers/AwaitBlock.ts
@@ -152,7 +152,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 		`);
 
 		block.builders.init.add_block(deindent`
-			@handlePromise(${promise} = ${snippet}, ${info});
+			@handle_promise(${promise} = ${snippet}, ${info});
 		`);
 
 		block.builders.create.add_block(deindent`
@@ -191,7 +191,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 
 		conditions.push(
 			`${promise} !== (${promise} = ${snippet})`,
-			`@handlePromise(${promise}, ${info})`
+			`@handle_promise(${promise}, ${info})`
 		);
 
 		block.builders.update.add_line(
@@ -222,7 +222,7 @@ export default class AwaitBlockWrapper extends Wrapper {
 		}
 
 		block.builders.destroy.add_block(deindent`
-			${info}.block.d(${parentNode ? '' : 'detach'});
+			${info}.block.d(${parentNode ? '' : 'detaching'});
 			${info} = null;
 		`);
 
diff --git a/src/compile/render-dom/wrappers/EachBlock.ts b/src/compile/render-dom/wrappers/EachBlock.ts
index b44cec3a7e..f9a6dd5aff 100644
--- a/src/compile/render-dom/wrappers/EachBlock.ts
+++ b/src/compile/render-dom/wrappers/EachBlock.ts
@@ -207,8 +207,8 @@ export default class EachBlockWrapper extends Wrapper {
 		if (needsAnchor) {
 			block.addElement(
 				this.vars.anchor,
-				`@createComment()`,
-				parentNodes && `@createComment()`,
+				`@comment()`,
+				parentNodes && `@comment()`,
 				parentNode
 			);
 		}
@@ -263,7 +263,7 @@ export default class EachBlockWrapper extends Wrapper {
 			}
 
 			block.builders.destroy.add_block(deindent`
-				if (${each_block_else}) ${each_block_else}.d(${parentNode ? '' : 'detach'});
+				if (${each_block_else}) ${each_block_else}.d(${parentNode ? '' : 'detaching'});
 			`);
 		}
 
@@ -292,7 +292,7 @@ export default class EachBlockWrapper extends Wrapper {
 		const lookup = block.getUniqueName(`${this.var}_lookup`);
 
 		block.addVariable(iterations, '[]');
-		block.addVariable(lookup, `@blankObject()`);
+		block.addVariable(lookup, `@blank_object()`);
 
 		if (this.fragment.nodes[0].isDomNode()) {
 			this.block.first = this.fragment.nodes[0].var;
@@ -300,8 +300,8 @@ export default class EachBlockWrapper extends Wrapper {
 			this.block.first = this.block.getUniqueName('first');
 			this.block.addElement(
 				this.block.first,
-				`@createComment()`,
-				parentNodes && `@createComment()`,
+				`@comment()`,
+				parentNodes && `@comment()`,
 				null
 			);
 		}
@@ -338,17 +338,17 @@ export default class EachBlockWrapper extends Wrapper {
 
 		const rects = block.getUniqueName('rects');
 		const destroy = this.node.hasAnimation
-			? `@fixAndOutroAndDestroyBlock`
+			? `@fix_and_outro_and_destroy_block`
 			: this.block.hasOutros
-				? `@outroAndDestroyBlock`
-				: `@destroyBlock`;
+				? `@outro_and_destroy_block`
+				: `@destroy_block`;
 
 		block.builders.update.add_block(deindent`
 			const ${this.vars.each_block_value} = ${snippet};
 
 			${this.block.hasOutros && `@group_outros();`}
 			${this.node.hasAnimation && `for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].r();`}
-			${iterations} = @updateKeyedEach(${iterations}, changed, ${get_key}, ${dynamic ? '1' : '0'}, ctx, ${this.vars.each_block_value}, ${lookup}, ${updateMountNode}, ${destroy}, ${create_each_block}, ${anchor}, ${this.vars.get_each_context});
+			${iterations} = @update_keyed_each(${iterations}, changed, ${get_key}, ${dynamic ? '1' : '0'}, ctx, ${this.vars.each_block_value}, ${lookup}, ${updateMountNode}, ${destroy}, ${create_each_block}, ${anchor}, ${this.vars.get_each_context});
 			${this.node.hasAnimation && `for (let #i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].a();`}
 			${this.block.hasOutros && `@check_outros();`}
 		`);
@@ -360,7 +360,7 @@ export default class EachBlockWrapper extends Wrapper {
 		}
 
 		block.builders.destroy.add_block(deindent`
-			for (#i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].d(${parentNode ? '' : 'detach'});
+			for (#i = 0; #i < ${view_length}; #i += 1) ${iterations}[#i].d(${parentNode ? '' : 'detaching'});
 		`);
 	}
 
@@ -421,11 +421,11 @@ export default class EachBlockWrapper extends Wrapper {
 		const outroBlock = this.block.hasOutros && block.getUniqueName('outroBlock')
 		if (outroBlock) {
 			block.builders.init.add_block(deindent`
-				function ${outroBlock}(i, detach, local) {
+				function ${outroBlock}(i, detaching, local) {
 					if (${iterations}[i]) {
-						if (detach) {
+						if (detaching) {
 							@on_outro(() => {
-								${iterations}[i].d(detach);
+								${iterations}[i].d(detaching);
 								${iterations}[i] = null;
 							});
 						}
@@ -507,6 +507,6 @@ export default class EachBlockWrapper extends Wrapper {
 			);
 		}
 
-		block.builders.destroy.add_block(`@destroyEach(${iterations}, detach);`);
+		block.builders.destroy.add_block(`@destroy_each(${iterations}, detaching);`);
 	}
 }
\ No newline at end of file
diff --git a/src/compile/render-dom/wrappers/Element/Attribute.ts b/src/compile/render-dom/wrappers/Element/Attribute.ts
index 39d110dade..434dabc21f 100644
--- a/src/compile/render-dom/wrappers/Element/Attribute.ts
+++ b/src/compile/render-dom/wrappers/Element/Attribute.ts
@@ -59,10 +59,10 @@ export default class AttributeWrapper {
 		// namespaced attributes but I'm not sure that's applicable in
 		// HTML5?
 		const method = /-/.test(element.node.name)
-			? '@setCustomElementData'
+			? '@set_custom_element_data'
 			: name.slice(0, 6) === 'xlink:'
-				? '@setXlinkAttribute'
-				: '@setAttribute';
+				? '@xlink_attr'
+				: '@attr';
 
 		const isLegacyInputType = element.renderer.component.compileOptions.legacy && name === 'type' && this.parent.node.name === 'input';
 
@@ -112,9 +112,9 @@ export default class AttributeWrapper {
 
 			if (isLegacyInputType) {
 				block.builders.hydrate.add_line(
-					`@setInputType(${element.var}, ${init});`
+					`@set_input_type(${element.var}, ${init});`
 				);
-				updater = `@setInputType(${element.var}, ${shouldCache ? last : value});`;
+				updater = `@set_input_type(${element.var}, ${shouldCache ? last : value});`;
 			} else if (isSelectValueAttribute) {
 				// annoying special case
 				const isMultipleSelect = element.getStaticAttributeValue('multiple');
@@ -183,7 +183,7 @@ export default class AttributeWrapper {
 
 			const statement = (
 				isLegacyInputType
-					? `@setInputType(${element.var}, ${value});`
+					? `@set_input_type(${element.var}, ${value});`
 					: propertyName
 						? `${element.var}.${propertyName} = ${value};`
 						: isDataSet
diff --git a/src/compile/render-dom/wrappers/Element/Binding.ts b/src/compile/render-dom/wrappers/Element/Binding.ts
index a0021bb846..ca90672f10 100644
--- a/src/compile/render-dom/wrappers/Element/Binding.ts
+++ b/src/compile/render-dom/wrappers/Element/Binding.ts
@@ -187,8 +187,8 @@ function getDomUpdater(
 
 	if (node.name === 'select') {
 		return node.getStaticAttributeValue('multiple') === true ?
-			`@selectOptions(${element.var}, ${binding.snippet})` :
-			`@selectOption(${element.var}, ${binding.snippet})`;
+			`@select_options(${element.var}, ${binding.snippet})` :
+			`@select_option(${element.var}, ${binding.snippet})`;
 	}
 
 	if (binding.node.name === 'group') {
@@ -288,8 +288,8 @@ function getValueFromDom(
 	// <select bind:value='selected>
 	if (node.name === 'select') {
 		return node.getStaticAttributeValue('multiple') === true ?
-			`@selectMultipleValue(this)` :
-			`@selectValue(this)`;
+			`@select_multiple_value(this)` :
+			`@select_value(this)`;
 	}
 
 	const type = node.getStaticAttributeValue('type');
@@ -298,7 +298,7 @@ function getValueFromDom(
 	if (name === 'group') {
 		const bindingGroup = getBindingGroup(renderer, binding.node.expression.node);
 		if (type === 'checkbox') {
-			return `@getBindingGroupValue($$binding_groups[${bindingGroup}])`;
+			return `@get_binding_group_value($$binding_groups[${bindingGroup}])`;
 		}
 
 		return `this.__value`;
@@ -306,11 +306,11 @@ function getValueFromDom(
 
 	// <input type='range|number' bind:value>
 	if (type === 'range' || type === 'number') {
-		return `@toNumber(this.${name})`;
+		return `@to_number(this.${name})`;
 	}
 
 	if ((name === 'buffered' || name === 'seekable' || name === 'played')) {
-		return `@timeRangesToArray(this.${name})`
+		return `@time_ranges_to_array(this.${name})`
 	}
 
 	// everything else
diff --git a/src/compile/render-dom/wrappers/Element/StyleAttribute.ts b/src/compile/render-dom/wrappers/Element/StyleAttribute.ts
index 407e66911d..7a32d9f4d9 100644
--- a/src/compile/render-dom/wrappers/Element/StyleAttribute.ts
+++ b/src/compile/render-dom/wrappers/Element/StyleAttribute.ts
@@ -51,7 +51,7 @@ export default class StyleAttributeWrapper extends AttributeWrapper {
 
 					block.builders.update.add_conditional(
 						condition,
-						`@setStyle(${this.parent.var}, "${prop.key}", ${value});`
+						`@set_style(${this.parent.var}, "${prop.key}", ${value});`
 					);
 				}
 			} else {
@@ -59,7 +59,7 @@ export default class StyleAttributeWrapper extends AttributeWrapper {
 			}
 
 			block.builders.hydrate.add_line(
-				`@setStyle(${this.parent.var}, "${prop.key}", ${value});`
+				`@set_style(${this.parent.var}, "${prop.key}", ${value});`
 			);
 		});
 	}
diff --git a/src/compile/render-dom/wrappers/Element/index.ts b/src/compile/render-dom/wrappers/Element/index.ts
index f7cbee09d0..d504efe7c7 100644
--- a/src/compile/render-dom/wrappers/Element/index.ts
+++ b/src/compile/render-dom/wrappers/Element/index.ts
@@ -193,7 +193,7 @@ export default class ElementWrapper extends Wrapper {
 			if (this.node.name === 'option') this.parent.cannotUseInnerHTML();
 
 			if (renderer.options.dev) {
-				this.parent.cannotUseInnerHTML(); // need to use addLoc
+				this.parent.cannotUseInnerHTML(); // need to use add_location
 			}
 		}
 
@@ -251,14 +251,14 @@ export default class ElementWrapper extends Wrapper {
 			);
 
 			if (parentNode === 'document.head') {
-				block.builders.destroy.add_line(`@detachNode(${node});`);
+				block.builders.destroy.add_line(`@detach(${node});`);
 			}
 		} else {
 			block.builders.mount.add_line(`@insert(#target, ${node}, anchor);`);
 
 			// TODO we eventually need to consider what happens to elements
 			// that belong to the same outgroup as an outroing element...
-			block.builders.destroy.add_conditional('detach', `@detachNode(${node});`);
+			block.builders.destroy.add_conditional('detaching', `@detach(${node});`);
 		}
 
 		// insert static children with textContent or innerHTML
@@ -308,7 +308,7 @@ export default class ElementWrapper extends Wrapper {
 
 		if (nodes && this.renderer.options.hydratable) {
 			block.builders.claim.add_line(
-				`${nodes}.forEach(@detachNode);`
+				`${nodes}.forEach(@detach);`
 			);
 		}
 
@@ -345,7 +345,7 @@ export default class ElementWrapper extends Wrapper {
 		if (renderer.options.dev) {
 			const loc = renderer.locate(this.node.start);
 			block.builders.hydrate.add_line(
-				`@addLoc(${this.var}, ${renderer.fileVar}, ${loc.line}, ${loc.column}, ${this.node.start});`
+				`@add_location(${this.var}, ${renderer.fileVar}, ${loc.line}, ${loc.column}, ${this.node.start});`
 			);
 		}
 	}
@@ -354,14 +354,14 @@ export default class ElementWrapper extends Wrapper {
 		const { name, namespace } = this.node;
 
 		if (namespace === 'http://www.w3.org/2000/svg') {
-			return `@createSvgElement("${name}")`;
+			return `@svg_element("${name}")`;
 		}
 
 		if (namespace) {
 			return `document.createElementNS("${namespace}", "${name}")`;
 		}
 
-		return `@createElement("${name}")`;
+		return `@element("${name}")`;
 	}
 
 	getClaimStatement(nodes: string) {
@@ -374,7 +374,7 @@ export default class ElementWrapper extends Wrapper {
 			? this.node.name
 			: this.node.name.toUpperCase();
 
-		return `@claimElement(${nodes}, "${name}", ${attributes
+		return `@claim_element(${nodes}, "${name}", ${attributes
 			? `{ ${attributes} }`
 			: `{}`}, ${this.node.namespace === namespaces.svg ? true : false})`;
 	}
@@ -470,7 +470,7 @@ export default class ElementWrapper extends Wrapper {
 					block.addVariable(resize_listener);
 
 					block.builders.mount.add_line(
-						`${resize_listener} = @addResizeListener(${this.var}, ${callee}.bind(${this.var}));`
+						`${resize_listener} = @add_resize_listener(${this.var}, ${callee}.bind(${this.var}));`
 					);
 
 					block.builders.destroy.add_line(
@@ -478,7 +478,7 @@ export default class ElementWrapper extends Wrapper {
 					);
 				} else {
 					block.event_listeners.push(
-						`@addListener(${this.var}, "${name}", ${callee})`
+						`@listen(${this.var}, "${name}", ${callee})`
 					);
 				}
 			});
@@ -596,11 +596,11 @@ export default class ElementWrapper extends Wrapper {
 		`);
 
 		block.builders.hydrate.add_line(
-			`@setAttributes(${this.var}, ${data});`
+			`@set_attributes(${this.var}, ${data});`
 		);
 
 		block.builders.update.add_block(deindent`
-			@setAttributes(${this.var}, @getSpreadUpdate(${levels}, [
+			@set_attributes(${this.var}, @get_spread_update(${levels}, [
 				${updates.join(',\n')}
 			]));
 		`);
@@ -658,7 +658,7 @@ export default class ElementWrapper extends Wrapper {
 				block.builders.outro.add_block(outro_block);
 			}
 
-			block.builders.destroy.add_conditional('detach', `if (${name}) ${name}.end();`);
+			block.builders.destroy.add_conditional('detaching', `if (${name}) ${name}.end();`);
 		}
 
 		else {
@@ -737,7 +737,7 @@ export default class ElementWrapper extends Wrapper {
 
 				block.builders.outro.add_block(outro_block);
 
-				block.builders.destroy.add_conditional('detach', `if (${outroName}) ${outroName}.end();`);
+				block.builders.destroy.add_conditional('detaching', `if (${outroName}) ${outroName}.end();`);
 			}
 		}
 	}
@@ -787,7 +787,7 @@ export default class ElementWrapper extends Wrapper {
 				snippet = `${quote_prop_if_necessary(name)}`;
 				dependencies = new Set([name]);
 			}
-			const updater = `@toggleClass(${this.var}, "${name}", ${snippet});`;
+			const updater = `@toggle_class(${this.var}, "${name}", ${snippet});`;
 
 			block.builders.hydrate.add_line(updater);
 
diff --git a/src/compile/render-dom/wrappers/IfBlock.ts b/src/compile/render-dom/wrappers/IfBlock.ts
index 68e31ec2f8..8c39f7b7a6 100644
--- a/src/compile/render-dom/wrappers/IfBlock.ts
+++ b/src/compile/render-dom/wrappers/IfBlock.ts
@@ -187,8 +187,8 @@ export default class IfBlockWrapper extends Wrapper {
 		if (needsAnchor) {
 			block.addElement(
 				anchor,
-				`@createComment()`,
-				parentNodes && `@createComment()`,
+				`@comment()`,
+				parentNodes && `@comment()`,
 				parentNode
 			);
 		}
@@ -256,7 +256,7 @@ export default class IfBlockWrapper extends Wrapper {
 			`);
 		}
 
-		block.builders.destroy.add_line(`${if_name}${name}.d(${parentNode ? '' : 'detach'});`);
+		block.builders.destroy.add_line(`${if_name}${name}.d(${parentNode ? '' : 'detaching'});`);
 	}
 
 	// if any of the siblings have outros, we need to keep references to the blocks
@@ -377,7 +377,7 @@ export default class IfBlockWrapper extends Wrapper {
 		}
 
 		block.builders.destroy.add_line(deindent`
-			${if_current_block_type_index}${if_blocks}[${current_block_type_index}].d(${parentNode ? '' : 'detach'});
+			${if_current_block_type_index}${if_blocks}[${current_block_type_index}].d(${parentNode ? '' : 'detaching'});
 		`);
 	}
 
@@ -452,6 +452,6 @@ export default class IfBlockWrapper extends Wrapper {
 			}
 		`);
 
-		block.builders.destroy.add_line(`${if_name}${name}.d(${parentNode ? '' : 'detach'});`);
+		block.builders.destroy.add_line(`${if_name}${name}.d(${parentNode ? '' : 'detaching'});`);
 	}
 }
\ No newline at end of file
diff --git a/src/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compile/render-dom/wrappers/InlineComponent/index.ts
index a44362252d..868486c533 100644
--- a/src/compile/render-dom/wrappers/InlineComponent/index.ts
+++ b/src/compile/render-dom/wrappers/InlineComponent/index.ts
@@ -221,7 +221,7 @@ export default class InlineComponentWrapper extends Wrapper {
 				const conditions = Array.from(allDependencies).map(dep => `changed.${dep}`).join(' || ');
 
 				updates.push(deindent`
-					var ${name_changes} = ${allDependencies.size === 1 ? `${conditions}` : `(${conditions})`} ? @getSpreadUpdate(${levels}, [
+					var ${name_changes} = ${allDependencies.size === 1 ? `${conditions}` : `(${conditions})`} ? @get_spread_update(${levels}, [
 						${changes.join(',\n')}
 					]) : {};
 				`);
@@ -458,7 +458,7 @@ export default class InlineComponentWrapper extends Wrapper {
 				`if (${name}) ${name}.$$.fragment.o(#local);`
 			);
 
-			block.builders.destroy.add_line(`if (${name}) ${name}.$destroy(${parentNode ? '' : 'detach'});`);
+			block.builders.destroy.add_line(`if (${name}) ${name}.$destroy(${parentNode ? '' : 'detaching'});`);
 		} else {
 			const expression = this.node.name === 'svelte:self'
 				? '__svelte:self__' // TODO conflict-proof this
@@ -499,7 +499,7 @@ export default class InlineComponentWrapper extends Wrapper {
 			}
 
 			block.builders.destroy.add_block(deindent`
-				${name}.$destroy(${parentNode ? '' : 'detach'});
+				${name}.$destroy(${parentNode ? '' : 'detaching'});
 			`);
 
 			block.builders.outro.add_line(
diff --git a/src/compile/render-dom/wrappers/MustacheTag.ts b/src/compile/render-dom/wrappers/MustacheTag.ts
index c18c9c54c1..5121de7518 100644
--- a/src/compile/render-dom/wrappers/MustacheTag.ts
+++ b/src/compile/render-dom/wrappers/MustacheTag.ts
@@ -5,7 +5,7 @@ import Tag from './shared/Tag';
 import Wrapper from './shared/Wrapper';
 
 export default class MustacheTagWrapper extends Tag {
-	var = 'text';
+	var = 't';
 
 	constructor(renderer: Renderer, block: Block, parent: Wrapper, node: Node) {
 		super(renderer, block, parent, node);
@@ -15,13 +15,13 @@ export default class MustacheTagWrapper extends Tag {
 	render(block: Block, parentNode: string, parentNodes: string) {
 		const { init } = this.renameThisMethod(
 			block,
-			value => `@setData(${this.var}, ${value});`
+			value => `@set_data(${this.var}, ${value});`
 		);
 
 		block.addElement(
 			this.var,
-			`@createText(${init})`,
-			parentNodes && `@claimText(${parentNodes}, ${init})`,
+			`@create_text(${init})`,
+			parentNodes && `@claim_text(${parentNodes}, ${init})`,
 			parentNode
 		);
 	}
diff --git a/src/compile/render-dom/wrappers/RawMustacheTag.ts b/src/compile/render-dom/wrappers/RawMustacheTag.ts
index f225cdf939..fcfffca763 100644
--- a/src/compile/render-dom/wrappers/RawMustacheTag.ts
+++ b/src/compile/render-dom/wrappers/RawMustacheTag.ts
@@ -42,13 +42,13 @@ export default class RawMustacheTagWrapper extends Tag {
 			detach = `${parentNode}.innerHTML = '';`;
 			insert = content => `${parentNode}.innerHTML = ${content};`;
 		} else if (anchorBefore === 'null') {
-			detach = `@detachBefore(${anchorAfter});`;
+			detach = `@detach_before(${anchorAfter});`;
 			insert = content => `${anchorAfter}.insertAdjacentHTML("beforebegin", ${content});`;
 		} else if (anchorAfter === 'null') {
-			detach = `@detachAfter(${anchorBefore});`;
+			detach = `@detach_after(${anchorBefore});`;
 			insert = content => `${anchorBefore}.insertAdjacentHTML("afterend", ${content});`;
 		} else {
-			detach = `@detachBetween(${anchorBefore}, ${anchorAfter});`;
+			detach = `@detach_between(${anchorBefore}, ${anchorAfter});`;
 			insert = content => `${anchorBefore}.insertAdjacentHTML("afterend", ${content});`;
 		}
 
@@ -65,8 +65,8 @@ export default class RawMustacheTagWrapper extends Tag {
 		if (needsAnchorBefore) {
 			block.addElement(
 				anchorBefore,
-				`@createElement('noscript')`,
-				parentNodes && `@createElement('noscript')`,
+				`@element('noscript')`,
+				parentNodes && `@element('noscript')`,
 				parentNode,
 				true
 			);
@@ -75,8 +75,8 @@ export default class RawMustacheTagWrapper extends Tag {
 		function addAnchorAfter() {
 			block.addElement(
 				anchorAfter,
-				`@createElement('noscript')`,
-				parentNodes && `@createElement('noscript')`,
+				`@element('noscript')`,
+				parentNodes && `@element('noscript')`,
 				parentNode
 			);
 		}
@@ -90,8 +90,8 @@ export default class RawMustacheTagWrapper extends Tag {
 		block.builders.mount.add_line(insert(init));
 
 		if (!parentNode) {
-			block.builders.destroy.add_conditional('detach', needsAnchorBefore
-				? `${detach}\n@detachNode(${anchorBefore});`
+			block.builders.destroy.add_conditional('detaching', needsAnchorBefore
+				? `${detach}\n@detach(${anchorBefore});`
 				: detach);
 		}
 
diff --git a/src/compile/render-dom/wrappers/Slot.ts b/src/compile/render-dom/wrappers/Slot.ts
index ae6b04472c..add8784813 100644
--- a/src/compile/render-dom/wrappers/Slot.ts
+++ b/src/compile/render-dom/wrappers/Slot.ts
@@ -147,7 +147,7 @@ export default class SlotWrapper extends Wrapper {
 		`);
 
 		block.builders.destroy.add_line(
-			`if (${slot}) ${slot}.d(detach);`
+			`if (${slot}) ${slot}.d(detaching);`
 		);
 	}
 }
diff --git a/src/compile/render-dom/wrappers/Text.ts b/src/compile/render-dom/wrappers/Text.ts
index 9c15033203..e64bdcab5a 100644
--- a/src/compile/render-dom/wrappers/Text.ts
+++ b/src/compile/render-dom/wrappers/Text.ts
@@ -46,7 +46,7 @@ export default class TextWrapper extends Wrapper {
 
 		this.skip = shouldSkip(this.node);
 		this.data = data;
-		this.var = this.skip ? null : 'text';
+		this.var = this.skip ? null : 't';
 	}
 
 	render(block: Block, parentNode: string, parentNodes: string) {
@@ -54,8 +54,8 @@ export default class TextWrapper extends Wrapper {
 
 		block.addElement(
 			this.var,
-			`@createText(${stringify(this.data)})`,
-			parentNodes && `@claimText(${parentNodes}, ${stringify(this.data)})`,
+			`@create_text(${stringify(this.data)})`,
+			parentNodes && `@claim_text(${parentNodes}, ${stringify(this.data)})`,
 			parentNode
 		);
 	}
diff --git a/src/compile/render-dom/wrappers/Window.ts b/src/compile/render-dom/wrappers/Window.ts
index 63b35d6d7d..f71e52cf2a 100644
--- a/src/compile/render-dom/wrappers/Window.ts
+++ b/src/compile/render-dom/wrappers/Window.ts
@@ -99,7 +99,7 @@ export default class WindowWrapper extends Wrapper {
 				`);
 
 				block.event_listeners.push(deindent`
-					@addListener(window, "${event}", () => {
+					@listen(window, "${event}", () => {
 						${scrolling} = true;
 						clearTimeout(${scrolling_timeout});
 						${scrolling_timeout} = setTimeout(${clear_scrolling}, 100);
@@ -114,7 +114,7 @@ export default class WindowWrapper extends Wrapper {
 				});
 
 				block.event_listeners.push(deindent`
-					@addListener(window, "${event}", ctx.${handler_name})
+					@listen(window, "${event}", ctx.${handler_name})
 				`);
 			}
 
diff --git a/src/compile/render-dom/wrappers/shared/Wrapper.ts b/src/compile/render-dom/wrappers/shared/Wrapper.ts
index f46d626078..31a7cb2386 100644
--- a/src/compile/render-dom/wrappers/shared/Wrapper.ts
+++ b/src/compile/render-dom/wrappers/shared/Wrapper.ts
@@ -53,8 +53,8 @@ export default class Wrapper {
 		if (needsAnchor) {
 			block.addElement(
 				anchor,
-				`@createComment()`,
-				parentNodes && `@createComment()`,
+				`@comment()`,
+				parentNodes && `@comment()`,
 				parentNode
 			);
 		}
diff --git a/src/compile/render-dom/wrappers/shared/addEventHandlers.ts b/src/compile/render-dom/wrappers/shared/addEventHandlers.ts
index 140d4e35f2..22881e033c 100644
--- a/src/compile/render-dom/wrappers/shared/addEventHandlers.ts
+++ b/src/compile/render-dom/wrappers/shared/addEventHandlers.ts
@@ -8,8 +8,8 @@ export default function addEventHandlers(
 ) {
 	handlers.forEach(handler => {
 		let snippet = handler.render(block);
-		if (handler.modifiers.has('preventDefault')) snippet = `@preventDefault(${snippet})`;
-		if (handler.modifiers.has('stopPropagation')) snippet = `@stopPropagation(${snippet})`;
+		if (handler.modifiers.has('preventDefault')) snippet = `@prevent_default(${snippet})`;
+		if (handler.modifiers.has('stopPropagation')) snippet = `@stop_propagation(${snippet})`;
 
 		const opts = ['passive', 'once', 'capture'].filter(mod => handler.modifiers.has(mod));
 
@@ -19,11 +19,11 @@ export default function addEventHandlers(
 				: `{ ${opts.map(opt => `${opt}: true`).join(', ')} }`;
 
 			block.event_listeners.push(
-				`@addListener(${target}, "${handler.name}", ${snippet}, ${optString})`
+				`@listen(${target}, "${handler.name}", ${snippet}, ${optString})`
 			);
 		} else {
 			block.event_listeners.push(
-				`@addListener(${target}, "${handler.name}", ${snippet})`
+				`@listen(${target}, "${handler.name}", ${snippet})`
 			);
 		}
 	});
diff --git a/src/compile/render-ssr/handlers/AwaitBlock.ts b/src/compile/render-ssr/handlers/AwaitBlock.ts
index dfb6dc247c..bbc4a15e05 100644
--- a/src/compile/render-ssr/handlers/AwaitBlock.ts
+++ b/src/compile/render-ssr/handlers/AwaitBlock.ts
@@ -3,7 +3,7 @@ import { CompileOptions } from '../../../interfaces';
 import { snip } from '../../utils/snip';
 
 export default function(node, renderer: Renderer, options: CompileOptions) {
-	renderer.append('${(function(__value) { if(@isPromise(__value)) return `');
+	renderer.append('${(function(__value) { if(@is_promise(__value)) return `');
 
 	renderer.render(node.pending.children, options);
 
diff --git a/src/compile/render-ssr/handlers/InlineComponent.ts b/src/compile/render-ssr/handlers/InlineComponent.ts
index a79b81fa9b..853a495341 100644
--- a/src/compile/render-ssr/handlers/InlineComponent.ts
+++ b/src/compile/render-ssr/handlers/InlineComponent.ts
@@ -76,7 +76,7 @@ export default function(node, renderer: Renderer, options) {
 		node.name === 'svelte:self'
 			? '__svelte:self__' // TODO conflict-proof this
 			: node.name === 'svelte:component'
-				? `((${snip(node.expression)}) || @missingComponent)`
+				? `((${snip(node.expression)}) || @missing_component)`
 				: node.name
 	);
 
diff --git a/src/compile/wrapModule.ts b/src/compile/wrapModule.ts
index 6358ac8459..746b25cbcc 100644
--- a/src/compile/wrapModule.ts
+++ b/src/compile/wrapModule.ts
@@ -1,6 +1,7 @@
 import deindent from './utils/deindent';
 import list from '../utils/list';
 import { CompileOptions, ModuleFormat, Node } from '../interfaces';
+import { stringify_props } from './utils/stringify_props';
 
 interface Dependency {
 	name: string;
@@ -57,7 +58,7 @@ function esm(
 	source: string
 ) {
 	const importHelpers = helpers.length > 0 && (
-		`import { ${helpers.map(h => h.name === h.alias ? h.name : `${h.name} as ${h.alias}`).join(', ')} } from ${JSON.stringify(internalPath)};`
+		`import ${stringify_props(helpers.map(h => h.name === h.alias ? h.name : `${h.name} as ${h.alias}`).sort())} from ${JSON.stringify(internalPath)};`
 	);
 
 	const importBlock = imports.length > 0 && (
@@ -95,10 +96,10 @@ function cjs(
 	imports: Node[],
 	module_exports: Export[]
 ) {
-	const helperDeclarations = helpers.map(h => `${h.alias === h.name ? h.name : `${h.name}: ${h.alias}`}`).join(', ');
+	const helperDeclarations = helpers.map(h => `${h.alias === h.name ? h.name : `${h.name}: ${h.alias}`}`).sort();
 
 	const helperBlock = helpers.length > 0 && (
-		`const { ${helperDeclarations} } = require(${JSON.stringify(internalPath)});\n`
+		`const ${stringify_props(helperDeclarations)} = require(${JSON.stringify(internalPath)});\n`
 	);
 
 	const requires = imports.map(node => {
diff --git a/src/internal/Component.js b/src/internal/Component.js
index 58149f8d9d..f707dfb18d 100644
--- a/src/internal/Component.js
+++ b/src/internal/Component.js
@@ -1,7 +1,7 @@
 import { add_render_callback, flush, intros, schedule_update, dirty_components } from './scheduler.js';
 import { current_component, set_current_component } from './lifecycle.js'
 import { is_function, run, run_all, noop } from './utils.js';
-import { blankObject } from './utils.js';
+import { blank_object } from './utils.js';
 import { children } from './dom.js';
 
 export function bind(component, name, callback) {
@@ -33,10 +33,10 @@ export function mount_component(component, target, anchor) {
 	after_render.forEach(add_render_callback);
 }
 
-function destroy(component, detach) {
+function destroy(component, detaching) {
 	if (component.$$) {
 		run_all(component.$$.on_destroy);
-		component.$$.fragment.d(detach);
+		component.$$.fragment.d(detaching);
 
 		// TODO null out other refs, including component.$$ (but need to
 		// preserve final state?)
@@ -68,7 +68,7 @@ export function init(component, options, instance, create_fragment, not_equal, p
 		props: prop_names,
 		update: noop,
 		not_equal,
-		bound: blankObject(),
+		bound: blank_object(),
 
 		// lifecycle
 		on_mount: [],
@@ -78,7 +78,7 @@ export function init(component, options, instance, create_fragment, not_equal, p
 		context: new Map(parent_component ? parent_component.$$.context : []),
 
 		// everything else
-		callbacks: blankObject(),
+		callbacks: blank_object(),
 		dirty: null
 	};
 
diff --git a/src/internal/await-block.js b/src/internal/await-block.js
index b09eff8e25..60584b59e5 100644
--- a/src/internal/await-block.js
+++ b/src/internal/await-block.js
@@ -1,8 +1,8 @@
-import { assign, isPromise } from './utils.js';
+import { assign, is_promise } from './utils.js';
 import { check_outros, group_outros, on_outro } from './transitions.js';
 import { flush } from '../internal/scheduler.js';
 
-export function handlePromise(promise, info) {
+export function handle_promise(promise, info) {
 	var token = info.token = {};
 
 	function update(type, index, key, value) {
@@ -41,7 +41,7 @@ export function handlePromise(promise, info) {
 		if (info.blocks) info.blocks[index] = block;
 	}
 
-	if (isPromise(promise)) {
+	if (is_promise(promise)) {
 		promise.then(value => {
 			update(info.then, 1, info.value, value);
 		}, error => {
diff --git a/src/internal/dom.js b/src/internal/dom.js
index b6b5bae83e..2a927c8b94 100644
--- a/src/internal/dom.js
+++ b/src/internal/dom.js
@@ -6,122 +6,99 @@ export function insert(target, node, anchor) {
 	target.insertBefore(node, anchor);
 }
 
-export function detachNode(node) {
+export function detach(node) {
 	node.parentNode.removeChild(node);
 }
 
-export function detachBetween(before, after) {
+export function detach_between(before, after) {
 	while (before.nextSibling && before.nextSibling !== after) {
 		before.parentNode.removeChild(before.nextSibling);
 	}
 }
 
-export function detachBefore(after) {
+export function detach_before(after) {
 	while (after.previousSibling) {
 		after.parentNode.removeChild(after.previousSibling);
 	}
 }
 
-export function detachAfter(before) {
+export function detach_after(before) {
 	while (before.nextSibling) {
 		before.parentNode.removeChild(before.nextSibling);
 	}
 }
 
-export function reinsertBetween(before, after, target) {
-	while (before.nextSibling && before.nextSibling !== after) {
-		target.appendChild(before.parentNode.removeChild(before.nextSibling));
-	}
-}
-
-export function reinsertChildren(parent, target) {
-	while (parent.firstChild) target.appendChild(parent.firstChild);
-}
-
-export function reinsertAfter(before, target) {
-	while (before.nextSibling) target.appendChild(before.nextSibling);
-}
-
-export function reinsertBefore(after, target) {
-	var parent = after.parentNode;
-	while (parent.firstChild !== after) target.appendChild(parent.firstChild);
-}
-
-export function destroyEach(iterations, detach) {
+export function destroy_each(iterations, detaching) {
 	for (var i = 0; i < iterations.length; i += 1) {
-		if (iterations[i]) iterations[i].d(detach);
+		if (iterations[i]) iterations[i].d(detaching);
 	}
 }
 
-export function createFragment() {
-	return document.createDocumentFragment();
-}
-
-export function createElement(name) {
+export function element(name) {
 	return document.createElement(name);
 }
 
-export function createSvgElement(name) {
+export function svg_element(name) {
 	return document.createElementNS('http://www.w3.org/2000/svg', name);
 }
 
-export function createText(data) {
+export function create_text(data) {
 	return document.createTextNode(data);
 }
 
-export function createComment() {
+export function comment() {
 	return document.createComment('');
 }
 
-export function addListener(node, event, handler, options) {
+export function listen(node, event, handler, options) {
 	node.addEventListener(event, handler, options);
 	return () => node.removeEventListener(event, handler, options);
 }
 
-export function preventDefault(fn) {
+export function prevent_default(fn) {
 	return function(event) {
 		event.preventDefault();
 		return fn.call(this, event);
 	};
 }
 
-export function stopPropagation(fn) {
+export function stop_propagation(fn) {
 	return function(event) {
 		event.stopPropagation();
 		return fn.call(this, event);
 	};
 }
 
-export function setAttribute(node, attribute, value) {
+export function attr(node, attribute, value) {
 	if (value == null) node.removeAttribute(attribute);
 	else node.setAttribute(attribute, value);
 }
 
-export function setAttributes(node, attributes) {
+export function set_attributes(node, attributes) {
 	for (var key in attributes) {
 		if (key === 'style') {
 			node.style.cssText = attributes[key];
 		} else if (key in node) {
 			node[key] = attributes[key];
 		} else {
-			setAttribute(node, key, attributes[key]);
+			attr(node, key, attributes[key]);
 		}
 	}
 }
 
-export function setCustomElementData(node, prop, value) {
+export function set_custom_element_data(node, prop, value) {
 	if (prop in node) {
 		node[prop] = value;
 	} else {
-		setAttribute(node, prop, value);
+		attr(node, prop, value);
 	}
 }
 
-export function setXlinkAttribute(node, attribute, value) {
+export function xlink_attr(node, attribute, value) {
 	node.setAttributeNS('http://www.w3.org/1999/xlink', attribute, value);
 }
 
-export function getBindingGroupValue(group) {
+export function get_binding_group_value(group) {
 	var value = [];
 	for (var i = 0; i < group.length; i += 1) {
 		if (group[i].checked) value.push(group[i].__value);
@@ -129,11 +106,11 @@ export function getBindingGroupValue(group) {
 	return value;
 }
 
-export function toNumber(value) {
+export function to_number(value) {
 	return value === '' ? undefined : +value;
 }
 
-export function timeRangesToArray(ranges) {
+export function time_ranges_to_array(ranges) {
 	var array = [];
 	for (var i = 0; i < ranges.length; i += 1) {
 		array.push({ start: ranges.start(i), end: ranges.end(i) });
@@ -141,11 +118,11 @@ export function timeRangesToArray(ranges) {
 	return array;
 }
 
-export function children (element) {
+export function children(element) {
 	return Array.from(element.childNodes);
 }
 
-export function claimElement (nodes, name, attributes, svg) {
+export function claim_element(nodes, name, attributes, svg) {
 	for (var i = 0; i < nodes.length; i += 1) {
 		var node = nodes[i];
 		if (node.nodeName === name) {
@@ -157,10 +134,10 @@ export function claimElement (nodes, name, attributes, svg) {
 		}
 	}
 
-	return svg ? createSvgElement(name) : createElement(name);
+	return svg ? svg_element(name) : element(name);
 }
 
-export function claimText (nodes, data) {
+export function claim_text(nodes, data) {
 	for (var i = 0; i < nodes.length; i += 1) {
 		var node = nodes[i];
 		if (node.nodeType === 3) {
@@ -169,24 +146,24 @@ export function claimText (nodes, data) {
 		}
 	}
 
-	return createText(data);
+	return create_text(data);
 }
 
-export function setData(text, data) {
+export function set_data(text, data) {
 	text.data = '' + data;
 }
 
-export function setInputType(input, type) {
+export function set_input_type(input, type) {
 	try {
 		input.type = type;
 	} catch (e) {}
 }
 
-export function setStyle(node, key, value) {
+export function set_style(node, key, value) {
 	node.style.setProperty(key, value);
 }
 
-export function selectOption(select, value) {
+export function select_option(select, value) {
 	for (var i = 0; i < select.options.length; i += 1) {
 		var option = select.options[i];
 
@@ -197,25 +174,25 @@ export function selectOption(select, value) {
 	}
 }
 
-export function selectOptions(select, value) {
+export function select_options(select, value) {
 	for (var i = 0; i < select.options.length; i += 1) {
 		var option = select.options[i];
 		option.selected = ~value.indexOf(option.__value);
 	}
 }
 
-export function selectValue(select) {
+export function select_value(select) {
 	var selectedOption = select.querySelector(':checked') || select.options[0];
 	return selectedOption && selectedOption.__value;
 }
 
-export function selectMultipleValue(select) {
+export function select_multiple_value(select) {
 	return [].map.call(select.querySelectorAll(':checked'), function(option) {
 		return option.__value;
 	});
 }
 
-export function addResizeListener(element, fn) {
+export function add_resize_listener(element, fn) {
 	if (getComputedStyle(element).position === 'static') {
 		element.style.position = 'relative';
 	}
@@ -247,7 +224,7 @@ export function addResizeListener(element, fn) {
 	};
 }
 
-export function toggleClass(element, name, toggle) {
+export function toggle_class(element, name, toggle) {
 	element.classList[toggle ? 'add' : 'remove'](name);
 }
 
diff --git a/src/internal/keyed-each.js b/src/internal/keyed-each.js
index 6732cac277..e2ce67d13c 100644
--- a/src/internal/keyed-each.js
+++ b/src/internal/keyed-each.js
@@ -1,24 +1,24 @@
 import { on_outro } from './transitions.js';
 
-export function destroyBlock(block, lookup) {
+export function destroy_block(block, lookup) {
 	block.d(1);
 	lookup[block.key] = null;
 }
 
-export function outroAndDestroyBlock(block, lookup) {
+export function outro_and_destroy_block(block, lookup) {
 	on_outro(() => {
-		destroyBlock(block, lookup);
+		destroy_block(block, lookup);
 	});
 
 	block.o(1);
 }
 
-export function fixAndOutroAndDestroyBlock(block, lookup) {
+export function fix_and_outro_and_destroy_block(block, lookup) {
 	block.f();
-	outroAndDestroyBlock(block, lookup);
+	outro_and_destroy_block(block, lookup);
 }
 
-export function updateKeyedEach(old_blocks, changed, get_key, dynamic, ctx, list, lookup, node, destroy, create_each_block, next, get_context) {
+export function update_keyed_each(old_blocks, changed, get_key, dynamic, ctx, list, lookup, node, destroy, create_each_block, next, get_context) {
 	var o = old_blocks.length;
 	var n = list.length;
 
diff --git a/src/internal/spread.js b/src/internal/spread.js
index 2ecc432fc3..50617fe8fb 100644
--- a/src/internal/spread.js
+++ b/src/internal/spread.js
@@ -1,4 +1,4 @@
-export function getSpreadUpdate(levels, updates) {
+export function get_spread_update(levels, updates) {
 	var update = {};
 
 	var to_null_out = {};
diff --git a/src/internal/ssr.js b/src/internal/ssr.js
index 09c5aa499c..a86982ede8 100644
--- a/src/internal/ssr.js
+++ b/src/internal/ssr.js
@@ -1,7 +1,7 @@
 import { set_current_component, current_component } from './lifecycle.js';
-import { run_all, blankObject } from './utils.js';
+import { run_all, blank_object } from './utils.js';
 
-export const invalidAttributeNameCharacter = /[\s'">\/=\u{FDD0}-\u{FDEF}\u{FFFE}\u{FFFF}\u{1FFFE}\u{1FFFF}\u{2FFFE}\u{2FFFF}\u{3FFFE}\u{3FFFF}\u{4FFFE}\u{4FFFF}\u{5FFFE}\u{5FFFF}\u{6FFFE}\u{6FFFF}\u{7FFFE}\u{7FFFF}\u{8FFFE}\u{8FFFF}\u{9FFFE}\u{9FFFF}\u{AFFFE}\u{AFFFF}\u{BFFFE}\u{BFFFF}\u{CFFFE}\u{CFFFF}\u{DFFFE}\u{DFFFF}\u{EFFFE}\u{EFFFF}\u{FFFFE}\u{FFFFF}\u{10FFFE}\u{10FFFF}]/u;
+export const invalid_attribute_name_character = /[\s'">\/=\u{FDD0}-\u{FDEF}\u{FFFE}\u{FFFF}\u{1FFFE}\u{1FFFF}\u{2FFFE}\u{2FFFF}\u{3FFFE}\u{3FFFF}\u{4FFFE}\u{4FFFF}\u{5FFFE}\u{5FFFF}\u{6FFFE}\u{6FFFF}\u{7FFFE}\u{7FFFF}\u{8FFFE}\u{8FFFF}\u{9FFFE}\u{9FFFF}\u{AFFFE}\u{AFFFF}\u{BFFFE}\u{BFFFF}\u{CFFFE}\u{CFFFF}\u{DFFFE}\u{DFFFF}\u{EFFFE}\u{EFFFF}\u{FFFFE}\u{FFFFF}\u{10FFFE}\u{10FFFF}]/u;
 // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
 // https://infra.spec.whatwg.org/#noncharacter
 
@@ -10,7 +10,7 @@ export function spread(args) {
 	let str = '';
 
 	Object.keys(attributes).forEach(name => {
-		if (invalidAttributeNameCharacter.test(name)) return;
+		if (invalid_attribute_name_character.test(name)) return;
 
 		const value = attributes[name];
 		if (value === undefined) return;
@@ -46,7 +46,7 @@ export function each(items, fn) {
 	return str;
 }
 
-export const missingComponent = {
+export const missing_component = {
 	$$render: () => ''
 };
 
@@ -79,7 +79,7 @@ export function create_ssr_component(fn) {
 			on_mount: [],
 			before_render: [],
 			after_render: [],
-			callbacks: blankObject()
+			callbacks: blank_object()
 		};
 
 		set_current_component({ $$ });
diff --git a/src/internal/style_manager.js b/src/internal/style_manager.js
index fe524562b8..d71e922f01 100644
--- a/src/internal/style_manager.js
+++ b/src/internal/style_manager.js
@@ -1,4 +1,4 @@
-import { createElement } from './dom.js';
+import { element } from './dom.js';
 
 let stylesheet;
 let active = 0;
@@ -27,7 +27,7 @@ export function create_rule(node, a, b, duration, delay, ease, fn, uid = 0) {
 
 	if (!current_rules[name]) {
 		if (!stylesheet) {
-			const style = createElement('style');
+			const style = element('style');
 			document.head.appendChild(style);
 			stylesheet = style.sheet;
 		}
diff --git a/src/internal/utils.js b/src/internal/utils.js
index 519d1b64d4..05ba599b22 100644
--- a/src/internal/utils.js
+++ b/src/internal/utils.js
@@ -7,11 +7,11 @@ export function assign(tar, src) {
 	return tar;
 }
 
-export function isPromise(value) {
+export function is_promise(value) {
 	return value && typeof value.then === 'function';
 }
 
-export function addLoc(element, file, line, column, char) {
+export function add_location(element, file, line, column, char) {
 	element.__svelte_meta = {
 		loc: { file, line, column, char }
 	};
@@ -21,7 +21,7 @@ export function run(fn) {
 	return fn();
 }
 
-export function blankObject() {
+export function blank_object() {
 	return Object.create(null);
 }
 
diff --git a/test/js/samples/action-custom-event-handler/expected.js b/test/js/samples/action-custom-event-handler/expected.js
index f5b3a87c84..8ecabf94be 100644
--- a/test/js/samples/action-custom-event-handler/expected.js
+++ b/test/js/samples/action-custom-event-handler/expected.js
@@ -1,12 +1,20 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var button, foo_action;
 
 	return {
 		c() {
-			button = createElement("button");
+			button = element("button");
 			button.textContent = "foo";
 		},
 
@@ -19,9 +27,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(button);
+		d(detaching) {
+			if (detaching) {
+				detach(button);
 			}
 
 			if (foo_action && typeof foo_action.destroy === 'function') foo_action.destroy();
diff --git a/test/js/samples/action/expected.js b/test/js/samples/action/expected.js
index 2284061a1b..edc82cc67e 100644
--- a/test/js/samples/action/expected.js
+++ b/test/js/samples/action/expected.js
@@ -1,12 +1,20 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var a, link_action;
 
 	return {
 		c() {
-			a = createElement("a");
+			a = element("a");
 			a.textContent = "Test";
 			a.href = "#";
 		},
@@ -20,9 +28,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(a);
+		d(detaching) {
+			if (detaching) {
+				detach(a);
 			}
 
 			if (link_action && typeof link_action.destroy === 'function') link_action.destroy();
diff --git a/test/js/samples/bind-width-height/expected.js b/test/js/samples/bind-width-height/expected.js
index f8b17f3de7..45c9e6a835 100644
--- a/test/js/samples/bind-width-height/expected.js
+++ b/test/js/samples/bind-width-height/expected.js
@@ -1,28 +1,38 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addResizeListener, add_render_callback, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	add_render_callback,
+	add_resize_listener,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var div, div_resize_listener;
 
 	return {
 		c() {
-			div = createElement("div");
+			div = element("div");
 			div.textContent = "some content";
 			add_render_callback(() => ctx.div_resize_handler.call(div));
 		},
 
 		m(target, anchor) {
 			insert(target, div, anchor);
-			div_resize_listener = addResizeListener(div, ctx.div_resize_handler.bind(div));
+			div_resize_listener = add_resize_listener(div, ctx.div_resize_handler.bind(div));
 		},
 
 		p: noop,
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 
 			div_resize_listener.cancel();
diff --git a/test/js/samples/collapses-text-around-comments/expected.js b/test/js/samples/collapses-text-around-comments/expected.js
index 5a8971391c..68b592b597 100644
--- a/test/js/samples/collapses-text-around-comments/expected.js
+++ b/test/js/samples/collapses-text-around-comments/expected.js
@@ -1,40 +1,51 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 function add_css() {
-	var style = createElement("style");
+	var style = element("style");
 	style.id = 'svelte-1a7i8ec-style';
 	style.textContent = "p.svelte-1a7i8ec{color:red}";
 	append(document.head, style);
 }
 
 function create_fragment(ctx) {
-	var p, text;
+	var p, t;
 
 	return {
 		c() {
-			p = createElement("p");
-			text = createText(ctx.foo);
+			p = element("p");
+			t = create_text(ctx.foo);
 			p.className = "svelte-1a7i8ec";
 		},
 
 		m(target, anchor) {
 			insert(target, p, anchor);
-			append(p, text);
+			append(p, t);
 		},
 
 		p(changed, ctx) {
 			if (changed.foo) {
-				setData(text, ctx.foo);
+				set_data(t, ctx.foo);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
diff --git a/test/js/samples/component-static-array/expected.js b/test/js/samples/component-static-array/expected.js
index 8967fdfa63..5cb7afde75 100644
--- a/test/js/samples/component-static-array/expected.js
+++ b/test/js/samples/component-static-array/expected.js
@@ -1,5 +1,11 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, mount_component, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	mount_component,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var current;
@@ -30,8 +36,8 @@ function create_fragment(ctx) {
 			current = false;
 		},
 
-		d(detach) {
-			nested.$destroy(detach);
+		d(detaching) {
+			nested.$destroy(detaching);
 		}
 	};
 }
diff --git a/test/js/samples/component-static-immutable/expected.js b/test/js/samples/component-static-immutable/expected.js
index 2f3bd46416..d0335b6ba0 100644
--- a/test/js/samples/component-static-immutable/expected.js
+++ b/test/js/samples/component-static-immutable/expected.js
@@ -1,5 +1,11 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, mount_component, noop, not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	mount_component,
+	noop,
+	not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var current;
@@ -30,8 +36,8 @@ function create_fragment(ctx) {
 			current = false;
 		},
 
-		d(detach) {
-			nested.$destroy(detach);
+		d(detaching) {
+			nested.$destroy(detaching);
 		}
 	};
 }
diff --git a/test/js/samples/component-static-immutable2/expected.js b/test/js/samples/component-static-immutable2/expected.js
index 2f3bd46416..d0335b6ba0 100644
--- a/test/js/samples/component-static-immutable2/expected.js
+++ b/test/js/samples/component-static-immutable2/expected.js
@@ -1,5 +1,11 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, mount_component, noop, not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	mount_component,
+	noop,
+	not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var current;
@@ -30,8 +36,8 @@ function create_fragment(ctx) {
 			current = false;
 		},
 
-		d(detach) {
-			nested.$destroy(detach);
+		d(detaching) {
+			nested.$destroy(detaching);
 		}
 	};
 }
diff --git a/test/js/samples/component-static/expected.js b/test/js/samples/component-static/expected.js
index 0fe7feb2ca..faad84b26c 100644
--- a/test/js/samples/component-static/expected.js
+++ b/test/js/samples/component-static/expected.js
@@ -1,5 +1,11 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, mount_component, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	mount_component,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var current;
@@ -30,8 +36,8 @@ function create_fragment(ctx) {
 			current = false;
 		},
 
-		d(detach) {
-			nested.$destroy(detach);
+		d(detaching) {
+			nested.$destroy(detaching);
 		}
 	};
 }
diff --git a/test/js/samples/computed-collapsed-if/expected.js b/test/js/samples/computed-collapsed-if/expected.js
index 855a70e7ae..754d202429 100644
--- a/test/js/samples/computed-collapsed-if/expected.js
+++ b/test/js/samples/computed-collapsed-if/expected.js
@@ -1,5 +1,10 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	return {
diff --git a/test/js/samples/css-media-query/expected.js b/test/js/samples/css-media-query/expected.js
index c44218d0fb..25ee94e03f 100644
--- a/test/js/samples/css-media-query/expected.js
+++ b/test/js/samples/css-media-query/expected.js
@@ -1,8 +1,17 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function add_css() {
-	var style = createElement("style");
+	var style = element("style");
 	style.id = 'svelte-1slhpfn-style';
 	style.textContent = "@media(min-width: 1px){div.svelte-1slhpfn{color:red}}";
 	append(document.head, style);
@@ -13,7 +22,7 @@ function create_fragment(ctx) {
 
 	return {
 		c() {
-			div = createElement("div");
+			div = element("div");
 			div.className = "svelte-1slhpfn";
 		},
 
@@ -25,9 +34,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 		}
 	};
diff --git a/test/js/samples/css-shadow-dom-keyframes/expected.js b/test/js/samples/css-shadow-dom-keyframes/expected.js
index 0fbe7a0cd3..2e410e11dd 100644
--- a/test/js/samples/css-shadow-dom-keyframes/expected.js
+++ b/test/js/samples/css-shadow-dom-keyframes/expected.js
@@ -1,12 +1,20 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteElement, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteElement,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var div;
 
 	return {
 		c() {
-			div = createElement("div");
+			div = element("div");
 			div.textContent = "fades in";
 			this.c = noop;
 		},
@@ -19,9 +27,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 		}
 	};
diff --git a/test/js/samples/debug-empty/expected.js b/test/js/samples/debug-empty/expected.js
index 9fd782a3c4..1283e82994 100644
--- a/test/js/samples/debug-empty/expected.js
+++ b/test/js/samples/debug-empty/expected.js
@@ -1,20 +1,32 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponentDev, addLoc, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponentDev,
+	add_location,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 const file = undefined;
 
 function create_fragment(ctx) {
-	var h1, text0, text1, text2, text3;
+	var h1, t0, t1, t2, t3;
 
 	return {
 		c: function create() {
-			h1 = createElement("h1");
-			text0 = createText("Hello ");
-			text1 = createText(ctx.name);
-			text2 = createText("!");
-			text3 = createText("\n");
+			h1 = element("h1");
+			t0 = create_text("Hello ");
+			t1 = create_text(ctx.name);
+			t2 = create_text("!");
+			t3 = create_text("\n");
 			debugger;
-			addLoc(h1, file, 4, 0, 38);
+			add_location(h1, file, 4, 0, 38);
 		},
 
 		l: function claim(nodes) {
@@ -23,15 +35,15 @@ function create_fragment(ctx) {
 
 		m: function mount(target, anchor) {
 			insert(target, h1, anchor);
-			append(h1, text0);
-			append(h1, text1);
-			append(h1, text2);
-			insert(target, text3, anchor);
+			append(h1, t0);
+			append(h1, t1);
+			append(h1, t2);
+			insert(target, t3, anchor);
 		},
 
 		p: function update(changed, ctx) {
 			if (changed.name) {
-				setData(text1, ctx.name);
+				set_data(t1, ctx.name);
 			}
 
 			debugger;
@@ -40,10 +52,10 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d: function destroy(detach) {
-			if (detach) {
-				detachNode(h1);
-				detachNode(text3);
+		d: function destroy(detaching) {
+			if (detaching) {
+				detach(h1);
+				detach(t3);
 			}
 		}
 	};
diff --git a/test/js/samples/debug-foo-bar-baz-things/expected.js b/test/js/samples/debug-foo-bar-baz-things/expected.js
index ad8e0b24ab..5c0c6005f2 100644
--- a/test/js/samples/debug-foo-bar-baz-things/expected.js
+++ b/test/js/samples/debug-foo-bar-baz-things/expected.js
@@ -1,5 +1,18 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponentDev, addLoc, append, createElement, createText, destroyEach, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponentDev,
+	add_location,
+	append,
+	create_text,
+	destroy_each,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 const file = undefined;
 
@@ -11,31 +24,31 @@ function get_each_context(ctx, list, i) {
 
 // (8:0) {#each things as thing}
 function create_each_block(ctx) {
-	var span, text0_value = ctx.thing.name, text0, text1;
+	var span, t0_value = ctx.thing.name, t0, t1;
 
 	return {
 		c: function create() {
-			span = createElement("span");
-			text0 = createText(text0_value);
-			text1 = createText("\n\t");
+			span = element("span");
+			t0 = create_text(t0_value);
+			t1 = create_text("\n\t");
 
 			{
 				const { foo, bar, baz, thing } = ctx;
 				console.log({ foo, bar, baz, thing });
 				debugger;
 			}
-			addLoc(span, file, 8, 1, 116);
+			add_location(span, file, 8, 1, 116);
 		},
 
 		m: function mount(target, anchor) {
 			insert(target, span, anchor);
-			append(span, text0);
-			insert(target, text1, anchor);
+			append(span, t0);
+			insert(target, t1, anchor);
 		},
 
 		p: function update(changed, ctx) {
-			if ((changed.things) && text0_value !== (text0_value = ctx.thing.name)) {
-				setData(text0, text0_value);
+			if ((changed.things) && t0_value !== (t0_value = ctx.thing.name)) {
+				set_data(t0, t0_value);
 			}
 
 			if (changed.foo || changed.bar || changed.baz || changed.things) {
@@ -45,17 +58,17 @@ function create_each_block(ctx) {
 			}
 		},
 
-		d: function destroy(detach) {
-			if (detach) {
-				detachNode(span);
-				detachNode(text1);
+		d: function destroy(detaching) {
+			if (detaching) {
+				detach(span);
+				detach(t1);
 			}
 		}
 	};
 }
 
 function create_fragment(ctx) {
-	var text0, p, text1, text2;
+	var t0, p, t1, t2;
 
 	var each_value = ctx.things;
 
@@ -71,11 +84,11 @@ function create_fragment(ctx) {
 				each_blocks[i].c();
 			}
 
-			text0 = createText("\n\n");
-			p = createElement("p");
-			text1 = createText("foo: ");
-			text2 = createText(ctx.foo);
-			addLoc(p, file, 12, 0, 182);
+			t0 = create_text("\n\n");
+			p = element("p");
+			t1 = create_text("foo: ");
+			t2 = create_text(ctx.foo);
+			add_location(p, file, 12, 0, 182);
 		},
 
 		l: function claim(nodes) {
@@ -87,10 +100,10 @@ function create_fragment(ctx) {
 				each_blocks[i].m(target, anchor);
 			}
 
-			insert(target, text0, anchor);
+			insert(target, t0, anchor);
 			insert(target, p, anchor);
-			append(p, text1);
-			append(p, text2);
+			append(p, t1);
+			append(p, t2);
 		},
 
 		p: function update(changed, ctx) {
@@ -105,7 +118,7 @@ function create_fragment(ctx) {
 					} else {
 						each_blocks[i] = create_each_block(child_ctx);
 						each_blocks[i].c();
-						each_blocks[i].m(text0.parentNode, text0);
+						each_blocks[i].m(t0.parentNode, t0);
 					}
 				}
 
@@ -116,19 +129,19 @@ function create_fragment(ctx) {
 			}
 
 			if (changed.foo) {
-				setData(text2, ctx.foo);
+				set_data(t2, ctx.foo);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d: function destroy(detach) {
-			destroyEach(each_blocks, detach);
+		d: function destroy(detaching) {
+			destroy_each(each_blocks, detaching);
 
-			if (detach) {
-				detachNode(text0);
-				detachNode(p);
+			if (detaching) {
+				detach(t0);
+				detach(p);
 			}
 		}
 	};
diff --git a/test/js/samples/debug-foo/expected.js b/test/js/samples/debug-foo/expected.js
index a9af1676e2..3d547b2a4b 100644
--- a/test/js/samples/debug-foo/expected.js
+++ b/test/js/samples/debug-foo/expected.js
@@ -1,5 +1,18 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponentDev, addLoc, append, createElement, createText, destroyEach, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponentDev,
+	add_location,
+	append,
+	create_text,
+	destroy_each,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 const file = undefined;
 
@@ -11,31 +24,31 @@ function get_each_context(ctx, list, i) {
 
 // (6:0) {#each things as thing}
 function create_each_block(ctx) {
-	var span, text0_value = ctx.thing.name, text0, text1;
+	var span, t0_value = ctx.thing.name, t0, t1;
 
 	return {
 		c: function create() {
-			span = createElement("span");
-			text0 = createText(text0_value);
-			text1 = createText("\n\t");
+			span = element("span");
+			t0 = create_text(t0_value);
+			t1 = create_text("\n\t");
 
 			{
 				const { foo } = ctx;
 				console.log({ foo });
 				debugger;
 			}
-			addLoc(span, file, 6, 1, 82);
+			add_location(span, file, 6, 1, 82);
 		},
 
 		m: function mount(target, anchor) {
 			insert(target, span, anchor);
-			append(span, text0);
-			insert(target, text1, anchor);
+			append(span, t0);
+			insert(target, t1, anchor);
 		},
 
 		p: function update(changed, ctx) {
-			if ((changed.things) && text0_value !== (text0_value = ctx.thing.name)) {
-				setData(text0, text0_value);
+			if ((changed.things) && t0_value !== (t0_value = ctx.thing.name)) {
+				set_data(t0, t0_value);
 			}
 
 			if (changed.foo) {
@@ -45,17 +58,17 @@ function create_each_block(ctx) {
 			}
 		},
 
-		d: function destroy(detach) {
-			if (detach) {
-				detachNode(span);
-				detachNode(text1);
+		d: function destroy(detaching) {
+			if (detaching) {
+				detach(span);
+				detach(t1);
 			}
 		}
 	};
 }
 
 function create_fragment(ctx) {
-	var text0, p, text1, text2;
+	var t0, p, t1, t2;
 
 	var each_value = ctx.things;
 
@@ -71,11 +84,11 @@ function create_fragment(ctx) {
 				each_blocks[i].c();
 			}
 
-			text0 = createText("\n\n");
-			p = createElement("p");
-			text1 = createText("foo: ");
-			text2 = createText(ctx.foo);
-			addLoc(p, file, 10, 0, 131);
+			t0 = create_text("\n\n");
+			p = element("p");
+			t1 = create_text("foo: ");
+			t2 = create_text(ctx.foo);
+			add_location(p, file, 10, 0, 131);
 		},
 
 		l: function claim(nodes) {
@@ -87,10 +100,10 @@ function create_fragment(ctx) {
 				each_blocks[i].m(target, anchor);
 			}
 
-			insert(target, text0, anchor);
+			insert(target, t0, anchor);
 			insert(target, p, anchor);
-			append(p, text1);
-			append(p, text2);
+			append(p, t1);
+			append(p, t2);
 		},
 
 		p: function update(changed, ctx) {
@@ -105,7 +118,7 @@ function create_fragment(ctx) {
 					} else {
 						each_blocks[i] = create_each_block(child_ctx);
 						each_blocks[i].c();
-						each_blocks[i].m(text0.parentNode, text0);
+						each_blocks[i].m(t0.parentNode, t0);
 					}
 				}
 
@@ -116,19 +129,19 @@ function create_fragment(ctx) {
 			}
 
 			if (changed.foo) {
-				setData(text2, ctx.foo);
+				set_data(t2, ctx.foo);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d: function destroy(detach) {
-			destroyEach(each_blocks, detach);
+		d: function destroy(detaching) {
+			destroy_each(each_blocks, detaching);
 
-			if (detach) {
-				detachNode(text0);
-				detachNode(p);
+			if (detaching) {
+				detach(t0);
+				detach(p);
 			}
 		}
 	};
diff --git a/test/js/samples/debug-ssr-foo/expected.js b/test/js/samples/debug-ssr-foo/expected.js
index c7edd8bf0a..02bbec5fba 100644
--- a/test/js/samples/debug-ssr-foo/expected.js
+++ b/test/js/samples/debug-ssr-foo/expected.js
@@ -1,5 +1,10 @@
 /* generated by Svelte vX.Y.Z */
-import { create_ssr_component, debug, each, escape } from "svelte/internal";
+import {
+	create_ssr_component,
+	debug,
+	each,
+	escape
+} from "svelte/internal";
 
 const SvelteComponent = create_ssr_component(($$result, $$props, $$bindings, $$slots) => {
 	let { things, foo } = $$props;
diff --git a/test/js/samples/deconflict-builtins/expected.js b/test/js/samples/deconflict-builtins/expected.js
index 8161f7c661..5423faaf80 100644
--- a/test/js/samples/deconflict-builtins/expected.js
+++ b/test/js/samples/deconflict-builtins/expected.js
@@ -1,5 +1,18 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createComment, createElement as createElement_1, createText, destroyEach, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	comment,
+	create_text,
+	destroy_each,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = Object.create(ctx);
@@ -9,35 +22,35 @@ function get_each_context(ctx, list, i) {
 
 // (5:0) {#each createElement as node}
 function create_each_block(ctx) {
-	var span, text_value = ctx.node, text;
+	var span, t_value = ctx.node, t;
 
 	return {
 		c() {
-			span = createElement_1("span");
-			text = createText(text_value);
+			span = element("span");
+			t = create_text(t_value);
 		},
 
 		m(target, anchor) {
 			insert(target, span, anchor);
-			append(span, text);
+			append(span, t);
 		},
 
 		p(changed, ctx) {
-			if ((changed.createElement) && text_value !== (text_value = ctx.node)) {
-				setData(text, text_value);
+			if ((changed.createElement) && t_value !== (t_value = ctx.node)) {
+				set_data(t, t_value);
 			}
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(span);
+		d(detaching) {
+			if (detaching) {
+				detach(span);
 			}
 		}
 	};
 }
 
 function create_fragment(ctx) {
-	var each_anchor;
+	var each_1_anchor;
 
 	var each_value = ctx.createElement;
 
@@ -53,7 +66,7 @@ function create_fragment(ctx) {
 				each_blocks[i].c();
 			}
 
-			each_anchor = createComment();
+			each_1_anchor = comment();
 		},
 
 		m(target, anchor) {
@@ -61,7 +74,7 @@ function create_fragment(ctx) {
 				each_blocks[i].m(target, anchor);
 			}
 
-			insert(target, each_anchor, anchor);
+			insert(target, each_1_anchor, anchor);
 		},
 
 		p(changed, ctx) {
@@ -76,7 +89,7 @@ function create_fragment(ctx) {
 					} else {
 						each_blocks[i] = create_each_block(child_ctx);
 						each_blocks[i].c();
-						each_blocks[i].m(each_anchor.parentNode, each_anchor);
+						each_blocks[i].m(each_1_anchor.parentNode, each_1_anchor);
 					}
 				}
 
@@ -90,11 +103,11 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			destroyEach(each_blocks, detach);
+		d(detaching) {
+			destroy_each(each_blocks, detaching);
 
-			if (detach) {
-				detachNode(each_anchor);
+			if (detaching) {
+				detach(each_1_anchor);
 			}
 		}
 	};
diff --git a/test/js/samples/deconflict-globals/expected.js b/test/js/samples/deconflict-globals/expected.js
index c9754108af..fe941d2b24 100644
--- a/test/js/samples/deconflict-globals/expected.js
+++ b/test/js/samples/deconflict-globals/expected.js
@@ -1,5 +1,10 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 import { onMount } from "svelte";
 
 function create_fragment(ctx) {
diff --git a/test/js/samples/dev-warning-missing-data-computed/expected.js b/test/js/samples/dev-warning-missing-data-computed/expected.js
index b8976fd405..81b8d3be9d 100644
--- a/test/js/samples/dev-warning-missing-data-computed/expected.js
+++ b/test/js/samples/dev-warning-missing-data-computed/expected.js
@@ -1,18 +1,30 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponentDev, addLoc, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponentDev,
+	add_location,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 const file = undefined;
 
 function create_fragment(ctx) {
-	var p, text0_value = Math.max(0, ctx.foo), text0, text1, text2;
+	var p, t0_value = Math.max(0, ctx.foo), t0, t1, t2;
 
 	return {
 		c: function create() {
-			p = createElement("p");
-			text0 = createText(text0_value);
-			text1 = createText("\n\t");
-			text2 = createText(ctx.bar);
-			addLoc(p, file, 7, 0, 67);
+			p = element("p");
+			t0 = create_text(t0_value);
+			t1 = create_text("\n\t");
+			t2 = create_text(ctx.bar);
+			add_location(p, file, 7, 0, 67);
 		},
 
 		l: function claim(nodes) {
@@ -21,27 +33,27 @@ function create_fragment(ctx) {
 
 		m: function mount(target, anchor) {
 			insert(target, p, anchor);
-			append(p, text0);
-			append(p, text1);
-			append(p, text2);
+			append(p, t0);
+			append(p, t1);
+			append(p, t2);
 		},
 
 		p: function update(changed, ctx) {
-			if ((changed.foo) && text0_value !== (text0_value = Math.max(0, ctx.foo))) {
-				setData(text0, text0_value);
+			if ((changed.foo) && t0_value !== (t0_value = Math.max(0, ctx.foo))) {
+				set_data(t0, t0_value);
 			}
 
 			if (changed.bar) {
-				setData(text2, ctx.bar);
+				set_data(t2, ctx.bar);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d: function destroy(detach) {
-			if (detach) {
-				detachNode(p);
+		d: function destroy(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
diff --git a/test/js/samples/do-use-dataset/expected.js b/test/js/samples/do-use-dataset/expected.js
index fd8aeab7b2..7f0d66ebdc 100644
--- a/test/js/samples/do-use-dataset/expected.js
+++ b/test/js/samples/do-use-dataset/expected.js
@@ -1,21 +1,30 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createElement, createText, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var div0, text, div1;
+	var div0, t, div1;
 
 	return {
 		c() {
-			div0 = createElement("div");
-			text = createText("\n");
-			div1 = createElement("div");
+			div0 = element("div");
+			t = create_text("\n");
+			div1 = element("div");
 			div0.dataset.foo = "bar";
 			div1.dataset.foo = ctx.bar;
 		},
 
 		m(target, anchor) {
 			insert(target, div0, anchor);
-			insert(target, text, anchor);
+			insert(target, t, anchor);
 			insert(target, div1, anchor);
 		},
 
@@ -28,11 +37,11 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div0);
-				detachNode(text);
-				detachNode(div1);
+		d(detaching) {
+			if (detaching) {
+				detach(div0);
+				detach(t);
+				detach(div1);
 			}
 		}
 	};
diff --git a/test/js/samples/dont-invalidate-this/expected.js b/test/js/samples/dont-invalidate-this/expected.js
index 573bafd826..2b3cd63514 100644
--- a/test/js/samples/dont-invalidate-this/expected.js
+++ b/test/js/samples/dont-invalidate-this/expected.js
@@ -1,13 +1,22 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var input, dispose;
 
 	return {
 		c() {
-			input = createElement("input");
-			dispose = addListener(input, "input", make_uppercase);
+			input = element("input");
+			dispose = listen(input, "input", make_uppercase);
 		},
 
 		m(target, anchor) {
@@ -18,9 +27,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(input);
+		d(detaching) {
+			if (detaching) {
+				detach(input);
 			}
 
 			dispose();
diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected.js b/test/js/samples/dont-use-dataset-in-legacy/expected.js
index ab0db608ee..1ea2935770 100644
--- a/test/js/samples/dont-use-dataset-in-legacy/expected.js
+++ b/test/js/samples/dont-use-dataset-in-legacy/expected.js
@@ -1,38 +1,48 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createElement, createText, detachNode, init, insert, noop, safe_not_equal, setAttribute } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	attr,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var div0, text, div1;
+	var div0, t, div1;
 
 	return {
 		c() {
-			div0 = createElement("div");
-			text = createText("\n");
-			div1 = createElement("div");
-			setAttribute(div0, "data-foo", "bar");
-			setAttribute(div1, "data-foo", ctx.bar);
+			div0 = element("div");
+			t = create_text("\n");
+			div1 = element("div");
+			attr(div0, "data-foo", "bar");
+			attr(div1, "data-foo", ctx.bar);
 		},
 
 		m(target, anchor) {
 			insert(target, div0, anchor);
-			insert(target, text, anchor);
+			insert(target, t, anchor);
 			insert(target, div1, anchor);
 		},
 
 		p(changed, ctx) {
 			if (changed.bar) {
-				setAttribute(div1, "data-foo", ctx.bar);
+				attr(div1, "data-foo", ctx.bar);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div0);
-				detachNode(text);
-				detachNode(div1);
+		d(detaching) {
+			if (detaching) {
+				detach(div0);
+				detach(t);
+				detach(div1);
 			}
 		}
 	};
diff --git a/test/js/samples/dont-use-dataset-in-svg/expected.js b/test/js/samples/dont-use-dataset-in-svg/expected.js
index 7648e60313..3f58d7f155 100644
--- a/test/js/samples/dont-use-dataset-in-svg/expected.js
+++ b/test/js/samples/dont-use-dataset-in-svg/expected.js
@@ -1,16 +1,26 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createSvgElement, detachNode, init, insert, noop, safe_not_equal, setAttribute } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	attr,
+	detach,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	svg_element
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var svg, g0, g1;
 
 	return {
 		c() {
-			svg = createSvgElement("svg");
-			g0 = createSvgElement("g");
-			g1 = createSvgElement("g");
-			setAttribute(g0, "data-foo", "bar");
-			setAttribute(g1, "data-foo", ctx.bar);
+			svg = svg_element("svg");
+			g0 = svg_element("g");
+			g1 = svg_element("g");
+			attr(g0, "data-foo", "bar");
+			attr(g1, "data-foo", ctx.bar);
 		},
 
 		m(target, anchor) {
@@ -21,16 +31,16 @@ function create_fragment(ctx) {
 
 		p(changed, ctx) {
 			if (changed.bar) {
-				setAttribute(g1, "data-foo", ctx.bar);
+				attr(g1, "data-foo", ctx.bar);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(svg);
+		d(detaching) {
+			if (detaching) {
+				detach(svg);
 			}
 		}
 	};
diff --git a/test/js/samples/dynamic-import/expected.js b/test/js/samples/dynamic-import/expected.js
index 6647619329..85d5ed0cbe 100644
--- a/test/js/samples/dynamic-import/expected.js
+++ b/test/js/samples/dynamic-import/expected.js
@@ -1,5 +1,11 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, mount_component, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	mount_component,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 import LazyLoad from "./LazyLoad.svelte";
 
 function create_fragment(ctx) {
@@ -31,8 +37,8 @@ function create_fragment(ctx) {
 			current = false;
 		},
 
-		d(detach) {
-			lazyload.$destroy(detach);
+		d(detaching) {
+			lazyload.$destroy(detaching);
 		}
 	};
 }
diff --git a/test/js/samples/each-block-array-literal/expected.js b/test/js/samples/each-block-array-literal/expected.js
index 8cc11dff47..c7e46ec1b2 100644
--- a/test/js/samples/each-block-array-literal/expected.js
+++ b/test/js/samples/each-block-array-literal/expected.js
@@ -1,5 +1,18 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createComment, createElement, createText, destroyEach, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	comment,
+	create_text,
+	destroy_each,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = Object.create(ctx);
@@ -9,35 +22,35 @@ function get_each_context(ctx, list, i) {
 
 // (9:0) {#each [a, b, c, d, e] as num}
 function create_each_block(ctx) {
-	var span, text_value = ctx.num, text;
+	var span, t_value = ctx.num, t;
 
 	return {
 		c() {
-			span = createElement("span");
-			text = createText(text_value);
+			span = element("span");
+			t = create_text(t_value);
 		},
 
 		m(target, anchor) {
 			insert(target, span, anchor);
-			append(span, text);
+			append(span, t);
 		},
 
 		p(changed, ctx) {
-			if ((changed.a || changed.b || changed.c || changed.d || changed.e) && text_value !== (text_value = ctx.num)) {
-				setData(text, text_value);
+			if ((changed.a || changed.b || changed.c || changed.d || changed.e) && t_value !== (t_value = ctx.num)) {
+				set_data(t, t_value);
 			}
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(span);
+		d(detaching) {
+			if (detaching) {
+				detach(span);
 			}
 		}
 	};
 }
 
 function create_fragment(ctx) {
-	var each_anchor;
+	var each_1_anchor;
 
 	var each_value = [ctx.a, ctx.b, ctx.c, ctx.d, ctx.e];
 
@@ -53,7 +66,7 @@ function create_fragment(ctx) {
 				each_blocks[i].c();
 			}
 
-			each_anchor = createComment();
+			each_1_anchor = comment();
 		},
 
 		m(target, anchor) {
@@ -61,7 +74,7 @@ function create_fragment(ctx) {
 				each_blocks[i].m(target, anchor);
 			}
 
-			insert(target, each_anchor, anchor);
+			insert(target, each_1_anchor, anchor);
 		},
 
 		p(changed, ctx) {
@@ -76,7 +89,7 @@ function create_fragment(ctx) {
 					} else {
 						each_blocks[i] = create_each_block(child_ctx);
 						each_blocks[i].c();
-						each_blocks[i].m(each_anchor.parentNode, each_anchor);
+						each_blocks[i].m(each_1_anchor.parentNode, each_1_anchor);
 					}
 				}
 
@@ -89,11 +102,11 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			destroyEach(each_blocks, detach);
+		d(detaching) {
+			destroy_each(each_blocks, detaching);
 
-			if (detach) {
-				detachNode(each_anchor);
+			if (detaching) {
+				detach(each_1_anchor);
 			}
 		}
 	};
diff --git a/test/js/samples/each-block-changed-check/expected.js b/test/js/samples/each-block-changed-check/expected.js
index d43771b9a2..e97760f7a8 100644
--- a/test/js/samples/each-block-changed-check/expected.js
+++ b/test/js/samples/each-block-changed-check/expected.js
@@ -1,5 +1,18 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createElement, createText, destroyEach, detachAfter, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	destroy_each,
+	detach,
+	detach_after,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = Object.create(ctx);
@@ -10,21 +23,21 @@ function get_each_context(ctx, list, i) {
 
 // (8:0) {#each comments as comment, i}
 function create_each_block(ctx) {
-	var div, strong, text0, text1, span, text2_value = ctx.comment.author, text2, text3, text4_value = ctx.elapsed(ctx.comment.time, ctx.time), text4, text5, text6, raw_value = ctx.comment.html, raw_before;
+	var div, strong, t0, t1, span, t2_value = ctx.comment.author, t2, t3, t4_value = ctx.elapsed(ctx.comment.time, ctx.time), t4, t5, t6, raw_value = ctx.comment.html, raw_before;
 
 	return {
 		c() {
-			div = createElement("div");
-			strong = createElement("strong");
-			text0 = createText(ctx.i);
-			text1 = createText("\n\n\t\t");
-			span = createElement("span");
-			text2 = createText(text2_value);
-			text3 = createText(" wrote ");
-			text4 = createText(text4_value);
-			text5 = createText(" ago:");
-			text6 = createText("\n\n\t\t");
-			raw_before = createElement('noscript');
+			div = element("div");
+			strong = element("strong");
+			t0 = create_text(ctx.i);
+			t1 = create_text("\n\n\t\t");
+			span = element("span");
+			t2 = create_text(t2_value);
+			t3 = create_text(" wrote ");
+			t4 = create_text(t4_value);
+			t5 = create_text(" ago:");
+			t6 = create_text("\n\n\t\t");
+			raw_before = element('noscript');
 			span.className = "meta";
 			div.className = "comment";
 		},
@@ -32,43 +45,43 @@ function create_each_block(ctx) {
 		m(target, anchor) {
 			insert(target, div, anchor);
 			append(div, strong);
-			append(strong, text0);
-			append(div, text1);
+			append(strong, t0);
+			append(div, t1);
 			append(div, span);
-			append(span, text2);
-			append(span, text3);
-			append(span, text4);
-			append(span, text5);
-			append(div, text6);
+			append(span, t2);
+			append(span, t3);
+			append(span, t4);
+			append(span, t5);
+			append(div, t6);
 			append(div, raw_before);
 			raw_before.insertAdjacentHTML("afterend", raw_value);
 		},
 
 		p(changed, ctx) {
-			if ((changed.comments) && text2_value !== (text2_value = ctx.comment.author)) {
-				setData(text2, text2_value);
+			if ((changed.comments) && t2_value !== (t2_value = ctx.comment.author)) {
+				set_data(t2, t2_value);
 			}
 
-			if ((changed.elapsed || changed.comments || changed.time) && text4_value !== (text4_value = ctx.elapsed(ctx.comment.time, ctx.time))) {
-				setData(text4, text4_value);
+			if ((changed.elapsed || changed.comments || changed.time) && t4_value !== (t4_value = ctx.elapsed(ctx.comment.time, ctx.time))) {
+				set_data(t4, t4_value);
 			}
 
 			if ((changed.comments) && raw_value !== (raw_value = ctx.comment.html)) {
-				detachAfter(raw_before);
+				detach_after(raw_before);
 				raw_before.insertAdjacentHTML("afterend", raw_value);
 			}
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 		}
 	};
 }
 
 function create_fragment(ctx) {
-	var text0, p, text1;
+	var t0, p, t1;
 
 	var each_value = ctx.comments;
 
@@ -84,9 +97,9 @@ function create_fragment(ctx) {
 				each_blocks[i].c();
 			}
 
-			text0 = createText("\n\n");
-			p = createElement("p");
-			text1 = createText(ctx.foo);
+			t0 = create_text("\n\n");
+			p = element("p");
+			t1 = create_text(ctx.foo);
 		},
 
 		m(target, anchor) {
@@ -94,9 +107,9 @@ function create_fragment(ctx) {
 				each_blocks[i].m(target, anchor);
 			}
 
-			insert(target, text0, anchor);
+			insert(target, t0, anchor);
 			insert(target, p, anchor);
-			append(p, text1);
+			append(p, t1);
 		},
 
 		p(changed, ctx) {
@@ -111,7 +124,7 @@ function create_fragment(ctx) {
 					} else {
 						each_blocks[i] = create_each_block(child_ctx);
 						each_blocks[i].c();
-						each_blocks[i].m(text0.parentNode, text0);
+						each_blocks[i].m(t0.parentNode, t0);
 					}
 				}
 
@@ -122,19 +135,19 @@ function create_fragment(ctx) {
 			}
 
 			if (changed.foo) {
-				setData(text1, ctx.foo);
+				set_data(t1, ctx.foo);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			destroyEach(each_blocks, detach);
+		d(detaching) {
+			destroy_each(each_blocks, detaching);
 
-			if (detach) {
-				detachNode(text0);
-				detachNode(p);
+			if (detaching) {
+				detach(t0);
+				detach(p);
 			}
 		}
 	};
diff --git a/test/js/samples/each-block-keyed-animated/expected.js b/test/js/samples/each-block-keyed-animated/expected.js
index cd37a916f6..8a5a69e878 100644
--- a/test/js/samples/each-block-keyed-animated/expected.js
+++ b/test/js/samples/each-block-keyed-animated/expected.js
@@ -1,5 +1,22 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, blankObject, createComment, createElement, createText, create_animation, detachNode, fixAndOutroAndDestroyBlock, fix_position, init, insert, noop, safe_not_equal, setData, updateKeyedEach } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	blank_object,
+	comment,
+	create_animation,
+	create_text,
+	detach,
+	element,
+	fix_and_outro_and_destroy_block,
+	fix_position,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data,
+	update_keyed_each
+} from "svelte/internal";
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = Object.create(ctx);
@@ -9,7 +26,7 @@ function get_each_context(ctx, list, i) {
 
 // (19:0) {#each things as thing (thing.id)}
 function create_each_block(key_1, ctx) {
-	var div, text_value = ctx.thing.name, text, rect, stop_animation = noop;
+	var div, t_value = ctx.thing.name, t, rect, stop_animation = noop;
 
 	return {
 		key: key_1,
@@ -17,19 +34,19 @@ function create_each_block(key_1, ctx) {
 		first: null,
 
 		c() {
-			div = createElement("div");
-			text = createText(text_value);
+			div = element("div");
+			t = create_text(t_value);
 			this.first = div;
 		},
 
 		m(target, anchor) {
 			insert(target, div, anchor);
-			append(div, text);
+			append(div, t);
 		},
 
 		p(changed, ctx) {
-			if ((changed.things) && text_value !== (text_value = ctx.thing.name)) {
-				setData(text, text_value);
+			if ((changed.things) && t_value !== (t_value = ctx.thing.name)) {
+				set_data(t, t_value);
 			}
 		},
 
@@ -47,16 +64,16 @@ function create_each_block(key_1, ctx) {
 			stop_animation = create_animation(div, rect, foo, {});
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 		}
 	};
 }
 
 function create_fragment(ctx) {
-	var each_blocks = [], each_lookup = blankObject(), each_anchor;
+	var each_blocks = [], each_1_lookup = blank_object(), each_1_anchor;
 
 	var each_value = ctx.things;
 
@@ -65,37 +82,37 @@ function create_fragment(ctx) {
 	for (var i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context(ctx, each_value, i);
 		let key = get_key(child_ctx);
-		each_blocks[i] = each_lookup[key] = create_each_block(key, child_ctx);
+		each_blocks[i] = each_1_lookup[key] = create_each_block(key, child_ctx);
 	}
 
 	return {
 		c() {
 			for (i = 0; i < each_blocks.length; i += 1) each_blocks[i].c();
 
-			each_anchor = createComment();
+			each_1_anchor = comment();
 		},
 
 		m(target, anchor) {
 			for (i = 0; i < each_blocks.length; i += 1) each_blocks[i].m(target, anchor);
 
-			insert(target, each_anchor, anchor);
+			insert(target, each_1_anchor, anchor);
 		},
 
 		p(changed, ctx) {
 			const each_value = ctx.things;
 			for (let i = 0; i < each_blocks.length; i += 1) each_blocks[i].r();
-			each_blocks = updateKeyedEach(each_blocks, changed, get_key, 1, ctx, each_value, each_lookup, each_anchor.parentNode, fixAndOutroAndDestroyBlock, create_each_block, each_anchor, get_each_context);
+			each_blocks = update_keyed_each(each_blocks, changed, get_key, 1, ctx, each_value, each_1_lookup, each_1_anchor.parentNode, fix_and_outro_and_destroy_block, create_each_block, each_1_anchor, get_each_context);
 			for (let i = 0; i < each_blocks.length; i += 1) each_blocks[i].a();
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			for (i = 0; i < each_blocks.length; i += 1) each_blocks[i].d(detach);
+		d(detaching) {
+			for (i = 0; i < each_blocks.length; i += 1) each_blocks[i].d(detaching);
 
-			if (detach) {
-				detachNode(each_anchor);
+			if (detaching) {
+				detach(each_1_anchor);
 			}
 		}
 	};
diff --git a/test/js/samples/each-block-keyed/expected.js b/test/js/samples/each-block-keyed/expected.js
index 081391780f..b896db617c 100644
--- a/test/js/samples/each-block-keyed/expected.js
+++ b/test/js/samples/each-block-keyed/expected.js
@@ -1,5 +1,20 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, blankObject, createComment, createElement, createText, destroyBlock, detachNode, init, insert, noop, safe_not_equal, setData, updateKeyedEach } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	blank_object,
+	comment,
+	create_text,
+	destroy_block,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_data,
+	update_keyed_each
+} from "svelte/internal";
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = Object.create(ctx);
@@ -9,7 +24,7 @@ function get_each_context(ctx, list, i) {
 
 // (5:0) {#each things as thing (thing.id)}
 function create_each_block(key_1, ctx) {
-	var div, text_value = ctx.thing.name, text;
+	var div, t_value = ctx.thing.name, t;
 
 	return {
 		key: key_1,
@@ -17,32 +32,32 @@ function create_each_block(key_1, ctx) {
 		first: null,
 
 		c() {
-			div = createElement("div");
-			text = createText(text_value);
+			div = element("div");
+			t = create_text(t_value);
 			this.first = div;
 		},
 
 		m(target, anchor) {
 			insert(target, div, anchor);
-			append(div, text);
+			append(div, t);
 		},
 
 		p(changed, ctx) {
-			if ((changed.things) && text_value !== (text_value = ctx.thing.name)) {
-				setData(text, text_value);
+			if ((changed.things) && t_value !== (t_value = ctx.thing.name)) {
+				set_data(t, t_value);
 			}
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 		}
 	};
 }
 
 function create_fragment(ctx) {
-	var each_blocks = [], each_lookup = blankObject(), each_anchor;
+	var each_blocks = [], each_1_lookup = blank_object(), each_1_anchor;
 
 	var each_value = ctx.things;
 
@@ -51,35 +66,35 @@ function create_fragment(ctx) {
 	for (var i = 0; i < each_value.length; i += 1) {
 		let child_ctx = get_each_context(ctx, each_value, i);
 		let key = get_key(child_ctx);
-		each_blocks[i] = each_lookup[key] = create_each_block(key, child_ctx);
+		each_blocks[i] = each_1_lookup[key] = create_each_block(key, child_ctx);
 	}
 
 	return {
 		c() {
 			for (i = 0; i < each_blocks.length; i += 1) each_blocks[i].c();
 
-			each_anchor = createComment();
+			each_1_anchor = comment();
 		},
 
 		m(target, anchor) {
 			for (i = 0; i < each_blocks.length; i += 1) each_blocks[i].m(target, anchor);
 
-			insert(target, each_anchor, anchor);
+			insert(target, each_1_anchor, anchor);
 		},
 
 		p(changed, ctx) {
 			const each_value = ctx.things;
-			each_blocks = updateKeyedEach(each_blocks, changed, get_key, 1, ctx, each_value, each_lookup, each_anchor.parentNode, destroyBlock, create_each_block, each_anchor, get_each_context);
+			each_blocks = update_keyed_each(each_blocks, changed, get_key, 1, ctx, each_value, each_1_lookup, each_1_anchor.parentNode, destroy_block, create_each_block, each_1_anchor, get_each_context);
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			for (i = 0; i < each_blocks.length; i += 1) each_blocks[i].d(detach);
+		d(detaching) {
+			for (i = 0; i < each_blocks.length; i += 1) each_blocks[i].d(detaching);
 
-			if (detach) {
-				detachNode(each_anchor);
+			if (detaching) {
+				detach(each_1_anchor);
 			}
 		}
 	};
diff --git a/test/js/samples/event-handler-no-passive/expected.js b/test/js/samples/event-handler-no-passive/expected.js
index da7882fdff..55e22666c1 100644
--- a/test/js/samples/event-handler-no-passive/expected.js
+++ b/test/js/samples/event-handler-no-passive/expected.js
@@ -1,15 +1,24 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var a, dispose;
 
 	return {
 		c() {
-			a = createElement("a");
+			a = element("a");
 			a.textContent = "this should not navigate to example.com";
 			a.href = "https://example.com";
-			dispose = addListener(a, "touchstart", touchstart_handler);
+			dispose = listen(a, "touchstart", touchstart_handler);
 		},
 
 		m(target, anchor) {
@@ -20,9 +29,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(a);
+		d(detaching) {
+			if (detaching) {
+				detach(a);
 			}
 
 			dispose();
diff --git a/test/js/samples/event-modifiers/expected.js b/test/js/samples/event-modifiers/expected.js
index f31ad09238..2ef4bf56ab 100644
--- a/test/js/samples/event-modifiers/expected.js
+++ b/test/js/samples/event-modifiers/expected.js
@@ -1,34 +1,48 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, append, createElement, createText, detachNode, init, insert, noop, preventDefault, run_all, safe_not_equal, stopPropagation } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	prevent_default,
+	run_all,
+	safe_not_equal,
+	stop_propagation
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var div, button0, text1, button1, text3, button2, dispose;
+	var div, button0, t1, button1, t3, button2, dispose;
 
 	return {
 		c() {
-			div = createElement("div");
-			button0 = createElement("button");
+			div = element("div");
+			button0 = element("button");
 			button0.textContent = "click me";
-			text1 = createText("\n\t");
-			button1 = createElement("button");
+			t1 = create_text("\n\t");
+			button1 = element("button");
 			button1.textContent = "or me";
-			text3 = createText("\n\t");
-			button2 = createElement("button");
+			t3 = create_text("\n\t");
+			button2 = element("button");
 			button2.textContent = "or me!";
 			dispose = [
-				addListener(button0, "click", stopPropagation(preventDefault(handleClick))),
-				addListener(button1, "click", handleClick, { once: true, capture: true }),
-				addListener(button2, "click", handleClick, true),
-				addListener(div, "touchstart", handleTouchstart, { passive: true })
+				listen(button0, "click", stop_propagation(prevent_default(handleClick))),
+				listen(button1, "click", handleClick, { once: true, capture: true }),
+				listen(button2, "click", handleClick, true),
+				listen(div, "touchstart", handleTouchstart, { passive: true })
 			];
 		},
 
 		m(target, anchor) {
 			insert(target, div, anchor);
 			append(div, button0);
-			append(div, text1);
+			append(div, t1);
 			append(div, button1);
-			append(div, text3);
+			append(div, t3);
 			append(div, button2);
 		},
 
@@ -36,9 +50,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 
 			run_all(dispose);
diff --git a/test/js/samples/head-no-whitespace/expected.js b/test/js/samples/head-no-whitespace/expected.js
index 136be77b59..552281ba66 100644
--- a/test/js/samples/head-no-whitespace/expected.js
+++ b/test/js/samples/head-no-whitespace/expected.js
@@ -1,13 +1,21 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createElement, detachNode, init, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	detach,
+	element,
+	init,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var meta0, meta1;
 
 	return {
 		c() {
-			meta0 = createElement("meta");
-			meta1 = createElement("meta");
+			meta0 = element("meta");
+			meta1 = element("meta");
 			meta0.name = "twitter:creator";
 			meta0.content = "@sveltejs";
 			meta1.name = "twitter:title";
@@ -23,9 +31,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			detachNode(meta0);
-			detachNode(meta1);
+		d(detaching) {
+			detach(meta0);
+			detach(meta1);
 		}
 	};
 }
diff --git a/test/js/samples/hoisted-const/expected.js b/test/js/samples/hoisted-const/expected.js
index 26169b25fe..0f6a5a05a9 100644
--- a/test/js/samples/hoisted-const/expected.js
+++ b/test/js/samples/hoisted-const/expected.js
@@ -1,27 +1,37 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var b, text_value = get_answer(), text;
+	var b, t_value = get_answer(), t;
 
 	return {
 		c() {
-			b = createElement("b");
-			text = createText(text_value);
+			b = element("b");
+			t = create_text(t_value);
 		},
 
 		m(target, anchor) {
 			insert(target, b, anchor);
-			append(b, text);
+			append(b, t);
 		},
 
 		p: noop,
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(b);
+		d(detaching) {
+			if (detaching) {
+				detach(b);
 			}
 		}
 	};
diff --git a/test/js/samples/hoisted-let/expected.js b/test/js/samples/hoisted-let/expected.js
index 409e5b1b45..cba0c12337 100644
--- a/test/js/samples/hoisted-let/expected.js
+++ b/test/js/samples/hoisted-let/expected.js
@@ -1,27 +1,37 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var b, text_value = get_answer(), text;
+	var b, t_value = get_answer(), t;
 
 	return {
 		c() {
-			b = createElement("b");
-			text = createText(text_value);
+			b = element("b");
+			t = create_text(t_value);
 		},
 
 		m(target, anchor) {
 			insert(target, b, anchor);
-			append(b, text);
+			append(b, t);
 		},
 
 		p: noop,
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(b);
+		d(detaching) {
+			if (detaching) {
+				detach(b);
 			}
 		}
 	};
diff --git a/test/js/samples/if-block-no-update/expected.js b/test/js/samples/if-block-no-update/expected.js
index b161285ffb..11fbf604b1 100644
--- a/test/js/samples/if-block-no-update/expected.js
+++ b/test/js/samples/if-block-no-update/expected.js
@@ -1,5 +1,14 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createComment, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	comment,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 // (7:0) {:else}
 function create_else_block(ctx) {
@@ -7,7 +16,7 @@ function create_else_block(ctx) {
 
 	return {
 		c() {
-			p = createElement("p");
+			p = element("p");
 			p.textContent = "not foo!";
 		},
 
@@ -15,9 +24,9 @@ function create_else_block(ctx) {
 			insert(target, p, anchor);
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
@@ -29,7 +38,7 @@ function create_if_block(ctx) {
 
 	return {
 		c() {
-			p = createElement("p");
+			p = element("p");
 			p.textContent = "foo!";
 		},
 
@@ -37,9 +46,9 @@ function create_if_block(ctx) {
 			insert(target, p, anchor);
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
@@ -59,7 +68,7 @@ function create_fragment(ctx) {
 	return {
 		c() {
 			if_block.c();
-			if_block_anchor = createComment();
+			if_block_anchor = comment();
 		},
 
 		m(target, anchor) {
@@ -81,11 +90,11 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if_block.d(detach);
+		d(detaching) {
+			if_block.d(detaching);
 
-			if (detach) {
-				detachNode(if_block_anchor);
+			if (detaching) {
+				detach(if_block_anchor);
 			}
 		}
 	};
diff --git a/test/js/samples/if-block-simple/expected.js b/test/js/samples/if-block-simple/expected.js
index db5fe0c42c..af8d45974f 100644
--- a/test/js/samples/if-block-simple/expected.js
+++ b/test/js/samples/if-block-simple/expected.js
@@ -1,5 +1,14 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createComment, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	comment,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 // (5:0) {#if foo}
 function create_if_block(ctx) {
@@ -7,7 +16,7 @@ function create_if_block(ctx) {
 
 	return {
 		c() {
-			p = createElement("p");
+			p = element("p");
 			p.textContent = "foo!";
 		},
 
@@ -15,9 +24,9 @@ function create_if_block(ctx) {
 			insert(target, p, anchor);
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
@@ -31,7 +40,7 @@ function create_fragment(ctx) {
 	return {
 		c() {
 			if (if_block) if_block.c();
-			if_block_anchor = createComment();
+			if_block_anchor = comment();
 		},
 
 		m(target, anchor) {
@@ -55,11 +64,11 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (if_block) if_block.d(detach);
+		d(detaching) {
+			if (if_block) if_block.d(detaching);
 
-			if (detach) {
-				detachNode(if_block_anchor);
+			if (detaching) {
+				detach(if_block_anchor);
 			}
 		}
 	};
diff --git a/test/js/samples/inline-style-optimized-multiple/expected.js b/test/js/samples/inline-style-optimized-multiple/expected.js
index 4b2c59672a..9766ca3738 100644
--- a/test/js/samples/inline-style-optimized-multiple/expected.js
+++ b/test/js/samples/inline-style-optimized-multiple/expected.js
@@ -1,14 +1,23 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createElement, detachNode, init, insert, noop, safe_not_equal, setStyle } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_style
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var div;
 
 	return {
 		c() {
-			div = createElement("div");
-			setStyle(div, "color", ctx.color);
-			setStyle(div, "transform", "translate(" + ctx.x + "px," + ctx.y + "px)");
+			div = element("div");
+			set_style(div, "color", ctx.color);
+			set_style(div, "transform", "translate(" + ctx.x + "px," + ctx.y + "px)");
 		},
 
 		m(target, anchor) {
@@ -17,20 +26,20 @@ function create_fragment(ctx) {
 
 		p(changed, ctx) {
 			if (changed.color) {
-				setStyle(div, "color", ctx.color);
+				set_style(div, "color", ctx.color);
 			}
 
 			if (changed.x || changed.y) {
-				setStyle(div, "transform", "translate(" + ctx.x + "px," + ctx.y + "px)");
+				set_style(div, "transform", "translate(" + ctx.x + "px," + ctx.y + "px)");
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 		}
 	};
diff --git a/test/js/samples/inline-style-optimized-url/expected.js b/test/js/samples/inline-style-optimized-url/expected.js
index dd64e40950..ffa679c429 100644
--- a/test/js/samples/inline-style-optimized-url/expected.js
+++ b/test/js/samples/inline-style-optimized-url/expected.js
@@ -1,13 +1,22 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createElement, detachNode, init, insert, noop, safe_not_equal, setStyle } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_style
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var div;
 
 	return {
 		c() {
-			div = createElement("div");
-			setStyle(div, "background", "url(data:image/png;base64," + ctx.data + ")");
+			div = element("div");
+			set_style(div, "background", "url(data:image/png;base64," + ctx.data + ")");
 		},
 
 		m(target, anchor) {
@@ -16,16 +25,16 @@ function create_fragment(ctx) {
 
 		p(changed, ctx) {
 			if (changed.data) {
-				setStyle(div, "background", "url(data:image/png;base64," + ctx.data + ")");
+				set_style(div, "background", "url(data:image/png;base64," + ctx.data + ")");
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 		}
 	};
diff --git a/test/js/samples/inline-style-optimized/expected.js b/test/js/samples/inline-style-optimized/expected.js
index 3948bc5fb0..0b97d34d56 100644
--- a/test/js/samples/inline-style-optimized/expected.js
+++ b/test/js/samples/inline-style-optimized/expected.js
@@ -1,13 +1,22 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createElement, detachNode, init, insert, noop, safe_not_equal, setStyle } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_style
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var div;
 
 	return {
 		c() {
-			div = createElement("div");
-			setStyle(div, "color", ctx.color);
+			div = element("div");
+			set_style(div, "color", ctx.color);
 		},
 
 		m(target, anchor) {
@@ -16,16 +25,16 @@ function create_fragment(ctx) {
 
 		p(changed, ctx) {
 			if (changed.color) {
-				setStyle(div, "color", ctx.color);
+				set_style(div, "color", ctx.color);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 		}
 	};
diff --git a/test/js/samples/inline-style-unoptimized/expected.js b/test/js/samples/inline-style-unoptimized/expected.js
index b9379a6838..27b52b67c7 100644
--- a/test/js/samples/inline-style-unoptimized/expected.js
+++ b/test/js/samples/inline-style-unoptimized/expected.js
@@ -1,21 +1,30 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createElement, createText, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var div0, text, div1, div1_style_value;
+	var div0, t, div1, div1_style_value;
 
 	return {
 		c() {
-			div0 = createElement("div");
-			text = createText("\n");
-			div1 = createElement("div");
+			div0 = element("div");
+			t = create_text("\n");
+			div1 = element("div");
 			div0.style.cssText = ctx.style;
 			div1.style.cssText = div1_style_value = "" + ctx.key + ": " + ctx.value;
 		},
 
 		m(target, anchor) {
 			insert(target, div0, anchor);
-			insert(target, text, anchor);
+			insert(target, t, anchor);
 			insert(target, div1, anchor);
 		},
 
@@ -32,11 +41,11 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div0);
-				detachNode(text);
-				detachNode(div1);
+		d(detaching) {
+			if (detaching) {
+				detach(div0);
+				detach(t);
+				detach(div1);
 			}
 		}
 	};
diff --git a/test/js/samples/input-files/expected.js b/test/js/samples/input-files/expected.js
index 697364106b..dad2af168c 100644
--- a/test/js/samples/input-files/expected.js
+++ b/test/js/samples/input-files/expected.js
@@ -1,15 +1,25 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, createElement, detachNode, init, insert, noop, safe_not_equal, setAttribute } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	attr,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var input, dispose;
 
 	return {
 		c() {
-			input = createElement("input");
-			setAttribute(input, "type", "file");
+			input = element("input");
+			attr(input, "type", "file");
 			input.multiple = true;
-			dispose = addListener(input, "input", ctx.input_input_handler);
+			dispose = listen(input, "input", ctx.input_input_handler);
 		},
 
 		m(target, anchor) {
@@ -20,9 +30,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(input);
+		d(detaching) {
+			if (detaching) {
+				detach(input);
 			}
 
 			dispose();
diff --git a/test/js/samples/input-range/expected.js b/test/js/samples/input-range/expected.js
index fff193f8e5..c57ef4f73b 100644
--- a/test/js/samples/input-range/expected.js
+++ b/test/js/samples/input-range/expected.js
@@ -1,17 +1,29 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, createElement, detachNode, init, insert, noop, run_all, safe_not_equal, setAttribute, toNumber } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	attr,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	run_all,
+	safe_not_equal,
+	to_number
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var input, dispose;
 
 	return {
 		c() {
-			input = createElement("input");
-			setAttribute(input, "type", "range");
+			input = element("input");
+			attr(input, "type", "range");
 
 			dispose = [
-				addListener(input, "change", ctx.input_change_input_handler),
-				addListener(input, "input", ctx.input_change_input_handler)
+				listen(input, "change", ctx.input_change_input_handler),
+				listen(input, "input", ctx.input_change_input_handler)
 			];
 		},
 
@@ -28,9 +40,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(input);
+		d(detaching) {
+			if (detaching) {
+				detach(input);
 			}
 
 			run_all(dispose);
@@ -42,7 +54,7 @@ function instance($$self, $$props, $$invalidate) {
 	let { value } = $$props;
 
 	function input_change_input_handler() {
-		value = toNumber(this.value);
+		value = to_number(this.value);
 		$$invalidate('value', value);
 	}
 
diff --git a/test/js/samples/input-without-blowback-guard/expected.js b/test/js/samples/input-without-blowback-guard/expected.js
index e97e4d1b0d..d47753396f 100644
--- a/test/js/samples/input-without-blowback-guard/expected.js
+++ b/test/js/samples/input-without-blowback-guard/expected.js
@@ -1,14 +1,24 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, createElement, detachNode, init, insert, noop, safe_not_equal, setAttribute } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	attr,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var input, dispose;
 
 	return {
 		c() {
-			input = createElement("input");
-			setAttribute(input, "type", "checkbox");
-			dispose = addListener(input, "change", ctx.input_change_handler);
+			input = element("input");
+			attr(input, "type", "checkbox");
+			dispose = listen(input, "change", ctx.input_change_handler);
 		},
 
 		m(target, anchor) {
@@ -24,9 +34,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(input);
+		d(detaching) {
+			if (detaching) {
+				detach(input);
 			}
 
 			dispose();
diff --git a/test/js/samples/instrumentation-script-if-no-block/expected.js b/test/js/samples/instrumentation-script-if-no-block/expected.js
index 4f7153e19e..ae835db80d 100644
--- a/test/js/samples/instrumentation-script-if-no-block/expected.js
+++ b/test/js/samples/instrumentation-script-if-no-block/expected.js
@@ -1,42 +1,54 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var button, text1, p, text2, text3, dispose;
+	var button, t1, p, t2, t3, dispose;
 
 	return {
 		c() {
-			button = createElement("button");
+			button = element("button");
 			button.textContent = "foo";
-			text1 = createText("\n\n");
-			p = createElement("p");
-			text2 = createText("x: ");
-			text3 = createText(ctx.x);
-			dispose = addListener(button, "click", ctx.foo);
+			t1 = create_text("\n\n");
+			p = element("p");
+			t2 = create_text("x: ");
+			t3 = create_text(ctx.x);
+			dispose = listen(button, "click", ctx.foo);
 		},
 
 		m(target, anchor) {
 			insert(target, button, anchor);
-			insert(target, text1, anchor);
+			insert(target, t1, anchor);
 			insert(target, p, anchor);
-			append(p, text2);
-			append(p, text3);
+			append(p, t2);
+			append(p, t3);
 		},
 
 		p(changed, ctx) {
 			if (changed.x) {
-				setData(text3, ctx.x);
+				set_data(t3, ctx.x);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(button);
-				detachNode(text1);
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(button);
+				detach(t1);
+				detach(p);
 			}
 
 			dispose();
diff --git a/test/js/samples/instrumentation-script-x-equals-x/expected.js b/test/js/samples/instrumentation-script-x-equals-x/expected.js
index 408e11279f..4b30477c4f 100644
--- a/test/js/samples/instrumentation-script-x-equals-x/expected.js
+++ b/test/js/samples/instrumentation-script-x-equals-x/expected.js
@@ -1,42 +1,54 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var button, text1, p, text2, text3_value = ctx.things.length, text3, dispose;
+	var button, t1, p, t2, t3_value = ctx.things.length, t3, dispose;
 
 	return {
 		c() {
-			button = createElement("button");
+			button = element("button");
 			button.textContent = "foo";
-			text1 = createText("\n\n");
-			p = createElement("p");
-			text2 = createText("number of things: ");
-			text3 = createText(text3_value);
-			dispose = addListener(button, "click", ctx.foo);
+			t1 = create_text("\n\n");
+			p = element("p");
+			t2 = create_text("number of things: ");
+			t3 = create_text(t3_value);
+			dispose = listen(button, "click", ctx.foo);
 		},
 
 		m(target, anchor) {
 			insert(target, button, anchor);
-			insert(target, text1, anchor);
+			insert(target, t1, anchor);
 			insert(target, p, anchor);
-			append(p, text2);
-			append(p, text3);
+			append(p, t2);
+			append(p, t3);
 		},
 
 		p(changed, ctx) {
-			if ((changed.things) && text3_value !== (text3_value = ctx.things.length)) {
-				setData(text3, text3_value);
+			if ((changed.things) && t3_value !== (t3_value = ctx.things.length)) {
+				set_data(t3, t3_value);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(button);
-				detachNode(text1);
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(button);
+				detach(t1);
+				detach(p);
 			}
 
 			dispose();
diff --git a/test/js/samples/instrumentation-template-if-no-block/expected.js b/test/js/samples/instrumentation-template-if-no-block/expected.js
index 29a764a8d5..0a9b5c6d04 100644
--- a/test/js/samples/instrumentation-template-if-no-block/expected.js
+++ b/test/js/samples/instrumentation-template-if-no-block/expected.js
@@ -1,42 +1,54 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var button, text1, p, text2, text3, dispose;
+	var button, t1, p, t2, t3, dispose;
 
 	return {
 		c() {
-			button = createElement("button");
+			button = element("button");
 			button.textContent = "foo";
-			text1 = createText("\n\n");
-			p = createElement("p");
-			text2 = createText("x: ");
-			text3 = createText(ctx.x);
-			dispose = addListener(button, "click", ctx.click_handler);
+			t1 = create_text("\n\n");
+			p = element("p");
+			t2 = create_text("x: ");
+			t3 = create_text(ctx.x);
+			dispose = listen(button, "click", ctx.click_handler);
 		},
 
 		m(target, anchor) {
 			insert(target, button, anchor);
-			insert(target, text1, anchor);
+			insert(target, t1, anchor);
 			insert(target, p, anchor);
-			append(p, text2);
-			append(p, text3);
+			append(p, t2);
+			append(p, t3);
 		},
 
 		p(changed, ctx) {
 			if (changed.x) {
-				setData(text3, ctx.x);
+				set_data(t3, ctx.x);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(button);
-				detachNode(text1);
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(button);
+				detach(t1);
+				detach(p);
 			}
 
 			dispose();
diff --git a/test/js/samples/instrumentation-template-x-equals-x/expected.js b/test/js/samples/instrumentation-template-x-equals-x/expected.js
index 909c4bfef6..6eb906a4ed 100644
--- a/test/js/samples/instrumentation-template-x-equals-x/expected.js
+++ b/test/js/samples/instrumentation-template-x-equals-x/expected.js
@@ -1,42 +1,54 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var button, text1, p, text2, text3_value = ctx.things.length, text3, dispose;
+	var button, t1, p, t2, t3_value = ctx.things.length, t3, dispose;
 
 	return {
 		c() {
-			button = createElement("button");
+			button = element("button");
 			button.textContent = "foo";
-			text1 = createText("\n\n");
-			p = createElement("p");
-			text2 = createText("number of things: ");
-			text3 = createText(text3_value);
-			dispose = addListener(button, "click", ctx.click_handler);
+			t1 = create_text("\n\n");
+			p = element("p");
+			t2 = create_text("number of things: ");
+			t3 = create_text(t3_value);
+			dispose = listen(button, "click", ctx.click_handler);
 		},
 
 		m(target, anchor) {
 			insert(target, button, anchor);
-			insert(target, text1, anchor);
+			insert(target, t1, anchor);
 			insert(target, p, anchor);
-			append(p, text2);
-			append(p, text3);
+			append(p, t2);
+			append(p, t3);
 		},
 
 		p(changed, ctx) {
-			if ((changed.things) && text3_value !== (text3_value = ctx.things.length)) {
-				setData(text3, text3_value);
+			if ((changed.things) && t3_value !== (t3_value = ctx.things.length)) {
+				set_data(t3, t3_value);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(button);
-				detachNode(text1);
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(button);
+				detach(t1);
+				detach(p);
 			}
 
 			dispose();
diff --git a/test/js/samples/legacy-input-type/expected.js b/test/js/samples/legacy-input-type/expected.js
index bc1d1f0155..1b3b32f6ce 100644
--- a/test/js/samples/legacy-input-type/expected.js
+++ b/test/js/samples/legacy-input-type/expected.js
@@ -1,13 +1,22 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createElement, detachNode, init, insert, noop, safe_not_equal, setInputType } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	set_input_type
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var input;
 
 	return {
 		c() {
-			input = createElement("input");
-			setInputType(input, "search");
+			input = element("input");
+			set_input_type(input, "search");
 		},
 
 		m(target, anchor) {
@@ -18,9 +27,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(input);
+		d(detaching) {
+			if (detaching) {
+				detach(input);
 			}
 		}
 	};
diff --git a/test/js/samples/media-bindings/expected.js b/test/js/samples/media-bindings/expected.js
index 97b6dbc82c..a2b64d7a49 100644
--- a/test/js/samples/media-bindings/expected.js
+++ b/test/js/samples/media-bindings/expected.js
@@ -1,5 +1,17 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, add_render_callback, createElement, detachNode, init, insert, noop, run_all, safe_not_equal, timeRangesToArray } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	add_render_callback,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	run_all,
+	safe_not_equal,
+	time_ranges_to_array
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var audio, audio_updating = false, audio_animationframe, audio_is_paused = true, dispose;
@@ -13,20 +25,20 @@ function create_fragment(ctx) {
 
 	return {
 		c() {
-			audio = createElement("audio");
+			audio = element("audio");
 			if (ctx.played === void 0 || ctx.currentTime === void 0) add_render_callback(audio_timeupdate_handler);
 			if (ctx.duration === void 0) add_render_callback(() => ctx.audio_durationchange_handler.call(audio));
 			if (ctx.buffered === void 0) add_render_callback(() => ctx.audio_progress_handler.call(audio));
 			if (ctx.buffered === void 0 || ctx.seekable === void 0) add_render_callback(() => ctx.audio_loadedmetadata_handler.call(audio));
 
 			dispose = [
-				addListener(audio, "timeupdate", audio_timeupdate_handler),
-				addListener(audio, "durationchange", ctx.audio_durationchange_handler),
-				addListener(audio, "play", ctx.audio_play_pause_handler),
-				addListener(audio, "pause", ctx.audio_play_pause_handler),
-				addListener(audio, "progress", ctx.audio_progress_handler),
-				addListener(audio, "loadedmetadata", ctx.audio_loadedmetadata_handler),
-				addListener(audio, "volumechange", ctx.audio_volumechange_handler)
+				listen(audio, "timeupdate", audio_timeupdate_handler),
+				listen(audio, "durationchange", ctx.audio_durationchange_handler),
+				listen(audio, "play", ctx.audio_play_pause_handler),
+				listen(audio, "pause", ctx.audio_play_pause_handler),
+				listen(audio, "progress", ctx.audio_progress_handler),
+				listen(audio, "loadedmetadata", ctx.audio_loadedmetadata_handler),
+				listen(audio, "volumechange", ctx.audio_volumechange_handler)
 			];
 		},
 
@@ -46,9 +58,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(audio);
+		d(detaching) {
+			if (detaching) {
+				detach(audio);
 			}
 
 			run_all(dispose);
@@ -60,7 +72,7 @@ function instance($$self, $$props, $$invalidate) {
 	let { buffered, seekable, played, currentTime, duration, paused, volume } = $$props;
 
 	function audio_timeupdate_handler() {
-		played = timeRangesToArray(this.played);
+		played = time_ranges_to_array(this.played);
 		currentTime = this.currentTime;
 		$$invalidate('played', played);
 		$$invalidate('currentTime', currentTime);
@@ -77,13 +89,13 @@ function instance($$self, $$props, $$invalidate) {
 	}
 
 	function audio_progress_handler() {
-		buffered = timeRangesToArray(this.buffered);
+		buffered = time_ranges_to_array(this.buffered);
 		$$invalidate('buffered', buffered);
 	}
 
 	function audio_loadedmetadata_handler() {
-		buffered = timeRangesToArray(this.buffered);
-		seekable = timeRangesToArray(this.seekable);
+		buffered = time_ranges_to_array(this.buffered);
+		seekable = time_ranges_to_array(this.seekable);
 		$$invalidate('buffered', buffered);
 		$$invalidate('seekable', seekable);
 	}
diff --git a/test/js/samples/non-imported-component/expected.js b/test/js/samples/non-imported-component/expected.js
index 6dcc5e6777..0741a14301 100644
--- a/test/js/samples/non-imported-component/expected.js
+++ b/test/js/samples/non-imported-component/expected.js
@@ -1,9 +1,18 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, createText, detachNode, init, insert, mount_component, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	create_text,
+	detach,
+	init,
+	insert,
+	mount_component,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 import Imported from "Imported.svelte";
 
 function create_fragment(ctx) {
-	var text, current;
+	var t, current;
 
 	var imported = new Imported({});
 
@@ -12,13 +21,13 @@ function create_fragment(ctx) {
 	return {
 		c() {
 			imported.$$.fragment.c();
-			text = createText("\n");
+			t = create_text("\n");
 			nonimported.$$.fragment.c();
 		},
 
 		m(target, anchor) {
 			mount_component(imported, target, anchor);
-			insert(target, text, anchor);
+			insert(target, t, anchor);
 			mount_component(nonimported, target, anchor);
 			current = true;
 		},
@@ -40,14 +49,14 @@ function create_fragment(ctx) {
 			current = false;
 		},
 
-		d(detach) {
-			imported.$destroy(detach);
+		d(detaching) {
+			imported.$destroy(detaching);
 
-			if (detach) {
-				detachNode(text);
+			if (detaching) {
+				detach(t);
 			}
 
-			nonimported.$destroy(detach);
+			nonimported.$destroy(detaching);
 		}
 	};
 }
diff --git a/test/js/samples/non-mutable-reference/expected.js b/test/js/samples/non-mutable-reference/expected.js
index 7d28dfab80..0c687ecd7a 100644
--- a/test/js/samples/non-mutable-reference/expected.js
+++ b/test/js/samples/non-mutable-reference/expected.js
@@ -1,31 +1,41 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var h1, text0, text1, text2;
+	var h1, t0, t1, t2;
 
 	return {
 		c() {
-			h1 = createElement("h1");
-			text0 = createText("Hello ");
-			text1 = createText(name);
-			text2 = createText("!");
+			h1 = element("h1");
+			t0 = create_text("Hello ");
+			t1 = create_text(name);
+			t2 = create_text("!");
 		},
 
 		m(target, anchor) {
 			insert(target, h1, anchor);
-			append(h1, text0);
-			append(h1, text1);
-			append(h1, text2);
+			append(h1, t0);
+			append(h1, t1);
+			append(h1, t2);
 		},
 
 		p: noop,
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(h1);
+		d(detaching) {
+			if (detaching) {
+				detach(h1);
 			}
 		}
 	};
diff --git a/test/js/samples/reactive-values-non-topologically-ordered/expected.js b/test/js/samples/reactive-values-non-topologically-ordered/expected.js
index 1145cf9b7e..bac07ebc7c 100644
--- a/test/js/samples/reactive-values-non-topologically-ordered/expected.js
+++ b/test/js/samples/reactive-values-non-topologically-ordered/expected.js
@@ -1,5 +1,10 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	return {
diff --git a/test/js/samples/reactive-values-non-writable-dependencies/expected.js b/test/js/samples/reactive-values-non-writable-dependencies/expected.js
index 76af68e6a8..b9aabdf76e 100644
--- a/test/js/samples/reactive-values-non-writable-dependencies/expected.js
+++ b/test/js/samples/reactive-values-non-writable-dependencies/expected.js
@@ -1,5 +1,10 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	return {
diff --git a/test/js/samples/select-dynamic-value/expected.js b/test/js/samples/select-dynamic-value/expected.js
index 8e875e3dd0..82698aafdc 100644
--- a/test/js/samples/select-dynamic-value/expected.js
+++ b/test/js/samples/select-dynamic-value/expected.js
@@ -1,15 +1,24 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createElement, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var select, option0, option1, select_value_value;
 
 	return {
 		c() {
-			select = createElement("select");
-			option0 = createElement("option");
+			select = element("select");
+			option0 = element("option");
 			option0.textContent = "1";
-			option1 = createElement("option");
+			option1 = element("option");
 			option1.textContent = "2";
 			option0.__value = "1";
 			option0.value = option0.__value;
@@ -49,9 +58,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(select);
+		d(detaching) {
+			if (detaching) {
+				detach(select);
 			}
 		}
 	};
diff --git a/test/js/samples/setup-method/expected.js b/test/js/samples/setup-method/expected.js
index 3cb71af431..dbde1c9039 100644
--- a/test/js/samples/setup-method/expected.js
+++ b/test/js/samples/setup-method/expected.js
@@ -1,5 +1,10 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	return {
diff --git a/test/js/samples/svg-title/expected.js b/test/js/samples/svg-title/expected.js
index 5d4bc61ee8..496a24d29a 100644
--- a/test/js/samples/svg-title/expected.js
+++ b/test/js/samples/svg-title/expected.js
@@ -1,29 +1,39 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createSvgElement, createText, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	create_text,
+	detach,
+	init,
+	insert,
+	noop,
+	safe_not_equal,
+	svg_element
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var svg, title, text;
+	var svg, title, t;
 
 	return {
 		c() {
-			svg = createSvgElement("svg");
-			title = createSvgElement("title");
-			text = createText("a title");
+			svg = svg_element("svg");
+			title = svg_element("title");
+			t = create_text("a title");
 		},
 
 		m(target, anchor) {
 			insert(target, svg, anchor);
 			append(svg, title);
-			append(title, text);
+			append(title, t);
 		},
 
 		p: noop,
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(svg);
+		d(detaching) {
+			if (detaching) {
+				detach(svg);
 			}
 		}
 	};
diff --git a/test/js/samples/title/expected.js b/test/js/samples/title/expected.js
index c9be2e6039..076582ac6f 100644
--- a/test/js/samples/title/expected.js
+++ b/test/js/samples/title/expected.js
@@ -1,5 +1,10 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, init, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	init,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 function create_fragment(ctx) {
 	var title_value;
diff --git a/test/js/samples/transition-local/expected.js b/test/js/samples/transition-local/expected.js
index c24e680820..b98d2a4520 100644
--- a/test/js/samples/transition-local/expected.js
+++ b/test/js/samples/transition-local/expected.js
@@ -1,5 +1,16 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, add_render_callback, createComment, createElement, create_in_transition, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	add_render_callback,
+	comment,
+	create_in_transition,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 // (8:0) {#if x}
 function create_if_block(ctx) {
@@ -10,7 +21,7 @@ function create_if_block(ctx) {
 	return {
 		c() {
 			if (if_block) if_block.c();
-			if_block_anchor = createComment();
+			if_block_anchor = comment();
 		},
 
 		m(target, anchor) {
@@ -34,11 +45,11 @@ function create_if_block(ctx) {
 			}
 		},
 
-		d(detach) {
-			if (if_block) if_block.d(detach);
+		d(detaching) {
+			if (if_block) if_block.d(detaching);
 
-			if (detach) {
-				detachNode(if_block_anchor);
+			if (detaching) {
+				detach(if_block_anchor);
 			}
 		}
 	};
@@ -50,7 +61,7 @@ function create_if_block_1(ctx) {
 
 	return {
 		c() {
-			div = createElement("div");
+			div = element("div");
 			div.textContent = "...";
 		},
 
@@ -71,9 +82,9 @@ function create_if_block_1(ctx) {
 
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 		}
 	};
@@ -87,7 +98,7 @@ function create_fragment(ctx) {
 	return {
 		c() {
 			if (if_block) if_block.c();
-			if_block_anchor = createComment();
+			if_block_anchor = comment();
 		},
 
 		m(target, anchor) {
@@ -113,11 +124,11 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (if_block) if_block.d(detach);
+		d(detaching) {
+			if (if_block) if_block.d(detaching);
 
-			if (detach) {
-				detachNode(if_block_anchor);
+			if (detaching) {
+				detach(if_block_anchor);
 			}
 		}
 	};
diff --git a/test/js/samples/use-elements-as-anchors/expected.js b/test/js/samples/use-elements-as-anchors/expected.js
index 2c46938496..b7b19bc220 100644
--- a/test/js/samples/use-elements-as-anchors/expected.js
+++ b/test/js/samples/use-elements-as-anchors/expected.js
@@ -1,5 +1,16 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, append, createComment, createElement, createText, detachNode, init, insert, noop, safe_not_equal } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	append,
+	comment,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	noop,
+	safe_not_equal
+} from "svelte/internal";
 
 // (10:1) {#if a}
 function create_if_block_4(ctx) {
@@ -7,7 +18,7 @@ function create_if_block_4(ctx) {
 
 	return {
 		c() {
-			p = createElement("p");
+			p = element("p");
 			p.textContent = "a";
 		},
 
@@ -15,9 +26,9 @@ function create_if_block_4(ctx) {
 			insert(target, p, anchor);
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
@@ -29,7 +40,7 @@ function create_if_block_3(ctx) {
 
 	return {
 		c() {
-			p = createElement("p");
+			p = element("p");
 			p.textContent = "b";
 		},
 
@@ -37,9 +48,9 @@ function create_if_block_3(ctx) {
 			insert(target, p, anchor);
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
@@ -51,7 +62,7 @@ function create_if_block_2(ctx) {
 
 	return {
 		c() {
-			p = createElement("p");
+			p = element("p");
 			p.textContent = "c";
 		},
 
@@ -59,9 +70,9 @@ function create_if_block_2(ctx) {
 			insert(target, p, anchor);
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
@@ -73,7 +84,7 @@ function create_if_block_1(ctx) {
 
 	return {
 		c() {
-			p = createElement("p");
+			p = element("p");
 			p.textContent = "d";
 		},
 
@@ -81,9 +92,9 @@ function create_if_block_1(ctx) {
 			insert(target, p, anchor);
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
@@ -95,7 +106,7 @@ function create_if_block(ctx) {
 
 	return {
 		c() {
-			p = createElement("p");
+			p = element("p");
 			p.textContent = "e";
 		},
 
@@ -103,16 +114,16 @@ function create_if_block(ctx) {
 			insert(target, p, anchor);
 		},
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 		}
 	};
 }
 
 function create_fragment(ctx) {
-	var div, text0, p0, text2, text3, text4, p1, text6, text7, if_block4_anchor;
+	var div, t0, p0, t2, t3, t4, p1, t6, t7, if_block4_anchor;
 
 	var if_block0 = (ctx.a) && create_if_block_4(ctx);
 
@@ -126,39 +137,39 @@ function create_fragment(ctx) {
 
 	return {
 		c() {
-			div = createElement("div");
+			div = element("div");
 			if (if_block0) if_block0.c();
-			text0 = createText("\n\n\t");
-			p0 = createElement("p");
+			t0 = create_text("\n\n\t");
+			p0 = element("p");
 			p0.textContent = "this can be used as an anchor";
-			text2 = createText("\n\n\t");
+			t2 = create_text("\n\n\t");
 			if (if_block1) if_block1.c();
-			text3 = createText("\n\n\t");
+			t3 = create_text("\n\n\t");
 			if (if_block2) if_block2.c();
-			text4 = createText("\n\n\t");
-			p1 = createElement("p");
+			t4 = create_text("\n\n\t");
+			p1 = element("p");
 			p1.textContent = "so can this";
-			text6 = createText("\n\n\t");
+			t6 = create_text("\n\n\t");
 			if (if_block3) if_block3.c();
-			text7 = createText("\n\n");
+			t7 = create_text("\n\n");
 			if (if_block4) if_block4.c();
-			if_block4_anchor = createComment();
+			if_block4_anchor = comment();
 		},
 
 		m(target, anchor) {
 			insert(target, div, anchor);
 			if (if_block0) if_block0.m(div, null);
-			append(div, text0);
+			append(div, t0);
 			append(div, p0);
-			append(div, text2);
+			append(div, t2);
 			if (if_block1) if_block1.m(div, null);
-			append(div, text3);
+			append(div, t3);
 			if (if_block2) if_block2.m(div, null);
-			append(div, text4);
+			append(div, t4);
 			append(div, p1);
-			append(div, text6);
+			append(div, t6);
 			if (if_block3) if_block3.m(div, null);
-			insert(target, text7, anchor);
+			insert(target, t7, anchor);
 			if (if_block4) if_block4.m(target, anchor);
 			insert(target, if_block4_anchor, anchor);
 		},
@@ -168,7 +179,7 @@ function create_fragment(ctx) {
 				if (!if_block0) {
 					if_block0 = create_if_block_4(ctx);
 					if_block0.c();
-					if_block0.m(div, text0);
+					if_block0.m(div, t0);
 				}
 			} else if (if_block0) {
 				if_block0.d(1);
@@ -179,7 +190,7 @@ function create_fragment(ctx) {
 				if (!if_block1) {
 					if_block1 = create_if_block_3(ctx);
 					if_block1.c();
-					if_block1.m(div, text3);
+					if_block1.m(div, t3);
 				}
 			} else if (if_block1) {
 				if_block1.d(1);
@@ -190,7 +201,7 @@ function create_fragment(ctx) {
 				if (!if_block2) {
 					if_block2 = create_if_block_2(ctx);
 					if_block2.c();
-					if_block2.m(div, text4);
+					if_block2.m(div, t4);
 				}
 			} else if (if_block2) {
 				if_block2.d(1);
@@ -223,9 +234,9 @@ function create_fragment(ctx) {
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(div);
+		d(detaching) {
+			if (detaching) {
+				detach(div);
 			}
 
 			if (if_block0) if_block0.d();
@@ -233,14 +244,14 @@ function create_fragment(ctx) {
 			if (if_block2) if_block2.d();
 			if (if_block3) if_block3.d();
 
-			if (detach) {
-				detachNode(text7);
+			if (detaching) {
+				detach(t7);
 			}
 
-			if (if_block4) if_block4.d(detach);
+			if (if_block4) if_block4.d(detaching);
 
-			if (detach) {
-				detachNode(if_block4_anchor);
+			if (detaching) {
+				detach(if_block4_anchor);
 			}
 		}
 	};
diff --git a/test/js/samples/window-binding-scroll/expected.js b/test/js/samples/window-binding-scroll/expected.js
index e1e03bf66d..375e03ec38 100644
--- a/test/js/samples/window-binding-scroll/expected.js
+++ b/test/js/samples/window-binding-scroll/expected.js
@@ -1,17 +1,30 @@
 /* generated by Svelte vX.Y.Z */
-import { SvelteComponent as SvelteComponent_1, addListener, add_render_callback, append, createElement, createText, detachNode, init, insert, noop, safe_not_equal, setData } from "svelte/internal";
+import {
+	SvelteComponent as SvelteComponent_1,
+	add_render_callback,
+	append,
+	create_text,
+	detach,
+	element,
+	init,
+	insert,
+	listen,
+	noop,
+	safe_not_equal,
+	set_data
+} from "svelte/internal";
 
 function create_fragment(ctx) {
-	var scrolling = false, clear_scrolling = () => { scrolling = false }, scrolling_timeout, p, text0, text1, dispose;
+	var scrolling = false, clear_scrolling = () => { scrolling = false }, scrolling_timeout, p, t0, t1, dispose;
 
 	add_render_callback(ctx.onwindowscroll);
 
 	return {
 		c() {
-			p = createElement("p");
-			text0 = createText("scrolled to ");
-			text1 = createText(ctx.y);
-			dispose = addListener(window, "scroll", () => {
+			p = element("p");
+			t0 = create_text("scrolled to ");
+			t1 = create_text(ctx.y);
+			dispose = listen(window, "scroll", () => {
 				scrolling = true;
 				clearTimeout(scrolling_timeout);
 				scrolling_timeout = setTimeout(clear_scrolling, 100);
@@ -21,8 +34,8 @@ function create_fragment(ctx) {
 
 		m(target, anchor) {
 			insert(target, p, anchor);
-			append(p, text0);
-			append(p, text1);
+			append(p, t0);
+			append(p, t1);
 		},
 
 		p(changed, ctx) {
@@ -34,16 +47,16 @@ function create_fragment(ctx) {
 			}
 
 			if (changed.y) {
-				setData(text1, ctx.y);
+				set_data(t1, ctx.y);
 			}
 		},
 
 		i: noop,
 		o: noop,
 
-		d(detach) {
-			if (detach) {
-				detachNode(p);
+		d(detaching) {
+			if (detaching) {
+				detach(p);
 			}
 
 			dispose();