diff --git a/cmd/arglist.c b/cmd/arglist.c
index 7cb2ff4..d396e68 100644
--- a/cmd/arglist.c
+++ b/cmd/arglist.c
@@ -10,14 +10,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-FX_BTREE_DEFINE_SIMPLE_INSERT(
+FX_BST_DEFINE_SIMPLE_INSERT(
 	struct fx_arglist_option, opt_node, opt_id, put_arglist_option)
-FX_BTREE_DEFINE_SIMPLE_GET(
+FX_BST_DEFINE_SIMPLE_GET(
 	struct fx_arglist_option, unsigned int, opt_node, opt_id, get_arglist_option)
 
-FX_BTREE_DEFINE_SIMPLE_INSERT(
+FX_BST_DEFINE_SIMPLE_INSERT(
 	struct fx_arglist_value, val_node, val_id, put_arglist_value)
-FX_BTREE_DEFINE_SIMPLE_GET(
+FX_BST_DEFINE_SIMPLE_GET(
 	struct fx_arglist_value, unsigned int, val_node, val_id, get_arglist_value)
 
 struct argv_parser {
diff --git a/cmd/command.c b/cmd/command.c
index 8fa44cd..b080266 100644
--- a/cmd/command.c
+++ b/cmd/command.c
@@ -1,7 +1,7 @@
 #include "command.h"
 
 #include <fx/cmd.h>
-#include <fx/core/btree.h>
+#include <fx/core/bst.h>
 #include <fx/ds/string.h>
 #include <fx/term/print.h>
 #include <fx/term/tty.h>
@@ -13,8 +13,8 @@
 
 static struct fx_bst command_list = {0};
 
-FX_BTREE_DEFINE_SIMPLE_GET(struct fx_command, unsigned int, c_node, c_id, get_command)
-FX_BTREE_DEFINE_SIMPLE_INSERT(struct fx_command, c_node, c_id, put_command)
+FX_BST_DEFINE_SIMPLE_GET(struct fx_command, unsigned int, c_node, c_id, get_command)
+FX_BST_DEFINE_SIMPLE_INSERT(struct fx_command, c_node, c_id, put_command)
 
 enum item_type {
 	ITEM_OPTION,
diff --git a/cmd/command.h b/cmd/command.h
index e900dc9..57c388b 100644
--- a/cmd/command.h
+++ b/cmd/command.h
@@ -2,7 +2,7 @@
 #define _FX_COMMAND_H_
 
 #include <fx/cmd.h>
-#include <fx/core/btree.h>
+#include <fx/core/bst.h>
 #include <fx/core/queue.h>
 #include <fx/ds/string.h>
 
diff --git a/cmd/include/fx/cmd.h b/cmd/include/fx/cmd.h
index 35cda05..5ea27e4 100644
--- a/cmd/include/fx/cmd.h
+++ b/cmd/include/fx/cmd.h
@@ -1,7 +1,7 @@
 #ifndef FX_CMD_H_
 #define FX_CMD_H_
 
-#include <fx/core/btree.h>
+#include <fx/core/bst.h>
 #include <fx/core/init.h>
 #include <fx/core/iterator.h>
 #include <fx/core/queue.h>