diff --git a/addrcheck/ac_include.h b/addrcheck/ac_include.h
index d4ef41d..1a47e4e 100644
--- a/addrcheck/ac_include.h
+++ b/addrcheck/ac_include.h
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of AddrCheck, a lightweight Valgrind skin for
+   detecting memory errors.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/addrcheck/ac_main.c b/addrcheck/ac_main.c
index c47b056..e2e8e3f 100644
--- a/addrcheck/ac_main.c
+++ b/addrcheck/ac_main.c
@@ -6,8 +6,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of AddrCheck, a lightweight Valgrind skin for
+   detecting memory errors.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
index 4fd28eb..40c804b 100644
--- a/cachegrind/cg_annotate.in
+++ b/cachegrind/cg_annotate.in
@@ -1,12 +1,13 @@
 #! /usr/bin/perl -w
+
 ##--------------------------------------------------------------------##
 ##--- The cache simulation framework: instrumentation, recording   ---##
 ##--- and results printing.                                        ---##
 ##---                                                  vg_annotate ---##
 ##--------------------------------------------------------------------##
 
-#  This file is part of Valgrind, an x86 protected-mode emulator 
-#  designed for debugging and profiling binaries on x86-Unixes.
+#  This file is part of Cachegrind, a Valgrind skin for cache
+#  profiling programs.
 #
 #  Copyright (C) 2002 Nicholas Nethercote
 #     njn25@cam.ac.uk
diff --git a/cachegrind/cg_main.c b/cachegrind/cg_main.c
index e8de3c4..13450d9 100644
--- a/cachegrind/cg_main.c
+++ b/cachegrind/cg_main.c
@@ -1,13 +1,13 @@
 
 /*--------------------------------------------------------------------*/
-/*--- The cache simulation skin: cache detection; instrumentation, ---*/
-/*--- recording and results printing.                              ---*/
+/*--- Cachegrind: cache detection; instrumentation, recording and  ---*/
+/*--- results printing.                                            ---*/
 /*---                                                    cg_main.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Cachegrind, a Valgrind skin for cache
+   profiling programs.
 
    Copyright (C) 2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/cachegrind/cg_sim_D1.c b/cachegrind/cg_sim_D1.c
index ee277c5..0dc4e45 100644
--- a/cachegrind/cg_sim_D1.c
+++ b/cachegrind/cg_sim_D1.c
@@ -1,11 +1,12 @@
+
 /*--------------------------------------------------------------------*/
 /*--- D1 cache simulation.                                         ---*/
 /*---                                                  cg_sim_D1.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Cachegrind, a Valgrind skin for cache
+   profiling programs.
 
    Copyright (C) 2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/cachegrind/cg_sim_I1.c b/cachegrind/cg_sim_I1.c
index 59f8417..5bc49b1 100644
--- a/cachegrind/cg_sim_I1.c
+++ b/cachegrind/cg_sim_I1.c
@@ -1,11 +1,12 @@
+
 /*--------------------------------------------------------------------*/
 /*--- I1 cache simulation.                                         ---*/
 /*---                                                  cg_sim_I1.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Cachegrind, a Valgrind skin for cache
+   profiling programs.
 
    Copyright (C) 2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/cachegrind/cg_sim_L2.c b/cachegrind/cg_sim_L2.c
index 9945f1e..954b5ce 100644
--- a/cachegrind/cg_sim_L2.c
+++ b/cachegrind/cg_sim_L2.c
@@ -1,11 +1,12 @@
+
 /*--------------------------------------------------------------------*/
 /*--- L2 cache simulation.                                         ---*/
 /*---                                                  cg_sim_L2.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Cachegrind, a Valgrind skin for cache
+   profiling programs.
 
    Copyright (C) 2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/cachegrind/cg_sim_gen.c b/cachegrind/cg_sim_gen.c
index 3d8993c..1184d5d 100644
--- a/cachegrind/cg_sim_gen.c
+++ b/cachegrind/cg_sim_gen.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Cachegrind, a Valgrind skin for cache
+   profiling programs.
 
    Copyright (C) 2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/corecheck/cc_main.c b/corecheck/cc_main.c
index 44bd66c..5ac657a 100644
--- a/corecheck/cc_main.c
+++ b/corecheck/cc_main.c
@@ -1,11 +1,12 @@
 
 /*--------------------------------------------------------------------*/
