diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c
index b4163230fea..924c5c83712 100644
--- a/fs/vfs/fs_poll.c
+++ b/fs/vfs/fs_poll.c
@@ -121,7 +121,7 @@ static int poll_fdsetup(int fd, FAR struct pollfd *fds, bool setup)
         }
     }
 
-  return file_poll(fd, fds, setup);
+  return fdesc_poll(fd, fds, setup);
 }
 #endif
 
@@ -244,7 +244,7 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds, int *count,
  ****************************************************************************/
 
 /****************************************************************************
- * Function: file_poll
+ * Function: fdesc_poll
  *
  * Description:
  *   The standard poll() operation redirects operations on file descriptors
@@ -262,7 +262,7 @@ static inline int poll_teardown(FAR struct pollfd *fds, nfds_t nfds, int *count,
  ****************************************************************************/
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
-int file_poll(int fd, FAR struct pollfd *fds, bool setup)
+int fdesc_poll(int fd, FAR struct pollfd *fds, bool setup)
 {
   FAR struct file *filep;
   FAR struct inode *inode;
diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h
index f383c4ac06a..b9952a4eb87 100644
--- a/include/nuttx/fs/fs.h
+++ b/include/nuttx/fs/fs.h
@@ -930,7 +930,7 @@ int file_vfcntl(FAR struct file *filep, int cmd, va_list ap);
 #endif
 
 /****************************************************************************
- * Function: file_poll
+ * Function: fdesc_poll
  *
  * Description:
  *   The standard poll() operation redirects operations on file descriptors
@@ -948,7 +948,7 @@ int file_vfcntl(FAR struct file *filep, int cmd, va_list ap);
  ****************************************************************************/
 
 #if CONFIG_NFILE_DESCRIPTORS > 0
-int file_poll(int fd, FAR struct pollfd *fds, bool setup);
+int fdesc_poll(int fd, FAR struct pollfd *fds, bool setup);
 #endif
 
 /****************************************************************************
diff --git a/net/local/local_netpoll.c b/net/local/local_netpoll.c
index 4b100d67d02..9800af3172c 100644
--- a/net/local/local_netpoll.c
+++ b/net/local/local_netpoll.c
@@ -233,13 +233,13 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
 
           /* Setup poll for both shadow pollfds. */
 
-          ret = file_poll(conn->lc_infd, &shadowfds[0], true);
+          ret = fdesc_poll(conn->lc_infd, &shadowfds[0], true);
           if (ret >= 0)
             {
-              ret = file_poll(conn->lc_outfd, &shadowfds[1], true);
+              ret = fdesc_poll(conn->lc_outfd, &shadowfds[1], true);
               if (ret < 0)
                 {
-                  (void)file_poll(conn->lc_infd, &shadowfds[0], false);
+                  (void)fdesc_poll(conn->lc_infd, &shadowfds[0], false);
                 }
             }
 
@@ -267,7 +267,7 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
               goto pollerr;
             }
 
-          ret = file_poll(conn->lc_infd, fds, true);
+          ret = fdesc_poll(conn->lc_infd, fds, true);
         }
         break;
 
@@ -281,7 +281,7 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds)
               goto pollerr;
             }
 
-          ret = file_poll(conn->lc_outfd, fds, true);
+          ret = fdesc_poll(conn->lc_outfd, fds, true);
         }
         break;
 
@@ -356,13 +356,13 @@ int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
 
           /* Teardown for both shadow pollfds. */
 
-          ret = file_poll(conn->lc_infd, &shadowfds[0], false);
+          ret = fdesc_poll(conn->lc_infd, &shadowfds[0], false);
           if (ret < 0)
             {
               status = ret;
             }
 
-          ret = file_poll(conn->lc_outfd, &shadowfds[1], false);
+          ret = fdesc_poll(conn->lc_outfd, &shadowfds[1], false);
           if (ret < 0)
             {
               status = ret;
@@ -381,7 +381,7 @@ int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
               return OK;
             }
 
-          status = file_poll(conn->lc_infd, fds, false);
+          status = fdesc_poll(conn->lc_infd, fds, false);
         }
         break;
 
@@ -392,7 +392,7 @@ int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
               return OK;
             }
 
-          status = file_poll(conn->lc_outfd, fds, false);
+          status = fdesc_poll(conn->lc_outfd, fds, false);
         }
         break;