diff --git a/site/content/examples/immutable/App.html b/site/content/examples/immutable/App.html
index db7795f43f..b5d78a165a 100644
--- a/site/content/examples/immutable/App.html
+++ b/site/content/examples/immutable/App.html
@@ -1,4 +1,4 @@
-<svelte:meta immutable/>
+<svelte:options immutable/>
 
 <script>
 	import ImmutableTodo from './ImmutableTodo.html';
diff --git a/site/content/examples/immutable/ImmutableTodo.html b/site/content/examples/immutable/ImmutableTodo.html
index bc2403f048..60992c61cb 100644
--- a/site/content/examples/immutable/ImmutableTodo.html
+++ b/site/content/examples/immutable/ImmutableTodo.html
@@ -1,4 +1,4 @@
-<svelte:meta immutable/>
+<svelte:options immutable/>
 
 <script>
 	import { afterUpdate } from 'svelte';
diff --git a/src/compile/Component.ts b/src/compile/Component.ts
index a09955d86d..de960813b4 100644
--- a/src/compile/Component.ts
+++ b/src/compile/Component.ts
@@ -23,7 +23,7 @@ import getObject from '../utils/getObject';
 import deindent from '../utils/deindent';
 import globalWhitelist from '../utils/globalWhitelist';
 
-type Meta = {
+type ComponentOptions = {
 	namespace?: string;
 	tag?: string;
 	immutable?: boolean;
@@ -45,13 +45,13 @@ export default class Component {
 	source: string;
 	code: MagicString;
 	name: string;
-	options: CompileOptions;
+	compileOptions: CompileOptions;
 	fragment: Fragment;
 	module_scope: Scope;
 	instance_scope: Scope;
 	instance_scope_map: WeakMap<Node, Scope>;
 
-	meta: Meta;
+	componentOptions: ComponentOptions;
 	namespace: string;
 	tag: string;
 
@@ -90,7 +90,7 @@ export default class Component {
 		ast: Ast,
 		source: string,
 		name: string,
-		options: CompileOptions,
+		compileOptions: CompileOptions,
 		stats: Stats
 	) {
 		this.name = name;
@@ -98,34 +98,34 @@ export default class Component {
 		this.stats = stats;
 		this.ast = ast;
 		this.source = source;
-		this.options = options;
+		this.compileOptions = compileOptions;
 
-		this.file = options.filename && (
-			typeof process !== 'undefined' ? options.filename.replace(process.cwd(), '').replace(/^[\/\\]/, '') : options.filename
+		this.file = compileOptions.filename && (
+			typeof process !== 'undefined' ? compileOptions.filename.replace(process.cwd(), '').replace(/^[\/\\]/, '') : compileOptions.filename
 		);
 		this.locate = getLocator(this.source);
 
 		this.code = new MagicString(source);
 
 		// styles
-		this.stylesheet = new Stylesheet(source, ast, options.filename, options.dev);
+		this.stylesheet = new Stylesheet(source, ast, compileOptions.filename, compileOptions.dev);
 		this.stylesheet.validate(this);
 
-		this.meta = process_meta(this, this.ast.html.children);
-		this.namespace = namespaces[this.meta.namespace] || this.meta.namespace;
+		this.componentOptions = process_component_options(this, this.ast.html.children);
+		this.namespace = namespaces[this.componentOptions.namespace] || this.componentOptions.namespace;
 
-		if (this.meta.props) {
+		if (this.componentOptions.props) {
 			this.has_reactive_assignments = true;
 		}
 
-		if (options.customElement === true && !this.meta.tag) {
+		if (compileOptions.customElement === true && !this.componentOptions.tag) {
 			throw new Error(`No tag name specified`); // TODO better error
 		}
 
-		this.tag = options.customElement
-			? options.customElement === true
-				? this.meta.tag
-				: options.customElement as string
+		this.tag = compileOptions.customElement
+			? compileOptions.customElement === true
+				? this.componentOptions.tag
+				: compileOptions.customElement as string
 			: this.name;
 
 		this.walk_module_js();
@@ -136,7 +136,7 @@ export default class Component {
 
 		this.walk_instance_js_post_template();
 
-		if (!options.customElement) this.stylesheet.reify();
+		if (!compileOptions.customElement) this.stylesheet.reify();
 
 		this.stylesheet.warnOnUnusedSelectors(stats);
 	}
@@ -196,18 +196,18 @@ export default class Component {
 	}
 
 	generate(result: string) {
-		const { options, name } = this;
-		const { format = 'esm' } = options;
+		const { compileOptions, name } = this;
+		const { format = 'esm' } = compileOptions;
 
 		const banner = `/* ${this.file ? `${this.file} ` : ``}generated by Svelte v${"__VERSION__"} */`;
 
 		const helpers = new Set();
 
 		// TODO use same regex for both
-		result = result.replace(options.generate === 'ssr' ? /(@+|#+)(\w*(?:-\w*)?)/g : /(@+)(\w*(?:-\w*)?)/g, (match: string, sigil: string, name: string) => {
+		result = result.replace(compileOptions.generate === 'ssr' ? /(@+|#+)(\w*(?:-\w*)?)/g : /(@+)(\w*(?:-\w*)?)/g, (match: string, sigil: string, name: string) => {
 			if (sigil === '@') {
 				if (internal_exports.has(name)) {
-					if (options.dev && internal_exports.has(`${name}Dev`)) name = `${name}Dev`;
+					if (compileOptions.dev && internal_exports.has(`${name}Dev`)) name = `${name}Dev`;
 					helpers.add(name);
 				}
 
@@ -228,10 +228,10 @@ export default class Component {
 			result,
 			format,
 			name,
-			options,
+			compileOptions,
 			this.stats,
 			banner,
-			options.sveltePath,
+			compileOptions.sveltePath,
 			importedHelpers,
 			this.imports,
 			this.vars.filter(variable => variable.module && variable.export_name).map(variable => ({
@@ -252,7 +252,7 @@ export default class Component {
 			});
 		}
 
-		const { filename } = options;
+		const { filename } = compileOptions;
 
 		// special case — the source file doesn't actually get used anywhere. we need
 		// to add an empty file to populate map.sources and map.sourcesContent
@@ -281,15 +281,15 @@ export default class Component {
 
 		addString(finalChunk);
 
-		const css = options.customElement ?
+		const css = compileOptions.customElement ?
 			{ code: null, map: null } :
-			this.stylesheet.render(options.cssOutputFilename, true);
+			this.stylesheet.render(compileOptions.cssOutputFilename, true);
 
 		const js = {
 			code: compiled.toString(),
 			map: compiled.generateMap({
 				includeContent: true,
-				file: options.outputFilename,
+				file: compileOptions.outputFilename,
 			})
 		};
 
@@ -355,7 +355,7 @@ export default class Component {
 			source: this.source,
 			start: pos.start,
 			end: pos.end,
-			filename: this.options.filename
+			filename: this.compileOptions.filename
 		});
 	}
 
@@ -385,7 +385,7 @@ export default class Component {
 			start,
 			end,
 			pos: pos.start,
-			filename: this.options.filename,
+			filename: this.compileOptions.filename,
 			toString: () => `${warning.message} (${start.line + 1}:${start.column})\n${frame}`,
 		});
 	}
@@ -692,7 +692,7 @@ export default class Component {
 
 	rewrite_props() {
 		const component = this;
-		const { code, instance_scope, instance_scope_map: map, meta } = this;
+		const { code, instance_scope, instance_scope_map: map, componentOptions } = this;
 		let scope = instance_scope;
 
 		const coalesced_declarations = [];
@@ -718,10 +718,10 @@ export default class Component {
 							extractNames(declarator.id).forEach(name => {
 								const variable = component.var_lookup.get(name);
 
-								if (name === meta.props_object) {
+								if (name === componentOptions.props_object) {
 									if (variable.export_name) {
 										component.error(declarator, {
-											code: 'exported-meta-props',
+											code: 'exported-options-props',
 											message: `Cannot export props binding`
 										});
 									}
@@ -1073,12 +1073,12 @@ export default class Component {
 	}
 }
 
-function process_meta(component, nodes) {
-	const meta: Meta = {
-		immutable: component.options.immutable || false
+function process_component_options(component: Component, nodes) {
+	const componentOptions: ComponentOptions = {
+		immutable: component.compileOptions.immutable || false
 	};
 
-	const node = nodes.find(node => node.name === 'svelte:meta');
+	const node = nodes.find(node => node.name === 'svelte:options');
 
 	function get_value(attribute, code, message) {
 		const { value } = attribute;
@@ -1119,7 +1119,7 @@ function process_meta(component, nodes) {
 							});
 						}
 
-						meta.tag = tag;
+						componentOptions.tag = tag;
 						break;
 					}
 
@@ -1145,7 +1145,7 @@ function process_meta(component, nodes) {
 							}
 						}
 
-						meta.namespace = ns;
+						componentOptions.namespace = ns;
 						break;
 					}
 
@@ -1156,13 +1156,13 @@ function process_meta(component, nodes) {
 
 						if (typeof value !== 'boolean') component.error(attribute, { code, message });
 
-						meta.immutable = value;
+						componentOptions.immutable = value;
 						break;
 
 					default:
 						component.error(attribute, {
-							code: `invalid-meta-attribute`,
-							message: `<svelte:meta> unknown attribute`
+							code: `invalid-options-attribute`,
+							message: `<svelte:options> unknown attribute`
 						});
 				}
 			}
@@ -1170,26 +1170,26 @@ function process_meta(component, nodes) {
 			else if (attribute.type === 'Binding') {
 				if (attribute.name !== 'props') {
 					component.error(attribute, {
-						code: `invalid-meta-binding`,
-						message: `<svelte:meta> only supports bind:props`
+						code: `invalid-options-binding`,
+						message: `<svelte:options> only supports bind:props`
 					});
 				}
 
 				const { start, end } = attribute.expression;
 				const { name } = flattenReference(attribute.expression);
 
-				meta.props = `[✂${start}-${end}✂]`;
-				meta.props_object = name;
+				componentOptions.props = `[✂${start}-${end}✂]`;
+				componentOptions.props_object = name;
 			}
 
 			else {
 				component.error(attribute, {
-					code: `invalid-meta-attribute`,
-					message: `<svelte:meta> can only have static 'tag', 'namespace' and 'immutable' attributes, or a bind:props directive`
+					code: `invalid-options-attribute`,
+					message: `<svelte:options> can only have static 'tag', 'namespace' and 'immutable' attributes, or a bind:props directive`
 				});
 			}
 		});
 	}
 
-	return meta;
+	return componentOptions;
 }
diff --git a/src/compile/nodes/Element.ts b/src/compile/nodes/Element.ts
index 44e91b6408..ed0a0a3265 100644
--- a/src/compile/nodes/Element.ts
+++ b/src/compile/nodes/Element.ts
@@ -618,7 +618,7 @@ export default class Element extends Node {
 					}
 				}
 
-				if (component.options.legacy && (modifier === 'once' || modifier === 'passive')) {
+				if (component.compileOptions.legacy && (modifier === 'once' || modifier === 'passive')) {
 					// TODO this could be supported, but it would need a few changes to
 					// how event listeners work
 					component.error(handler, {
@@ -695,4 +695,4 @@ function shouldHaveAttribute(
 		code: `a11y-missing-attribute`,
 		message: `A11y: <${name}> element should have ${article} ${sequence} attribute`
 	});
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/Meta.ts b/src/compile/nodes/Meta.ts
deleted file mode 100644
index 7e93b8d0d9..0000000000
--- a/src/compile/nodes/Meta.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import Node from './shared/Node';
-
-export default class Meta extends Node {
-	type: 'Meta';
-}
\ No newline at end of file
diff --git a/src/compile/nodes/Options.ts b/src/compile/nodes/Options.ts
new file mode 100644
index 0000000000..613587604e
--- /dev/null
+++ b/src/compile/nodes/Options.ts
@@ -0,0 +1,5 @@
+import Node from './shared/Node';
+
+export default class Options extends Node {
+	type: 'Options';
+}
diff --git a/src/compile/nodes/shared/Node.ts b/src/compile/nodes/shared/Node.ts
index 5d8435965c..330dac3e35 100644
--- a/src/compile/nodes/shared/Node.ts
+++ b/src/compile/nodes/shared/Node.ts
@@ -49,7 +49,7 @@ export default class Node {
 	}
 
 	warnIfEmptyBlock() {
-		if (!this.component.options.dev) return;
+		if (!this.component.compileOptions.dev) return;
 		if (!/Block$/.test(this.type) || !this.children) return;
 		if (this.children.length > 1) return;
 
@@ -62,4 +62,4 @@ export default class Node {
 			});
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/compile/nodes/shared/mapChildren.ts b/src/compile/nodes/shared/mapChildren.ts
index 21df3e2918..9cd49fad94 100644
--- a/src/compile/nodes/shared/mapChildren.ts
+++ b/src/compile/nodes/shared/mapChildren.ts
@@ -6,8 +6,8 @@ import Element from '../Element';
 import Head from '../Head';
 import IfBlock from '../IfBlock';
 import InlineComponent from '../InlineComponent';
-import Meta from '../Meta';
 import MustacheTag from '../MustacheTag';
+import Options from '../Options';
 import RawMustacheTag from '../RawMustacheTag';
 import DebugTag from '../DebugTag';
 import Slot from '../Slot';
@@ -26,8 +26,8 @@ function getConstructor(type): typeof Node {
 		case 'Head': return Head;
 		case 'IfBlock': return IfBlock;
 		case 'InlineComponent': return InlineComponent;
-		case 'Meta': return Meta;
 		case 'MustacheTag': return MustacheTag;
+		case 'Options': return Options;
 		case 'RawMustacheTag': return RawMustacheTag;
 		case 'DebugTag': return DebugTag;
 		case 'Slot': return Slot;
diff --git a/src/compile/render-dom/index.ts b/src/compile/render-dom/index.ts
index 8567725763..ecfe790f38 100644
--- a/src/compile/render-dom/index.ts
+++ b/src/compile/render-dom/index.ts
@@ -28,7 +28,7 @@ export default function dom(
 
 	const builder = new CodeBuilder();
 
-	if (component.options.dev) {
+	if (component.compileOptions.dev) {
 		builder.addLine(`const ${renderer.fileVar} = ${JSON.stringify(component.file)};`);
 	}
 
@@ -37,7 +37,7 @@ export default function dom(
 		`${css.code}\n/*# sourceMappingURL=${css.map.toUrl()} */` :
 		css.code, { onlyEscapeAtSymbol: true });
 
-	if (styles && component.options.css !== false && !options.customElement) {
+	if (styles && component.compileOptions.css !== false && !options.customElement) {
 		builder.addBlock(deindent`
 			function @add_css() {
 				var style = @createElement("style");
@@ -73,13 +73,13 @@ export default function dom(
 	const props = component.vars.filter(variable => !variable.module && variable.export_name);
 	const writable_props = props.filter(variable => variable.writable);
 
-	const set = (component.meta.props || writable_props.length > 0 || renderer.slots.size > 0)
+	const set = (component.componentOptions.props || writable_props.length > 0 || renderer.slots.size > 0)
 		? deindent`
 			$$props => {
-				${component.meta.props && deindent`
-				if (!${component.meta.props}) ${component.meta.props} = {};
-				@assign(${component.meta.props}, $$props);
-				$$invalidate('${component.meta.props_object}', ${component.meta.props_object});
+				${component.componentOptions.props && deindent`
+				if (!${component.componentOptions.props}) ${component.componentOptions.props} = {};
+				@assign(${component.componentOptions.props}, $$props);
+				$$invalidate('${component.componentOptions.props_object}', ${component.componentOptions.props_object});
 				`}
 				${writable_props.map(prop =>
 				`if ('${prop.export_name}' in $$props) $$invalidate('${prop.name}', ${prop.name} = $$props.${prop.export_name});`)}
@@ -91,7 +91,7 @@ export default function dom(
 
 	const body = [];
 
-	const not_equal = component.meta.immutable ? `@not_equal` : `@safe_not_equal`;
+	const not_equal = component.componentOptions.immutable ? `@not_equal` : `@safe_not_equal`;
 	let dev_props_check;
 
 	props.forEach(x => {
@@ -118,7 +118,7 @@ export default function dom(
 					@flush();
 				}
 			`);
-		} else if (component.options.dev) {
+		} else if (component.compileOptions.dev) {
 			body.push(deindent`
 				set ${x.export_name}(value) {
 					throw new Error("<${component.tag}>: Cannot set read-only property '${x.export_name}'");
@@ -127,7 +127,7 @@ export default function dom(
 		}
 	});
 
-	if (component.options.dev) {
+	if (component.compileOptions.dev) {
 		// TODO check no uunexpected props were passed, as well as
 		// checking that expected ones were passed
 		const expected = props.filter(prop => !prop.initialised);
@@ -306,7 +306,7 @@ export default function dom(
 	const reactive_store_subscriptions = reactive_stores.length > 0 && reactive_stores
 		.map(({ name }) => deindent`
 			let ${name};
-			${component.options.dev && `@validate_store(${name.slice(1)}, '${name.slice(1)}');`}
+			${component.compileOptions.dev && `@validate_store(${name.slice(1)}, '${name.slice(1)}');`}
 			$$self.$$.on_destroy.push(${name.slice(1)}.subscribe($$value => { ${name} = $$value; $$invalidate('${name}', ${name}); }));
 		`)
 		.join('\n\n');
@@ -355,7 +355,7 @@ export default function dom(
 							@insert(options.target, this, options.anchor);
 						}
 
-						${(props.length > 0 || component.meta.props) && deindent`
+						${(props.length > 0 || component.componentOptions.props) && deindent`
 						if (options.props) {
 							this.$set(options.props);
 							@flush();
diff --git a/src/compile/render-dom/wrappers/Element/Attribute.ts b/src/compile/render-dom/wrappers/Element/Attribute.ts
index ba4186f360..b098f68248 100644
--- a/src/compile/render-dom/wrappers/Element/Attribute.ts
+++ b/src/compile/render-dom/wrappers/Element/Attribute.ts
@@ -64,9 +64,9 @@ export default class AttributeWrapper {
 				? '@setXlinkAttribute'
 				: '@setAttribute';
 
-		const isLegacyInputType = element.renderer.component.options.legacy && name === 'type' && this.parent.node.name === 'input';
+		const isLegacyInputType = element.renderer.component.compileOptions.legacy && name === 'type' && this.parent.node.name === 'input';
 
-		const isDataSet = /^data-/.test(name) && !element.renderer.component.options.legacy && !element.node.namespace;
+		const isDataSet = /^data-/.test(name) && !element.renderer.component.compileOptions.legacy && !element.node.namespace;
 		const camelCaseName = isDataSet ? name.replace('data-', '').replace(/(-\w)/g, function (m) {
 			return m[1].toUpperCase();
 		}) : name;
diff --git a/src/compile/render-dom/wrappers/Fragment.ts b/src/compile/render-dom/wrappers/Fragment.ts
index 4c9ae10d65..ef16d4e2aa 100644
--- a/src/compile/render-dom/wrappers/Fragment.ts
+++ b/src/compile/render-dom/wrappers/Fragment.ts
@@ -29,8 +29,8 @@ const wrappers = {
 	Head,
 	IfBlock,
 	InlineComponent,
-	Meta: null,
 	MustacheTag,
+	Options: null,
 	RawMustacheTag,
 	Slot,
 	Text,
diff --git a/src/compile/render-dom/wrappers/InlineComponent/index.ts b/src/compile/render-dom/wrappers/InlineComponent/index.ts
index f4dfe6f123..5a07e3533a 100644
--- a/src/compile/render-dom/wrappers/InlineComponent/index.ts
+++ b/src/compile/render-dom/wrappers/InlineComponent/index.ts
@@ -138,7 +138,7 @@ export default class InlineComponentWrapper extends Wrapper {
 			});
 		}
 
-		if (component.options.dev) {
+		if (component.compileOptions.dev) {
 			// TODO this is a terrible hack, but without it the component
 			// will complain that options.target is missing. This would
 			// work better if components had separate public and private
@@ -507,4 +507,4 @@ function isComputed(node: Node) {
 	}
 
 	return false;
-}
\ No newline at end of file
+}
diff --git a/src/compile/render-dom/wrappers/Window.ts b/src/compile/render-dom/wrappers/Window.ts
index 18a15dcd77..0ccf9553f5 100644
--- a/src/compile/render-dom/wrappers/Window.ts
+++ b/src/compile/render-dom/wrappers/Window.ts
@@ -162,9 +162,9 @@ export default class WindowWrapper extends Wrapper {
 			const handler_name = block.getUniqueName(`onlinestatuschanged`);
 			block.builders.init.addBlock(deindent`
 				function ${handler_name}(event) {
-					${component.options.dev && `component._updatingReadonlyProperty = true;`}
+					${component.compileOptions.dev && `component._updatingReadonlyProperty = true;`}
 					#component.set({ ${bindings.online}: navigator.onLine });
-					${component.options.dev && `component._updatingReadonlyProperty = false;`}
+					${component.compileOptions.dev && `component._updatingReadonlyProperty = false;`}
 				}
 				window.addEventListener("online", ${handler_name});
 				window.addEventListener("offline", ${handler_name});
diff --git a/src/compile/render-ssr/Renderer.ts b/src/compile/render-ssr/Renderer.ts
index ad7d44459e..498cc453c9 100644
--- a/src/compile/render-ssr/Renderer.ts
+++ b/src/compile/render-ssr/Renderer.ts
@@ -27,8 +27,8 @@ const handlers: Record<string, Handler> = {
 	Head,
 	IfBlock,
 	InlineComponent,
-	Meta: noop,
 	MustacheTag: Tag, // TODO MustacheTag is an anachronism
+	Options: noop,
 	RawMustacheTag: HtmlTag,
 	Slot,
 	Text,
diff --git a/src/compile/render-ssr/index.ts b/src/compile/render-ssr/index.ts
index 351a36570a..0ade0da8b4 100644
--- a/src/compile/render-ssr/index.ts
+++ b/src/compile/render-ssr/index.ts
@@ -38,7 +38,7 @@ export default function ssr(
 	const reactive_store_values = reactive_stores.map(({ name }) => {
 		const assignment = `const ${name} = @get_store_value(${name.slice(1)});`;
 
-		return component.options.dev
+		return component.compileOptions.dev
 			? `@validate_store(${name.slice(1)}, '${name.slice(1)}'); ${assignment}`
 			: assignment;
 	});
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index c11c660082..451060aff7 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -12,7 +12,7 @@ const validTagName = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
 
 const metaTags = new Map([
 	['svelte:head', 'Head'],
-	['svelte:meta', 'Meta'],
+	['svelte:options', 'Options'],
 	['svelte:window', 'Window'],
 	['svelte:body', 'Body']
 ]);
diff --git a/test/cli/samples/custom-element/src/Main.html b/test/cli/samples/custom-element/src/Main.html
index 3ac2c716c2..6323e9e8d1 100644
--- a/test/cli/samples/custom-element/src/Main.html
+++ b/test/cli/samples/custom-element/src/Main.html
@@ -1,3 +1,3 @@
-<svelte:meta tag="my-element"/>
+<svelte:options tag="my-element"/>
 
-<p>Hello world!</p>
\ No newline at end of file
+<p>Hello world!</p>
diff --git a/test/custom-elements/samples/custom-method/main.html b/test/custom-elements/samples/custom-method/main.html
index 8b85a52575..6a99cd7ed6 100644
--- a/test/custom-elements/samples/custom-method/main.html
+++ b/test/custom-elements/samples/custom-method/main.html
@@ -1,4 +1,4 @@
-<svelte:meta tag="custom-element"/>
+<svelte:options tag="custom-element"/>
 
 <script>
 	export function updateFoo(value) {
@@ -8,4 +8,4 @@
 	export let foo;
 </script>
 
-<p>{foo}</p>
\ No newline at end of file
+<p>{foo}</p>
diff --git a/test/custom-elements/samples/escaped-css/main.html b/test/custom-elements/samples/escaped-css/main.html
index 0a28900d85..c465165483 100644
--- a/test/custom-elements/samples/escaped-css/main.html
+++ b/test/custom-elements/samples/escaped-css/main.html
@@ -1,4 +1,4 @@
-<svelte:meta tag="custom-element"/>
+<svelte:options tag="custom-element"/>
 
 <span class='icon'></span>
 
@@ -6,4 +6,4 @@
 	.icon::before {
 		content: '\ff'
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/test/custom-elements/samples/html-slots/main.html b/test/custom-elements/samples/html-slots/main.html
index fbc70b0aeb..91f1fb800e 100644
--- a/test/custom-elements/samples/html-slots/main.html
+++ b/test/custom-elements/samples/html-slots/main.html
@@ -1,4 +1,4 @@
-<svelte:meta tag="custom-element"/>
+<svelte:options tag="custom-element"/>
 
 <div>
 	<slot>
@@ -8,4 +8,4 @@
 	<slot name='foo'>
 		<p>foo fallback content</p>
 	</slot>
-</div>
\ No newline at end of file
+</div>
diff --git a/test/custom-elements/samples/html/main.html b/test/custom-elements/samples/html/main.html
index 4765b5a151..0931535a18 100644
--- a/test/custom-elements/samples/html/main.html
+++ b/test/custom-elements/samples/html/main.html
@@ -1,7 +1,7 @@
-<svelte:meta tag="custom-element"/>
+<svelte:options tag="custom-element"/>
 
 <script>
 	export let name;
 </script>
 
-<h1>Hello {name}!</h1>
\ No newline at end of file
+<h1>Hello {name}!</h1>
diff --git a/test/custom-elements/samples/nested.skip/Counter.html b/test/custom-elements/samples/nested.skip/Counter.html
index d365ce7644..87cde48466 100644
--- a/test/custom-elements/samples/nested.skip/Counter.html
+++ b/test/custom-elements/samples/nested.skip/Counter.html
@@ -1,7 +1,7 @@
-<svelte:meta tag="my-counter"/>
+<svelte:options tag="my-counter"/>
 
 <script>
 	export let count = 0;
 </script>
 
-<button on:click='{() => count += 1}'>count: {count}</button>
\ No newline at end of file
+<button on:click='{() => count += 1}'>count: {count}</button>
diff --git a/test/custom-elements/samples/nested.skip/main.html b/test/custom-elements/samples/nested.skip/main.html
index 3e80f6015e..90459c83eb 100644
--- a/test/custom-elements/samples/nested.skip/main.html
+++ b/test/custom-elements/samples/nested.skip/main.html
@@ -1,4 +1,4 @@
-<svelte:meta tag="my-app"/>
+<svelte:options tag="my-app"/>
 
 <script>
 	import Counter from './Counter.html';
@@ -7,4 +7,4 @@
 </script>
 
 <Counter bind:count/>
-<p>clicked {count} times</p>
\ No newline at end of file
+<p>clicked {count} times</p>
diff --git a/test/custom-elements/samples/new-styled/main.html b/test/custom-elements/samples/new-styled/main.html
index be1b397fa5..e69c6e05b1 100644
--- a/test/custom-elements/samples/new-styled/main.html
+++ b/test/custom-elements/samples/new-styled/main.html
@@ -1,4 +1,4 @@
-<svelte:meta tag="custom-element"/>
+<svelte:options tag="custom-element"/>
 
 <p>styled</p>
 
@@ -6,4 +6,4 @@
 	p {
 		color: red;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/test/custom-elements/samples/new/main.html b/test/custom-elements/samples/new/main.html
index 4765b5a151..0931535a18 100644
--- a/test/custom-elements/samples/new/main.html
+++ b/test/custom-elements/samples/new/main.html
@@ -1,7 +1,7 @@
-<svelte:meta tag="custom-element"/>
+<svelte:options tag="custom-element"/>
 
 <script>
 	export let name;
 </script>
 
-<h1>Hello {name}!</h1>
\ No newline at end of file
+<h1>Hello {name}!</h1>
diff --git a/test/custom-elements/samples/no-missing-prop-warnings/main.html b/test/custom-elements/samples/no-missing-prop-warnings/main.html
index a9baee2faf..3ea205e3f3 100644
--- a/test/custom-elements/samples/no-missing-prop-warnings/main.html
+++ b/test/custom-elements/samples/no-missing-prop-warnings/main.html
@@ -1,4 +1,4 @@
-<svelte:meta tag="my-app"/>
+<svelte:options tag="my-app"/>
 
 <script>
 	export let foo;
@@ -6,4 +6,4 @@
 </script>
 
 <p>foo: {foo}</p>
-<p>bar: {bar}</p>
\ No newline at end of file
+<p>bar: {bar}</p>
diff --git a/test/custom-elements/samples/oncreate/main.html b/test/custom-elements/samples/oncreate/main.html
index 1a521ed761..ed3980a28e 100644
--- a/test/custom-elements/samples/oncreate/main.html
+++ b/test/custom-elements/samples/oncreate/main.html
@@ -1,4 +1,4 @@
-<svelte:meta tag="my-app"/>
+<svelte:options tag="my-app"/>
 
 <script>
 	import { onMount } from 'svelte';
@@ -9,4 +9,3 @@
 		wasCreated = true;
 	});
 </script>
-
diff --git a/test/custom-elements/samples/props/main.html b/test/custom-elements/samples/props/main.html
index bee06784e4..b36c7f3e3d 100644
--- a/test/custom-elements/samples/props/main.html
+++ b/test/custom-elements/samples/props/main.html
@@ -1,4 +1,4 @@
-<svelte:meta tag="custom-element"/>
+<svelte:options tag="custom-element"/>
 
 <script>
 	import './my-widget.html';
@@ -6,4 +6,4 @@
 	export let items = ['a', 'b', 'c'];
 </script>
 
-<my-widget class="foo" {items}/>
\ No newline at end of file
+<my-widget class="foo" {items}/>
diff --git a/test/custom-elements/samples/props/my-widget.html b/test/custom-elements/samples/props/my-widget.html
index 6aabe5a73b..cf512e0ff8 100644
--- a/test/custom-elements/samples/props/my-widget.html
+++ b/test/custom-elements/samples/props/my-widget.html
@@ -1,8 +1,8 @@
-<svelte:meta tag="my-widget"/>
+<svelte:options tag="my-widget"/>
 
 <script>
 	export let items = [];
 </script>
 
 <p>{items.length} items</p>
-<p>{items.join(', ')}</p>
\ No newline at end of file
+<p>{items.join(', ')}</p>
diff --git a/test/js/samples/component-static-immutable/input.html b/test/js/samples/component-static-immutable/input.html
index d3c9d8066a..370c68e907 100644
--- a/test/js/samples/component-static-immutable/input.html
+++ b/test/js/samples/component-static-immutable/input.html
@@ -1,7 +1,7 @@
-<svelte:meta immutable/>
+<svelte:options immutable/>
 
 <script>
 	const Nested = window.Nested;
 </script>
 
-<Nested foo='bar'/>
\ No newline at end of file
+<Nested foo='bar'/>
diff --git a/test/js/samples/css-shadow-dom-keyframes/input.html b/test/js/samples/css-shadow-dom-keyframes/input.html
index cc1274d7f9..bf0aebaa9a 100644
--- a/test/js/samples/css-shadow-dom-keyframes/input.html
+++ b/test/js/samples/css-shadow-dom-keyframes/input.html
@@ -1,4 +1,4 @@
-<svelte:meta tag="custom-element"/>
+<svelte:options tag="custom-element"/>
 
 <div>fades in</div>
 
@@ -11,4 +11,4 @@
 		0% { opacity: 0; }
 		100% { opacity: 1; }
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/test/parser/samples/error-svelte-selfdestructive/error.json b/test/parser/samples/error-svelte-selfdestructive/error.json
index bdef619538..2443bb9822 100644
--- a/test/parser/samples/error-svelte-selfdestructive/error.json
+++ b/test/parser/samples/error-svelte-selfdestructive/error.json
@@ -1,6 +1,6 @@
 {
 	"code": "invalid-tag-name",
-	"message": "Valid <svelte:...> tag names are svelte:head, svelte:meta, svelte:window, svelte:body, svelte:self or svelte:component",
+	"message": "Valid <svelte:...> tag names are svelte:head, svelte:options, svelte:window, svelte:body, svelte:self or svelte:component",
 	"pos": 10,
 	"start": {
 		"character": 10,
diff --git a/test/runtime/samples/immutable-svelte-meta-false/main.html b/test/runtime/samples/immutable-svelte-meta-false/main.html
index 4649dac766..861260404b 100644
--- a/test/runtime/samples/immutable-svelte-meta-false/main.html
+++ b/test/runtime/samples/immutable-svelte-meta-false/main.html
@@ -1,4 +1,4 @@
-<svelte:meta immutable={false}/>
+<svelte:options immutable={false}/>
 
 <script>
 	export let count = 0;
@@ -9,4 +9,4 @@
 
 <div>
 	<h3>Called {count} times.</h3>
-</div>
\ No newline at end of file
+</div>
diff --git a/test/runtime/samples/immutable-svelte-meta/main.html b/test/runtime/samples/immutable-svelte-meta/main.html
index 7e7979e0f1..49ae354cb3 100644
--- a/test/runtime/samples/immutable-svelte-meta/main.html
+++ b/test/runtime/samples/immutable-svelte-meta/main.html
@@ -1,4 +1,4 @@
-<svelte:meta immutable/>
+<svelte:options immutable/>
 
 <script>
 	export let count = 0;
@@ -9,4 +9,4 @@
 
 <div>
 	<h3>Called {count} times.</h3>
-</div>
\ No newline at end of file
+</div>
diff --git a/test/runtime/samples/spread-own-props/main.html b/test/runtime/samples/spread-own-props/main.html
index 5f0a0089b5..79afded90e 100644
--- a/test/runtime/samples/spread-own-props/main.html
+++ b/test/runtime/samples/spread-own-props/main.html
@@ -1,4 +1,4 @@
-<svelte:meta bind:props/>
+<svelte:options bind:props/>
 
 <script>
 	import Widget from './Widget.html';
diff --git a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
index 4e72c96fbe..3871f86c21 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace-shorthand/Rect.html
@@ -1,4 +1,4 @@
-<svelte:meta namespace="svg"/>
+<svelte:options namespace="svg"/>
 
 <script>
 	export let x;
diff --git a/test/runtime/samples/svg-child-component-declared-namespace/Rect.html b/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
index b9d1584b44..fe672ede16 100644
--- a/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
+++ b/test/runtime/samples/svg-child-component-declared-namespace/Rect.html
@@ -1,4 +1,4 @@
-<svelte:meta namespace="http://www.w3.org/2000/svg"/>
+<svelte:options namespace="http://www.w3.org/2000/svg"/>
 
 <script>
 	export let x;
diff --git a/test/validator/samples/namespace-invalid-unguessable/errors.json b/test/validator/samples/namespace-invalid-unguessable/errors.json
index 98e95676c1..50288aa2c6 100644
--- a/test/validator/samples/namespace-invalid-unguessable/errors.json
+++ b/test/validator/samples/namespace-invalid-unguessable/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-namespace-property",
 	"message": "Invalid namespace 'lol'",
-	"pos": 13,
+	"pos": 16,
 	"start": {
 		"line": 1,
-		"column": 13,
-		"character": 13
+		"column": 16,
+		"character": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 28,
-		"character": 28
+		"column": 31,
+		"character": 31
 	}
 }]
diff --git a/test/validator/samples/namespace-invalid-unguessable/input.html b/test/validator/samples/namespace-invalid-unguessable/input.html
index 1f8500503d..fdbd779b5c 100644
--- a/test/validator/samples/namespace-invalid-unguessable/input.html
+++ b/test/validator/samples/namespace-invalid-unguessable/input.html
@@ -1 +1 @@
-<svelte:meta namespace="lol"/>
\ No newline at end of file
+<svelte:options namespace="lol"/>
diff --git a/test/validator/samples/namespace-invalid/errors.json b/test/validator/samples/namespace-invalid/errors.json
index 9e99fe7ab1..ddb49a33e0 100644
--- a/test/validator/samples/namespace-invalid/errors.json
+++ b/test/validator/samples/namespace-invalid/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-namespace-property",
 	"message": "Invalid namespace 'http://www.w3.org/1999/svg' (did you mean 'http://www.w3.org/2000/svg'?)",
-	"pos": 13,
+	"pos": 16,
 	"start": {
 		"line": 1,
-		"column": 13,
-		"character": 13
+		"column": 16,
+		"character": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 51,
-		"character": 51
+		"column": 54,
+		"character": 54
 	}
 }]
diff --git a/test/validator/samples/namespace-invalid/input.html b/test/validator/samples/namespace-invalid/input.html
index 6999e7ee02..7d0189bbb4 100644
--- a/test/validator/samples/namespace-invalid/input.html
+++ b/test/validator/samples/namespace-invalid/input.html
@@ -1 +1 @@
-<svelte:meta namespace="http://www.w3.org/1999/svg"/>
\ No newline at end of file
+<svelte:options namespace="http://www.w3.org/1999/svg"/>
diff --git a/test/validator/samples/namespace-non-literal/errors.json b/test/validator/samples/namespace-non-literal/errors.json
index 112e2ac73b..c365065e48 100644
--- a/test/validator/samples/namespace-non-literal/errors.json
+++ b/test/validator/samples/namespace-non-literal/errors.json
@@ -1,15 +1,15 @@
 [{
 	"code": "invalid-namespace-attribute",
 	"message": "The 'namespace' attribute must be a string literal representing a valid namespace",
-	"pos": 13,
+	"pos": 16,
 	"start": {
 		"line": 1,
-		"column": 13,
-		"character": 13
+		"column": 16,
+		"character": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 27,
-		"character": 27
+		"column": 30,
+		"character": 30
 	}
 }]
diff --git a/test/validator/samples/namespace-non-literal/input.html b/test/validator/samples/namespace-non-literal/input.html
index 5f88f6d899..e7d600810f 100644
--- a/test/validator/samples/namespace-non-literal/input.html
+++ b/test/validator/samples/namespace-non-literal/input.html
@@ -1 +1 @@
-<svelte:meta namespace={ns}/>
\ No newline at end of file
+<svelte:options namespace={ns}/>
diff --git a/test/validator/samples/svg-child-component-declared-namespace/input.html b/test/validator/samples/svg-child-component-declared-namespace/input.html
index 4e72c96fbe..3871f86c21 100644
--- a/test/validator/samples/svg-child-component-declared-namespace/input.html
+++ b/test/validator/samples/svg-child-component-declared-namespace/input.html
@@ -1,4 +1,4 @@
-<svelte:meta namespace="svg"/>
+<svelte:options namespace="svg"/>
 
 <script>
 	export let x;
diff --git a/test/validator/samples/tag-invalid/errors.json b/test/validator/samples/tag-invalid/errors.json
index 6b61f76fbb..e6daa8433e 100644
--- a/test/validator/samples/tag-invalid/errors.json
+++ b/test/validator/samples/tag-invalid/errors.json
@@ -3,13 +3,13 @@
 	"message": "tag name must be two or more words joined by the '-' character",
 	"start": {
 		"line": 1,
-		"column": 13,
-		"character": 13
+		"column": 16,
+		"character": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 26,
-		"character": 26
+		"column": 29,
+		"character": 29
 	},
-	"pos": 13
-}]
\ No newline at end of file
+	"pos": 16
+}]
diff --git a/test/validator/samples/tag-invalid/input.html b/test/validator/samples/tag-invalid/input.html
index 9054644cac..330552f726 100644
--- a/test/validator/samples/tag-invalid/input.html
+++ b/test/validator/samples/tag-invalid/input.html
@@ -1 +1 @@
-<svelte:meta tag="invalid"/>
\ No newline at end of file
+<svelte:options tag="invalid"/>
diff --git a/test/validator/samples/tag-non-string/errors.json b/test/validator/samples/tag-non-string/errors.json
index 54d58b2d4e..5736daaac6 100644
--- a/test/validator/samples/tag-non-string/errors.json
+++ b/test/validator/samples/tag-non-string/errors.json
@@ -3,13 +3,13 @@
 	"message": "'tag' must be a string literal",
 	"start": {
 		"line": 1,
-		"column": 13,
-		"character": 13
+		"column": 16,
+		"character": 16
 	},
 	"end": {
 		"line": 1,
-		"column": 21,
-		"character": 21
+		"column": 24,
+		"character": 24
 	},
-	"pos": 13
-}]
\ No newline at end of file
+	"pos": 16
+}]
diff --git a/test/validator/samples/tag-non-string/input.html b/test/validator/samples/tag-non-string/input.html
index 4cf1a63eec..168b3ca031 100644
--- a/test/validator/samples/tag-non-string/input.html
+++ b/test/validator/samples/tag-non-string/input.html
@@ -1 +1 @@
-<svelte:meta tag={42}/>
\ No newline at end of file
+<svelte:options tag={42}/>