-/*--- Skin reporting errors detected in core.            cc_main.c ---*/
+/*--- CoreCheck: a skin reporting errors detected in core.         ---*/
+/*---                                                    cc_main.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of CoreCheck, a rudimentary Valgrind skin for
+   detecting certain basic program errors.
 
    Copyright (C) 2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/coregrind/arch/x86-linux/vg_libpthread.c b/coregrind/arch/x86-linux/vg_libpthread.c
index fec71a1..692e5d8 100644
--- a/coregrind/arch/x86-linux/vg_libpthread.c
+++ b/coregrind/arch/x86-linux/vg_libpthread.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/arch/x86-linux/vg_libpthread_unimp.c b/coregrind/arch/x86-linux/vg_libpthread_unimp.c
index f3938ec..86a46c1 100644
--- a/coregrind/arch/x86-linux/vg_libpthread_unimp.c
+++ b/coregrind/arch/x86-linux/vg_libpthread_unimp.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/arch/x86-linux/vg_syscall.S b/coregrind/arch/x86-linux/vg_syscall.S
index c10af41..7840942 100644
--- a/coregrind/arch/x86-linux/vg_syscall.S
+++ b/coregrind/arch/x86-linux/vg_syscall.S
@@ -5,8 +5,8 @@
 ##--------------------------------------------------------------------##
 
 /*
-  This file is part of Valgrind, an x86 protected-mode emulator 
-  designed for debugging and profiling binaries on x86-Unixes.
+  This file is part of Valgrind, an extensible x86 protected-mode
+  emulator for monitoring program execution on x86-Unixes.
 
   Copyright (C) 2000-2002 Julian Seward 
      jseward@acm.org
diff --git a/coregrind/valgrind.in b/coregrind/valgrind.in
index 7359eb6..8b86e5d 100755
--- a/coregrind/valgrind.in
+++ b/coregrind/valgrind.in
@@ -3,8 +3,8 @@
 ##--- The startup script.                                 valgrind ---##
 ##--------------------------------------------------------------------##
 
-#  This file is part of Valgrind, an x86 protected-mode emulator 
-#  designed for debugging and profiling binaries on x86-Unixes.
+#  This file is part of Valgrind, an extensible x86 protected-mode
+#  emulator for monitoring program execution on x86-Unixes.
 #
 #  Copyright (C) 2002 Julian Seward
 #     jseward@acm.org
diff --git a/coregrind/vg_clientfuncs.c b/coregrind/vg_clientfuncs.c
index e4d205b..6898818 100644
--- a/coregrind/vg_clientfuncs.c
+++ b/coregrind/vg_clientfuncs.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_clientmalloc.c b/coregrind/vg_clientmalloc.c
index 974ae67..1d1a50b 100644
--- a/coregrind/vg_clientmalloc.c
+++ b/coregrind/vg_clientmalloc.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_constants.h b/coregrind/vg_constants.h
index abf7240..926fa01 100644
--- a/coregrind/vg_constants.h
+++ b/coregrind/vg_constants.h
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_default.c b/coregrind/vg_default.c
index 4911e34..1bbcd2a 100644
--- a/coregrind/vg_default.c
+++ b/coregrind/vg_default.c
@@ -1,3 +1,4 @@
+
 /*--------------------------------------------------------------------*/
 /*--- Default panicky definitions of template functions that skins ---*/
 /*--- should override.                                             ---*/
@@ -5,8 +6,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/coregrind/vg_demangle.c b/coregrind/vg_demangle.c
index 6dff76f..e1ba69b 100644
--- a/coregrind/vg_demangle.c
+++ b/coregrind/vg_demangle.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_dispatch.S b/coregrind/vg_dispatch.S
index ddb8819..716eca2 100644
--- a/coregrind/vg_dispatch.S
+++ b/coregrind/vg_dispatch.S
@@ -1,12 +1,12 @@
 
