diff --git a/site/content/docs/02-template-syntax.md b/site/content/docs/02-template-syntax.md
index e985234025..75ac845938 100644
--- a/site/content/docs/02-template-syntax.md
+++ b/site/content/docs/02-template-syntax.md
@@ -1551,7 +1551,7 @@ If `this` is falsy, no component is rendered.
 ### `<svelte:element>`
 
 ```sv
-<svelte:element tag={expression}/>
+<svelte:element this={expression}/>
 ```
 
 ---
@@ -1560,7 +1560,7 @@ The `<svelte:element>` element lets you render an element of a dynamically speci
 
 The only supported binding is `bind:this`, since the element type specific bindings that Svelte does at build time (e.g. `bind:value` for input elements) does not work with a dynamic tag type.
 
-If `tag` has a nullish value, a warning will be logged in development mode.
+If `this` has a nullish value, a warning will be logged in development mode.
 
 ```sv
 <script>
@@ -1568,7 +1568,7 @@ If `tag` has a nullish value, a warning will be logged in development mode.
 	export let handler;
 </script>
 
-<svelte:element {tag} on:click={handler}>Foo</svelte:element>
+<svelte:element this={tag} on:click={handler}>Foo</svelte:element>
 ```
 
 ### `<svelte:window>`
diff --git a/src/compiler/parse/errors.ts b/src/compiler/parse/errors.ts
index ef1f72a8be..63bd5b0919 100644
--- a/src/compiler/parse/errors.ts
+++ b/src/compiler/parse/errors.ts
@@ -99,6 +99,10 @@ export default {
 		code: `invalid-${slug}-content`,
 		message: `<${name}> cannot have children`
 	}),
