Index: uspace/lib/fdisk/include/fdisk.h
===================================================================
--- uspace/lib/fdisk/include/fdisk.h	(revision 3cdd876d0918f7f14a6d0e500a2f8a23bfdcb133)
+++ uspace/lib/fdisk/include/fdisk.h	(revision a163d102718b1eaba5e08139ad98ade5e94e60ee)
@@ -50,5 +50,5 @@
 extern errno_t fdisk_dev_info_get_svcname(fdisk_dev_info_t *, char **);
 extern void fdisk_dev_info_get_svcid(fdisk_dev_info_t *, service_id_t *);
-extern errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *, cap_spec_t *);
+extern errno_t fdisk_dev_info_capacity(fdisk_dev_info_t *, capa_spec_t *);
 
 extern errno_t fdisk_dev_open(fdisk_t *, service_id_t, fdisk_dev_t **);
@@ -57,5 +57,5 @@
 extern void fdisk_dev_get_flags(fdisk_dev_t *, fdisk_dev_flags_t *);
 extern errno_t fdisk_dev_get_svcname(fdisk_dev_t *, char **);
-extern errno_t fdisk_dev_capacity(fdisk_dev_t *, cap_spec_t *);
+extern errno_t fdisk_dev_capacity(fdisk_dev_t *, capa_spec_t *);
 
 extern errno_t fdisk_label_get_info(fdisk_dev_t *, fdisk_label_info_t *);
@@ -66,6 +66,6 @@
 extern fdisk_part_t *fdisk_part_next(fdisk_part_t *);
 extern errno_t fdisk_part_get_info(fdisk_part_t *, fdisk_part_info_t *);
-extern errno_t fdisk_part_get_max_avail(fdisk_dev_t *, fdisk_spc_t, cap_spec_t *);
-extern errno_t fdisk_part_get_tot_avail(fdisk_dev_t *, fdisk_spc_t, cap_spec_t *);
+extern errno_t fdisk_part_get_max_avail(fdisk_dev_t *, fdisk_spc_t, capa_spec_t *);
+extern errno_t fdisk_part_get_tot_avail(fdisk_dev_t *, fdisk_spc_t, capa_spec_t *);
 extern errno_t fdisk_part_create(fdisk_dev_t *, fdisk_part_spec_t *,
     fdisk_part_t **);
Index: uspace/lib/fdisk/include/types/fdisk.h
===================================================================
--- uspace/lib/fdisk/include/types/fdisk.h	(revision 3cdd876d0918f7f14a6d0e500a2f8a23bfdcb133)
+++ uspace/lib/fdisk/include/types/fdisk.h	(revision a163d102718b1eaba5e08139ad98ade5e94e60ee)
@@ -38,5 +38,5 @@
 
 #include <adt/list.h>
-#include <cap.h>
+#include <capa.h>
 #include <loc.h>
 #include <stdint.h>
@@ -126,5 +126,5 @@
 	link_t llog_ba;
 	/** Capacity */
-	cap_spec_t capacity;
+	capa_spec_t capacity;
 	/** Partition kind */
 	label_pkind_t pkind;
@@ -150,5 +150,5 @@
 typedef struct {
 	/** Desired capacity */
-	cap_spec_t capacity;
+	capa_spec_t capacity;
 	/** Partition kind */
 	label_pkind_t pkind;
@@ -164,5 +164,5 @@
 typedef struct {
 	/** Capacity */
-	cap_spec_t capacity;
+	capa_spec_t capacity;
 	/** Partition kind */
 	label_pkind_t pkind;