diff --git a/src/generators/Generator.ts b/src/generators/Generator.ts
index 2dcc3f3797..65574ee303 100644
--- a/src/generators/Generator.ts
+++ b/src/generators/Generator.ts
@@ -764,7 +764,7 @@ export default class Generator {
 					this.skip();
 				}
 
-				if (node.type === 'Element' && node.name === ':Switch') {
+				if (node.type === 'Element' && node.name === ':Component') {
 					node.metadata = contextualise(node.expression, contextDependencies, indexes);
 				}
 			},
diff --git a/src/generators/dom/preprocess.ts b/src/generators/dom/preprocess.ts
index 1bdedd6795..89af90a36e 100644
--- a/src/generators/dom/preprocess.ts
+++ b/src/generators/dom/preprocess.ts
@@ -437,7 +437,7 @@ const preprocessors = {
 		}
 
 		const isComponent =
-			generator.components.has(node.name) || node.name === ':Self' || node.name === ':Switch';
+			generator.components.has(node.name) || node.name === ':Self' || node.name === ':Component';
 
 		if (isComponent) {
 			cannotUseInnerHTML(node);
@@ -445,7 +445,7 @@ const preprocessors = {
 			node.var = block.getUniqueName(
 				(
 					node.name === ':Self' ? generator.name :
-					node.name === ':Switch' ? 'switch_instance' :
+					node.name === ':Component' ? 'switch_instance' :
 					node.name
 				).toLowerCase()
 			);
diff --git a/src/generators/dom/visitors/Component.ts b/src/generators/dom/visitors/Component.ts
index 0e8cb3d69a..7f9cd16610 100644
--- a/src/generators/dom/visitors/Component.ts
+++ b/src/generators/dom/visitors/Component.ts
@@ -205,7 +205,7 @@ export default function visitComponent(
 		}
 	}
 
-	const isSwitch = node.name === ':Switch';
+	const isSwitch = node.name === ':Component';
 
 	const switch_vars = isSwitch && {
 		value: block.getUniqueName('switch_value'),
@@ -563,7 +563,7 @@ function remount(generator: DomGenerator, node: Node, name: string) {
 	// TODO make this a method of the nodes
 
 	if (node.type === 'Element') {
-		if (node.name === ':Self' || node.name === ':Switch' || generator.components.has(node.name)) {
+		if (node.name === ':Self' || node.name === ':Component' || generator.components.has(node.name)) {
 			return `${node.var}._mount(${name}._slotted.default, null);`;
 		}
 
diff --git a/src/generators/dom/visitors/Element/Element.ts b/src/generators/dom/visitors/Element/Element.ts
index 7dc6eb7262..3121e24a01 100644
--- a/src/generators/dom/visitors/Element/Element.ts
+++ b/src/generators/dom/visitors/Element/Element.ts
@@ -43,7 +43,7 @@ export default function visitElement(
 		}
 	}
 
-	if (generator.components.has(node.name) || node.name === ':Self' || node.name === ':Switch') {
+	if (generator.components.has(node.name) || node.name === ':Self' || node.name === ':Component') {
 		return visitComponent(generator, block, state, node, elementStack, componentStack);
 	}
 
diff --git a/src/generators/server-side-rendering/visitors/Component.ts b/src/generators/server-side-rendering/visitors/Component.ts
index 1689647ba1..0c800e1c8b 100644
--- a/src/generators/server-side-rendering/visitors/Component.ts
+++ b/src/generators/server-side-rendering/visitors/Component.ts
@@ -71,7 +71,7 @@ export default function visitComponent(
 		)
 		.join(', ');
 
-	const isSwitch = node.name === ':Switch';
+	const isSwitch = node.name === ':Component';
 	if (isSwitch) block.contextualise(node.expression);
 
 	const expression = (
diff --git a/src/generators/server-side-rendering/visitors/Element.ts b/src/generators/server-side-rendering/visitors/Element.ts
index 8834a2b90b..25da587a1f 100644
--- a/src/generators/server-side-rendering/visitors/Element.ts
+++ b/src/generators/server-side-rendering/visitors/Element.ts
@@ -40,7 +40,7 @@ export default function visitElement(
 		return;
 	}
 
-	if (generator.components.has(node.name) || node.name === ':Self' || node.name === ':Switch') {
+	if (generator.components.has(node.name) || node.name === ':Self' || node.name === ':Component') {
 		visitComponent(generator, block, node);
 		return;
 	}
diff --git a/src/generators/shared/utils/isChildOfComponent.ts b/src/generators/shared/utils/isChildOfComponent.ts
index e74b6a658b..77275f3d8c 100644
--- a/src/generators/shared/utils/isChildOfComponent.ts
+++ b/src/generators/shared/utils/isChildOfComponent.ts
@@ -4,7 +4,7 @@ import Generator from '../../Generator';
 export default function isChildOfComponent(node: Node, generator: Generator) {
 	while (node = node.parent) {
 		if (node.type !== 'Element') continue;
-		if (node.name === ':Self' || node.name === ':Switch' || generator.components.has(node.name)) return true; // TODO extract this out into a helper
+		if (node.name === ':Self' || node.name === ':Component' || generator.components.has(node.name)) return true; // TODO extract this out into a helper
 		if (/-/.test(node.name)) return false;
 	}
 }
\ No newline at end of file
diff --git a/src/parse/state/tag.ts b/src/parse/state/tag.ts
index c62053ffb5..d946656a90 100644
--- a/src/parse/state/tag.ts
+++ b/src/parse/state/tag.ts
@@ -15,7 +15,7 @@ import { Node } from '../../interfaces';
 const validTagName = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
 
 const SELF = ':Self';
-const SWITCH = ':Switch';
+const SWITCH = ':Component';
 
 const metaTags = {
 	':Window': true
diff --git a/src/validate/html/validateElement.ts b/src/validate/html/validateElement.ts
index 46e6bb94bf..e29066be01 100644
--- a/src/validate/html/validateElement.ts
+++ b/src/validate/html/validateElement.ts
@@ -14,7 +14,7 @@ export default function validateElement(
 	elementStack: Node[]
 ) {
 	const isComponent =
-		node.name === ':Self' || node.name === ':Switch' || validator.components.has(node.name);
+		node.name === ':Self' || node.name === ':Component' || validator.components.has(node.name);
 
 	if (!isComponent && /^[A-Z]/.test(node.name[0])) {
 		// TODO upgrade to validator.error in v2
@@ -230,7 +230,7 @@ function checkSlotAttribute(validator: Validator, node: Node, attribute: Node, s
 		const parent = stack[i];
 		if (parent.type === 'Element') {
 			// if we're inside a component or a custom element, gravy
-			if (parent.name === ':Self' || parent.name === ':Switch' || validator.components.has(parent.name)) return;
+			if (parent.name === ':Self' || parent.name === ':Component' || validator.components.has(parent.name)) return;
 			if (/-/.test(parent.name)) return;
 		}