diff --git a/lib/libkvm/kvm.3 b/lib/libkvm/kvm.3
index f8ae7d3fbfae..309be0cee476 100644
--- a/lib/libkvm/kvm.3
+++ b/lib/libkvm/kvm.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kvm.3,v 1.9 2003/01/18 10:40:41 thorpej Exp $
+.\"	$NetBSD: kvm.3,v 1.10 2003/05/16 10:24:55 wiz Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -49,10 +49,10 @@
 The
 .Nm
 library provides a uniform interface for accessing kernel virtual memory
-images, including live systems and crashdumps.
+images, including live systems and crash dumps.
 Access to live systems is via
 .Pa /dev/mem
-while crashdumps can be examined via the core file generated by
+while crash dumps can be examined via the core file generated by
 .Xr savecore 8 .
 The interface behaves identically in both cases.
 Memory can be read and written, kernel symbol addresses can be
diff --git a/lib/libkvm/kvm_alpha.c b/lib/libkvm/kvm_alpha.c
index 8eba7caa7b39..4a881c8dc89c 100644
--- a/lib/libkvm/kvm_alpha.c
+++ b/lib/libkvm/kvm_alpha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_alpha.c,v 1.21 2003/04/09 22:46:39 nathanw Exp $ */
+/* $NetBSD: kvm_alpha.c,v 1.22 2003/05/16 10:24:55 wiz Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -153,7 +153,7 @@ lose:
 }
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
+ * Translate a physical address to a file-offset in the crash dump.
  */
 off_t
 _kvm_pa2off(kd, pa)
diff --git a/lib/libkvm/kvm_dump.3 b/lib/libkvm/kvm_dump.3
index 7e3279d818ba..770c18fbddf2 100644
--- a/lib/libkvm/kvm_dump.3
+++ b/lib/libkvm/kvm_dump.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kvm_dump.3,v 1.12 2003/04/16 13:35:06 wiz Exp $
+.\"	$NetBSD: kvm_dump.3,v 1.13 2003/05/16 10:24:55 wiz Exp $
 .\"
 .\" Copyright (c) 1996 Leo Weppelman
 .\" All rights reserved.
@@ -37,7 +37,7 @@
 .Nm kvm_dump_mkheader ,
 .Nm kvm_dump_wrtheader ,
 .Nm kvm_dump_inval
-.Nd crash-dump support functions
+.Nd crash dump support functions
 .Sh LIBRARY
 .Lb libkvm
 .Sh SYNOPSIS
@@ -57,10 +57,10 @@ The function
 .Fn kvm_dump_mkheader
 checks if the physical memory file associated with
 .Fa kd
-contains a valid crash-dump header as generated by a dumping kernel.
+contains a valid crash dump header as generated by a dumping kernel.
 When a valid header is found,
 .Fn kvm_dump_mkheader
-initializes the internal kvm data structures as if a crash-dump generated by
+initializes the internal kvm data structures as if a crash dump generated by
 the
 .Xr savecore 8
 program was opened.
diff --git a/lib/libkvm/kvm_m68k_cmn.c b/lib/libkvm/kvm_m68k_cmn.c
index 00d23d0dab8a..0dd0bbb44c2e 100644
--- a/lib/libkvm/kvm_m68k_cmn.c
+++ b/lib/libkvm/kvm_m68k_cmn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_m68k_cmn.c,v 1.10 2000/10/10 20:44:16 he Exp $	*/
+/*	$NetBSD: kvm_m68k_cmn.c,v 1.11 2003/05/16 10:24:55 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: kvm_m68k_cmn.c,v 1.10 2000/10/10 20:44:16 he Exp $");
+__RCSID("$NetBSD: kvm_m68k_cmn.c,v 1.11 2003/05/16 10:24:55 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -131,7 +131,7 @@ _kvm_cmn_kvatop(kd, va, pa)
 }
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
+ * Translate a physical address to a file-offset in the crash dump.
  */
 off_t
 _kvm_cmn_pa2off(kd, pa)
diff --git a/lib/libkvm/kvm_mips.c b/lib/libkvm/kvm_mips.c
index 00b725fbc1ef..13501f94f3bf 100644
--- a/lib/libkvm/kvm_mips.c
+++ b/lib/libkvm/kvm_mips.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_mips.c,v 1.16 2001/08/05 03:33:15 matt Exp $ */
+/* $NetBSD: kvm_mips.c,v 1.17 2003/05/16 10:24:55 wiz Exp $ */
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: kvm_mips.c,v 1.16 2001/08/05 03:33:15 matt Exp $");
+__RCSID("$NetBSD: kvm_mips.c,v 1.17 2003/05/16 10:24:55 wiz Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -169,7 +169,7 @@ _kvm_kvatop(kd, va, pa)
 }
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
+ * Translate a physical address to a file-offset in the crash dump.
  */
 off_t
 _kvm_pa2off(kd, pa)
