Index: uspace/lib/fs/libfs.c
===================================================================
--- uspace/lib/fs/libfs.c	(revision 80a96d2355e43d996baf70b026fae98a9d19add6)
+++ uspace/lib/fs/libfs.c	(revision b33870b00ba2bd8f14a2d09b6b7de5f304c5b953)
@@ -837,5 +837,5 @@
 	stat.is_directory = ops->is_directory(fn);
 	stat.size = ops->size_get(fn);
-	stat.service = ops->device_get(fn);
+	stat.service = ops->service_get(fn);
 	
 	ops->node_put(fn);
Index: uspace/lib/fs/libfs.h
===================================================================
--- uspace/lib/fs/libfs.h	(revision 80a96d2355e43d996baf70b026fae98a9d19add6)
+++ uspace/lib/fs/libfs.h	(revision b33870b00ba2bd8f14a2d09b6b7de5f304c5b953)
@@ -92,5 +92,5 @@
 	bool (* is_directory)(fs_node_t *);
 	bool (* is_file)(fs_node_t *);
-	service_id_t (* device_get)(fs_node_t *);
+	service_id_t (* service_get)(fs_node_t *);
 } libfs_ops_t;
 
Index: uspace/srv/fs/cdfs/cdfs_ops.c
===================================================================
--- uspace/srv/fs/cdfs/cdfs_ops.c	(revision 80a96d2355e43d996baf70b026fae98a9d19add6)
+++ uspace/srv/fs/cdfs/cdfs_ops.c	(revision b33870b00ba2bd8f14a2d09b6b7de5f304c5b953)
@@ -629,5 +629,5 @@
 }
 
-static service_id_t cdfs_device_get(fs_node_t *fn)
+static service_id_t cdfs_service_get(fs_node_t *fn)
 {
 	return 0;
@@ -650,5 +650,5 @@
 	.is_directory = cdfs_is_directory,
 	.is_file = cdfs_is_file,
-	.device_get = cdfs_device_get
+	.service_get = cdfs_service_get
 };
 
Index: uspace/srv/fs/exfat/exfat_ops.c
===================================================================
--- uspace/srv/fs/exfat/exfat_ops.c	(revision 80a96d2355e43d996baf70b026fae98a9d19add6)
+++ uspace/srv/fs/exfat/exfat_ops.c	(revision b33870b00ba2bd8f14a2d09b6b7de5f304c5b953)
@@ -87,5 +87,5 @@
 static bool exfat_is_directory(fs_node_t *);
 static bool exfat_is_file(fs_node_t *node);
