diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index b0345f7fb6d2..89b2c2ebf2f2 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -98,7 +98,7 @@ Sort by memory usage, instead of by process
 .Tn ID .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Dq Pa /vmunix .
+.Dq Pa /kernel .
 .It Fl O
 Add the information associated with the space or comma separated list
 of keywords specified, after the process
@@ -475,7 +475,7 @@ wait channel (as a symbolic name)
 exit or stop status (valid only for stopped or zombie process)
 .El
 .Sh FILES
-.Bl -tag -width /var/run/kvm_vmunix.db -compact
+.Bl -tag -width /var/run/kvm_kernel.db -compact
 .It Pa /dev
 special files and device names
 .It Pa /dev/drum
@@ -484,9 +484,9 @@ default swap device
 default kernel memory
 .It Pa /var/run/dev.db
 /dev name database
-.It Pa /var/run/kvm_vmunix.db
+.It Pa /var/run/kvm_kernel.db
 system namelist database
-.It Pa /vmunix
+.It Pa /kernel
 default system namelist
 .El
 .Sh SEE ALSO
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index 317c13978432..0db9ea2349cb 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -62,7 +62,7 @@ The default, causing the system to reboot in its usual fashion.
 Interpreted by the bootstrap program itself, causing it to
 prompt on the console as to what file should be booted.
 Normally, the system is booted from the file
-.Dq Em xx Ns No (0,0)vmunix ,
+.Dq Em xx Ns No (0,0)kernel ,
 where
 .Em xx
 is the default disk name,
@@ -123,7 +123,7 @@ program in the newly booted system.
 When no options are given (i.e.,
 .Dv RB_AUTOBOOT
 is used), the system is
-rebooted from file ``vmunix'' in the root file system of unit 0
+rebooted from file ``kernel'' in the root file system of unit 0
 of a disk chosen in a processor specific way.
 An automatic consistency check of the disks is normally performed
 (see
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index a76f61e8d52c..56ab485fb364 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -226,7 +226,7 @@ _kvm_open(kd, uf, mf, sf, flag, errout)
 		}
 		/*
 		 * Open kvm nlist database.  We go ahead and do this
-		 * here so that we don't have to hold on to the vmunix
+		 * here so that we don't have to hold on to the kernel
 		 * path name.  Since a kvm application will surely do
 		 * a kvm_nlist(), this probably won't be a wasted effort.
 		 * If the database cannot be opened, open the namelist
diff --git a/lib/libkvm/kvm_nlist.3 b/lib/libkvm/kvm_nlist.3
index 1c0cd89af75b..f620f559b90f 100644
--- a/lib/libkvm/kvm_nlist.3
+++ b/lib/libkvm/kvm_nlist.3
@@ -71,8 +71,8 @@ The
 function returns the number of invalid entries found.
 If the kernel symbol table was unreadable, -1 is returned.
 .Sh FILES
-.Bl -tag -width /var/db/kvm_vmunix.db -compact
-.It Pa /var/db/kvm_vmunix.db
+.Bl -tag -width /var/db/kvm_kernel.db -compact
+.It Pa /var/db/kvm_kernel.db
 .El
 .Sh SEE ALSO
 .Xr kvm 3 ,
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index baaeb053814b..5df73eb7ddf9 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -51,7 +51,7 @@ struct __kvm {
 	int	pmfd;		/* physical memory file (or crashdump) */
 	int	vmfd;		/* virtual memory file (-1 if crashdump) */
 	int	swfd;		/* swap file (e.g., /dev/drum) */
-	int	nlfd;		/* namelist file (e.g., /vmunix) */
+	int	nlfd;		/* namelist file (e.g., /kernel) */
 	struct kinfo_proc *procbase;
 	char	*argspc;	/* (dynamic) storage for argv strings */
 	int	arglen;		/* length of the above */
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index 7dd0acf633ed..195beedc6125 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -52,7 +52,7 @@ Extract values associated with the name list from the specified core
 instead of the default ``/dev/kmem''.
 .It Fl N
 Extract the name list from the specified system instead of the default
-``/vmunix''.
+``/kernel''.
 .El
 .Sh SEE ALSO
 .Xr syslogd 8
diff --git a/sbin/reboot/boot_hp300.8 b/sbin/reboot/boot_hp300.8
index 030354264a77..1d3a4f6e9f4b 100644
--- a/sbin/reboot/boot_hp300.8
+++ b/sbin/reboot/boot_hp300.8
@@ -64,7 +64,7 @@ This
 .Em boot
 program
 finds the corresponding file on the given device 