diff --git a/lib/libkvm/kvm_ns32k.c b/lib/libkvm/kvm_ns32k.c
index b9737d975b1c..2625c3418e05 100644
--- a/lib/libkvm/kvm_ns32k.c
+++ b/lib/libkvm/kvm_ns32k.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_ns32k.c,v 1.15 2001/09/17 12:48:20 simonb Exp $	*/
+/*	$NetBSD: kvm_ns32k.c,v 1.16 2003/05/16 10:24:55 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1992, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: kvm_ns32k.c,v 1.15 2001/09/17 12:48:20 simonb Exp $");
+__RCSID("$NetBSD: kvm_ns32k.c,v 1.16 2003/05/16 10:24:55 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -156,7 +156,7 @@ invalid:
 }
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
+ * Translate a physical address to a file-offset in the crash dump.
  */
 off_t
 _kvm_pa2off(kd, pa)
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index 233177796fa2..c4968815ca75 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_private.h,v 1.12 2003/05/11 13:37:34 ragge Exp $	*/
+/*	$NetBSD: kvm_private.h,v 1.13 2003/05/16 10:24:55 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -48,8 +48,8 @@ struct __kvm {
 	const char *program;
 	char	*errp;		/* XXX this can probably go away */
 	char	errbuf[_POSIX2_LINE_MAX];
-	int	pmfd;		/* physical memory file (or crashdump) */
-	int	vmfd;		/* virtual memory file (-1 if crashdump) */
+	int	pmfd;		/* physical memory file (or crash dump) */
+	int	vmfd;		/* virtual memory file (-1 if crash dump) */
 	int	swfd;		/* swap file (e.g., /dev/drum) */
 	int	nlfd;		/* namelist file (e.g., /vmunix) */
 	char	alive;		/* live kernel? */
diff --git a/lib/libkvm/kvm_sparc.c b/lib/libkvm/kvm_sparc.c
index 76e7a872c212..90099c927a7c 100644
--- a/lib/libkvm/kvm_sparc.c
+++ b/lib/libkvm/kvm_sparc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_sparc.c,v 1.26 2001/09/22 00:53:01 mrg Exp $	*/
+/*	$NetBSD: kvm_sparc.c,v 1.27 2003/05/16 10:24:56 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: kvm_sparc.c,v 1.26 2001/09/22 00:53:01 mrg Exp $");
+__RCSID("$NetBSD: kvm_sparc.c,v 1.27 2003/05/16 10:24:56 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -155,7 +155,7 @@ _kvm_initvtop(kd)
  * Translate a kernel virtual address to a physical address using the
  * mapping information in kd->vm.  Returns the result in pa, and returns
  * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crashdumps.
+ * physical address.  This routine is used only for crash dumps.
  */
 int
 _kvm_kvatop(kd, va, pa)
@@ -357,7 +357,7 @@ err:
 
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
+ * Translate a physical address to a file-offset in the crash dump.
  */
 off_t
 _kvm_pa2off(kd, pa)
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index 8a1bae373d5d..d4af6536d4e5 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_sparc64.c,v 1.8 2003/04/03 22:07:16 martin Exp $	*/
+/*	$NetBSD: kvm_sparc64.c,v 1.9 2003/05/16 10:24:56 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: kvm_sparc64.c,v 1.8 2003/04/03 22:07:16 martin Exp $");
+__RCSID("$NetBSD: kvm_sparc64.c,v 1.9 2003/05/16 10:24:56 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -105,7 +105,7 @@ _kvm_initvtop(kd)
  * Translate a kernel virtual address to a physical address using the
  * mapping information in kd->vm.  Returns the result in pa, and returns
  * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crashdumps.
+ * physical address.  This routine is used only for crash dumps.
  */
 int
 _kvm_kvatop(kd, va, pa)
@@ -202,7 +202,7 @@ lose:
 
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
+ * Translate a physical address to a file-offset in the crash dump.
  */
 off_t
 _kvm_pa2off(kd, pa)
