Index: uspace/app/trace/trace.c
===================================================================
--- uspace/app/trace/trace.c	(revision fcab7ef52ce87f4e12983237693d25d80bdb4fd7)
+++ uspace/app/trace/trace.c	(revision fe91f66babd983082bdd8bef5fe246fe62811619)
@@ -708,5 +708,5 @@
 	proto_add_oper(p, VFS_IN_TRUNCATE, o);
 	o = oper_new("fstat", 1, arg_def, V_ERRNO, 0, resp_def);
-	proto_add_oper(p, VFS_IN_FSTAT, o);
+	proto_add_oper(p, VFS_IN_STAT, o);
 	o = oper_new("close", 1, arg_def, V_ERRNO, 0, resp_def);
 	proto_add_oper(p, VFS_IN_CLOSE, o);
@@ -723,8 +723,8 @@
 	o = oper_new("walk", 2, arg_def, V_INT_ERRNO, 0, resp_def);
 	proto_add_oper(p, VFS_IN_WALK, o);
-	o = oper_new("open2", 2, arg_def, V_ERRNO, 0, resp_def);
-	proto_add_oper(p, VFS_IN_OPEN2, o);
-	o = oper_new("unlink2", 3, arg_def, V_ERRNO, 0, resp_def);
-	proto_add_oper(p, VFS_IN_UNLINK2, o);
+	o = oper_new("open", 2, arg_def, V_ERRNO, 0, resp_def);
+	proto_add_oper(p, VFS_IN_OPEN, o);
+	o = oper_new("unlink", 3, arg_def, V_ERRNO, 0, resp_def);
+	proto_add_oper(p, VFS_IN_UNLINK, o);
 
 	proto_register(SERVICE_VFS, p);