-.Pf ( Ar vmunix
+.Pf ( Ar kernel
 by default),
 loads that file into memory,
 and starts the program at the entry address specified in the program header.
@@ -94,7 +94,7 @@ specifiers.
 For example,
 to boot from the `a' file system of unit 0 on HP-IB 2,
 type
-.Ql rd(16, 0)vmunix
+.Ql rd(16, 0)kernel
 to the boot prompt.
 For tapes, the minor device number gives a file offset.
 .Pp
@@ -103,7 +103,7 @@ In an emergency, the bootstrap methods described in the paper
 can be used to boot from a distribution tape.
 .Sh FILES
 .Bl -tag -width /usr/mdec/installboot -compact
-.It Pa /vmunix
+.It Pa /kernel
 system code
 .It Pa /usr/mdec/bootrd
 .Tn LIF
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 0dc3e0bf6be5..24a46442bebe 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -54,7 +54,7 @@ clones attempt to boot the floppy disk drive A (otherwise known as drive
 0) first, and failing that, attempt to boot the hard disk C (otherwise
 known as hard disk controller 1, drive 0).
 The automatic boot will attempt to load
-.Pa vmunix
+.Pa kernel
 from partition A of either the floppy or the hard disk.
 This boot may be aborted by typing any character on the keyboard repeatedly
 (four or five times at least) during the operating system load phase, after
@@ -99,9 +99,9 @@ fd	5 1/4" or 3 1/2" High density floppies
 For example,
 to boot from a file system which starts at cylinder 0
 of unit 0 of an IDE disk, type
-.Dq Li wd0a:vmunix
+.Dq Li wd0a:kernel
 to the boot prompt;
-.Dq Li fd0a:vmunix
+.Dq Li fd0a:kernel
 would specify a 3 1/2" floppy drive 0 .
 .Pp
 In an emergency, the bootstrap methods described in the paper
@@ -109,8 +109,8 @@ In an emergency, the bootstrap methods described in the paper
 can be used
 to boot from a distribution tape.
 .Sh FILES
-.Bl -tag -width /vmunixxx -compact
-.It Pa /vmunix
+.Bl -tag -width /kernelxx -compact
+.It Pa /kernel
 system code
 .It Pa /boot
 system bootstrap
diff --git a/sbin/reboot/boot_sparc.8 b/sbin/reboot/boot_sparc.8
index 72e57b01c910..c3499bc72d21 100644
--- a/sbin/reboot/boot_sparc.8
+++ b/sbin/reboot/boot_sparc.8
@@ -55,7 +55,7 @@ and unless this fails, the system will resume multi-user operations.
 The SPARC system currently uses the SunOS bootstrap loaders.
 This will be changed in a future version of the system.
 The SunOS boot will attempt to load
-.Pa vmunix
+.Pa kernel
 from partition A of the boot device,
 which must currently be an ``sd'' disk.
 .Pp
@@ -69,8 +69,8 @@ Here it waits for a kernel debugger connect; see
 .Xr kgdb 8 .
 Other flags are currently ignored.
 .Sh FILES
-.Bl -tag -width /vmunixxx -compact
-.It Pa /vmunix
+.Bl -tag -width /kernelxx -compact
+.It Pa /kernel
 system code
 .It Pa /boot
 system bootstrap
diff --git a/sbin/reboot/boot_tahoe.8 b/sbin/reboot/boot_tahoe.8
index 01c7f81bfe77..52b2047c8937 100644
--- a/sbin/reboot/boot_tahoe.8
+++ b/sbin/reboot/boot_tahoe.8
@@ -122,9 +122,9 @@ to boot from a file system which starts at cylinder 0
 of unit 0 of an
 .Tn SMD-E
 disk, type
-.Ql dk(0,0)vmunix
+.Ql dk(0,0)kernel
 to the boot prompt;
-.Ql dk(2,1,0)vmunix
+.Ql dk(2,1,0)kernel
 would specify drive 1 on
 .Tn SMD-E
 controller 2.
@@ -134,8 +134,8 @@ In an emergency, the bootstrap methods described in the paper
 can be used
 to boot from a distribution tape.
 .Sh FILES
-.Bl -tag -width /vmunix -compact
-.It Pa /vmunix
+.Bl -tag -width /kernel -compact
+.It Pa /kernel
 system code
 .It Pa /boot
 system bootstrap
diff --git a/sbin/reboot/boot_vax.8 b/sbin/reboot/boot_vax.8
index dce6b69105ad..37e9cbeb454d 100644
--- a/sbin/reboot/boot_vax.8
+++ b/sbin/reboot/boot_vax.8
@@ -199,7 +199,7 @@ On any processor, the
 .Em boot
 program
 finds the corresponding file on the given device 
-.Pf ( Pa vmunix
+.Pf ( Pa kernel
 by default), loads that file
 into memory location zero, and starts the program at the entry address
 specified in the program header (after clearing off the high bit
@@ -257,26 +257,26 @@ to boot from a file system which starts at cylinder 0
 of unit 0 of a
 .Tn MASSBUS
 disk, type
-.Ql hp(0,0)vmunix
+.Ql hp(0,0)kernel
 to the boot prompt;
-.Ql hp(2,0,1,0)vmunix
+.Ql hp(2,0,1,0)kernel
 would specify drive 1 on
 .Tn MASSBUS
 adaptor 2;
-.Ql up(0,0)vmunix
+.Ql up(0,0)kernel
 would specify a
 .Tn UNIBUS
 drive,
-.Ql hk(0,0)vmunix
+.Ql hk(0,0)kernel
 would specify
 an RK07 disk drive,
-.Ql ra(1,0,0,0)vmunix
+.Ql ra(1,0,0,0)kernel
 would specify a
 .Tn UDA50
 disk drive on a second
 .Tn UNIBUS ,
 and
-.Ql rb(0,0)vmunix
+.Ql rb(0,0)kernel
 would specify a
 disk on a 730
 .Tn IDC .
@@ -299,7 +299,7 @@ In an emergency, the bootstrap methods described in the paper
 can be used to boot from a distribution tape.
 .Sh FILES
 .Bl -tag -width /usr/mdec/xxboot -compact
-.It Pa /vmunix
+.It Pa /kernel
 system code
 .It Pa /boot
 system bootstrap
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index aabee53db700..3fca145f9fc8 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -63,7 +63,7 @@ is insufficient disk space.
 .It Fl N
 Use
 .Ar system
-as the kernel instead of the default ``/vmunix''.
+as the kernel instead of the default ``/kernel''.
 .It Fl v
 Prints out some additional debugging information.
 .It Fl z
@@ -77,7 +77,7 @@ that it corresponds to the currently running system.
 If it passes these checks, it saves the core image in
 .Ar directory Ns Pa /vmcore.#
 and the system in
-.Ar directory Ns Pa /vmunix.#
+.Ar directory Ns Pa /kernel.#
 The ``#'' is the number from the first line of the file
 .Ar directory Ns Pa /bounds ,
 and it is incremented and stored back into the file each time
@@ -107,8 +107,8 @@ is meant to be called near the end of the initialization file
 (see
 .Xr rc 8 ) .
 .Sh FILES
-.Bl -tag -width /vmunixxx -compact
-.It Pa /vmunix
+.Bl -tag -width /kernelxx -compact
+.It Pa /kernel
 current
 .Tn UNIX
 .El
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index f9c106d60c85..59e0ff555ab3 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -99,7 +99,7 @@ long	dumplo;				/* where dump starts on dumpdev */
 int	dumpmag;			/* magic number in dump */
 int	dumpsize;			/* amount of memory dumped */
 
-char	*vmunix;
+char	*kernel;
 char	*dirname;			/* directory to save dumps in */
 char	*ddname;			/* name of dump device */
 dev_t	dumpdev;			/* dump device */
@@ -150,7 +150,7 @@ main(argc, argv)
 			force = 1;
 			break;
 		case 'N':
-			vmunix = optarg;
+			kernel = optarg;
 			break;
 		case 'z':
 			compress = 1;
@@ -168,7 +168,7 @@ main(argc, argv)
 		dirname = argv[0];
 	}
 	if (argc == 2)
-		vmunix = argv[1];
+		kernel = argv[1];
 
 	(void)time(&now);
 	kmem_setup();
@@ -221,7 +221,7 @@ kmem_setup()
 			exit(1);
 		}
 
-	dump_sys = vmunix ? vmunix : _PATH_UNIX;
+	dump_sys = kernel ? kernel : _PATH_UNIX;
 	if ((nlist(dump_sys, dump_nl)) == -1)
 		syslog(LOG_ERR, "%s: nlist: %s", dump_sys, strerror(errno));
 	for (i = 0; dumpsyms[i] != -1; i++)
@@ -253,7 +253,7 @@ kmem_setup()
 		syslog(LOG_ERR, "%s: fdopen: %m", _PATH_KMEM);
 		exit(1);
 	}
-	if (vmunix)
+	if (kernel)
 		return;
 	(void)fseek(fp, (off_t)current_nl[X_VERSION].n_value, L_SET);
 	(void)fgets(vers, sizeof(vers), fp);
@@ -275,7 +275,7 @@ check_kmem()
 	}
 	fseek(fp, (off_t)(dumplo + ok(dump_nl[X_VERSION].n_value)), L_SET);
 	fgets(core_vers, sizeof(core_vers), fp);
-	if (strcmp(vers, core_vers) && vmunix == 0)
+	if (strcmp(vers, core_vers) && kernel == 0)
 		syslog(LOG_WARNING,
 		    "warning: %s version mismatch:\n\t%s\nand\t%s\n",
 		    _PATH_UNIX, vers, core_vers);
@@ -413,8 +413,8 @@ err2:			syslog(LOG_WARNING,
 		(void)close(ofd);
 
 	/* Copy the kernel. */
-	ifd = Open(vmunix ? vmunix : _PATH_UNIX, O_RDONLY);
-	(void)snprintf(path, sizeof(path), "%s/vmunix.%d%s",
+	ifd = Open(kernel ? kernel : _PATH_UNIX, O_RDONLY);
+	(void)snprintf(path, sizeof(path), "%s/kernel.%d%s",
 	    dirname, bounds, compress ? ".Z" : "");
 	if (compress) {
 		if ((fp = zopen(path, "w", 0)) == NULL) {
@@ -434,15 +434,15 @@ err2:			syslog(LOG_WARNING,
 			syslog(LOG_ERR, "%s: %s",
 			    path, strerror(nw == 0 ? EIO : errno));
 			syslog(LOG_WARNING,
-			    "WARNING: vmunix may be incomplete");
+			    "WARNING: kernel may be incomplete");
 			exit(1);
 		}
 	}
 	if (nr < 0) {
 		syslog(LOG_ERR, "%s: %s",
-		    vmunix ? vmunix : _PATH_UNIX, strerror(errno));
+		    kernel ? kernel : _PATH_UNIX, strerror(errno));
 		syslog(LOG_WARNING,
-		    "WARNING: vmunix may be incomplete");
+		    "WARNING: kernel may be incomplete");
 		exit(1);
 	}
 	if (compress)
@@ -532,18 +532,18 @@ int
 check_space()
 {
 	register FILE *fp;
-	char *tvmunix;
-	off_t minfree, spacefree, vmunixsize, needed;
+	char *tkernel;
+	off_t minfree, spacefree, kernelsize, needed;
 	struct stat st;
 	struct statfs fsbuf;
 	char buf[100], path[MAXPATHLEN];
 
-	tvmunix = vmunix ? vmunix : _PATH_UNIX;
-	if (stat(tvmunix, &st) < 0) {
-		syslog(LOG_ERR, "%s: %m", tvmunix);
+	tkernel = kernel ? kernel : _PATH_UNIX;
+	if (stat(tkernel, &st) < 0) {
+		syslog(LOG_ERR, "%s: %m", tkernel);
 		exit(1);
 	}
-	vmunixsize = st.st_blocks * S_BLKSIZE;
+	kernelsize = st.st_blocks * S_BLKSIZE;
 	if (statfs(dirname, &fsbuf) < 0) {
 		syslog(LOG_ERR, "%s: %m", dirname);
 		exit(1);
@@ -561,7 +561,7 @@ check_space()
 		(void)fclose(fp);
 	}
 
-	needed = (dumpsize + vmunixsize) / 1024;
+	needed = (dumpsize + kernelsize) / 1024;
  	if (minfree > 0 && spacefree - needed < minfree) {
 		syslog(LOG_WARNING,
 		    "no dump, not enough free space on device");
diff --git a/share/doc/smm/01.setup/2.t b/share/doc/smm/01.setup/2.t
index ddc4f7edb29d..396f9563ec7c 100644
--- a/share/doc/smm/01.setup/2.t
+++ b/share/doc/smm/01.setup/2.t
@@ -370,7 +370,7 @@ prompt for a kernel file to boot:
 HP433 CPU
 Boot
 .R
-\fB:\fP \fI/vmunix\fP
+\fB:\fP \fI/kernel\fP
 .DE
 .LP
 After providing the kernel name, the machine will boot \*(4B with
@@ -755,7 +755,7 @@ Boot the supplied kernel:
 .DS
 .ft CW
 # halt
-ok boot sd(0,3)vmunix -s		[for old proms] OR
+ok boot sd(0,3)kernel -s		[for old proms] OR
 ok boot disk3 -s			[for new proms]
 \&... [\*(4B boot messages]
 .DE
@@ -773,7 +773,7 @@ to set up \*(4B to reboot automatically:
 .DS
 .ft CW
 # halt
-ok setenv boot-from sd(0,3)vmunix	[for old proms] OR
+ok setenv boot-from sd(0,3)kernel	[for old proms] OR
 ok setenv boot-device disk3		[for new proms]
 .DE
 If you build backwards-compatible filesystems, either with the SunOS
@@ -857,8 +857,8 @@ tar xf /dev/rmt0
 will extract the following four files:
 .DS
 A) root.image: \fIdd\fP image of the root filesystem
-B) vmunix.tape: \fIdd\fP image for creating boot tapes
-C) vmunix.net: file for booting over the network
+B) kernel.tape: \fIdd\fP image for creating boot tapes
+C) kernel.net: file for booting over the network
 D) root.dump: \fIdump\fP image of the root filesystem
 .DE
 There are three basic ways a system can be bootstrapped corresponding to the
@@ -886,8 +886,8 @@ following PROM commands. If you are booting on a 3100, the disk must be SCSI
 id zero because of a bug.
 .DS
 .ft CW
-DEC 3100:    boot \-f rz(0,0,0)vmunix
-DEC 5000:    boot 5/rz0/vmunix
+DEC 3100:    boot \-f rz(0,0,0)kernel
+DEC 5000:    boot 5/rz0/kernel
 .DE
 You can then proceed to section 2.5
 to create reasonable disk partitions for your machine
@@ -903,7 +903,7 @@ First, you will need to create a boot tape. This can be done using
 \fIdd\fP as in the following example.
 .DS
 .ft CW
-dd if=vmunix.tape of=/dev/nrmt0 bs=1b
+dd if=kernel.tape of=/dev/nrmt0 bs=1b
 dd if=root.dump of=/dev/nrmt0 bs=\*(Bzb
 .DE
 The actual special file syntax for the tape drive will vary depending on
@@ -925,15 +925,15 @@ Next you should proceed to section 2.4.3 to build a disk-based root filesystem.
 .PP
 You will need a host machine that is running the \fIbootp\fP server 
 with the
-.Pn vmunix.net
+.Pn kernel.net
 file installed in the default directory defined by the
 configuration file for
 .Xr bootp .
 Here are two example PROM commands to boot across the net:
 .DS
 .ft CW
-DEC 3100:	boot \-f tftp()vmunix.net m
-DEC 5000:	boot 6/tftp/vmunix.net m
+DEC 3100:	boot \-f tftp()kernel.net m
+DEC 5000:	boot 6/tftp/kernel.net m
 .DE
 This command should load the kernel and mini-root into memory and
 run the same as the tape install (procedure B).
@@ -1001,8 +1001,8 @@ When the restore finishes, clean up with:
 Reset the system and initialize the PROM monitor to boot automatically.
 .DS
 .ft CW
-DEC 3100:	setenv bootpath boot \-f rz(0,?,0)vmunix
-DEC 5000:	setenv bootpath 5/rz?/vmunix -a
+DEC 3100:	setenv bootpath boot \-f rz(0,?,0)kernel
+DEC 5000:	setenv bootpath 5/rz?/kernel -a
 .DE
 .IP 4)
 After booting UNIX, you will need to create
@@ -1370,7 +1370,7 @@ directory is a memory-based filesystem.
 Note that to interleave the paging between the two disks
 you must build a system configuration that specifies:
 .DS
-config	vmunix	root on \*(Dk0 swap on \*(Dk0 and \*(Dk1
+config	kernel	root on \*(Dk0 swap on \*(Dk0 and \*(Dk1
 .DE
 The
 .Pn /etc/fstab
diff --git a/share/doc/smm/01.setup/4.t b/share/doc/smm/01.setup/4.t
index fee3fc2d7b28..d26dac7d1475 100644
--- a/share/doc/smm/01.setup/4.t
+++ b/share/doc/smm/01.setup/4.t
@@ -200,24 +200,24 @@ and look at the sample configuration files in the
 directory.
 .PP
 The configured system image
-.Pn vmunix
+.Pn kernel
 should be copied to the root, and then booted to try it out.
 It is best to name it
-.Pn /newvmunix
+.Pn /newkernel
 so as not to destroy the working system until you are sure it does work:
 .DS
-\fB#\fP \fIcp vmunix /newvmunix\fP
+\fB#\fP \fIcp kernel /newkernel\fP
 \fB#\fP \fIsync\fP
 .DE
 It is also a good idea to keep the previous system around under some other
 name.  In particular, we recommend that you save the generic distribution
 version of the system permanently as
-.Pn /genvmunix
+.Pn /genkernel
 for use in emergencies.
 To boot the new version of the system you should follow the
 bootstrap procedures outlined in section 6.1.
 After having booted and tested the new system, it should be installed as
-.Pn /vmunix
+.Pn /kernel
 before going into multiuser operation.
 A systematic scheme for numbering and saving old versions
 of the system may be useful.
diff --git a/share/doc/smm/01.setup/spell.ok b/share/doc/smm/01.setup/spell.ok
index c4f58a2a14d7..daedb66bbca0 100644
--- a/share/doc/smm/01.setup/spell.ok
+++ b/share/doc/smm/01.setup/spell.ok
@@ -294,7 +294,7 @@ ftpwelcome
 fts
 funopen
 gcc
-genvmunix
+genkernel
 getcap
 gettytab
 gid
@@ -411,7 +411,7 @@ netx25
 newdev
 newlfs
 news3400
-newvmunix
+newkernel
 nfs
 nfsd
 nfsiod
@@ -590,9 +590,9 @@ vax
 ventel
 vfs
 vm
-vmunix
-vmunix.net
-vmunix.tape
+kernel
+kernel.net
+kernel.tape
 vnode
 vnodes
 vol
diff --git a/share/doc/smm/06.nfs/1.t b/share/doc/smm/06.nfs/1.t
index 6804ed1fb4af..f68a863d90a9 100644
--- a/share/doc/smm/06.nfs/1.t
+++ b/share/doc/smm/06.nfs/1.t
@@ -512,7 +512,7 @@ planning (dreaming) stage.
 The NFS client does include kernel support for diskless/dataless operation
 where the root file system and optionally the swap area is remote NFS mounted.
 A diskless/dataless client is configured using a version of the
-``swapvmunix.c'' file as provided in the directory \fIcontrib/diskless.nfs\fR.
+``swapkernel.c'' file as provided in the directory \fIcontrib/diskless.nfs\fR.
 If the swap device == NODEV, it specifies an NFS mounted swap area and should
 be configured the same size as set up by diskless_setup when run on the server.
 This file must be put in the \fIsys/compile/<machine_name>\fR kernel build
@@ -529,7 +529,7 @@ flexibility when setting up different servers.
 .lp
 The tools are as follows:
 .ip \(bu
-diskless_offset.c - This little program reads a ``vmunix'' object file and
+diskless_offset.c - This little program reads a ``kernel'' object file and
 writes the file byte offset of the nfs_diskless structure in it to
 standard out. It was kept separate because it sometimes has to
 be compiled/linked in funny ways depending on the client architecture.
@@ -537,47 +537,47 @@ be compiled/linked in funny ways depending on the client architecture.
 .ip \(bu
 diskless_setup.c - This program is run on the server and sets up files for a
 given client. It mostly just fills in an nfs_diskless structure and
-writes it out to either the "vmunix" file or a separate file called
+writes it out to either the "kernel" file or a separate file called
 /var/diskless/setup.<official-hostname>
 .ip \(bu
 diskless_boot.c - There are two functions in here that may be used
-by a bootstrap server such as tftpd to permit sharing of the ``vmunix''
+by a bootstrap server such as tftpd to permit sharing of the ``kernel''
 object file for similar clients. This saves disk space on the bootstrap
 server and simplify organization, but are not critical for correct operation.
-They read the ``vmunix''
+They read the ``kernel''
 file, but optionally fill in the nfs_diskless structure from a
 separate "setup.<official-hostname>" file so that there is only
-one copy of "vmunix" for all similar (same arch etc.) clients.
+one copy of "kernel" for all similar (same arch etc.) clients.
 These functions use a text file called
 /var/diskless/boot.<official-hostname> to control the netboot.
 .lp
 The basic setup steps are:
 .ip \(bu
-make a "vmunix" for the client(s) with mountroot() == nfs_mountroot()
+make a "kernel" for the client(s) with mountroot() == nfs_mountroot()
 and swdevt[0].sw_dev == NODEV if it is to do nfs swapping as well
-(See the same swapvmunix.c file)
+(See the same swapkernel.c file)
 .ip \(bu
-run diskless_offset on the vmunix file to find out the byte offset
+run diskless_offset on the kernel file to find out the byte offset
 of the nfs_diskless structure
 .ip \(bu
 Run diskless_setup on the server to set up the server and fill in the
 nfs_diskless structure for that client.
 The nfs_diskless structure can either be written into the
-vmunix file (the -x option) or
+kernel file (the -x option) or
 saved in /var/diskless/setup.<official-hostname>.
 .ip \(bu
 Set up the bootstrap server. If the nfs_diskless structure was written into
-the ``vmunix'' file, any vanilla bootstrap protocol such as bootp/tftp can
+the ``kernel'' file, any vanilla bootstrap protocol such as bootp/tftp can
 be used. If the bootstrap server has been modified to use the functions in
 diskless_boot.c, then a
 file called /var/diskless/boot.<official-hostname>
 must be created.
 It is simply a two line text file, where the first line is the pathname
-of the correct ``vmunix'' file and the second line has the pathname of
+of the correct ``kernel'' file and the second line has the pathname of
 the nfs_diskless structure file and its byte offset in it.
 For example:
 .br
-	/var/diskless/vmunix.pmax
+	/var/diskless/kernel.pmax
 .br
 	/var/diskless/setup.rickers.cis.uoguelph.ca 642308
 .br
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 8d9ab1088826..e8e8614d33e2 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -368,7 +368,7 @@ commonly ~uucp; public uucp temporary directory
 .It Li tmp/ 
 temporary files that are kept between system reboots
 .El
-.It Li /vmunix
+.It Li /kernel
 pure kernel executable (the operating system loaded into memory
 at boot time).  
 .El
diff --git a/share/man/tools/newsp.errs b/share/man/tools/newsp.errs
index 2cde891df094..7eb1c760aa3d 100644
--- a/share/man/tools/newsp.errs
+++ b/share/man/tools/newsp.errs
@@ -1059,7 +1059,7 @@ vk
 vlp
 vlpmacs
 vmcore
-vmunix
+kernel
 vol
 vpd
 vpf
@@ -1570,7 +1570,7 @@ tzp
 uio.h
 usec
 vec
-vmunix
+kernel
 wait.h
 writefds
 writen
@@ -2526,7 +2526,7 @@ vidnorm
 vlimit.3c
 vlimit.h
 vm
-vmunix
+kernel
 vrbose
 vtimes.3c
 vtimes.h
@@ -3931,7 +3931,7 @@ vaxif
 vaxmba
 vaxuba
 versatec
-vmunix
+kernel
 vpacct
 vv.c
 wd
@@ -4564,8 +4564,8 @@ vipw
 vipw.8
 vmcore
 vmcore.n
-vmunix
-vmunix.n
+kernel
+kernel.n
 whod
 whoent
 xfc
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 1db03308873b..715e09aaa9f3 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -72,7 +72,7 @@ instead of the default
 .Pa /dev/kmem .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Pa /vmunix .
+.Pa /kernel .
 .It Fl n
 Numerical format.  Print the device number (maj,min) of the filesystem
 the file resides in rather than the mount point name; for special
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index fc0d3036eb63..bf9d60ed4e1a 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -145,7 +145,7 @@ Show statistics recorded by the memory management routines
 (the network manages a private pool of memory buffers).
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Pa /vmunix .
+.Pa /kernel .
 .It Fl n
 Show network addresses as numbers (normally
 .Nm netstat
@@ -280,7 +280,7 @@ command appeared in
 .Bx 4.2 .
 .\" .Sh FILES
 .\" .Bl -tag -width /dev/kmem -compact
-.\" .It Pa /vmunix
+.\" .It Pa /kernel
 .\" default kernel namelist
 .\" .It Pa /dev/kmem
 .\" default memory file
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 3acda6cab33e..cd353c0db1bd 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -58,7 +58,7 @@ instead of the default
 .Pa /dev/kmem .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Pa /vmunix .
+.Pa /kernel .
 .It Fl w
 Display a shorter summary of
 .Tn NFS
@@ -68,7 +68,7 @@ second intervals.
 .El
 .Sh FILES
 .Bl -tag -width /dev/kmem -compact
-.It Pa /vmunix
+.It Pa /kernel
 default kernel namelist
 .It Pa /dev/kmem
 default memory file
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 3b9a5d97ade5..11bdbd5fea60 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -396,7 +396,7 @@ may be specified, separated by spaces.
 .El
 .Sh FILES
 .Bl -tag -width /etc/networks -compact
-.It Pa /vmunix
+.It Pa /kernel
 For the namelist.
 .It Pa /dev/kmem
 For information in main memory.
diff --git a/usr.bin/uucp/acucntrl/acucntrl.8 b/usr.bin/uucp/acucntrl/acucntrl.8
index 57ce495ad771..b2b7f0e31876 100644
--- a/usr.bin/uucp/acucntrl/acucntrl.8
+++ b/usr.bin/uucp/acucntrl/acucntrl.8
@@ -139,7 +139,7 @@ Worked over many times by W.Sebok
 .RI ( i . e .
 hacked to death)
 .SH FILES
-/dev/kmem, /vmunix, /etc/ttys, /etc/utmp, /dev/tty*
+/dev/kmem, /kernel, /etc/ttys, /etc/utmp, /dev/tty*
 .SH BUGS
 .PP
 Sensing carrier requires the 4.2 BSD TIOCMGET ioctl call.  Unfortunately this
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index d2eb074606dc..28ba3e8d9cc6 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -78,7 +78,7 @@ instead of the default ``/dev/kmem''.
 .TP
 \-N
 Extract the name list from the specified system instead of the default
-``/vmunix''.
+``/kernel''.
 .TP
 \-m
 Report on the usage of kernel dynamic memory listed first by size of
@@ -188,7 +188,7 @@ Others vary every second and running the output for a while will make it
 apparent which are recomputed every second.
 .SH FILES
 .ta \w'/dev/kmem  'u
-/vmunix	default kernel namelist
+/kernel	default kernel namelist
 .br
 /dev/kmem	default memory file
 .SH SEE ALSO
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index a5eb169cda14..8589bbc02f33 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -47,8 +47,8 @@ the length of time the system has been up,
 the number of users, and the load average of the system over the last
 1, 5, and 15 minutes.
 .Sh FILES
-.Bl -tag -width /vmunix
-.It Pa /vmunix
+.Bl -tag -width /kernel
+.It Pa /kernel
 system name list
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 4e4f5d328fc4..9034ebe15941 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -72,7 +72,7 @@ core instead of the default
 .It Fl N
 Extract the name list from the specified system instead of the
 default
-.Dq /vmunix .
+.Dq /kernel .
 .It Fl n
 Show network addresses as numbers (normally
 .Nm w
diff --git a/usr.sbin/XNSrouted/defs.h b/usr.sbin/XNSrouted/defs.h
index c380e816b224..c6f8b5fa65b6 100644
--- a/usr.sbin/XNSrouted/defs.h
+++ b/usr.sbin/XNSrouted/defs.h
@@ -73,7 +73,7 @@ int	kmem;
 int	supplier;		/* process should supply updates */
 int	install;		/* if 1 call kernel */
 int	lookforinterfaces;	/* if 1 probe kernel for new up interfaces */
-int	performnlist;		/* if 1 check if /vmunix has changed */
+int	performnlist;		/* if 1 check if /kernel has changed */
 int	externalinterfaces;	/* # of remote and local interfaces */
 int	timeval;		/* local idea of time */
 int	noteremoterequests;	/* squawk on requests from non-local nets */
diff --git a/usr.sbin/bad144/bad144.8 b/usr.sbin/bad144/bad144.8
index 9ea8c883bc43..e3843dec65f3 100644
--- a/usr.sbin/bad144/bad144.8
+++ b/usr.sbin/bad144/bad144.8
@@ -172,7 +172,7 @@ errors, or the special
 .Tn SSE
 (skip sector) errors of RM80-type disks.
 This means that none of these errors can occur when reading the file
-.Pa /vmunix
+.Pa /kernel
 to boot.  Sectors 0-15 of the disk drive
 must also not have any of these errors.
 .Pp
diff --git a/usr.sbin/config.new/config.h b/usr.sbin/config.new/config.h
index dde683d9457e..a36abbdaaa4b 100644
--- a/usr.sbin/config.new/config.h
+++ b/usr.sbin/config.new/config.h
@@ -63,7 +63,7 @@ struct nvlist {
  */
 struct config {
 	struct	config *cf_next;	/* linked list */
-	const char *cf_name;		/* "vmunix" */
+	const char *cf_name;		/* "kernel" */
 	int	cf_lineno;		/* source line */
 	struct	nvlist *cf_root;	/* "root on ra0a" */
 	struct	nvlist *cf_swap;	/* "swap on ra0b and ra1b" */
diff --git a/usr.sbin/config/SMM.doc/3.t b/usr.sbin/config/SMM.doc/3.t
index cbb904f3fbed..e0b62348eec5 100644
--- a/usr.sbin/config/SMM.doc/3.t
+++ b/usr.sbin/config/SMM.doc/3.t
@@ -194,17 +194,17 @@ Building the system
 The makefile constructed by
 .I config
 should allow a new system to be rebuilt by simply typing ``make image-name''.
-For example, if you have named your bootable system image ``vmunix'',
-then ``make vmunix''
-will generate a bootable image named ``vmunix''.  Alternate system image names
+For example, if you have named your bootable system image ``kernel'',
+then ``make kernel''
+will generate a bootable image named ``kernel''.  Alternate system image names
 are used when the root file system location and/or swapping configuration
 is done in more than one way.  The makefile which
 .I config
 creates has entry points for each system image defined in
 the configuration file.
-Thus, if you have configured ``vmunix'' to be a system with the root file
-system on an ``hp'' device and ``hkvmunix'' to be a system with the root
-file system on an ``hk'' device, then ``make vmunix hkvmunix'' will generate
+Thus, if you have configured ``kernel'' to be a system with the root file
+system on an ``hp'' device and ``hkkernel'' to be a system with the root
+file system on an ``hk'' device, then ``make kernel hkkernel'' will generate
 binary images for each.
 As the system will generally use the disk from which it is loaded
 as the root filesystem, separate system images are only required
@@ -225,8 +225,8 @@ This is advantageous for programs such as
 which run much faster when the symbols they need are located at
 the front of the symbol table.  
 Remember also that many programs expect
-the currently executing system to be named ``/vmunix''.  If you install
-a new system and name it something other than ``/vmunix'', many programs
+the currently executing system to be named ``/kernel''.  If you install
+a new system and name it something other than ``/kernel'', many programs
 are likely to give strange results.
 .NH 2
 Sharing object modules
diff --git a/usr.sbin/config/SMM.doc/4.t b/usr.sbin/config/SMM.doc/4.t
index d267799a430a..74981859a18b 100644
--- a/usr.sbin/config/SMM.doc/4.t
+++ b/usr.sbin/config/SMM.doc/4.t
@@ -150,7 +150,7 @@ with a ``config'' line:
 The
 .I sysname
 field is the name given to the loaded system image; almost everyone
-names their standard system image ``vmunix''.  The configuration clauses
+names their standard system image ``kernel''.  The configuration clauses
 are one or more specifications indicating where the root file system
 is located and the number and location of paging devices.
 The device used by the system to process argument lists during
@@ -218,7 +218,7 @@ This is done by substituting
 where the device name would normally be found.  For example,
 .IP
 .nf
-\fBconfig\fP vmunix \fBroot\fP \fBon\fP \fBmajor\fP 99 \fBminor\fP 1
+\fBconfig\fP kernel \fBroot\fP \fBon\fP \fBmajor\fP 99 \fBminor\fP 1
 .fi
 .PP
 Normally, the areas configured for swap space are sized by the system
@@ -229,7 +229,7 @@ device name specified for a swap area should have a ``size''
 specification appended.  For example,
 .IP
 .nf
-\fBconfig\fP vmunix \fBroot\fP \fBon\fP hp0 \fBswap\fP \fBon\fP hp0b \fBsize\fP 1200
+\fBconfig\fP kernel \fBroot\fP \fBon\fP hp0 \fBswap\fP \fBon\fP hp0b \fBsize\fP 1200
 .fi
 .LP
 would force swapping to be done in partition ``b'' of ``hp0'' and
diff --git a/usr.sbin/config/SMM.doc/5.t b/usr.sbin/config/SMM.doc/5.t
index 3a0f449502ba..81f2a52b7735 100644
--- a/usr.sbin/config/SMM.doc/5.t
+++ b/usr.sbin/config/SMM.doc/5.t
@@ -109,9 +109,9 @@ Finally, the third will be a generic system,
 to allow us to boot off any of the four disk drives.
 .DS
 .ta 1.5i 2.5i
-config	vmunix	root on hp0
-config	hpvmunix	root on hp0 swap on hp0 and hp2
-config	genvmunix	swap generic
+config	kernel	root on hp0
+config	hpkernel	root on hp0 swap on hp0 and hp2
+config	genkernel	swap generic
 .DE
 .PP
 Finally, the hardware must be specified.  Let us first just try
@@ -206,9 +206,9 @@ the network protocol options do not require corresponding pseudo devices.
 The system images and disks are configured next.
 .DS
 .ta 1.5i 2.5i 4.0i
-config	vmunix	root on hp swap on hp and rk0 and rk1
-config 	upvmunix	root on up
-config 	hkvmunix	root on hk swap on rk0 and rk1
+config	kernel	root on hp swap on hp and rk0 and rk1
+config 	upkernel	root on up
+config 	hkkernel	root on hk swap on rk0 and rk1
 
 controller	mba0	at nexus ?
 controller	uba0	at nexus ?
diff --git a/usr.sbin/config/SMM.doc/b.t b/usr.sbin/config/SMM.doc/b.t
index 7281610b5376..901a009c2c9c 100644
--- a/usr.sbin/config/SMM.doc/b.t
+++ b/usr.sbin/config/SMM.doc/b.t
@@ -110,7 +110,7 @@ the dump.  The \fIsavecore\fP\|(8)
 program then copies the information from the dump partition to
 a file in a ``crash'' directory and also makes a copy of the
 system which was running at the time of the crash (usually
-``/vmunix'').  The offset to the system dump is defined in the
+``/kernel'').  The offset to the system dump is defined in the
 system variable \fIdumplo\fP (a sector offset from
 the front of the dump partition). The 
 .I savecore
diff --git a/usr.sbin/config/SMM.doc/c.t b/usr.sbin/config/SMM.doc/c.t
index 0f28fdad4040..67b63ec2f635 100644
--- a/usr.sbin/config/SMM.doc/c.t
+++ b/usr.sbin/config/SMM.doc/c.t
@@ -55,9 +55,9 @@ timezone	8 dst
 ident	ANSEL
 maxusers	40
 
-config	vmunix	root on hp0
-config	hpvmunix	root on hp0 swap on hp0 and hp2
-config	genvmunix	swap generic
+config	kernel	root on hp0
+config	hpkernel	root on hp0 swap on hp0 and hp2
+config	genkernel	swap generic
 
 controller	mba0	at nexus ?
 disk	hp0	at mba? disk ?
@@ -86,9 +86,9 @@ maxusers	32
 options	INET
 options	NS
 
-config	vmunix	root on hp swap on hp and rk0 and rk1
-config	upvmunix	root on up
-config	hkvmunix	root on hk swap on rk0 and rk1
+config	kernel	root on hp swap on hp and rk0 and rk1
+config	upkernel	root on up
+config	hkkernel	root on hk swap on rk0 and rk1
 
 controller	mba0	at nexus ?
 controller	uba0	at nexus ?
diff --git a/usr.sbin/config/SMM.doc/spell.ok b/usr.sbin/config/SMM.doc/spell.ok
index 41324523022f..50c4ef2e5ab9 100644
--- a/usr.sbin/config/SMM.doc/spell.ok
+++ b/usr.sbin/config/SMM.doc/spell.ok
@@ -157,7 +157,7 @@ files.machine
 filesystem
 foo
 foo.c
-genvmunix
+genkernel
 gettimeofday
 gigabytes
 gprof
@@ -165,14 +165,14 @@ hardwired
 hd
 hk
 hk0
-hkvmunix
+hkkernel
 howmany
 hp0
 hp0b
 hp1
 hp2
 hp3
-hpvmunix
+hpkernel
 ht0
 hz
 ident
@@ -288,7 +288,7 @@ upminfo
 upprobe
 upslave
 upstd
-upvmunix
+upkernel
 upwatch
 upwstart
 value,name2
@@ -298,7 +298,7 @@ vaxif
 vaxmba
 vaxuba
 vmparam.h
-vmunix
+kernel
 wildcard
 wildcarded
 wildcarding
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 48ef627b86aa..679dfc66b520 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -70,7 +70,7 @@ instead of the default
 .Dq Pa /dev/kmem .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Dq Pa /vmunix .
+.Dq Pa /kernel .
 .It Fl w
 Pause
 .Ar wait
@@ -124,7 +124,7 @@ seeks and rotational latency)
 .El
 .Sh FILES
 .Bl -tag -width /dev/kmem -compact
-.It Pa /vmunix
+.It Pa /kernel
 Default kernel namelist.
 .It Pa /dev/kmem
 Default memory file.
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index 060ed2eba4fd..114fea8dea69 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -82,7 +82,7 @@ Extract values associated with the name list from the specified core
 instead of the default ``/dev/kmem''.
 .It Fl N
 Extract the name list from the specified system instead of the
-default ``/vmunix''.
+default ``/kernel''.
 .El
 .Pp
 If neither 
@@ -98,7 +98,7 @@ the operating system profile buffers will be dumped,
 and profiling will be immediately resumed.
 .Sh FILES
 .Bl -tag -width /dev/kmemx -compact
-.It Pa /vmunix
+.It Pa /kernel
 the default system
 .It Pa /dev/kmem
 the default memory
diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.8 b/usr.sbin/kvm_mkdb/kvm_mkdb.8
index d9dcbf9f16bc..6b14e080e222 100644
--- a/usr.sbin/kvm_mkdb/kvm_mkdb.8
+++ b/usr.sbin/kvm_mkdb/kvm_mkdb.8
@@ -46,7 +46,7 @@ creates a database in
 .Pa /var/db
 containing information about the specified file.
 If no file is specified,
-.Pa /vmunix
+.Pa /kernel
 is used by default.
 The file is named ``kvm_filename.db'', where ``filename'' is the
 name of the file read.
@@ -57,9 +57,9 @@ used by the
 function, however, in the future the database may contain other static
 information about the current system.
 .Sh FILES
-.Bl -tag -width /var/db/kvm_vmunix.db -compact
-.It Pa /vmunix
-.It Pa /var/db/kvm_vmunix.db
+.Bl -tag -width /var/db/kvm_kernel.db -compact
+.It Pa /kernel
+.It Pa /var/db/kvm_kernel.db
 .El
 .Sh SEE ALSO
 .Xr kvm_nlist 3
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 95f3d8609e1f..b2e8decfbe00 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -53,7 +53,7 @@ is given, the information is sought there, otherwise
 in
 .Pa /dev/kmem .
 The required namelist is taken from
-.Pa /vmunix
+.Pa /kernel
 unless 
 .Ar system
 is specified.
@@ -294,7 +294,7 @@ major and minor device of special file.
 .El
 .Sh FILES
 .Bl -tag -width /dev/kmemxxx -compact
-.It Pa /vmunix
+.It Pa /kernel
 namelist
 .It Pa /dev/kmem
 default source of tables
diff --git a/usr.sbin/routed/defs.h b/usr.sbin/routed/defs.h
index 5b5ccacbf2f9..56722109ba62 100644
--- a/usr.sbin/routed/defs.h
+++ b/usr.sbin/routed/defs.h
@@ -76,7 +76,7 @@ int	kmem;
 int	supplier;		/* process should supply updates */
 int	install;		/* if 1 call kernel */
 int	lookforinterfaces;	/* if 1 probe kernel for new up interfaces */
-int	performnlist;		/* if 1 check if /vmunix has changed */
+int	performnlist;		/* if 1 check if /kernel has changed */
 int	externalinterfaces;	/* # of remote and local interfaces */
 struct	timeval now;		/* current idea of time */
 struct	timeval lastbcast;	/* last time all/changes broadcast */
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index 4b8492e15b00..2922bccf52f6 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -126,7 +126,7 @@ Status messages are generated approximately once every
 performs an
 .Xr nlist 3
 on
-.Pa /vmunix
+.Pa /kernel
 every 30 minutes to guard against
 the possibility that this file is not the system
 image currently operating.
diff --git a/usr.sbin/sendmail/src/conf.c b/usr.sbin/sendmail/src/conf.c
index e74c8d0b2d3a..8c7ad33bce38 100644
--- a/usr.sbin/sendmail/src/conf.c
+++ b/usr.sbin/sendmail/src/conf.c
@@ -653,7 +653,7 @@ init_md(argc, argv)
 # if defined(SYSTEM5)
 #  define _PATH_UNIX	"/unix"
 # else
-#  define _PATH_UNIX	"/vmunix"
+#  define _PATH_UNIX	"/kernel"
 # endif
 #endif
 
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 01c5d51fcb4b..47592d5cbf1b 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -428,7 +428,7 @@ printsys(msg)
 	int c, pri, flags;
 	char *lp, *p, *q, line[MAXLINE + 1];
 
-	(void)strcpy(line, "vmunix: ");
+	(void)strcpy(line, "kernel: ");
 	lp = line + strlen(line);
 	for (p = msg; *p != '\0'; ) {
 		flags = SYNC_FILE | ADDDATE;	/* fsync file after write */
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 8cc6c2acc480..eee7dc82f691 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -124,7 +124,7 @@ core file other than the default, the last two
 arguments may be used to supplant the defaults.
 .Sh FILES
 .Bl -tag -width /dev/kmem -compact
-.It Pa /vmunix
+.It Pa /kernel
 .It Pa /dev/kmem
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/trsp/trsp.8 b/usr.sbin/trsp/trsp.8
index 19c23b43a28d..dd8db27c6e78 100644
--- a/usr.sbin/trsp/trsp.8
+++ b/usr.sbin/trsp/trsp.8
@@ -116,7 +116,7 @@ core file other than the default, the last two
 arguments may be used to supplant the defaults.
 .Sh FILES
 .Bl -tag -width /dev/kmem -compact
-.It Pa /vmunix
+.It Pa /kernel
 .It Pa /dev/kmem
 .El
 .Sh SEE ALSO