+	invalid_element_definition: {
+		code: 'invalid-element-definition',
+		message: 'Invalid element definition'
+	},
 	invalid_element_placement: (slug: string, name: string) => ({
 		code: `invalid-${slug}-placement`,
 		message: `<${name}> tags cannot be inside elements or blocks`
@@ -161,6 +165,10 @@ export default {
 		code: 'missing-attribute-value',
 		message: 'Expected value for the attribute'
 	},
+	missing_element_definition: {
+		code: 'missing-element-definition',
+		message: '<svelte:element> must have a \'this\' attribute'
+	},
 	unclosed_script: {
 		code: 'unclosed-script',
 		message: '<script> must have a closing tag'
diff --git a/src/compiler/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
index c9ca1d8a7f..31bd977b74 100644
--- a/src/compiler/parse/state/tag.ts
+++ b/src/compiler/parse/state/tag.ts
@@ -184,20 +184,15 @@ export default function tag(parser: Parser) {
 	}
 	
 	if (name === 'svelte:element') {
-		const index = element.attributes.findIndex(attr => attr.type === 'Attribute' && attr.name === 'tag');
+		const index = element.attributes.findIndex(attr => attr.type === 'Attribute' && attr.name === 'this');
 		if (index === -1) {
-			parser.error({
-				code: 'missing-element-definition',
-				message: '<svelte:element> must have a \'tag\' attribute'
-			}, start);
+			parser.error(parser_errors.missing_element_definition, start);
 		}
 
 		const definition = element.attributes.splice(index, 1)[0];
-		if (definition.value === true || definition.value.length !== 1 || (definition.value[0].type !== 'Text' && definition.value[0].type !== 'MustacheTag' && definition.value[0].type !== 'AttributeShorthand')) {
-			parser.error({
-				code: 'invalid-element-definition',
-				message: 'invalid element definition'
-			}, definition.start);
+		if (definition.value === true || definition.value.length !== 1 ||
+			(definition.value[0].type !== 'Text' && definition.value[0].type !== 'MustacheTag' && definition.value[0].type !== 'AttributeShorthand')) {
+			parser.error(parser_errors.invalid_element_definition, definition.start);
 		}
 
 		element.tag = definition.value[0].data || definition.value[0].expression;
diff --git a/src/runtime/internal/dev.ts b/src/runtime/internal/dev.ts
index d9ca635109..5a459aefd7 100644
--- a/src/runtime/internal/dev.ts
+++ b/src/runtime/internal/dev.ts
@@ -109,7 +109,7 @@ export function validate_slots(name, slot, keys) {
 
 export function validate_dynamic_element(tag) {
 	if (tag == null) {
-		console.warn('<svelte:element> expects a non-nullish value in attribute "tag"');
+		console.warn('<svelte:element> expects a non-nullish value in attribute "this"');
 	}
 }
 
diff --git a/test/parser/samples/dynamic-element-string/input.svelte b/test/parser/samples/dynamic-element-string/input.svelte
index e58edf3717..1a939ceaec 100644
--- a/test/parser/samples/dynamic-element-string/input.svelte
+++ b/test/parser/samples/dynamic-element-string/input.svelte
@@ -1 +1,2 @@
-<svelte:element tag="div"></svelte:element>
\ No newline at end of file
+<svelte:element this="div"></svelte:element>
+<svelte:element this="div" class="foo"></svelte:element>
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-element-string/output.json b/test/parser/samples/dynamic-element-string/output.json
index 85739dd326..b88e796bb9 100644
--- a/test/parser/samples/dynamic-element-string/output.json
+++ b/test/parser/samples/dynamic-element-string/output.json
@@ -1,18 +1,50 @@
 {
 	"html": {
 		"start": 0,
-		"end": 43,
+		"end": 101,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 43,
+				"end": 44,
 				"type": "DynamicElement",
 				"name": "svelte:element",
 				"attributes": [],
 				"children": [],
 				"tag": "div"
+			},
+			{
+				"type": "Text",
+				"start": 44,
+				"end": 45,
+				"data": "\n",
+				"raw": "\n"
+			},
+			{
+				"start": 45,
+				"end": 101,
+				"type": "DynamicElement",
+				"name": "svelte:element",
+				"attributes": [
+					{
+						"type": "Attribute",
+						"start": 72,
+						"end": 83,
+						"name": "class",
+						"value": [
+							{
+								"type": "Text",
+								"start": 79,
+								"end": 82,
+								"data": "foo",
+								"raw": "foo"
+							}
+						]
+					}
+				],
+				"children": [],
+				"tag": "div"
 			}
 		]
 	}
-}
+}
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-element-variable/input.svelte b/test/parser/samples/dynamic-element-variable/input.svelte
index 1a0cba9dc3..229696d37b 100644
--- a/test/parser/samples/dynamic-element-variable/input.svelte
+++ b/test/parser/samples/dynamic-element-variable/input.svelte
@@ -1 +1,2 @@
-<svelte:element tag={tag}></svelte:element>
\ No newline at end of file
+<svelte:element this={tag}></svelte:element>
+<svelte:element this={tag} class="foo"></svelte:element>
\ No newline at end of file
diff --git a/test/parser/samples/dynamic-element-variable/output.json b/test/parser/samples/dynamic-element-variable/output.json
index 47805104e4..7c5fe713d0 100644
--- a/test/parser/samples/dynamic-element-variable/output.json
+++ b/test/parser/samples/dynamic-element-variable/output.json
@@ -1,27 +1,74 @@
 {
 	"html": {
 		"start": 0,
-		"end": 43,
+		"end": 101,
 		"type": "Fragment",
 		"children": [
 			{
 				"start": 0,
-				"end": 43,
+				"end": 44,
 				"type": "DynamicElement",
 				"name": "svelte:element",
 				"attributes": [],
 				"children": [],
 				"tag": {
-					"start": 21,
-					"end": 24,
+					"start": 22,
+					"end": 25,
 					"loc": {
 						"start": {
 							"line": 1,
-							"column": 21
+							"column": 22
 						},
 						"end": {
 							"line": 1,
-							"column": 24
+							"column": 25
+						}
+					},
+					"name": "tag",
+					"type": "Identifier"
+				}
+			},
+			{
+				"type": "Text",
+				"start": 44,
+				"end": 45,
+				"data": "\n",
+				"raw": "\n"
+			},
+			{
+				"start": 45,
+				"end": 101,
+				"type": "DynamicElement",
+				"name": "svelte:element",
+				"children": [],
+				"attributes": [
+					{
+						"type": "Attribute",
+						"start": 72,
+						"end": 83,
+						"name": "class",
+						"value": [
+							{
+								"type": "Text",
+								"start": 79,
+								"end": 82,
+								"data": "foo",
+								"raw": "foo"
+							}
+						]
+					}
+				],
+				"tag": {
+					"start": 67,
+					"end": 70,
+					"loc": {
+						"start": {
+							"line": 2,
+							"column": 22
+						},
+						"end": {
+							"line": 2,
+							"column": 25
 						}
 					},
 					"name": "tag",
diff --git a/test/runtime/samples/dev-warning-dynamic-element-nullish-tag/_config.js b/test/runtime/samples/dev-warning-dynamic-element-nullish-tag/_config.js
index 026a93cf74..a010e9365a 100644
--- a/test/runtime/samples/dev-warning-dynamic-element-nullish-tag/_config.js
+++ b/test/runtime/samples/dev-warning-dynamic-element-nullish-tag/_config.js
@@ -4,6 +4,6 @@ export default {
 	},
 
 	warnings: [
-		'<svelte:element> expects a non-nullish value in attribute "tag"'
+		'<svelte:element> expects a non-nullish value in attribute "this"'
 	]
 };
diff --git a/test/runtime/samples/dev-warning-dynamic-element-nullish-tag/main.svelte b/test/runtime/samples/dev-warning-dynamic-element-nullish-tag/main.svelte
index 8ab231d49d..978f3d25be 100644
--- a/test/runtime/samples/dev-warning-dynamic-element-nullish-tag/main.svelte
+++ b/test/runtime/samples/dev-warning-dynamic-element-nullish-tag/main.svelte
@@ -2,4 +2,4 @@
   let tag = null;
 </script>
 
-<svelte:element {tag}></svelte:element>
+<svelte:element this={tag}></svelte:element>
diff --git a/test/runtime/samples/dynamic-element-binding-invalid/main.svelte b/test/runtime/samples/dynamic-element-binding-invalid/main.svelte
index 4639427fdf..45f8f96061 100644
--- a/test/runtime/samples/dynamic-element-binding-invalid/main.svelte
+++ b/test/runtime/samples/dynamic-element-binding-invalid/main.svelte
@@ -3,4 +3,4 @@
   let value;
 </script>
 
-<svelte:element tag={tag} bind:value></svelte:element>
+<svelte:element this={tag} bind:value></svelte:element>
diff --git a/test/runtime/samples/dynamic-element-binding-this/main.svelte b/test/runtime/samples/dynamic-element-binding-this/main.svelte
index 0c1e3a3f15..75e8b02ce1 100644
--- a/test/runtime/samples/dynamic-element-binding-this/main.svelte
+++ b/test/runtime/samples/dynamic-element-binding-this/main.svelte
@@ -3,4 +3,4 @@
   export let foo;
 </script>
 
-<svelte:element tag={tag} bind:this={foo}></svelte:element>
+<svelte:element this={tag} bind:this={foo}></svelte:element>
diff --git a/test/runtime/samples/dynamic-element-change-tag/main.svelte b/test/runtime/samples/dynamic-element-change-tag/main.svelte
index 8e30ac99c5..a9c4d5c00c 100644
--- a/test/runtime/samples/dynamic-element-change-tag/main.svelte
+++ b/test/runtime/samples/dynamic-element-change-tag/main.svelte
@@ -2,4 +2,4 @@
   export let tag = 'div';
 </script>
 
-<svelte:element tag={tag}>Foo</svelte:element>
\ No newline at end of file
+<svelte:element this={tag}>Foo</svelte:element>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-element-event-handler/main.svelte b/test/runtime/samples/dynamic-element-event-handler/main.svelte
index 1fd8c41dcf..7a7fef9c22 100644
--- a/test/runtime/samples/dynamic-element-event-handler/main.svelte
+++ b/test/runtime/samples/dynamic-element-event-handler/main.svelte
@@ -3,4 +3,4 @@
   export let handler;
 </script>
 
-<svelte:element tag={tag} on:click={handler}>Foo</svelte:element>
\ No newline at end of file
+<svelte:element this={tag} on:click={handler}>Foo</svelte:element>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-element-expression/main.svelte b/test/runtime/samples/dynamic-element-expression/main.svelte
index f12ee38b97..7ec11e4ef6 100644
--- a/test/runtime/samples/dynamic-element-expression/main.svelte
+++ b/test/runtime/samples/dynamic-element-expression/main.svelte
@@ -1 +1 @@
-<svelte:element tag={"div"}>Foo</svelte:element>
\ No newline at end of file
+<svelte:element this={"div"}>Foo</svelte:element>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-element-pass-props/main.svelte b/test/runtime/samples/dynamic-element-pass-props/main.svelte
index dbd4e79abd..6a54a93f27 100644
--- a/test/runtime/samples/dynamic-element-pass-props/main.svelte
+++ b/test/runtime/samples/dynamic-element-pass-props/main.svelte
@@ -3,4 +3,4 @@
   export let onClick;
 </script>
 
-<svelte:element tag={tag} style="display: inline;" on:click={onClick}>Foo</svelte:element>
\ No newline at end of file
+<svelte:element this={tag} style="display: inline;" on:click={onClick}>Foo</svelte:element>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-element-reuse-children/main.svelte b/test/runtime/samples/dynamic-element-reuse-children/main.svelte
index a46765658f..4be99aab09 100644
--- a/test/runtime/samples/dynamic-element-reuse-children/main.svelte
+++ b/test/runtime/samples/dynamic-element-reuse-children/main.svelte
@@ -2,7 +2,7 @@
   export let tag = 'div', text = 'Foo';
 </script>
 
-<svelte:element tag={tag}>
+<svelte:element this={tag}>
   <div>
     {text}
   </div>
diff --git a/test/runtime/samples/dynamic-element-store/main.svelte b/test/runtime/samples/dynamic-element-store/main.svelte
index 5b8098d244..84a577ecee 100644
--- a/test/runtime/samples/dynamic-element-store/main.svelte
+++ b/test/runtime/samples/dynamic-element-store/main.svelte
@@ -3,4 +3,4 @@
   const foo = writable('div');
 </script>
 
-<svelte:element tag={$foo}></svelte:element>
\ No newline at end of file
+<svelte:element this={$foo}></svelte:element>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-element-string/main.svelte b/test/runtime/samples/dynamic-element-string/main.svelte
index 2cf3b2b189..62d65d5f20 100644
--- a/test/runtime/samples/dynamic-element-string/main.svelte
+++ b/test/runtime/samples/dynamic-element-string/main.svelte
@@ -1 +1 @@
-<svelte:element tag="div">Foo</svelte:element>
\ No newline at end of file
+<svelte:element this="div">Foo</svelte:element>
\ No newline at end of file
diff --git a/test/runtime/samples/dynamic-element-variable/main.svelte b/test/runtime/samples/dynamic-element-variable/main.svelte
index 4cac422635..d60953bba5 100644
--- a/test/runtime/samples/dynamic-element-variable/main.svelte
+++ b/test/runtime/samples/dynamic-element-variable/main.svelte
@@ -3,4 +3,4 @@
   export let text = "Foo";
 </script>
 
-<svelte:element tag={tag}>{text}</svelte:element>
\ No newline at end of file
+<svelte:element this={tag}>{text}</svelte:element>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/dynamic-element-string/main.svelte b/test/server-side-rendering/samples/dynamic-element-string/main.svelte
index 2cf3b2b189..62d65d5f20 100644
--- a/test/server-side-rendering/samples/dynamic-element-string/main.svelte
+++ b/test/server-side-rendering/samples/dynamic-element-string/main.svelte
@@ -1 +1 @@
-<svelte:element tag="div">Foo</svelte:element>
\ No newline at end of file
+<svelte:element this="div">Foo</svelte:element>
\ No newline at end of file
diff --git a/test/server-side-rendering/samples/dynamic-element-variable/main.svelte b/test/server-side-rendering/samples/dynamic-element-variable/main.svelte
index 45addc2576..9aaba18bf1 100644
--- a/test/server-side-rendering/samples/dynamic-element-variable/main.svelte
+++ b/test/server-side-rendering/samples/dynamic-element-variable/main.svelte
@@ -3,5 +3,5 @@
   let tag = 'div';
 </script>
 
-<svelte:element tag={heading}>Foo</svelte:element>
-<svelte:element {tag}>Bar</svelte:element>
\ No newline at end of file
+<svelte:element this={heading}>Foo</svelte:element>
+<svelte:element this={tag}>Bar</svelte:element>
\ No newline at end of file