Index: uspace/lib/fdisk/src/fdisk.c
===================================================================
--- uspace/lib/fdisk/src/fdisk.c	(revision 3cdd876d0918f7f14a6d0e500a2f8a23bfdcb133)
+++ uspace/lib/fdisk/src/fdisk.c	(revision e18f0c0a995a22fc6e4a2213cd438d98b62beab4)
@@ -35,5 +35,5 @@
 
 #include <adt/list.h>
-#include <cap.h>
+#include <capa.h>
 #include <errno.h>
 #include <fdisk.h>
@@ -219,5 +219,5 @@
 }
 
-errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *info, cap_spec_t *cap)
+errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *info, capa_spec_t *capa)
 {
 	vbd_disk_info_t vinfo;
@@ -228,5 +228,5 @@
 		return EIO;
 
-	cap_from_blocks(vinfo.nblocks, vinfo.block_size, cap);
+	capa_from_blocks(vinfo.nblocks, vinfo.block_size, capa);
 	return EOK;
 }
@@ -295,5 +295,5 @@
 		dev->ext_part = part;
 
-	cap_from_blocks(part->nblocks, dev->dinfo.block_size,
+	capa_from_blocks(part->nblocks, dev->dinfo.block_size,
 	    &part->capacity);
 	part->part_id = partid;
@@ -536,7 +536,7 @@
 }
 
-errno_t fdisk_dev_capacity(fdisk_dev_t *dev, cap_spec_t *cap)
-{
-	cap_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, cap);
+errno_t fdisk_dev_capacity(fdisk_dev_t *dev, capa_spec_t *capa)
+{
+	capa_from_blocks(dev->dinfo.nblocks, dev->dinfo.block_size, capa);
 	return EOK;
 }
@@ -679,5 +679,6 @@
 
 /** Get size of largest free block. */
-errno_t fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc, cap_spec_t *cap)
+errno_t fdisk_part_get_max_avail(fdisk_dev_t *dev, fdisk_spc_t spc,
+    capa_spec_t *capa)
 {
 	errno_t rc;
@@ -698,5 +699,5 @@
 	}
 
-	cap_from_blocks(nb, dev->dinfo.block_size, cap);
+	capa_from_blocks(nb, dev->dinfo.block_size, capa);
 	return EOK;
 }
@@ -704,5 +705,5 @@
 /** Get total free space capacity. */
 errno_t fdisk_part_get_tot_avail(fdisk_dev_t *dev, fdisk_spc_t spc,
-    cap_spec_t *cap)
+    capa_spec_t *capa)
 {
 	fdisk_free_range_t fr;
@@ -726,5 +727,5 @@
 	} while (fdisk_free_range_next(&fr));
 
-	cap_from_blocks(totb, dev->dinfo.block_size, cap);
+	capa_from_blocks(totb, dev->dinfo.block_size, capa);
 	return EOK;
 }
@@ -938,15 +939,15 @@
 	errno_t rc;
 
-	rc = cap_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
+	rc = capa_to_blocks(&pspec->capacity, cv_nom, dev->dinfo.block_size,
 	    &nom_blocks);
 	if (rc != EOK)
 		return rc;
 
-	rc = cap_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
+	rc = capa_to_blocks(&pspec->capacity, cv_min, dev->dinfo.block_size,
 	    &min_blocks);
 	if (rc != EOK)
 		return rc;
 
-	rc = cap_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
+	rc = capa_to_blocks(&pspec->capacity, cv_max, dev->dinfo.block_size,
 	    &max_blocks);
 	if (rc != EOK)