Index: uspace/lib/c/generic/vfs/vfs.c
===================================================================
--- uspace/lib/c/generic/vfs/vfs.c	(revision fcab7ef52ce87f4e12983237693d25d80bdb4fd7)
+++ uspace/lib/c/generic/vfs/vfs.c	(revision fe91f66babd983082bdd8bef5fe246fe62811619)
@@ -160,5 +160,5 @@
 {
 	async_exch_t *exch = vfs_exchange_begin();
-	sysarg_t rc = async_req_2_0(exch, VFS_IN_OPEN2, fildes, mode);
+	sysarg_t rc = async_req_2_0(exch, VFS_IN_OPEN, fildes, mode);
 	vfs_exchange_end(exch);
 	
@@ -654,5 +654,5 @@
 	async_exch_t *exch = vfs_exchange_begin();
 	
-	req = async_send_1(exch, VFS_IN_FSTAT, fildes, NULL);
+	req = async_send_1(exch, VFS_IN_STAT, fildes, NULL);
 	rc = async_data_read_start(exch, (void *) stat, sizeof(struct stat));
 	if (rc != EOK) {
@@ -808,5 +808,5 @@
 }
 
-static int _vfs_unlink2(int parent, const char *path, int expect, int wflag)
+static int _vfs_unlink(int parent, const char *path, int expect, int wflag)
 {
 	sysarg_t rc;
@@ -815,5 +815,5 @@
 	async_exch_t *exch = vfs_exchange_begin();
 	
-	req = async_send_3(exch, VFS_IN_UNLINK2, parent, expect, wflag, NULL);
+	req = async_send_3(exch, VFS_IN_UNLINK, parent, expect, wflag, NULL);
 	rc = async_data_write_start(exch, path, str_size(path));
 	
@@ -849,5 +849,5 @@
 	}
 	
-	int rc = _vfs_unlink2(root, pa, -1, 0);
+	int rc = _vfs_unlink(root, pa, -1, 0);
 	
 	if (rc != EOK) {
@@ -882,5 +882,5 @@
 	}
 	
-	int rc = _vfs_unlink2(root, pa, -1, WALK_DIRECTORY);
+	int rc = _vfs_unlink(root, pa, -1, WALK_DIRECTORY);
 	if (rc != EOK) {
 		errno = rc;
Index: uspace/lib/c/include/ipc/vfs.h
===================================================================
--- uspace/lib/c/include/ipc/vfs.h	(revision fcab7ef52ce87f4e12983237693d25d80bdb4fd7)
+++ uspace/lib/c/include/ipc/vfs.h	(revision fe91f66babd983082bdd8bef5fe246fe62811619)
@@ -66,5 +66,5 @@
 	VFS_IN_WRITE,
 	VFS_IN_TRUNCATE,
-	VFS_IN_FSTAT,
+	VFS_IN_STAT,
 	VFS_IN_CLOSE,
 	VFS_IN_MOUNT,
@@ -76,6 +76,6 @@
 	VFS_IN_STATFS,
 	VFS_IN_WALK,
-	VFS_IN_OPEN2,
-	VFS_IN_UNLINK2,
+	VFS_IN_OPEN,
+	VFS_IN_UNLINK,
 	VFS_IN_CLONE,
 } vfs_in_request_t;
Index: uspace/srv/vfs/vfs.h
===================================================================
--- uspace/srv/vfs/vfs.h	(revision fcab7ef52ce87f4e12983237693d25d80bdb4fd7)
+++ uspace/srv/vfs/vfs.h	(revision fe91f66babd983082bdd8bef5fe246fe62811619)
@@ -206,14 +206,14 @@
 extern int vfs_op_clone(int oldfd, int newfd, bool desc);
 extern int vfs_op_close(int fd);
-extern int vfs_op_fstat(int fd);
 extern int vfs_op_mount(int mpfd, unsigned servid, unsigned flags, unsigned instance, const char *opts, const char *fsname, int *outfd);
 extern int vfs_op_mtab_get(void);
-extern int vfs_op_open2(int fd, int flags);
+extern int vfs_op_open(int fd, int flags);
 extern int vfs_op_read(int fd, aoff64_t, size_t *out_bytes);
 extern int vfs_op_rename(int basefd, char *old, char *new);
+extern int vfs_op_stat(int fd);
 extern int vfs_op_statfs(int fd);
 extern int vfs_op_sync(int fd);
 extern int vfs_op_truncate(int fd, int64_t size);
-extern int vfs_op_unlink2(int parentfd, int expectfd, int wflag, char *path);
+extern int vfs_op_unlink(int parentfd, int expectfd, int wflag, char *path);
 extern int vfs_op_unmount(int mpfd);
 extern int vfs_op_wait_handle(bool high_fd);
Index: uspace/srv/vfs/vfs_ipc.c
===================================================================
--- uspace/srv/vfs/vfs_ipc.c	(revision fcab7ef52ce87f4e12983237693d25d80bdb4fd7)
+++ uspace/srv/vfs/vfs_ipc.c	(revision fe91f66babd983082bdd8bef5fe246fe62811619)
@@ -51,11 +51,4 @@
 }
 
-static void vfs_in_fstat(ipc_callid_t rid, ipc_call_t *request)
-{
-	int fd = IPC_GET_ARG1(*request);
-	int rc = vfs_op_fstat(fd);
-	async_answer_0(rid, rc);
-}
-
 static void vfs_in_mount(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -103,10 +96,10 @@
 }
 
-static void vfs_in_open2(ipc_callid_t rid, ipc_call_t *request)
+static void vfs_in_open(ipc_callid_t rid, ipc_call_t *request)
 {
 	int fd = IPC_GET_ARG1(*request);
 	int flags = IPC_GET_ARG2(*request);
 
-	int rc = vfs_op_open2(fd, flags);
+	int rc = vfs_op_open(fd, flags);
 	async_answer_0(rid, rc);
 }
@@ -167,4 +160,11 @@
 }
 
+static void vfs_in_stat(ipc_callid_t rid, ipc_call_t *request)
+{
+	int fd = IPC_GET_ARG1(*request);
+	int rc = vfs_op_stat(fd);
+	async_answer_0(rid, rc);
+}
+
 static void vfs_in_statfs(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -190,5 +190,5 @@
 }
 
