Index: uspace/lib/ext4/libext4_directory_index.c
===================================================================
--- uspace/lib/ext4/libext4_directory_index.c	(revision 96598b823c7d286ff63f30af73787faf330ddbcc)
+++ uspace/lib/ext4/libext4_directory_index.c	(revision b191acaeb4937b8c78ceeb66b93260dc8d84d7de)
@@ -43,4 +43,10 @@
 #include "libext4.h"
 
+typedef struct ext4_dx_sort_entry {
+	uint32_t hash;
+	uint32_t rec_len;
+	void *dentry;
+} ext4_dx_sort_entry_t;
+
 
 uint8_t ext4_directory_dx_root_info_get_hash_version(
@@ -412,11 +418,5 @@
 }
 
-typedef struct ext4_dx_sort_entry {
-	uint32_t hash;
-	uint32_t rec_len;
-	void *dentry;
-} ext4_dx_sort_entry_t;
-
-static int dx_entry_comparator(void *arg1, void *arg2, void *dummy)
+static int ext4_directory_dx_entry_comparator(void *arg1, void *arg2, void *dummy)
 {
 	ext4_dx_sort_entry_t *entry1 = arg1;
@@ -519,5 +519,5 @@
 	}
 
-	qsort(sort_array, idx, sizeof(ext4_dx_sort_entry_t), dx_entry_comparator, NULL);
+	qsort(sort_array, idx, sizeof(ext4_dx_sort_entry_t), ext4_directory_dx_entry_comparator, NULL);
 
 	uint32_t new_fblock;
Index: uspace/lib/ext4/libext4_inode.c
===================================================================
--- uspace/lib/ext4/libext4_inode.c	(revision 96598b823c7d286ff63f30af73787faf330ddbcc)
+++ uspace/lib/ext4/libext4_inode.c	(revision b191acaeb4937b8c78ceeb66b93260dc8d84d7de)
@@ -234,5 +234,5 @@
 }
 
-uint64_t ext4_get_inode_file_acl(ext4_inode_t *inode, ext4_superblock_t *sb)
+uint64_t ext4_inode_get_file_acl(ext4_inode_t *inode, ext4_superblock_t *sb)
 {
 	if (ext4_superblock_get_creator_os(sb) == EXT4_SUPERBLOCK_OS_LINUX) {
@@ -244,5 +244,5 @@
 }
 
-void ext4_set_inode_file_acl(ext4_inode_t *inode, ext4_superblock_t *sb,
+void ext4_inode_set_file_acl(ext4_inode_t *inode, ext4_superblock_t *sb,
 		uint64_t file_acl)
 {
Index: uspace/lib/ext4/libext4_inode.h
===================================================================
--- uspace/lib/ext4/libext4_inode.h	(revision 96598b823c7d286ff63f30af73787faf330ddbcc)
+++ uspace/lib/ext4/libext4_inode.h	(revision b191acaeb4937b8c78ceeb66b93260dc8d84d7de)
@@ -62,6 +62,6 @@
 extern uint32_t ext4_inode_get_generation(ext4_inode_t *);
 extern void ext4_inode_set_generation(ext4_inode_t *, uint32_t);
-extern uint64_t ext4_get_inode_file_acl(ext4_inode_t *, ext4_superblock_t *);
-extern void ext4_set_inode_file_acl(ext4_inode_t *, ext4_superblock_t *, uint64_t);
+extern uint64_t ext4_inode_get_file_acl(ext4_inode_t *, ext4_superblock_t *);
+extern void ext4_inode_set_file_acl(ext4_inode_t *, ext4_superblock_t *, uint64_t);
 /*
 uint16_t extra_isize;