diff --git a/extra/trees/avl-tree/avl-tree-tests.factor b/extra/trees/avl/avl-tests.factor
similarity index 99%
rename from extra/trees/avl-tree/avl-tree-tests.factor
rename to extra/trees/avl/avl-tests.factor
index 5790bc46d8..aba97ad043 100644
--- a/extra/trees/avl-tree/avl-tree-tests.factor
+++ b/extra/trees/avl/avl-tests.factor
@@ -1,4 +1,4 @@
-USING: kernel tools.test trees trees.avl-tree math random sequences ;
+USING: kernel tools.test trees trees.avl math random sequences ;
 IN: temporary
 
 [ "key1" 0 "key2" 0 ] [ T{ avl-node T{ node f "key1" f f T{ avl-node T{ node f "key2" } 1 } } 2 } [ single-rotate ] go-left [ node-left dup node-key swap avl-node-balance ] keep dup node-key swap avl-node-balance ] unit-test
diff --git a/extra/trees/avl-tree/avl-tree.factor b/extra/trees/avl/avl.factor
similarity index 99%
rename from extra/trees/avl-tree/avl-tree.factor
rename to extra/trees/avl/avl.factor
index 3f3cd1f7c5..654a078a23 100644
--- a/extra/trees/avl-tree/avl-tree.factor
+++ b/extra/trees/avl/avl.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators kernel generic math math.functions math.parser namespaces io
 sequences trees ;
-IN: trees.avl-tree
+IN: trees.avl
 
 TUPLE: avl-tree ;
 
diff --git a/extra/trees/bst/bst-tests.factor b/extra/trees/binary/binary-tests.factor
similarity index 97%
rename from extra/trees/bst/bst-tests.factor
rename to extra/trees/binary/binary-tests.factor
index 09761cec96..7abf2f0da5 100644
--- a/extra/trees/bst/bst-tests.factor
+++ b/extra/trees/binary/binary-tests.factor
@@ -1,4 +1,4 @@
-USING: trees trees.bst tools.test kernel sequences ;
+USING: trees trees.binary tools.test kernel sequences ;
 IN: temporary
 
 : test-tree ( -- tree )
diff --git a/extra/trees/bst/bst.factor b/extra/trees/binary/binary.factor
similarity index 99%
rename from extra/trees/bst/bst.factor
rename to extra/trees/binary/binary.factor
index 9b2aca4c9d..5fc7abc636 100644
--- a/extra/trees/bst/bst.factor
+++ b/extra/trees/binary/binary.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Alex Chapman
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel generic math trees ;
-IN: trees.bst
+IN: trees.binary
 
 TUPLE: bst ;