diff --git a/man1/intro.1 b/man1/intro.1
index ba973b66e..ad86de1f4 100644
--- a/man1/intro.1
+++ b/man1/intro.1
@@ -138,7 +138,7 @@ The
 here was the command prompt \(em it is the shell's way of indicating
 that it is ready for the next command.
 The prompt can be customized
-in lots of ways, and one might include stuff like user name,
+in lots of ways, and one might include stuff like username,
 machine name, current directory, time, etc.
 An assignment PS1="What next, master? "
 would change the prompt as indicated.
diff --git a/man3/fgetpwent.3 b/man3/fgetpwent.3
index 6fbad6163..5ef5357cc 100644
--- a/man3/fgetpwent.3
+++ b/man3/fgetpwent.3
@@ -62,7 +62,7 @@ The \fIpasswd\fP structure is defined in \fI<pwd.h>\fP as follows:
 .in +4n
 .nf
 struct passwd {
-    char   *pw_name;       /* user name */
+    char   *pw_name;       /* username */
     char   *pw_passwd;     /* user password */
     uid_t   pw_uid;        /* user ID */
     gid_t   pw_gid;        /* group ID */
diff --git a/man3/getlogin.3 b/man3/getlogin.3
index f3dc206e2..ee5cce696 100644
--- a/man3/getlogin.3
+++ b/man3/getlogin.3
@@ -27,7 +27,7 @@
 .\" modified 2003 Walter Harms, aeb - added getlogin_r, note on stdin use
 .TH GETLOGIN 3 2008-06-29 "GNU" "Linux Programmer's Manual"
 .SH NAME
-getlogin, getlogin_r, cuserid \- get user name
+getlogin, getlogin_r, cuserid \- get username
 .SH SYNOPSIS
 .B #include <unistd.h>
 .sp
@@ -60,13 +60,13 @@ this function or to
 .BR cuserid ().
 .PP
 .BR getlogin_r ()
-returns this same user name in the array
+returns this same username in the array
 .I buf
 of size
 .IR bufsize .
 .PP
 .BR cuserid ()
-returns a pointer to a string containing a user name
+returns a pointer to a string containing a username
 associated with the effective user ID of the process.
 If \fIstring\fP
 is not a null pointer, it should be an array that can hold at least
@@ -78,7 +78,7 @@ calls to this function or to
 .BR getlogin ().
 .PP
 The macro \fBL_cuserid\fP is an integer constant that indicates how
-long an array you might need to store a user name.
+long an array you might need to store a username.
 \fBL_cuserid\fP is declared in \fI<stdio.h>\fP.
 .PP
 These functions let your program identify positively the user who is
@@ -94,7 +94,7 @@ This is more flexible
 precisely because the user can set \fBLOGNAME\fP arbitrarily.
 .SH "RETURN VALUE"
 .BR getlogin ()
-returns a pointer to the user name when successful,
+returns a pointer to the username when successful,
 and NULL on failure.
 .BR getlogin_r ()
 returns 0 when successful, and non-zero on failure.
@@ -112,7 +112,7 @@ The calling process has no controlling tty.
 .TP
 .B ERANGE
 (getlogin_r)
-The length of the user name, including the terminating null byte,
+The length of the username, including the terminating null byte,
 is larger than
 .IR bufsize .
 .LP
diff --git a/man3/getpw.3 b/man3/getpw.3
index aedcdd465..2b2680348 100644
--- a/man3/getpw.3
+++ b/man3/getpw.3
@@ -54,7 +54,7 @@ The \fIpasswd\fP structure is defined in \fI<pwd.h>\fP as follows:
 .in +4n
 .nf
 struct passwd {
-    char   *pw_name;       /* user name */
+    char   *pw_name;       /* username */
     char   *pw_passwd;     /* user password */
     uid_t   pw_uid;        /* user ID */
     gid_t   pw_gid;        /* group ID */
diff --git a/man3/getpwent.3 b/man3/getpwent.3
index cdfdcc0a1..ca099987a 100644
--- a/man3/getpwent.3
+++ b/man3/getpwent.3
@@ -81,7 +81,7 @@ The \fIpasswd\fP structure is defined in \fI<pwd.h>\fP as follows:
 .in +4n
 .nf
 struct passwd {
-    char   *pw_name;       /* user name */
+    char   *pw_name;       /* username */
     char   *pw_passwd;     /* user password */
     uid_t   pw_uid;        /* user ID */
     gid_t   pw_gid;        /* group ID */
diff --git a/man3/getpwent_r.3 b/man3/getpwent_r.3
index cb594da37..3717b0ced 100644
--- a/man3/getpwent_r.3
+++ b/man3/getpwent_r.3
@@ -68,7 +68,7 @@ as follows:
 .in +4n
 .nf
 struct passwd {
-    char    *pw_name;      /* user name */
+    char    *pw_name;      /* username */
     char    *pw_passwd;    /* user password */
     uid_t    pw_uid;       /* user ID */
     gid_t    pw_gid;       /* group ID */
diff --git a/man3/getpwnam.3 b/man3/getpwnam.3
index a53762139..268400233 100644
--- a/man3/getpwnam.3
+++ b/man3/getpwnam.3
@@ -68,7 +68,7 @@ the broken-out fields of the record in the password database
 (e.g., the local password file
 .IR /etc/passwd ,
 NIS, and LDAP)
-that matches the user name
+that matches the username
 .IR name .
 .PP
 The
@@ -102,7 +102,7 @@ The \fIpasswd\fP structure is defined in \fI<pwd.h>\fP as follows:
 .in +4n
 .nf
 struct passwd {
-    char   *pw_name;       /* user name */
+    char   *pw_name;       /* username */
     char   *pw_passwd;     /* user password */
     uid_t   pw_uid;        /* user ID */
     gid_t   pw_gid;        /* group ID */
diff --git a/man3/getspnam.3 b/man3/getspnam.3
index a5266b54d..99d728b94 100644
--- a/man3/getspnam.3
+++ b/man3/getspnam.3
@@ -99,7 +99,7 @@ The
 .BR getspnam ()
 function returns a pointer to a structure containing
 the broken-out fields of the record in the shadow password database
-that matches the user name
+that matches the username
 .IR name .
 .LP
 The
diff --git a/man3/putpwent.3 b/man3/putpwent.3
index 034341d5b..ec13264bd 100644
--- a/man3/putpwent.3
+++ b/man3/putpwent.3
@@ -55,7 +55,7 @@ The \fIpasswd\fP structure is defined in \fI<pwd.h>\fP as follows:
 .in +4n
 .nf
 struct passwd {
-    char    *pw_name;        /* user name */
+    char    *pw_name;        /* username */
     char    *pw_passwd;      /* user password */
     uid_t    pw_uid;         /* user ID */
     gid_t    pw_gid;         /* group ID */
diff --git a/man3/rcmd.3 b/man3/rcmd.3
index 4a5f1640c..f0885c49e 100644
--- a/man3/rcmd.3
+++ b/man3/rcmd.3
@@ -153,7 +153,7 @@ The
 and
 .BR ruserok ()
 functions take a remote host's IP address or name, respectively,
-two user names and a flag indicating whether the local user's
+two usernames and a flag indicating whether the local user's
 name is that of the superuser.
 Then, if the user is
 .I not
@@ -170,7 +170,7 @@ other than the user or the superuser, or is writable by anyone other
 than the owner, the check automatically fails.
 Zero is returned if the machine name is listed in the
 .IR hosts.equiv
-file, or the host and remote user name are found in the
+file, or the host and remote username are found in the
 .IR .rhosts
 file; otherwise
 .BR iruserok ()
diff --git a/man5/ftpusers.5 b/man5/ftpusers.5
index b8bdb0891..df4f3586c 100644
--- a/man5/ftpusers.5
+++ b/man5/ftpusers.5
@@ -40,7 +40,7 @@ Washington University FTP server Daemon
 The format of
 .B ftpusers
 is very simple.
-There is one account name (or user name) per line.
+There is one account name (or username) per line.
 Lines starting with a # are ignored.
 .SH FILES
 .I /etc/ftpusers
diff --git a/man5/group.5 b/man5/group.5
index 16b6aa9c6..d4a48dee6 100644
--- a/man5/group.5
+++ b/man5/group.5
@@ -42,7 +42,7 @@ If this field is empty, no password is needed.
 .IP GID
 the numerical group ID.
 .IP user_list
-all the group member's user names, separated by commas.
+all the group member's usernames, separated by commas.
 .SH FILES
 /etc/group
 .SH BUGS
diff --git a/man5/passwd.5 b/man5/passwd.5
index bd415dfee..fa970d079 100644
--- a/man5/passwd.5
+++ b/man5/passwd.5
@@ -36,7 +36,7 @@ group ID, home directory, shell, etc.
 Often, it also contains the encrypted passwords for each account.
 It should have general read permission (many utilities, like
 .BR ls (1)
-use it to map user IDs to user names), but write access only for the
+use it to map user IDs to usernames), but write access only for the
 superuser.
 .PP
 In the good old days there was no great problem with this general
@@ -89,7 +89,7 @@ the numerical primary group ID for this user.
 .TP
 .I GECOS
 This field is optional and only used for informational purposes.
-Usually, it contains the full user name.
+Usually, it contains the full username.
 GECOS means General Electric
 Comprehensive Operating System, which has been renamed to GCOS when
 GE's large systems division was sold to Honeywell.
diff --git a/man5/utmp.5 b/man5/utmp.5
index c5def1364..0eec66cc4 100644
--- a/man5/utmp.5
+++ b/man5/utmp.5
@@ -194,11 +194,11 @@ After the telnet session ends,
 cleans up utmp in the described way.
 .PP
 The \fIwtmp\fP file records all logins and logouts.
-Its format is exactly like \fIutmp\fP except that a null user name
+Its format is exactly like \fIutmp\fP except that a null username
 indicates a logout
 on the associated terminal.
 Furthermore, the terminal name \fB~\fP
-with user name \fBshutdown\fP or \fBreboot\fP indicates a system
+with username \fBshutdown\fP or \fBreboot\fP indicates a system
 shutdown or reboot and the pair of terminal names \fB|\fP/\fB}\fP
 logs the old/new system time when
 .BR date (1)
diff --git a/man7/mailaddr.7 b/man7/mailaddr.7
index 9071ee5c4..f8eb85701 100644
--- a/man7/mailaddr.7
+++ b/man7/mailaddr.7
@@ -48,7 +48,7 @@ The domain part ("monet.berkeley.edu") is a mail-accepting domain.
 It can be a host and in the past it usually was, but it doesn't have to be.
 The domain part is not case sensitive.
 .PP
-The local part ("eric") is often a user name, but its meaning is
+The local part ("eric") is often a username, but its meaning is
 defined by the local software.
 Sometimes it is case sensitive,
 although that is unusual.
diff --git a/man7/uri.7 b/man7/uri.7
index f4846c2c0..b2951cd23 100644
--- a/man7/uri.7
+++ b/man7/uri.7
@@ -116,7 +116,7 @@ permit the authority to be the following format, called here an
 .HP
 .IR "ip_server = " [ user " [ : " password " ] @ ] " host " [ : " port ]
 .PP
-This format allows you to optionally insert a user name,
+This format allows you to optionally insert a username,
 a user plus password, and/or a port number.
 The
 .I host
@@ -128,7 +128,7 @@ logs into a web server on host xyz.com
 as fred (using fredpassword) using port 8080.
 Avoid including a password in a URI if possible because of the many
 security risks of having a password written down.
-If the URL supplies a user name but no password, and the remote
+If the URL supplies a username but no password, and the remote
 server requests a password, the program interpreting the URL
 should request one from the user.
 .PP
@@ -178,7 +178,7 @@ See the Common Gateway Interface specification at
 .PP
 This is a URL accessing a file through the file transfer protocol (FTP).
 The default port (for control) is 21.
-If no username is included, the user name "anonymous" is supplied, and
+If no username is included, the username "anonymous" is supplied, and
 in that case many clients provide as the password the requestor's
 Internet email address.
 An example is