diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 73e4795f8..f564f7987 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_disk_file.cc (path_conv::get_ino_by_handle): Rename fai to
+	fii for clearness.
+	(fhandler_disk_file::readdir): Ditto.
+
 2015-12-09  Corinna Vinschen  <corinna@vinschen.de>
 
 	* ntdll.h (FILE_ID_BOTH_DIR_INFORMATION): Revert IndexNumber to FileId
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 0567a1352..76060005c 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -224,12 +224,12 @@ inline ino_t
 path_conv::get_ino_by_handle (HANDLE hdl)
 {
   IO_STATUS_BLOCK io;
-  FILE_INTERNAL_INFORMATION fai;
+  FILE_INTERNAL_INFORMATION fii;
 
-  if (NT_SUCCESS (NtQueryInformationFile (hdl, &io, &fai, sizeof fai,
+  if (NT_SUCCESS (NtQueryInformationFile (hdl, &io, &fii, sizeof fii,
 					  FileInternalInformation))
-      && isgood_inode (fai.IndexNumber.QuadPart))
-    return fai.IndexNumber.QuadPart;
+      && isgood_inode (fii.IndexNumber.QuadPart))
+    return fii.IndexNumber.QuadPart;
   return 0;
 }
 
@@ -2407,14 +2407,14 @@ go_ahead:
 		  /* We call NtQueryInformationFile here, rather than
 		     pc.get_ino_by_handle(), otherwise we can't short-circuit
 		     dirent_set_d_ino correctly. */
-		  FILE_INTERNAL_INFORMATION fai;
-		  f_status = NtQueryInformationFile (hdl, &io, &fai, sizeof fai,
+		  FILE_INTERNAL_INFORMATION fii;
+		  f_status = NtQueryInformationFile (hdl, &io, &fii, sizeof fii,
 						     FileInternalInformation);
 		  NtClose (hdl);
 		  if (NT_SUCCESS (f_status))
 		    {
-		      if (pc.isgood_inode (fai.IndexNumber.QuadPart))
-			de->d_ino = fai.IndexNumber.QuadPart;
+		      if (pc.isgood_inode (fii.IndexNumber.QuadPart))
+			de->d_ino = fii.IndexNumber.QuadPart;
 		      else
 			/* Untrusted file system.  Don't try to fetch inode
 			   number again. */