diff --git a/lib/libkvm/kvm_sun2.c b/lib/libkvm/kvm_sun2.c
index d026136c2359..064c756b7f82 100644
--- a/lib/libkvm/kvm_sun2.c
+++ b/lib/libkvm/kvm_sun2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_sun2.c,v 1.1 2001/05/21 14:56:30 fredette Exp $ */
+/*	$NetBSD: kvm_sun2.c,v 1.2 2003/05/16 10:24:56 wiz Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: kvm_sun2.c,v 1.1 2001/05/21 14:56:30 fredette Exp $");
+__RCSID("$NetBSD: kvm_sun2.c,v 1.2 2003/05/16 10:24:56 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -132,7 +132,7 @@ _kvm_sun2_freevtop(kd)
  * Translate a kernel virtual address to a physical address using the
  * mapping information in kd->vm.  Returns the result in pa, and returns
  * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crashdumps.
+ * physical address.  This routine is used only for crash dumps.
  */
 int
 _kvm_sun2_kvatop(kd, va, pap)
@@ -181,7 +181,7 @@ _kvm_sun2_kvatop(kd, va, pap)
 }
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
+ * Translate a physical address to a file-offset in the crash dump.
  */
 off_t
 _kvm_sun2_pa2off(kd, pa)
diff --git a/lib/libkvm/kvm_sun3.c b/lib/libkvm/kvm_sun3.c
index ee63715fbbf7..f4c908fb6670 100644
--- a/lib/libkvm/kvm_sun3.c
+++ b/lib/libkvm/kvm_sun3.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_sun3.c,v 1.10 2000/10/10 20:44:17 he Exp $	*/
+/*	$NetBSD: kvm_sun3.c,v 1.11 2003/05/16 10:24:56 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: kvm_sun3.c,v 1.10 2000/10/10 20:44:17 he Exp $");
+__RCSID("$NetBSD: kvm_sun3.c,v 1.11 2003/05/16 10:24:56 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -132,7 +132,7 @@ _kvm_sun3_freevtop(kd)
  * Translate a kernel virtual address to a physical address using the
  * mapping information in kd->vm.  Returns the result in pa, and returns
  * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crashdumps.
+ * physical address.  This routine is used only for crash dumps.
  */
 int
 _kvm_sun3_kvatop(kd, va, pap)
@@ -181,7 +181,7 @@ _kvm_sun3_kvatop(kd, va, pap)
 }
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
+ * Translate a physical address to a file-offset in the crash dump.
  */
 off_t
 _kvm_sun3_pa2off(kd, pa)
diff --git a/lib/libkvm/kvm_sun3x.c b/lib/libkvm/kvm_sun3x.c
index 0e98d1522d74..fa5242bb7b67 100644
--- a/lib/libkvm/kvm_sun3x.c
+++ b/lib/libkvm/kvm_sun3x.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_sun3x.c,v 1.7 2000/10/10 20:44:17 he Exp $	*/
+/*	$NetBSD: kvm_sun3x.c,v 1.8 2003/05/16 10:24:56 wiz Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_sparc.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: kvm_sun3x.c,v 1.7 2000/10/10 20:44:17 he Exp $");
+__RCSID("$NetBSD: kvm_sun3x.c,v 1.8 2003/05/16 10:24:56 wiz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -105,7 +105,7 @@ _kvm_sun3x_freevtop(kd)
  * Translate a kernel virtual address to a physical address using the
  * mapping information in kd->vm.  Returns the result in pa, and returns
  * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crashdumps.
+ * physical address.  This routine is used only for crash dumps.
  */
 int
 _kvm_sun3x_kvatop(kd, va, pap)
@@ -165,7 +165,7 @@ done:
 }
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
+ * Translate a physical address to a file-offset in the crash dump.
  */
 off_t
 _kvm_sun3x_pa2off(kd, pa)
diff --git a/lib/libkvm/kvm_vax.c b/lib/libkvm/kvm_vax.c
index 5fb08240216f..56f1c0f4291c 100644
--- a/lib/libkvm/kvm_vax.c
+++ b/lib/libkvm/kvm_vax.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kvm_vax.c,v 1.14 2001/11/29 23:32:42 thorpej Exp $ */
+/*	$NetBSD: kvm_vax.c,v 1.15 2003/05/16 10:24:56 wiz Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -110,7 +110,7 @@ _kvm_initvtop(kd)
  * Translate a kernel virtual address to a physical address using the
  * mapping information in kd->vm.  Returns the result in pa, and returns
  * the number of bytes that are contiguously available from this
- * physical address.  This routine is used only for crashdumps.
+ * physical address.  This routine is used only for crash dumps.
  */
 int
 _kvm_kvatop(kd, va, pa)
@@ -136,8 +136,8 @@ _kvm_kvatop(kd, va, pa)
 }
 
 /*
- * Translate a physical address to a file-offset in the crash-dump.
- * XXX - crash-dumps doesn't work anyway.
+ * Translate a physical address to a file-offset in the crash dump.
+ * XXX - crash dump doesn't work anyway.
  */
 off_t
 _kvm_pa2off(kd, pa)