-/*--------------------------------------------------------------------*/
-/*--- The core dispatch loop, for jumping to a code address.       ---*/
-/*---                                                vg_dispatch.S ---*/
-/*--------------------------------------------------------------------*/
+##--------------------------------------------------------------------##
+##--- The core dispatch loop, for jumping to a code address.       ---##
+##---                                                vg_dispatch.S ---##
+##--------------------------------------------------------------------##
 
 /*
-  This file is part of Valgrind, an x86 protected-mode emulator 
-  designed for debugging and profiling binaries on x86-Unixes.
+  This file is part of Valgrind, an extensible x86 protected-mode
+  emulator for monitoring program execution on x86-Unixes.
 
   Copyright (C) 2000-2002 Julian Seward 
      jseward@acm.org
@@ -213,6 +213,6 @@
 .text	
 
 
-/*--------------------------------------------------------------------*/
-/*--- end                                            vg_dispatch.S ---*/
-/*--------------------------------------------------------------------*/
+##--------------------------------------------------------------------##
+##--- end                                            vg_dispatch.S ---##
+##--------------------------------------------------------------------##
diff --git a/coregrind/vg_dummy_profile.c b/coregrind/vg_dummy_profile.c
index 3620ff8..6db1f11 100644
--- a/coregrind/vg_dummy_profile.c
+++ b/coregrind/vg_dummy_profile.c
@@ -6,8 +6,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_errcontext.c b/coregrind/vg_errcontext.c
index 198dd78..f0d126b 100644
--- a/coregrind/vg_errcontext.c
+++ b/coregrind/vg_errcontext.c
@@ -4,8 +4,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_execontext.c b/coregrind/vg_execontext.c
index e1a0ff1..5ce393d 100644
--- a/coregrind/vg_execontext.c
+++ b/coregrind/vg_execontext.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_from_ucode.c b/coregrind/vg_from_ucode.c
index 23e804c..0c11f03 100644
--- a/coregrind/vg_from_ucode.c
+++ b/coregrind/vg_from_ucode.c
@@ -3,9 +3,10 @@
 /*--- The JITter: translate ucode back to x86 code.                ---*/
 /*---                                              vg_from_ucode.c ---*/
 /*--------------------------------------------------------------------*/
