Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 216d6fc606ae06cb619154c1ca9763af0f2c1978)
+++ boot/arch/amd64/Makefile.inc	(revision 5ab597d597af91ae13344efc2265b1cbfb0ee935)
@@ -49,5 +49,5 @@
 	$(USPACEDIR)/app/tester/tester \
 	$(USPACEDIR)/app/klog/klog \
-	$(USPACEDIR)/app/cli/cli \
+	$(USPACEDIR)/app/bdsh/bdsh \
 	$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
 	$(USPACEDIR)/srv/fs/fat/fat
Index: boot/arch/arm32/loader/Makefile
===================================================================
--- boot/arch/arm32/loader/Makefile	(revision 216d6fc606ae06cb619154c1ca9763af0f2c1978)
+++ boot/arch/arm32/loader/Makefile	(revision 5ab597d597af91ae13344efc2265b1cbfb0ee935)
@@ -102,5 +102,5 @@
 	$(USPACEDIR)/app/tester/tester \
 	$(USPACEDIR)/app/klog/klog \
-	$(USPACEDIR)/app/cli/cli
+	$(USPACEDIR)/app/bdsh/bdsh
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
Index: boot/arch/ia32/Makefile.inc
===================================================================
--- boot/arch/ia32/Makefile.inc	(revision 216d6fc606ae06cb619154c1ca9763af0f2c1978)
+++ boot/arch/ia32/Makefile.inc	(revision 5ab597d597af91ae13344efc2265b1cbfb0ee935)
@@ -49,5 +49,4 @@
 	$(USPACEDIR)/app/tetris/tetris \
 	$(USPACEDIR)/app/tester/tester \
-	$(USPACEDIR)/app/cli/cli \
 	$(USPACEDIR)/app/klog/klog \
 	$(USPACEDIR)/app/bdsh/bdsh
Index: boot/arch/mips32/loader/Makefile
===================================================================
--- boot/arch/mips32/loader/Makefile	(revision 216d6fc606ae06cb619154c1ca9763af0f2c1978)
+++ boot/arch/mips32/loader/Makefile	(revision 5ab597d597af91ae13344efc2265b1cbfb0ee935)
@@ -101,5 +101,5 @@
 	$(USPACEDIR)/app/tetris/tetris \
 	$(USPACEDIR)/app/tester/tester \
-	$(USPACEDIR)/app/cli/cli \
+	$(USPACEDIR)/app/bdsh/bdsh \
 	$(USPACEDIR)/app/klog/klog
 
Index: boot/arch/ppc32/loader/Makefile
===================================================================
--- boot/arch/ppc32/loader/Makefile	(revision 216d6fc606ae06cb619154c1ca9763af0f2c1978)
+++ boot/arch/ppc32/loader/Makefile	(revision 5ab597d597af91ae13344efc2265b1cbfb0ee935)
@@ -97,5 +97,5 @@
 	$(USPACEDIR)/app/tester/tester \
 	$(USPACEDIR)/app/klog/klog \
-	$(USPACEDIR)/app/cli/cli
+	$(USPACEDIR)/app/bdsh/bdsh
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
Index: boot/arch/sparc64/loader/Makefile
===================================================================
--- boot/arch/sparc64/loader/Makefile	(revision 216d6fc606ae06cb619154c1ca9763af0f2c1978)
+++ boot/arch/sparc64/loader/Makefile	(revision 5ab597d597af91ae13344efc2265b1cbfb0ee935)
@@ -99,5 +99,5 @@
 	$(USPACEDIR)/app/tetris/tetris \
 	$(USPACEDIR)/app/tester/tester \
-	$(USPACEDIR)/app/cli/cli \
+	$(USPACEDIR)/app/bdsh/bdsh \
 	$(USPACEDIR)/app/klog/klog