diff --git a/src/validate/js/propValidators/ondestroy.js b/src/validate/js/propValidators/ondestroy.js
index 7ce61e223d..3471034178 100644
--- a/src/validate/js/propValidators/ondestroy.js
+++ b/src/validate/js/propValidators/ondestroy.js
@@ -1,9 +1,9 @@
 import usesThisOrArguments from '../utils/usesThisOrArguments.js';
 
-export default function onteardown ( validator, prop ) {
+export default function ondestroy ( validator, prop ) {
 	if ( prop.value.type === 'ArrowFunctionExpression' ) {
 		if ( usesThisOrArguments( prop.value.body ) ) {
-			validator.error( `'onteardown' should be a function expression, not an arrow function expression`, prop.start );
+			validator.error( `'ondestroy' should be a function expression, not an arrow function expression`, prop.start );
 		}
 	}
 }
diff --git a/test/generator/component-ref/Widget.html b/test/generator/component-ref/Widget.html
index c5a462601a..c8cf786cc8 100644
--- a/test/generator/component-ref/Widget.html
+++ b/test/generator/component-ref/Widget.html
@@ -2,7 +2,7 @@
 
 <script>
 	export default {
-		onrender () {
+		oncreate () {
 			this.isWidget = true;
 		}
 	};
diff --git a/test/generator/lifecycle-events/main.html b/test/generator/lifecycle-events/main.html
index e0a18d15ef..1989d158c0 100644
--- a/test/generator/lifecycle-events/main.html
+++ b/test/generator/lifecycle-events/main.html
@@ -2,11 +2,11 @@
 
 <script>
 	export default {
-		onrender () {
+		oncreate () {
 			this.events = [ 'render' ];
 		},
 
-		onteardown () {
+		ondestroy () {
 			this.events.push( 'teardown' );
 		}
 	};
diff --git a/test/generator/onrender-chain/Item.html b/test/generator/onrender-chain/Item.html
index d039a445f1..b75cd0ca23 100644
--- a/test/generator/onrender-chain/Item.html
+++ b/test/generator/onrender-chain/Item.html
@@ -7,7 +7,7 @@
 				foo: 'XX'
 			};
 		},
-		onrender () {
+		oncreate () {
 			this.observe( 'item', item => {
 				this.set({ foo: item });
 			});
diff --git a/test/generator/onrender-fires-when-ready-nested/Widget.html b/test/generator/onrender-fires-when-ready-nested/Widget.html
index 10de81c6d4..1bcf103d01 100644
--- a/test/generator/onrender-fires-when-ready-nested/Widget.html
+++ b/test/generator/onrender-fires-when-ready-nested/Widget.html
@@ -2,7 +2,7 @@
 
 <script>
 	export default {
-		onrender () {
+		oncreate () {
 			this.set({ inDocument: document.contains( this.refs.x ) })
 		}
 	};
diff --git a/test/generator/onrender-fires-when-ready-nested/_config.js b/test/generator/onrender-fires-when-ready-nested/_config.js
index cbc0b87604..f16d3ddeb9 100644
--- a/test/generator/onrender-fires-when-ready-nested/_config.js
+++ b/test/generator/onrender-fires-when-ready-nested/_config.js
@@ -1,5 +1,5 @@
 export default {
-	'skip-ssr': true, // uses onrender
+	'skip-ssr': true, // uses oncreate
 
 	html: `<div><p>true</p>\n<p>true</p></div>`
 };
diff --git a/test/generator/onrender-fires-when-ready/Widget.html b/test/generator/onrender-fires-when-ready/Widget.html
index 10de81c6d4..1bcf103d01 100644
--- a/test/generator/onrender-fires-when-ready/Widget.html
+++ b/test/generator/onrender-fires-when-ready/Widget.html
@@ -2,7 +2,7 @@
 
 <script>
 	export default {
-		onrender () {
+		oncreate () {
 			this.set({ inDocument: document.contains( this.refs.x ) })
 		}
 	};
diff --git a/test/generator/onrender-fires-when-ready/_config.js b/test/generator/onrender-fires-when-ready/_config.js
index 6ed7e85e9c..5776e23915 100644
--- a/test/generator/onrender-fires-when-ready/_config.js
+++ b/test/generator/onrender-fires-when-ready/_config.js
@@ -1,5 +1,5 @@
 export default {
-	'skip-ssr': true, // uses onrender
+	'skip-ssr': true, // uses oncreate
 
 	html: `<div><p>true</p></div>`,
 
diff --git a/test/generator/set-in-observe-dedupes-renders/Widget.html b/test/generator/set-in-observe-dedupes-renders/Widget.html
index 855577b8bf..3d414dd204 100644
--- a/test/generator/set-in-observe-dedupes-renders/Widget.html
+++ b/test/generator/set-in-observe-dedupes-renders/Widget.html
@@ -2,7 +2,7 @@
 
 <script>
 	export default {
-		onrender () {
+		oncreate () {
 			this.observe( 'foo', foo => {
 				const bar = this.get( 'bar' );
 				if ( foo.x !== bar.x ) throw new Error( 'mismatch' );
diff --git a/test/generator/set-in-observe-dedupes-renders/main.html b/test/generator/set-in-observe-dedupes-renders/main.html
index f303b14c1b..f62940a473 100644
--- a/test/generator/set-in-observe-dedupes-renders/main.html
+++ b/test/generator/set-in-observe-dedupes-renders/main.html
@@ -11,7 +11,7 @@
 			}
 		},
 
-		onrender () {
+		oncreate () {
 			this.observe( 'foo', foo => {
 				this.set({ bar: foo });
 			});
diff --git a/test/generator/set-in-observe/_config.js b/test/generator/set-in-observe/_config.js
index 65d993fdb9..5c7c3d213b 100644
--- a/test/generator/set-in-observe/_config.js
+++ b/test/generator/set-in-observe/_config.js
@@ -1,5 +1,5 @@
 export default {
-	'skip-ssr': true, // uses onrender
+	'skip-ssr': true, // uses oncreate
 
 	html: `
 		<p>1</p>
diff --git a/test/generator/set-in-observe/main.html b/test/generator/set-in-observe/main.html
index 813954511c..d07607f5fe 100644
--- a/test/generator/set-in-observe/main.html
+++ b/test/generator/set-in-observe/main.html
@@ -7,7 +7,7 @@
 			foo: 1
 		}),
 
-		onrender () {
+		oncreate () {
 			this.observe( 'foo', foo => {
 				this.set({ bar: foo * 2 });
 			});
diff --git a/test/generator/set-in-onrender/_config.js b/test/generator/set-in-onrender/_config.js
index 6cd361c076..307b5cb860 100644
--- a/test/generator/set-in-onrender/_config.js
+++ b/test/generator/set-in-onrender/_config.js
@@ -1,5 +1,5 @@
 export default {
-	'skip-ssr': true, // uses onrender
+	'skip-ssr': true, // uses oncreate
 
 	html: '<p>2</p>'
 };
diff --git a/test/generator/set-in-onrender/main.html b/test/generator/set-in-onrender/main.html
index 63b72a1383..8e71ec5905 100644
--- a/test/generator/set-in-onrender/main.html
+++ b/test/generator/set-in-onrender/main.html
@@ -6,7 +6,7 @@
 			foo: 1
 		}),
 
-		onrender () {
+		oncreate () {
 			this.set({ foo: 2 });
 		}
 	};
diff --git a/test/sourcemaps/script/input.html b/test/sourcemaps/script/input.html
index c4dc11d3a0..c171960915 100644
--- a/test/sourcemaps/script/input.html
+++ b/test/sourcemaps/script/input.html
@@ -2,7 +2,7 @@
 
 <script>
 	export default {
-		onrender () {
+		oncreate () {
 			console.log( 42 );
 		}
 	}
diff --git a/test/validator/onrender-arrow-no-this/errors.json b/test/validator/oncreate-arrow-no-this/errors.json
similarity index 100%
rename from test/validator/onrender-arrow-no-this/errors.json
rename to test/validator/oncreate-arrow-no-this/errors.json
diff --git a/test/validator/oncreate-arrow-no-this/input.html b/test/validator/oncreate-arrow-no-this/input.html
new file mode 100644
index 0000000000..a8e0988595
--- /dev/null
+++ b/test/validator/oncreate-arrow-no-this/input.html
@@ -0,0 +1,5 @@
+<script>
+	export default {
+		oncreate: () => console.log( 'rendering' )
+	};
+</script>
diff --git a/test/validator/onrender-arrow-this/errors.json b/test/validator/oncreate-arrow-this/errors.json
similarity index 57%
rename from test/validator/onrender-arrow-this/errors.json
rename to test/validator/oncreate-arrow-this/errors.json
index 5cc9b2c78d..06d020a4f8 100644
--- a/test/validator/onrender-arrow-this/errors.json
+++ b/test/validator/oncreate-arrow-this/errors.json
@@ -1,5 +1,5 @@
 [{
-	"message": "'onrender' should be a function expression, not an arrow function expression",
+	"message": "'oncreate' should be a function expression, not an arrow function expression",
 	"pos": 29,
 	"loc": {
 		"line": 3,
diff --git a/test/validator/onrender-arrow-this/input.html b/test/validator/oncreate-arrow-this/input.html
similarity index 77%
rename from test/validator/onrender-arrow-this/input.html
rename to test/validator/oncreate-arrow-this/input.html
index e4283e60ba..36d36b698d 100644
--- a/test/validator/onrender-arrow-this/input.html
+++ b/test/validator/oncreate-arrow-this/input.html
@@ -1,6 +1,6 @@
 <script>
 	export default {
-		onrender: () => {
+		oncreate: () => {
 			this.set({ a: 1 });
 		}
 	};
diff --git a/test/validator/onteardown-arrow-no-this/errors.json b/test/validator/ondestroy-arrow-no-this/errors.json
similarity index 100%
rename from test/validator/onteardown-arrow-no-this/errors.json
rename to test/validator/ondestroy-arrow-no-this/errors.json
diff --git a/test/validator/ondestroy-arrow-no-this/input.html b/test/validator/ondestroy-arrow-no-this/input.html
new file mode 100644
index 0000000000..1237541ebc
--- /dev/null
+++ b/test/validator/ondestroy-arrow-no-this/input.html
@@ -0,0 +1,5 @@
+<script>
+	export default {
+		ondestroy: () => console.log( 'tearing down' )
+	};
+</script>
diff --git a/test/validator/ondestroy-arrow-this/errors.json b/test/validator/ondestroy-arrow-this/errors.json
new file mode 100644
index 0000000000..98e176f58f
--- /dev/null
+++ b/test/validator/ondestroy-arrow-this/errors.json
@@ -0,0 +1,8 @@
+[{
+	"message": "'ondestroy' should be a function expression, not an arrow function expression",
+	"pos": 29,
+	"loc": {
+		"line": 3,
+		"column": 2
+	}
+}]
diff --git a/test/validator/onteardown-arrow-this/input.html b/test/validator/ondestroy-arrow-this/input.html
similarity index 75%
rename from test/validator/onteardown-arrow-this/input.html
rename to test/validator/ondestroy-arrow-this/input.html
index ac2f1d7e8b..2f5df93962 100644
--- a/test/validator/onteardown-arrow-this/input.html
+++ b/test/validator/ondestroy-arrow-this/input.html
@@ -1,6 +1,6 @@
 <script>
 	export default {
-		onteardown: () => {
+		ondestroy: () => {
 			this.set({ a: 1 });
 		}
 	};
diff --git a/test/validator/onrender-arrow-no-this/input.html b/test/validator/onrender-arrow-no-this/input.html
deleted file mode 100644
index c82e5c3745..0000000000
--- a/test/validator/onrender-arrow-no-this/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	export default {
-		onrender: () => console.log( 'rendering' )
-	};
-</script>
diff --git a/test/validator/onteardown-arrow-no-this/input.html b/test/validator/onteardown-arrow-no-this/input.html
deleted file mode 100644
index a742898edb..0000000000
--- a/test/validator/onteardown-arrow-no-this/input.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-	export default {
-		onteardown: () => console.log( 'tearing down' )
-	};
-</script>
diff --git a/test/validator/onteardown-arrow-this/errors.json b/test/validator/onteardown-arrow-this/errors.json
deleted file mode 100644
index 0596578b95..0000000000
--- a/test/validator/onteardown-arrow-this/errors.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[{
-	"message": "'onteardown' should be a function expression, not an arrow function expression",
-	"pos": 29,
-	"loc": {
-		"line": 3,
-		"column": 2
-	}
-}]