+
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_helpers.S b/coregrind/vg_helpers.S
index 1511bc1..9d7356d 100644
--- a/coregrind/vg_helpers.S
+++ b/coregrind/vg_helpers.S
@@ -5,8 +5,8 @@
 ##--------------------------------------------------------------------##
 
 /*
-  This file is part of Valgrind, an x86 protected-mode emulator 
-  designed for debugging and profiling binaries on x86-Unixes.
+  This file is part of Valgrind, an extensible x86 protected-mode
+  emulator for monitoring program execution on x86-Unixes.
 
   Copyright (C) 2000-2002 Julian Seward 
      jseward@acm.org
diff --git a/coregrind/vg_include.h b/coregrind/vg_include.h
index d0c8f08..ed2fe57 100644
--- a/coregrind/vg_include.h
+++ b/coregrind/vg_include.h
@@ -6,8 +6,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_instrument.c b/coregrind/vg_instrument.c
index dd870ec..94a8a41 100644
--- a/coregrind/vg_instrument.c
+++ b/coregrind/vg_instrument.c
@@ -1,11 +1,12 @@
+
 /*--------------------------------------------------------------------*/
 /*--- Higher-level UCode sequence builders                         ---*/
 /*---                                              vg_instrument.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/coregrind/vg_kerneliface.h b/coregrind/vg_kerneliface.h
index 25a3c85..a5fea6d 100644
--- a/coregrind/vg_kerneliface.h
+++ b/coregrind/vg_kerneliface.h
@@ -6,8 +6,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_ldt.c b/coregrind/vg_ldt.c
index 3f3b760..2848044 100644
--- a/coregrind/vg_ldt.c
+++ b/coregrind/vg_ldt.c
@@ -4,8 +4,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index fec71a1..692e5d8 100644
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_libpthread_unimp.c b/coregrind/vg_libpthread_unimp.c
index f3938ec..86a46c1 100644
--- a/coregrind/vg_libpthread_unimp.c
+++ b/coregrind/vg_libpthread_unimp.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 99c17e3..6c628c4 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_malloc2.c b/coregrind/vg_malloc2.c
index ffe7159..2edc9ee 100644
--- a/coregrind/vg_malloc2.c
+++ b/coregrind/vg_malloc2.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_memory.c b/coregrind/vg_memory.c
index 85d0688..0fa968e 100644
--- a/coregrind/vg_memory.c
+++ b/coregrind/vg_memory.c
@@ -6,8 +6,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_messages.c b/coregrind/vg_messages.c
index b0051bd..73fe06b 100644
--- a/coregrind/vg_messages.c
+++ b/coregrind/vg_messages.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_mylibc.c b/coregrind/vg_mylibc.c
index 7eab2f7..d6bb58c 100644
--- a/coregrind/vg_mylibc.c
+++ b/coregrind/vg_mylibc.c
@@ -6,8 +6,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_procselfmaps.c b/coregrind/vg_procselfmaps.c
index 840f34b..7998927 100644
--- a/coregrind/vg_procselfmaps.c
+++ b/coregrind/vg_procselfmaps.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index 70ef7d6..c465ab6 100644
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -4,8 +4,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c
index 90726c0..6482366 100644
--- a/coregrind/vg_signals.c
+++ b/coregrind/vg_signals.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_startup.S b/coregrind/vg_startup.S
index ae6bf94..0cf5e87 100644
--- a/coregrind/vg_startup.S
+++ b/coregrind/vg_startup.S
@@ -5,8 +5,8 @@
 ##--------------------------------------------------------------------##
 
 /*
-  This file is part of Valgrind, an x86 protected-mode emulator 
-  designed for debugging and profiling binaries on x86-Unixes.
+  This file is part of Valgrind, an extensible x86 protected-mode
+  emulator for monitoring program execution on x86-Unixes.
 
   Copyright (C) 2000-2002 Julian Seward 
      jseward@acm.org
diff --git a/coregrind/vg_symtab2.c b/coregrind/vg_symtab2.c
index eaa7223..f945d54 100644
--- a/coregrind/vg_symtab2.c
+++ b/coregrind/vg_symtab2.c
@@ -4,8 +4,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_syscall.S b/coregrind/vg_syscall.S
index c10af41..7840942 100644
--- a/coregrind/vg_syscall.S
+++ b/coregrind/vg_syscall.S
@@ -5,8 +5,8 @@
 ##--------------------------------------------------------------------##
 
 /*
-  This file is part of Valgrind, an x86 protected-mode emulator 
-  designed for debugging and profiling binaries on x86-Unixes.
+  This file is part of Valgrind, an extensible x86 protected-mode
+  emulator for monitoring program execution on x86-Unixes.
 
   Copyright (C) 2000-2002 Julian Seward 
      jseward@acm.org
diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index 1735b60..5b07705 100644
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_to_ucode.c b/coregrind/vg_to_ucode.c
index 7250a4d..4bf1352 100644
--- a/coregrind/vg_to_ucode.c
+++ b/coregrind/vg_to_ucode.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_translate.c b/coregrind/vg_translate.c
index a6d9028..e9c4a26 100644
--- a/coregrind/vg_translate.c
+++ b/coregrind/vg_translate.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_transtab.c b/coregrind/vg_transtab.c
index d327429..05e454e 100644
--- a/coregrind/vg_transtab.c
+++ b/coregrind/vg_transtab.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_unsafe.h b/coregrind/vg_unsafe.h
index 0862e0e..be4ac5d 100644
--- a/coregrind/vg_unsafe.h
+++ b/coregrind/vg_unsafe.h
@@ -6,8 +6,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/coregrind/vg_valgrinq_dummy.c b/coregrind/vg_valgrinq_dummy.c
index 332085a..34b718e 100644
--- a/coregrind/vg_valgrinq_dummy.c
+++ b/coregrind/vg_valgrinq_dummy.c
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/example/ex_main.c b/example/ex_main.c
index e22405b..d3316b0 100644
--- a/example/ex_main.c
+++ b/example/ex_main.c
@@ -9,7 +9,7 @@
 {
    needs->name           = "example";
    needs->description    = "an example Valgrind skin";
-   needs->report_bugs_to = "the North Pole";
+   needs->report_bugs_to = "santa.claus@northpole.org";
 }
 
 void SK_(post_clo_init)(void)
diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index efe6fae..b53a2be 100644
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -1,12 +1,12 @@
+
 /*--------------------------------------------------------------------*/
