Index: uspace/srv/fs/fat/fat_dentry.h
===================================================================
--- uspace/srv/fs/fat/fat_dentry.h	(revision 4f302225f2b25aadcba779f5a36656dd5a66959e)
+++ uspace/srv/fs/fat/fat_dentry.h	(revision f2460a50f76f92f3a70ead8969f2bffd83b3a7a4)
@@ -83,5 +83,6 @@
 #define FAT_LFN_CHKSUM(d) ((d)->lfn.check_sum)
 
-#define FAT_LFN_NAME_SIZE   260
+#define FAT_LFN_NAME_LEN    260                           /* characters */
+#define FAT_LFN_NAME_SIZE   STR_BOUNDS(FAT_LFN_NAME_LEN)  /* bytes */
 #define FAT_LFN_MAX_COUNT   20
 #define FAT_LFN_PART1_SIZE  5
Index: uspace/srv/fs/fat/fat_directory.c
===================================================================
--- uspace/srv/fs/fat/fat_directory.c	(revision 4f302225f2b25aadcba779f5a36656dd5a66959e)
+++ uspace/srv/fs/fat/fat_directory.c	(revision f2460a50f76f92f3a70ead8969f2bffd83b3a7a4)
@@ -155,5 +155,5 @@
 {
 	fat_dentry_t *d = NULL;
-	uint16_t wname[FAT_LFN_NAME_SIZE];
+	uint16_t wname[FAT_LFN_NAME_LEN];
 	size_t lfn_offset, lfn_size;
 	bool long_entry = false;
@@ -293,8 +293,8 @@
 		int long_entry_count;
 		uint8_t checksum;
-		uint16_t wname[FAT_LFN_NAME_SIZE];
+		uint16_t wname[FAT_LFN_NAME_LEN];
 		size_t lfn_size, lfn_offset;
 		
-		rc = str_to_utf16(wname, FAT_LFN_NAME_SIZE, name);
+		rc = str_to_utf16(wname, FAT_LFN_NAME_LEN, name);
 		if (rc != EOK)
 			return rc;