-static service_id_t exfat_device_get(fs_node_t *node);
+static service_id_t exfat_service_get(fs_node_t *node);
 
 /*
@@ -898,5 +898,5 @@
 }
 
-service_id_t exfat_device_get(fs_node_t *node)
+service_id_t exfat_service_get(fs_node_t *node)
 {
 	return 0;
@@ -921,5 +921,5 @@
 	.is_directory = exfat_is_directory,
 	.is_file = exfat_is_file,
-	.device_get = exfat_device_get
+	.service_get = exfat_service_get
 };
 
Index: uspace/srv/fs/ext2fs/ext2fs_ops.c
===================================================================
--- uspace/srv/fs/ext2fs/ext2fs_ops.c	(revision 80a96d2355e43d996baf70b026fae98a9d19add6)
+++ uspace/srv/fs/ext2fs/ext2fs_ops.c	(revision b33870b00ba2bd8f14a2d09b6b7de5f304c5b953)
@@ -112,5 +112,5 @@
 static bool ext2fs_is_directory(fs_node_t *);
 static bool ext2fs_is_file(fs_node_t *node);
-static service_id_t ext2fs_device_get(fs_node_t *node);
+static service_id_t ext2fs_service_get(fs_node_t *node);
 
 /*
@@ -557,5 +557,5 @@
 }
 
-service_id_t ext2fs_device_get(fs_node_t *fn)
+service_id_t ext2fs_service_get(fs_node_t *fn)
 {
 	EXT2FS_DBG("");
@@ -581,5 +581,5 @@
 	.is_directory = ext2fs_is_directory,
 	.is_file = ext2fs_is_file,
-	.device_get = ext2fs_device_get
+	.service_get = ext2fs_service_get
 };
 
Index: uspace/srv/fs/fat/fat_ops.c
===================================================================
--- uspace/srv/fs/fat/fat_ops.c	(revision 80a96d2355e43d996baf70b026fae98a9d19add6)
+++ uspace/srv/fs/fat/fat_ops.c	(revision b33870b00ba2bd8f14a2d09b6b7de5f304c5b953)
@@ -90,5 +90,5 @@
 static bool fat_is_directory(fs_node_t *);
 static bool fat_is_file(fs_node_t *node);
-static service_id_t fat_device_get(fs_node_t *node);
+static service_id_t fat_service_get(fs_node_t *node);
 
 /*
@@ -838,5 +838,5 @@
 }
 
-service_id_t fat_device_get(fs_node_t *node)
+service_id_t fat_service_get(fs_node_t *node)
 {
 	return 0;
@@ -860,5 +860,5 @@
 	.is_directory = fat_is_directory,
 	.is_file = fat_is_file,
-	.device_get = fat_device_get
+	.service_get = fat_service_get
 };
 
Index: uspace/srv/fs/locfs/locfs_ops.c
===================================================================
--- uspace/srv/fs/locfs/locfs_ops.c	(revision 80a96d2355e43d996baf70b026fae98a9d19add6)
+++ uspace/srv/fs/locfs/locfs_ops.c	(revision b33870b00ba2bd8f14a2d09b6b7de5f304c5b953)
@@ -418,5 +418,5 @@
 }
 
-static service_id_t locfs_device_get(fs_node_t *fn)
+static service_id_t locfs_service_get(fs_node_t *fn)
 {
 	locfs_node_t *node = (locfs_node_t *) fn->data;
@@ -445,5 +445,5 @@
 	.is_directory = locfs_is_directory,
 	.is_file = locfs_is_file,
-	.device_get = locfs_device_get
+	.service_get = locfs_service_get
 };
 
Index: uspace/srv/fs/minixfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/minixfs/mfs_ops.c	(revision 80a96d2355e43d996baf70b026fae98a9d19add6)
+++ uspace/srv/fs/minixfs/mfs_ops.c	(revision b33870b00ba2bd8f14a2d09b6b7de5f304c5b953)
@@ -55,5 +55,5 @@
 static int mfs_has_children(bool *has_children, fs_node_t *fsnode);
 static int mfs_root_get(fs_node_t **rfn, service_id_t service_id);
-static service_id_t mfs_device_get(fs_node_t *fsnode);
+static service_id_t mfs_service_get(fs_node_t *fsnode);
 static aoff64_t mfs_size_get(fs_node_t *node);
 static int mfs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component);
@@ -81,5 +81,5 @@
 	.size_get = mfs_size_get,
 	.root_get = mfs_root_get,
-	.device_get = mfs_device_get,
+	.service_get = mfs_service_get,
 	.is_directory = mfs_is_directory,
 	.is_file = mfs_is_file,
@@ -325,5 +325,5 @@
 }
 
-service_id_t mfs_device_get(fs_node_t *fsnode)
+service_id_t mfs_service_get(fs_node_t *fsnode)
 {
 	struct mfs_node *node = fsnode->data;
Index: uspace/srv/fs/tmpfs/tmpfs_ops.c
===================================================================
--- uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision 80a96d2355e43d996baf70b026fae98a9d19add6)
+++ uspace/srv/fs/tmpfs/tmpfs_ops.c	(revision b33870b00ba2bd8f14a2d09b6b7de5f304c5b953)
@@ -114,5 +114,5 @@
 }
 
-static service_id_t tmpfs_device_get(fs_node_t *fn)
+static service_id_t tmpfs_service_get(fs_node_t *fn)
 {
 	return 0;
@@ -136,5 +136,5 @@
 	.is_directory = tmpfs_is_directory,
 	.is_file = tmpfs_is_file,
-	.device_get = tmpfs_device_get
+	.service_get = tmpfs_service_get
 };