-/*--- The Eraser skin: checking for data races in threaded         ---*/
-/*--- programs.                                                    ---*/
+/*--- Helgrind: checking for data races in threaded programs.      ---*/
 /*---                                                    hg_main.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Helgrind, a Valgrind skin for detecting
+   data races in threaded programs.
 
    Copyright (C) 2000-2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/include/valgrind.h b/include/valgrind.h
index fe880db..0b16d8c 100644
--- a/include/valgrind.h
+++ b/include/valgrind.h
@@ -9,8 +9,8 @@
 
    ----------------------------------------------------------------
 
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward.  All rights reserved.
 
diff --git a/include/vg_constants_skin.h b/include/vg_constants_skin.h
index a151cb0..0e29d3e 100644
--- a/include/vg_constants_skin.h
+++ b/include/vg_constants_skin.h
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/include/vg_profile.c b/include/vg_profile.c
index 31bad99..280bd8e 100644
--- a/include/vg_profile.c
+++ b/include/vg_profile.c
@@ -7,8 +7,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/include/vg_skin.h b/include/vg_skin.h
index ff589f1..3b4a138 100644
--- a/include/vg_skin.h
+++ b/include/vg_skin.h
@@ -5,8 +5,8 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/lackey/lk_main.c b/lackey/lk_main.c
index e4afcc4..95015d3 100644
--- a/lackey/lk_main.c
+++ b/lackey/lk_main.c
@@ -1,11 +1,12 @@
+
 /*--------------------------------------------------------------------*/
 /*--- Simple skin for counting UInstrs, using a C helper.          ---*/
 /*---                                                    lk_main.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Lackey, an example Valgrind skin that does
+   some simple program measurement.
 
    Copyright (C) 2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/memcheck/mc_clientreqs.c b/memcheck/mc_clientreqs.c
index ef617ad..ad4b86c 100644
--- a/memcheck/mc_clientreqs.c
+++ b/memcheck/mc_clientreqs.c
@@ -1,13 +1,13 @@
 
 /*--------------------------------------------------------------------*/
-/*--- Part of the MemCheck skin: for when the client advises       ---*/
-/*--- Valgrind about memory permissions.                           ---*/
+/*--- For when the client advises Valgrind about memory            ---*/
+/*--- permissions.                                                 ---*/
 /*---                                              mc_clientreqs.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of MemCheck, a heavyweight Valgrind skin for
+   detecting memory errors.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/memcheck/mc_errcontext.c b/memcheck/mc_errcontext.c
index 80647ce..367bb37 100644
--- a/memcheck/mc_errcontext.c
+++ b/memcheck/mc_errcontext.c
@@ -1,13 +1,12 @@
 
 /*--------------------------------------------------------------------*/
-/*--- Part of the MemCheck skin: management of memory error        ---*/
-/*--- messages.                                                    ---*/
+/*--- Management of memory error messages.                         ---*/
 /*---                                              mc_errcontext.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of MemCheck, a heavyweight Valgrind skin for
+   detecting memory errors.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/memcheck/mc_from_ucode.c b/memcheck/mc_from_ucode.c
index 912158c..59fe6e4 100644
--- a/memcheck/mc_from_ucode.c
+++ b/memcheck/mc_from_ucode.c
@@ -1,12 +1,12 @@
 
 /*--------------------------------------------------------------------*/
-/*--- Part of the MemCheck skin: Generate code for skin-specific   ---*/
-/*--- UInstrs.                                                     ---*/
+/*--- Generate code for skin-specific UInstrs.                     ---*/
 /*---                                              mc_from_ucode.c ---*/
 /*--------------------------------------------------------------------*/
