Index: uspace/app/bdsh/cmds/modules/ls/ls.c
===================================================================
--- uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 1e4cadad49fbe94a308f6f74c331537fbfc59425)
+++ uspace/app/bdsh/cmds/modules/ls/ls.c	(revision 963dd91470c346cae22958901351f421d3cbe02d)
@@ -100,4 +100,6 @@
 	if (s.is_file)
 		printf("%-40s\t%llu\n", name, (long long) s.size);
+	else if (s.is_directory)
+		printf("%-40s\t<dir>\n", name);
 	else
 		printf("%-40s\n", name);
Index: uspace/app/init/init.c
===================================================================
--- uspace/app/init/init.c	(revision 1e4cadad49fbe94a308f6f74c331537fbfc59425)
+++ uspace/app/init/init.c	(revision 963dd91470c346cae22958901351f421d3cbe02d)
@@ -58,5 +58,5 @@
 {
 	char *opts = "";
-	const char *root_dev = "initrd";
+	const char *root_dev = "bd/initrd";
 	
 	if (str_cmp(fstype, "tmpfs") == 0)
@@ -97,5 +97,5 @@
 	}
 	
-	snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
+	snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
 	int rc = mount("devfs", "/dev", null, "", IPC_FLAG_BLOCKING);
 	
@@ -170,5 +170,5 @@
 	}
 
-	if (texit != TASK_EXIT_NORMAL || retval != 0) {
+	if ((texit != TASK_EXIT_NORMAL) || (retval != 0)) {
 		printf(NAME ": Server %s failed to start (returned %d)\n",
 			fname, retval);
@@ -206,8 +206,8 @@
 	int rc;
 
-	printf("Trying to mount disk0 on /data... ");
+	printf("Trying to mount bd/disk0 on /data... ");
 	fflush(stdout);
 
-	rc = mount("fat", "/data", "disk0", "wtcache", 0);
+	rc = mount("fat", "/data", "bd/disk0", "wtcache", 0);
 	if (rc == EOK)
 		printf("OK\n");
@@ -256,11 +256,11 @@
 #endif
 
-	getvc("vc0", "/app/bdsh");
-	getvc("vc1", "/app/bdsh");
-	getvc("vc2", "/app/bdsh");
-	getvc("vc3", "/app/bdsh");
-	getvc("vc4", "/app/bdsh");
-	getvc("vc5", "/app/bdsh");
-	getvc("vc6", "/app/klog");
+	getvc("term/vc0", "/app/bdsh");
+	getvc("term/vc1", "/app/bdsh");
+	getvc("term/vc2", "/app/bdsh");
+	getvc("term/vc3", "/app/bdsh");
+	getvc("term/vc4", "/app/bdsh");
+	getvc("term/vc5", "/app/bdsh");
+	getvc("term/vc6", "/app/klog");
 	
 	return 0;
Index: uspace/app/tester/vfs/vfs1.c
===================================================================
--- uspace/app/tester/vfs/vfs1.c	(revision 1e4cadad49fbe94a308f6f74c331537fbfc59425)
+++ uspace/app/tester/vfs/vfs1.c	(revision 963dd91470c346cae22958901351f421d3cbe02d)
@@ -85,5 +85,5 @@
 		return "Unable to create null device";
 	
-	snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
+	snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
 	int rc = mount(FS_TYPE, MOUNT_POINT, null, OPTIONS, FLAGS);
 	switch (rc) {