Index: uspace/srv/fs/fat/fat_dentry.c
===================================================================
--- uspace/srv/fs/fat/fat_dentry.c	(revision 82374b260b178245bed361ad071a6de1fd4ab2df)
+++ uspace/srv/fs/fat/fat_dentry.c	(revision fcc3cd810dbe367d24b2ef35689ccd02cec2f405)
@@ -266,5 +266,5 @@
 }
 
-size_t fat_lfn_get_part(const uint16_t *src, size_t src_size, wchar_t *dst, size_t *offset)
+size_t fat_lfn_get_part(const uint16_t *src, size_t src_size, uint16_t *dst, size_t *offset)
 {
 	while (src_size!=0 && (*offset)!=0) {
@@ -279,5 +279,5 @@
 }
 
-size_t fat_lfn_get_entry(const fat_dentry_t *d, wchar_t *dst, size_t *offset)
+size_t fat_lfn_get_entry(const fat_dentry_t *d, uint16_t *dst, size_t *offset)
 {
 	fat_lfn_get_part(FAT_LFN_PART3(d), FAT_LFN_PART3_SIZE, dst, offset);
Index: uspace/srv/fs/fat/fat_dentry.h
===================================================================
--- uspace/srv/fs/fat/fat_dentry.h	(revision 82374b260b178245bed361ad071a6de1fd4ab2df)
+++ uspace/srv/fs/fat/fat_dentry.h	(revision fcc3cd810dbe367d24b2ef35689ccd02cec2f405)
@@ -140,6 +140,6 @@
 extern size_t fat_lfn_str_nlength(const uint16_t *, size_t);
 extern size_t fat_lfn_size(const fat_dentry_t *);
-extern size_t fat_lfn_get_part(const uint16_t *, size_t, wchar_t *, size_t *);
-extern size_t fat_lfn_get_entry(const fat_dentry_t *, wchar_t *, size_t *);
+extern size_t fat_lfn_get_part(const uint16_t *, size_t, uint16_t *, size_t *);
+extern size_t fat_lfn_get_entry(const fat_dentry_t *, uint16_t *, size_t *);
 extern size_t fat_lfn_set_part(const wchar_t *, size_t *, size_t, uint16_t *, size_t);
 extern size_t fat_lfn_set_entry(const wchar_t *, size_t *, size_t, fat_dentry_t *);
Index: uspace/srv/fs/fat/fat_directory.c
===================================================================
--- uspace/srv/fs/fat/fat_directory.c	(revision 82374b260b178245bed361ad071a6de1fd4ab2df)
+++ uspace/srv/fs/fat/fat_directory.c	(revision fcc3cd810dbe367d24b2ef35689ccd02cec2f405)
@@ -154,5 +154,5 @@
 {
 	fat_dentry_t *d = NULL;
-	wchar_t wname[FAT_LFN_NAME_SIZE];
+	uint16_t wname[FAT_LFN_NAME_SIZE];
 	size_t lfn_offset, lfn_size;
 	bool long_entry = false;
@@ -199,5 +199,5 @@
 					(checksum == fat_dentry_chksum(d->name))) {
 					wname[lfn_size] = '\0';
-					if (wstr_to_str(name, FAT_LFN_NAME_SIZE, wname)!=EOK)
+					if (utf16_to_str(name, FAT_LFN_NAME_SIZE, wname) != EOK)
 						fat_dentry_name_get(d, name);
 				}