diff --git a/basis/compiler/tree/cleanup/cleanup-tests.factor b/basis/compiler/tree/cleanup/cleanup-tests.factor
index 6919e2b022..9ebb13163f 100644
--- a/basis/compiler/tree/cleanup/cleanup-tests.factor
+++ b/basis/compiler/tree/cleanup/cleanup-tests.factor
@@ -479,7 +479,7 @@ cell-bits 32 = [
 
 [ ] [
     [ { null } declare [ 1 ] [ 2 ] if ]
-    build-tree normalize propagate cleanup check-nodes
+    build-tree normalize propagate cleanup-tree check-nodes
 ] unit-test
 
 [ t ] [
diff --git a/basis/compiler/tree/dead-code/dead-code-tests.factor b/basis/compiler/tree/dead-code/dead-code-tests.factor
index 237078a159..1ea78be523 100644
--- a/basis/compiler/tree/dead-code/dead-code-tests.factor
+++ b/basis/compiler/tree/dead-code/dead-code-tests.factor
@@ -15,7 +15,7 @@ IN: compiler.tree.dead-code.tests
     analyze-recursive
     normalize
     propagate
-    cleanup
+    cleanup-tree
     escape-analysis
     unbox-tuples
     compute-def-use
@@ -67,7 +67,7 @@ IN: compiler.tree.dead-code.tests
     analyze-recursive
     normalize
     propagate
-    cleanup
+    cleanup-tree
     escape-analysis
     unbox-tuples
     compute-def-use
diff --git a/basis/compiler/tree/def-use/def-use-tests.factor b/basis/compiler/tree/def-use/def-use-tests.factor
index 227a1f1dd7..8dec477aae 100644
--- a/basis/compiler/tree/def-use/def-use-tests.factor
+++ b/basis/compiler/tree/def-use/def-use-tests.factor
@@ -20,7 +20,7 @@ IN: compiler.tree.def-use.tests
     analyze-recursive
     normalize
     propagate
-    cleanup
+    cleanup-tree
     compute-def-use
     check-nodes ;
 
diff --git a/basis/compiler/tree/escape-analysis/check/check-tests.factor b/basis/compiler/tree/escape-analysis/check/check-tests.factor
index bd91dd53e8..beeac95fe9 100644
--- a/basis/compiler/tree/escape-analysis/check/check-tests.factor
+++ b/basis/compiler/tree/escape-analysis/check/check-tests.factor
@@ -4,7 +4,7 @@ compiler.tree.propagation compiler.tree.cleanup ;
 IN: compiler.tree.escape-analysis.check.tests
 
 : test-checker ( quot -- ? )
-    build-tree normalize propagate cleanup run-escape-analysis? ;
+    build-tree normalize propagate cleanup-tree run-escape-analysis? ;
 
 [ t ] [
     [ { complex } declare [ real>> ] [ imaginary>> ] bi ]
diff --git a/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor b/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor
index ff67059e1e..ec8d042f3d 100644
--- a/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor
+++ b/basis/compiler/tree/escape-analysis/escape-analysis-tests.factor
@@ -34,7 +34,7 @@ M: node count-unboxed-allocations* drop ;
     analyze-recursive
     normalize
     propagate
-    cleanup
+    cleanup-tree
     escape-analysis
     dup check-nodes
     compute-def-use
diff --git a/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor b/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor
index 6f70035fed..1adff3b95b 100644
--- a/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor
+++ b/basis/compiler/tree/tuple-unboxing/tuple-unboxing-tests.factor
@@ -13,7 +13,7 @@ IN: compiler.tree.tuple-unboxing.tests
     analyze-recursive
     normalize
     propagate
-    cleanup
+    cleanup-tree
     escape-analysis
     unbox-tuples
     check-nodes ;