Index: uspace/lib/fs/libfs.c
===================================================================
--- uspace/lib/fs/libfs.c	(revision b86a32ebc441f6ac34403513e2fad30f2cc1742a)
+++ uspace/lib/fs/libfs.c	(revision c84146d3591766f01374dd9dbf6a71f9db5f7055)
@@ -864,8 +864,8 @@
 	if (NULL != ops->size_block)	
 		statfs.f_bsize = ops->size_block(service_id);
-	if (NULL != ops->total_block)
-		statfs.f_blocks = ops->total_block(service_id);
-	if (NULL != ops->free_block)
-		statfs.f_bfree = ops->free_block(service_id);
+	if (NULL != ops->total_block_count)
+		statfs.f_blocks = ops->total_block_count(service_id);
+	if (NULL != ops->free_block_count)
+		statfs.f_bfree = ops->free_block_count(service_id);
 	
 	ops->node_put(fn);
Index: uspace/lib/fs/libfs.h
===================================================================
--- uspace/lib/fs/libfs.h	(revision b86a32ebc441f6ac34403513e2fad30f2cc1742a)
+++ uspace/lib/fs/libfs.h	(revision c84146d3591766f01374dd9dbf6a71f9db5f7055)
@@ -94,6 +94,6 @@
 	service_id_t (* service_get)(fs_node_t *);
 	uint32_t (* size_block)(service_id_t);
-	uint64_t (* total_block)(service_id_t);
-	uint64_t (* free_block)(service_id_t);
+	uint64_t (* total_block_count)(service_id_t);
+	uint64_t (* free_block_count)(service_id_t);
 } libfs_ops_t;
 
Index: uspace/srv/fs/exfat/exfat_ops.c
===================================================================
--- uspace/srv/fs/exfat/exfat_ops.c	(revision b86a32ebc441f6ac34403513e2fad30f2cc1742a)
+++ uspace/srv/fs/exfat/exfat_ops.c	(revision c84146d3591766f01374dd9dbf6a71f9db5f7055)
@@ -90,6 +90,6 @@
 static service_id_t exfat_service_get(fs_node_t *node);
 static uint32_t exfat_size_block(service_id_t);
-static uint64_t exfat_total_block(service_id_t);
-static uint64_t exfat_free_block(service_id_t);
+static uint64_t exfat_total_block_count(service_id_t);
+static uint64_t exfat_free_block_count(service_id_t);
 
 /*
@@ -923,5 +923,5 @@
 }
 
-uint64_t exfat_total_block(service_id_t service_id)
+uint64_t exfat_total_block_count(service_id_t service_id)
 {
 	exfat_bs_t *bs;
@@ -933,5 +933,5 @@
 }
 
-uint64_t exfat_free_block(service_id_t service_id)
+uint64_t exfat_free_block_count(service_id_t service_id)
 {
 	exfat_bs_t *bs;
@@ -963,6 +963,6 @@
 	.service_get = exfat_service_get,
 	.size_block = exfat_size_block,
-	.total_block = exfat_total_block,
-	.free_block = exfat_free_block
+	.total_block_count = exfat_total_block_count,
+	.free_block_count = exfat_free_block_count
 };
 
Index: uspace/srv/fs/ext4fs/ext4fs_ops.c
===================================================================
--- uspace/srv/fs/ext4fs/ext4fs_ops.c	(revision b86a32ebc441f6ac34403513e2fad30f2cc1742a)
+++ uspace/srv/fs/ext4fs/ext4fs_ops.c	(revision c84146d3591766f01374dd9dbf6a71f9db5f7055)
@@ -102,6 +102,6 @@
 static service_id_t ext4fs_service_get(fs_node_t *node);
 static uint32_t ext4fs_size_block(service_id_t);
-static uint64_t ext4fs_total_block(service_id_t);
-static uint64_t ext4fs_free_block(service_id_t);
+static uint64_t ext4fs_total_block_count(service_id_t);
+static uint64_t ext4fs_free_block_count(service_id_t);
 
 /* Static variables */
@@ -856,5 +856,5 @@
 }
 
-uint64_t ext4fs_total_block(service_id_t service_id)
+uint64_t ext4fs_total_block_count(service_id_t service_id)
 {
 	ext4fs_instance_t *inst;
@@ -871,5 +871,5 @@
 }
 
-uint64_t ext4fs_free_block(service_id_t service_id)
+uint64_t ext4fs_free_block_count(service_id_t service_id)
 {
 	ext4fs_instance_t *inst;
@@ -907,6 +907,6 @@
 	.service_get = ext4fs_service_get,
 	.size_block = ext4fs_size_block,
-	.total_block = ext4fs_total_block,
-	.free_block = ext4fs_free_block
+	.total_block_count = ext4fs_total_block_count,
+	.free_block_count = ext4fs_free_block_count
 };
 
Index: uspace/srv/fs/mfs/mfs_ops.c
===================================================================
--- uspace/srv/fs/mfs/mfs_ops.c	(revision b86a32ebc441f6ac34403513e2fad30f2cc1742a)
+++ uspace/srv/fs/mfs/mfs_ops.c	(revision c84146d3591766f01374dd9dbf6a71f9db5f7055)
@@ -65,6 +65,6 @@
 static bool is_power_of_two(uint32_t n);
 static uint32_t mfs_size_block(service_id_t service_id);
-static uint64_t mfs_total_block(service_id_t service_id);
-static uint64_t mfs_free_block(service_id_t service_id);
+static uint64_t mfs_total_block_count(service_id_t service_id);
+static uint64_t mfs_free_block_count(service_id_t service_id);
 
 static hash_table_t open_nodes;
@@ -89,6 +89,6 @@
 	.lnkcnt_get = mfs_lnkcnt_get,
 	.size_block = mfs_size_block,
-	.total_block = mfs_total_block,
-	.free_block = mfs_free_block
+	.total_block_count = mfs_total_block_count,
+	.free_block_count = mfs_free_block_count
 };
 
@@ -1153,5 +1153,5 @@
 
 static uint64_t
-mfs_total_block(service_id_t service_id)
+mfs_total_block_count(service_id_t service_id)
 {
 	uint64_t block_total;
@@ -1171,5 +1171,5 @@
 
 static uint64_t
-mfs_free_block(service_id_t service_id)
+mfs_free_block_count(service_id_t service_id)
 {
 	uint32_t block_free;