-static void vfs_in_unlink2(ipc_callid_t rid, ipc_call_t *request)
+static void vfs_in_unlink(ipc_callid_t rid, ipc_call_t *request)
 {
 	int parentfd = IPC_GET_ARG1(*request);
@@ -199,5 +199,5 @@
 	int rc = async_data_write_accept((void **) &path, true, 0, 0, 0, NULL);
 	if (rc == EOK)
-		rc = vfs_op_unlink2(parentfd, expectfd, wflag, path);
+		rc = vfs_op_unlink(parentfd, expectfd, wflag, path);
 	
 	async_answer_0(rid, rc);
@@ -272,12 +272,9 @@
 			vfs_in_close(callid, &call);
 			break;
-		case VFS_IN_FSTAT:
-			vfs_in_fstat(callid, &call);
-			break;
 		case VFS_IN_MOUNT:
 			vfs_in_mount(callid, &call);
 			break;
-		case VFS_IN_OPEN2:
-			vfs_in_open2(callid, &call);
+		case VFS_IN_OPEN:
+			vfs_in_open(callid, &call);
 			break;
 		case VFS_IN_READ:
@@ -291,4 +288,7 @@
 			vfs_in_rename(callid, &call);
 			break;
+		case VFS_IN_STAT:
+			vfs_in_stat(callid, &call);
+			break;
 		case VFS_IN_STATFS:
 			vfs_in_statfs(callid, &call);
@@ -300,6 +300,6 @@
 			vfs_in_truncate(callid, &call);
 			break;
-		case VFS_IN_UNLINK2:
-			vfs_in_unlink2(callid, &call);
+		case VFS_IN_UNLINK:
+			vfs_in_unlink(callid, &call);
 			break;
 		case VFS_IN_UNMOUNT:
Index: uspace/srv/vfs/vfs_ops.c
===================================================================
--- uspace/srv/vfs/vfs_ops.c	(revision fcab7ef52ce87f4e12983237693d25d80bdb4fd7)
+++ uspace/srv/vfs/vfs_ops.c	(revision fe91f66babd983082bdd8bef5fe246fe62811619)
@@ -130,21 +130,4 @@
 }
 
-int vfs_op_fstat(int fd)
-{
-	vfs_file_t *file = vfs_file_get(fd);
-	if (!file)
-		return EBADF;
-
-	vfs_node_t *node = file->node;
-
-	async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-	int rc = async_data_read_forward_fast(exch, VFS_OUT_STAT,
-	    node->service_id, node->index, true, 0, NULL);
-	vfs_exchange_release(exch);
-	
-	vfs_file_put(file);
-	return rc;
-}
-
 static int vfs_connect_internal(service_id_t service_id, unsigned flags,
     unsigned instance, const char *options, const char *fsname,
@@ -291,5 +274,5 @@
 }
 
-int vfs_op_open2(int fd, int flags)
+int vfs_op_open(int fd, int flags)
 {
 	if (flags == 0)
@@ -602,4 +585,21 @@
 }
 
+int vfs_op_stat(int fd)
+{
+	vfs_file_t *file = vfs_file_get(fd);
+	if (!file)
+		return EBADF;
+
+	vfs_node_t *node = file->node;
+
+	async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
+	int rc = async_data_read_forward_fast(exch, VFS_OUT_STAT,
+	    node->service_id, node->index, true, 0, NULL);
+	vfs_exchange_release(exch);
+	
+	vfs_file_put(file);
+	return rc;
+}
+
 int vfs_op_statfs(int fd)
 {
@@ -672,5 +672,5 @@
 }
 
-int vfs_op_unlink2(int parentfd, int expectfd, int wflag, char *path)
+int vfs_op_unlink(int parentfd, int expectfd, int wflag, char *path)
 {
 	int rc = EOK;