diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index 61d3fd40bc6e..859a63e23151 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -475,7 +475,7 @@ bundle_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w, fd_set *e, int *n)
   /*
    * This *MUST* be called after the datalink UpdateSet()s as it
    * might be ``holding'' one of the datalinks (death-row) and
-   * wants to be able to de-select() it from the fdescriptor set.
+   * wants to be able to de-select() it from the descriptor set.
    */
   result += descriptor_UpdateSet(&bundle->ncp.mp.server.desc, r, w, e, n);
 
@@ -872,7 +872,7 @@ bundle_Destroy(struct bundle *bundle)
   /*
    * Clean up the interface.  We don't need to timer_Stop()s, mp_Down(),
    * ipcp_CleanInterface() and bundle_DownInterface() unless we're getting
-   * out under exceptional conditions such as a fdescriptor exception.
+   * out under exceptional conditions such as a descriptor exception.
    */
   timer_Stop(&bundle->idle.timer);
   timer_Stop(&bundle->choked.timer);
@@ -1463,7 +1463,7 @@ bundle_ReceiveDatalink(struct bundle *bundle, int s)
   nfd = (cmsg->cmsg_len - sizeof *cmsg) / sizeof(int);
 
   if (nfd < 2) {
-    log_Printf(LogERROR, "Recvmsg: %d fdescriptor%s received (too few) !\n",
+    log_Printf(LogERROR, "Recvmsg: %d descriptor%s received (too few) !\n",
                nfd, nfd == 1 ? "" : "s");
     while (nfd--)
       close(fd[nfd]);
@@ -1521,7 +1521,7 @@ bundle_ReceiveDatalink(struct bundle *bundle, int s)
   close(fd[1]);
 
   onfd = nfd;	/* We've got this many in our array */
-  nfd -= 2;	/* Don't include p->fd and our reply fdescriptor */
+  nfd -= 2;	/* Don't include p->fd and our reply descriptor */
   niov = 1;	/* Skip the version id */
   dl = iov2datalink(bundle, iov, &niov, sizeof iov / sizeof *iov, fd[0],
                     fd + 2, &nfd);
@@ -1623,7 +1623,7 @@ bundle_SendDatalink(struct datalink *dl, int s, struct sockaddr_un *sun)
       log_Printf(LogERROR, "setsockopt(SO_RCVBUF, %d): %s\n", expect,
                  strerror(errno));
 
-    log_Printf(LogDEBUG, "Sending %d fdescriptor%s and %d bytes in scatter"
+    log_Printf(LogDEBUG, "Sending %d descriptor%s and %d bytes in scatter"
                "/gather array\n", nfd, nfd == 1 ? "" : "s", iov[0].iov_len);
 
     if ((got = sendmsg(s, &msg, 0)) == -1)
@@ -1633,7 +1633,7 @@ bundle_SendDatalink(struct datalink *dl, int s, struct sockaddr_un *sun)
       log_Printf(LogERROR, "%s: Failed initial sendmsg: Only sent %d of %d\n",
                  sun->sun_path, got, iov[0].iov_len);
     else {
-      /* We must get the ACK before closing the fdescriptor ! */
+      /* We must get the ACK before closing the descriptor ! */
       int res;
 
       if ((got = read(reply[0], &newpid, sizeof newpid)) == sizeof newpid) {
@@ -1825,8 +1825,8 @@ bundle_setsid(struct bundle *bundle, int holdsession)
         setuid(ID0realuid());
         /*
          * Hang around for a HUP.  This should happen as soon as the
-         * ppp that we passed our ctty fdescriptor to closes it.
-         * NOTE: If this process dies, the passed fdescriptor becomes
+         * ppp that we passed our ctty descriptor to closes it.
+         * NOTE: If this process dies, the passed descriptor becomes
          *       invalid and will give a select() error by setting one
          *       of the error fds, aborting the other ppp.  We don't
          *       want that to happen !
diff --git a/usr.sbin/ppp/bundle.h b/usr.sbin/ppp/bundle.h
index c6a5cb469832..1cd694609346 100644
--- a/usr.sbin/ppp/bundle.h
+++ b/usr.sbin/ppp/bundle.h
@@ -66,7 +66,7 @@ struct bundle {
 
   struct {
     char Name[20];            /* The /dev/XXXX name */
-    int fd;                   /* The /dev/XXXX fdescriptor */
+    int fd;                   /* The /dev/XXXX descriptor */
     unsigned header : 1;      /* Family header sent & received ? */
   } dev;
 
diff --git a/usr.sbin/ppp/exec.c b/usr.sbin/ppp/exec.c
index c6fc5a24c08f..5336dd334cd3 100644
--- a/usr.sbin/ppp/exec.c
+++ b/usr.sbin/ppp/exec.c
@@ -166,7 +166,7 @@ exec_Create(struct physical *p)
           close(fids[1]);
           p->fd = fids[0];
           waitpid(pid, &stat, 0);
-          log_Printf(LogDEBUG, "Using fdescriptor %d for child\n", p->fd);
+          log_Printf(LogDEBUG, "Using descriptor %d for child\n", p->fd);
           physical_SetupStack(p, execdevice.name, PHYSICAL_FORCE_ASYNC);
           if (p->cfg.cd.necessity != CD_DEFAULT)
             log_Printf(LogWARN, "Carrier settings ignored\n");
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index 336ed3e2da77..6bcfdce1f4fb 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -583,8 +583,8 @@ DoLoop(struct bundle *bundle)
 
     for (i = 0; i <= nfds; i++)
       if (FD_ISSET(i, &efds)) {
-        log_Printf(LogPHASE, "Exception detected on fdescriptor %d\n", i);
-        /* We deal gracefully with link fdescriptor exceptions */
+        log_Printf(LogPHASE, "Exception detected on descriptor %d\n", i);
+        /* We deal gracefully with link descriptor exceptions */
         if (!bundle_Exception(bundle, i)) {
           log_Printf(LogERROR, "Exception cannot be handled !\n");
           break;
diff --git a/usr.sbin/ppp/physical.h b/usr.sbin/ppp/physical.h
index 9946eaf3a879..74ce890745cd 100644
--- a/usr.sbin/ppp/physical.h
+++ b/usr.sbin/ppp/physical.h
@@ -77,7 +77,7 @@ struct physical {
   int type;                    /* What sort of PHYS_* link are we ? */
   struct async async;          /* Our async state */
   struct hdlc hdlc;            /* Our hdlc state */
-  int fd;                      /* File fdescriptor for this device */
+  int fd;                      /* File descriptor for this device */
   struct mbuf *out;            /* mbuf that suffered a short write */
   int connect_count;
   struct datalink *dl;         /* my owner */
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index cac6b6ebe22c..c868a6725036 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -232,7 +232,7 @@ radius_Process(struct radius *r, int got)
 }
 
 /*
- * We've either timed out or select()ed on the read fdescriptor
+ * We've either timed out or select()ed on the read descriptor
  */
 static void
 radius_Continue(struct radius *r, int sel)
@@ -270,7 +270,7 @@ radius_Read(struct fdescriptor *d, struct bundle *bundle, const fd_set *fdset)
 }
 
 /*
- * Behave as a struct fdescriptor (fdescriptor.h)
+ * Behave as a struct fdescriptor (descriptor.h)
  */
 static int
 radius_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w, fd_set *e, int *n)
@@ -289,7 +289,7 @@ radius_UpdateSet(struct fdescriptor *d, fd_set *r, fd_set *w, fd_set *e, int *n)
 }
 
 /*
- * Behave as a struct fdescriptor (fdescriptor.h)
+ * Behave as a struct fdescriptor (descriptor.h)
  */
 static int
 radius_IsSet(struct fdescriptor *d, const fd_set *fdset)
@@ -300,7 +300,7 @@ radius_IsSet(struct fdescriptor *d, const fd_set *fdset)
 }
 
 /*
- * Behave as a struct fdescriptor (fdescriptor.h)
+ * Behave as a struct fdescriptor (descriptor.h)
  */
 static int
 radius_Write(struct fdescriptor *d, struct bundle *bundle, const fd_set *fdset)
diff --git a/usr.sbin/ppp/tty.c b/usr.sbin/ppp/tty.c
index dc7a1beade32..df6029cdc2ce 100644
--- a/usr.sbin/ppp/tty.c
+++ b/usr.sbin/ppp/tty.c
@@ -202,7 +202,7 @@ tty_Raw(struct physical *p)
   log_Printf(LogDEBUG, "%s: Entering tty_Raw\n", p->link.name);
 
   if (p->type != PHYS_DIRECT && p->fd >= 0 && !Online(dev))
-    log_Printf(LogDEBUG, "%s: Raw: fdescriptor = %d, mbits = %x\n",
+    log_Printf(LogDEBUG, "%s: Raw: descriptor = %d, mbits = %x\n",
               p->link.name, p->fd, dev->mbits);
 
   if (!physical_IsSync(p)) {