diff --git a/dev-assets/doodads/azulian/azulian-red.js b/dev-assets/doodads/azulian/azulian-red.js
index ca87ff3..87d7d4c 100644
--- a/dev-assets/doodads/azulian/azulian-red.js
+++ b/dev-assets/doodads/azulian/azulian-red.js
@@ -1,5 +1,5 @@
 function main() {
-	log.Info("Azulian '%s' initialized!", Self.Doodad().Title);
+	console.log("Azulian '%s' initialized!", Self.Title);
 
 	var playerSpeed = 4;
 	var gravity = 4;
diff --git a/dev-assets/doodads/buttons/button.js b/dev-assets/doodads/buttons/button.js
index 976c2d6..ceac9e7 100644
--- a/dev-assets/doodads/buttons/button.js
+++ b/dev-assets/doodads/buttons/button.js
@@ -1,5 +1,5 @@
 function main() {
-	console.log("%s initialized!", Self.Doodad().Title);
+	console.log("%s initialized!", Self.Title);
 
 	var timer = 0;
 
@@ -26,9 +26,4 @@ function main() {
 			timer = 0;
 		}, 200);
 	});
-
-	// Events.OnLeave(function(e) {
-	// 	console.log("%s has stopped touching %s", e, Self.Doodad().Title)
-	// 	Self.Canvas.SetBackground(RGBA(0, 0, 1, 0));
-	// })
 }
diff --git a/dev-assets/doodads/buttons/sticky.js b/dev-assets/doodads/buttons/sticky.js
index 8750fad..9d1893e 100644
--- a/dev-assets/doodads/buttons/sticky.js
+++ b/dev-assets/doodads/buttons/sticky.js
@@ -1,5 +1,5 @@
 function main() {
-	console.log("%s initialized!", Self.Doodad().Title);
+	console.log("%s initialized!", Self.Title);
 
 	var pressed = false;
 
diff --git a/dev-assets/doodads/doors/colored-door.js b/dev-assets/doodads/doors/colored-door.js
index a221b58..f3e12fc 100644
--- a/dev-assets/doodads/doors/colored-door.js
+++ b/dev-assets/doodads/doors/colored-door.js
@@ -1,6 +1,6 @@
 
 function main() {
-	var color = Self.Doodad().Tag("color");
+	var color = Self.GetTag("color");
 	var keyname = "key-" + color + ".doodad";
 
 	// Layers in the doodad image.
diff --git a/dev-assets/doodads/doors/electric-door.js b/dev-assets/doodads/doors/electric-door.js
index ab6dc54..1642890 100644
--- a/dev-assets/doodads/doors/electric-door.js
+++ b/dev-assets/doodads/doors/electric-door.js
@@ -1,5 +1,5 @@
 function main() {
-	console.log("%s initialized!", Self.Doodad().Title);
+	console.log("%s initialized!", Self.Title);
 
 	Self.AddAnimation("open", 100, [0, 1, 2, 3]);
 	Self.AddAnimation("close", 100, [3, 2, 1, 0]);
@@ -9,7 +9,7 @@ function main() {
 	Self.SetHitbox(16, 0, 32, 64);
 
 	Message.Subscribe("power", function(powered) {
-		console.log("%s got power=%+v", Self.Doodad().Title, powered);
+		console.log("%s got power=%+v", Self.Title, powered);
 
 		if (powered) {
 			if (animating || opened) {
diff --git a/dev-assets/doodads/doors/keys.js b/dev-assets/doodads/doors/keys.js
index ee7586a..159069e 100644
--- a/dev-assets/doodads/doors/keys.js
+++ b/dev-assets/doodads/doors/keys.js
@@ -1,9 +1,9 @@
 function main() {
-	var color = Self.Doodad().Tag("color");
+	var color = Self.GetTag("color");
 
 	Events.OnCollide(function(e) {
 		if (e.Settled) {
-			e.Actor.AddItem(Self.Doodad().Filename, 0);
+			e.Actor.AddItem(Self.Filename, 0);
 			Self.Destroy();
 		}
 	})
diff --git a/dev-assets/doodads/doors/locked-door.js b/dev-assets/doodads/doors/locked-door.js
index e1f9f3f..820ae1a 100644
--- a/dev-assets/doodads/doors/locked-door.js
+++ b/dev-assets/doodads/doors/locked-door.js
@@ -2,7 +2,7 @@
 function main() {
 	Self.AddAnimation("open", 0, [1]);
 	var unlocked = false;
-	var color = Self.Doodad().Tag("color");
+	var color = Self.GetTag("color");
 
 	Self.SetHitbox(16, 0, 32, 64);
 
diff --git a/dev-assets/doodads/objects/exit-flag.js b/dev-assets/doodads/objects/exit-flag.js
index 215ad05..08680a9 100644
--- a/dev-assets/doodads/objects/exit-flag.js
+++ b/dev-assets/doodads/objects/exit-flag.js
@@ -1,6 +1,6 @@
 // Exit Flag.
 function main() {
-	console.log("%s initialized!", Self.Doodad().Title);
+	console.log("%s initialized!", Self.Title);
 	Self.SetHitbox(22+16, 16, 75-16, 86);
 
 	Events.OnCollide(function(e) {
diff --git a/dev-assets/doodads/on-off/state-button.js b/dev-assets/doodads/on-off/state-button.js
index 88c06ed..85084d8 100644
--- a/dev-assets/doodads/on-off/state-button.js
+++ b/dev-assets/doodads/on-off/state-button.js
@@ -4,7 +4,7 @@
 var state = false;
 
 function main() {
-	console.log("%s ID '%s' initialized!", Self.Doodad().Title, Self.ID());
+	console.log("%s ID '%s' initialized!", Self.Title, Self.ID());
 	Self.SetHitbox(0, 0, 33, 33);
 
 	// When the button is activated, don't keep toggling state until we're not
diff --git a/dev-assets/doodads/switches/switch.js b/dev-assets/doodads/switches/switch.js
index c5aff2e..c36b2de 100644
--- a/dev-assets/doodads/switches/switch.js
+++ b/dev-assets/doodads/switches/switch.js
@@ -1,5 +1,5 @@
 function main() {
-	console.log("%s initialized!", Self.Doodad().Title);
+	console.log("%s initialized!", Self.Title);
 
 	// Switch has two frames:
 	// 0: Off
diff --git a/dev-assets/doodads/trapdoors/down.js b/dev-assets/doodads/trapdoors/down.js
index 2ed3907..cc45c41 100644
--- a/dev-assets/doodads/trapdoors/down.js
+++ b/dev-assets/doodads/trapdoors/down.js
@@ -1,5 +1,5 @@
 function main() {
-	console.log("%s initialized!", Self.Doodad().Title);
+	console.log("%s initialized!", Self.Title);
 
 	var timer = 0;
 
diff --git a/dev-assets/doodads/trapdoors/trapdoor.js b/dev-assets/doodads/trapdoors/trapdoor.js
index 9e2a27a..fb23362 100644
--- a/dev-assets/doodads/trapdoors/trapdoor.js
+++ b/dev-assets/doodads/trapdoors/trapdoor.js
@@ -1,6 +1,6 @@
 function main() {
 	// What direction is the trapdoor facing?
-	var direction = Self.Doodad().Tag("direction");
+	var direction = Self.GetTag("direction");
 	console.log("Trapdoor(%s) initialized", direction);
 
 	var timer = 0;