Index: uspace/lib/libc/generic/io/io.c
===================================================================
--- uspace/lib/libc/generic/io/io.c	(revision 301ff30236f92bdd150603d5f6eb622239140696)
+++ uspace/lib/libc/generic/io/io.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -145,5 +145,5 @@
 }
 
-FILE *fopen_node(inode_t *node, const char *mode)
+FILE *fopen_node(fdi_node_t *node, const char *mode)
 {
 	int flags;
@@ -354,5 +354,5 @@
 }
 
-void fnode(FILE *stream, inode_t *node)
+void fnode(FILE *stream, fdi_node_t *node)
 {
 	if (stream->fd >= 0) {
Index: uspace/lib/libc/generic/loader.c
===================================================================
--- uspace/lib/libc/generic/loader.c	(revision 301ff30236f92bdd150603d5f6eb622239140696)
+++ uspace/lib/libc/generic/loader.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -206,5 +206,5 @@
  *
  */
-int loader_set_files(loader_t *ldr, inode_t *const files[])
+int loader_set_files(loader_t *ldr, fdi_node_t *const files[])
 {
 	/*
@@ -212,5 +212,5 @@
 	 * compute size of the buffer needed.
 	 */
-	inode_t *const *ap = files;
+	fdi_node_t *const *ap = files;
 	size_t count = 0;
 	while (*ap != NULL) {
@@ -219,5 +219,6 @@
 	}
 	
-	inode_t *files_buf = (inode_t *) malloc(count * sizeof(inode_t));
+	fdi_node_t *files_buf;
+	files_buf = (fdi_node_t *) malloc(count * sizeof(fdi_node_t));
 	if (files_buf == NULL)
 		return ENOMEM;
@@ -232,5 +233,5 @@
 	aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
 	ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) files_buf,
-	    count * sizeof(inode_t));
+	    count * sizeof(fdi_node_t));
 	if (rc != EOK) {
 		async_wait_for(req, NULL);
Index: uspace/lib/libc/generic/task.c
===================================================================
--- uspace/lib/libc/generic/task.c	(revision 301ff30236f92bdd150603d5f6eb622239140696)
+++ uspace/lib/libc/generic/task.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -101,8 +101,8 @@
 	
 	/* Send default files */
-	inode_t *files[4];
-	inode_t stdin_node;
-	inode_t stdout_node;
-	inode_t stderr_node;
+	fdi_node_t *files[4];
+	fdi_node_t stdin_node;
+	fdi_node_t stdout_node;
+	fdi_node_t stderr_node;
 	
 	if ((stdin != NULL) && (stdin != &stdin_null)) {
Index: uspace/lib/libc/generic/vfs/vfs.c
===================================================================
--- uspace/lib/libc/generic/vfs/vfs.c	(revision 301ff30236f92bdd150603d5f6eb622239140696)
+++ uspace/lib/libc/generic/vfs/vfs.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -224,5 +224,5 @@
 }
 
-int open_node(inode_t *node, int oflag)
+int open_node(fdi_node_t *node, int oflag)
 {
 	futex_down(&vfs_phone_futex);
@@ -333,5 +333,5 @@
 }
 
-void fd_node(int fildes, inode_t *node)
+void fd_node(int fildes, fdi_node_t *node)
 {
 	futex_down(&vfs_phone_futex);