+
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of MemCheck, a heavyweight Valgrind skin for
+   detecting memory errors.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/memcheck/mc_helpers.S b/memcheck/mc_helpers.S
index e37d101..e19cafa 100644
--- a/memcheck/mc_helpers.S
+++ b/memcheck/mc_helpers.S
@@ -1,11 +1,12 @@
+
 ##--------------------------------------------------------------------##
 ##--- Support routines for the memory checker.                     ---##
 ##---                                        	      mc_helpers.S ---##
 ##--------------------------------------------------------------------##
 
 /*
-  This file is part of Valgrind, an x86 protected-mode emulator 
-  designed for debugging and profiling binaries on x86-Unixes.
+  This file is part of MemCheck, a heavyweight Valgrind skin for
+  detecting memory errors.
 
   Copyright (C) 2000-2002 Julian Seward 
      jseward@acm.org
diff --git a/memcheck/mc_include.h b/memcheck/mc_include.h
index 95638cf..e25dedb 100644
--- a/memcheck/mc_include.h
+++ b/memcheck/mc_include.h
@@ -1,11 +1,12 @@
+
 /*--------------------------------------------------------------------*/
 /*--- A header file for all parts of the MemCheck skin.            ---*/
 /*---                                                 mc_include.h ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of MemCheck, a heavyweight Valgrind skin for
+   detecting memory errors.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 4a7ff24..a4ff6dd 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -1,13 +1,13 @@
+
 /*--------------------------------------------------------------------*/
-/*--- Part of the MemCheck skin: Maintain bitmaps of memory,       ---*/
-/*--- tracking the accessibility (A) and validity (V) status of    ---*/
-/*--- each byte.                                                   ---*/
+/*--- MemCheck: Maintain bitmaps of memory, tracking the           ---*/
+/*--- accessibility (A) and validity (V) status of each byte.      ---*/
 /*---                                                    mc_main.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of MemCheck, a heavyweight Valgrind skin for
+   detecting memory errors.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
index 031208e..9c3474c 100644
--- a/memcheck/mc_translate.c
+++ b/memcheck/mc_translate.c
@@ -1,11 +1,12 @@
+
 /*--------------------------------------------------------------------*/
-/*--- Part of the MemCheck skin: instrument UCode to perform       ---*/
-/*--- memory checking operations.                                  ---*/
+/*--- Instrument UCode to perform memory checking operations.      ---*/
 /*---                                               mc_translate.c ---*/
 /*--------------------------------------------------------------------*/
+
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of MemCheck, a heavyweight Valgrind skin for
+   detecting memory errors.
 
    Copyright (C) 2000-2002 Julian Seward 
       jseward@acm.org
diff --git a/memcheck/memcheck.h b/memcheck/memcheck.h
index d48aad9..ff0fa50 100644
--- a/memcheck/memcheck.h
+++ b/memcheck/memcheck.h
@@ -9,8 +9,8 @@
 
    ----------------------------------------------------------------
 
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of MemCheck, a heavyweight Valgrind skin for
+   detecting memory errors.
 
    Copyright (C) 2000-2002 Julian Seward.  All rights reserved.
 
diff --git a/none/nl_main.c b/none/nl_main.c
index 3a97680..cbc1292 100644
--- a/none/nl_main.c
+++ b/none/nl_main.c
@@ -1,11 +1,11 @@
 
 /*--------------------------------------------------------------------*/
-/*--- The null skin.                                     nl_main.c ---*/
+/*--- Nulgrind: The null skin.                           nl_main.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Valgrind, an x86 protected-mode emulator 
-   designed for debugging and profiling binaries on x86-Unixes.
+   This file is part of Nulgrind, the simplest possible Valgrind skin,
+   which does nothing.
 
    Copyright (C) 2002 Nicholas Nethercote
       njn25@cam.ac.uk
diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
index 76e2d7c..948b7ee 100755
--- a/tests/vg_regtest.in
+++ b/tests/vg_regtest.in
@@ -3,8 +3,8 @@
 ##--- Valgrind regression testing script                vg_regtest ---##
 ##--------------------------------------------------------------------##
 
-#  This file is part of Valgrind, an x86 protected-mode emulator 
-#  designed for debugging and profiling binaries on x86-Unixes.
+#  This file is part of Valgrind, an extensible x86 protected-mode
+#  emulator for monitoring program execution on x86-Unixes.
 #
 #  Copyright (C) 2002 Nicholas Nethercote
 #     njn25@cam.ac.uk