diff --git a/cachegrind/cg_annotate.in b/cachegrind/cg_annotate.in
index d73ee2d..9278668 100644
--- a/cachegrind/cg_annotate.in
+++ b/cachegrind/cg_annotate.in
@@ -6,7 +6,7 @@
 ##---                                               cg_annotate.in ---##
 ##--------------------------------------------------------------------##
 
-#  This file is part of Cachegrind, a Valgrind skin for cache
+#  This file is part of Cachegrind, a Valgrind tool for cache
 #  profiling programs.
 #
 #  Copyright (C) 2002-2003 Nicholas Nethercote
diff --git a/cachegrind/cg_main.c b/cachegrind/cg_main.c
index 9307fcc..9287ae0 100644
--- a/cachegrind/cg_main.c
+++ b/cachegrind/cg_main.c
@@ -6,7 +6,7 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Cachegrind, a Valgrind skin for cache
+   This file is part of Cachegrind, a Valgrind tool for cache
    profiling programs.
 
    Copyright (C) 2002-2003 Nicholas Nethercote
diff --git a/cachegrind/cg_sim_D1.c b/cachegrind/cg_sim_D1.c
index 0eaf028..a8c05de 100644
--- a/cachegrind/cg_sim_D1.c
+++ b/cachegrind/cg_sim_D1.c
@@ -5,7 +5,7 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Cachegrind, a Valgrind skin for cache
+   This file is part of Cachegrind, a Valgrind tool for cache
    profiling programs.
 
    Copyright (C) 2002-2003 Nicholas Nethercote
diff --git a/cachegrind/cg_sim_I1.c b/cachegrind/cg_sim_I1.c
index db9b794..52220c2 100644
--- a/cachegrind/cg_sim_I1.c
+++ b/cachegrind/cg_sim_I1.c
@@ -5,7 +5,7 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Cachegrind, a Valgrind skin for cache
+   This file is part of Cachegrind, a Valgrind tool for cache
    profiling programs.
 
    Copyright (C) 2002-2003 Nicholas Nethercote
diff --git a/cachegrind/cg_sim_L2.c b/cachegrind/cg_sim_L2.c
index ba5ece6..e38624f 100644
--- a/cachegrind/cg_sim_L2.c
+++ b/cachegrind/cg_sim_L2.c
@@ -5,7 +5,7 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Cachegrind, a Valgrind skin for cache
+   This file is part of Cachegrind, a Valgrind tool for cache
    profiling programs.
 
    Copyright (C) 2002-2003 Nicholas Nethercote
diff --git a/cachegrind/cg_sim_gen.c b/cachegrind/cg_sim_gen.c
index a5c1df0..57cb932 100644
--- a/cachegrind/cg_sim_gen.c
+++ b/cachegrind/cg_sim_gen.c
@@ -5,7 +5,7 @@
 /*--------------------------------------------------------------------*/
 
 /*
-   This file is part of Cachegrind, a Valgrind skin for cache
+   This file is part of Cachegrind, a Valgrind tool for cache
    profiling programs.
 
    Copyright (C) 2002-2003 Nicholas Nethercote
diff --git a/cachegrind/docs/cg_main.html b/cachegrind/docs/cg_main.html
index 6449e81..545748a 100644
--- a/cachegrind/docs/cg_main.html
+++ b/cachegrind/docs/cg_main.html
@@ -7,7 +7,7 @@
 <a name="cg-top"></a>
 <h2>4&nbsp; <b>Cachegrind</b>: a cache-miss profiler</h2>
 
-To use this skin, you must specify <code>--skin=cachegrind</code>
+To use this tool, you must specify <code>--tool=cachegrind</code>
 on the Valgrind command line.
 
 <p>
@@ -44,7 +44,7 @@
 
 The two steps are:
 <ol>
-  <li>Run your program with <code>valgrind --skin=cachegrind</code> in front of
+  <li>Run your program with <code>valgrind --tool=cachegrind</code> in front of
       the normal command line invocation.  When the program finishes,
       Cachegrind will print summary cache statistics. It also collects
       line-by-line information in a file
@@ -144,11 +144,10 @@
 <a name="profile"></a>
 <h3>4.4&nbsp; Profiling programs</h3>
 
-Cache profiling is enabled by using the <code>--skin=cachegrind</code>
-option to the <code>valgrind</code> shell script.  To gather cache profiling
-information about the program <code>ls -l</code>, type:
+To gather cache profiling information about the program <code>ls -l</code>,
+invoke Cachegrind like this:
 
-<blockquote><code>valgrind --skin=cachegrind ls -l</code></blockquote>
+<blockquote><code>valgrind --tool=cachegrind ls -l</code></blockquote>
 
 The program will execute (slowly).  Upon completion, summary statistics
 that look like this will be printed:
@@ -193,7 +192,7 @@
 <p>
 Things to note about the <code>cachegrind.out.<i>pid</i></code> file:
 <ul>
-  <li>It is written every time <code>valgrind --skin=cachegrind</code>
+  <li>It is written every time Cachegrind
       is run, and will overwrite any existing
       <code>cachegrind.out.<i>pid</i></code> in the current directory (but
       that won't happen very often because it takes some time for process ids
@@ -229,7 +228,7 @@
       three items must be comma-separated, but with no spaces, eg:
 
       <blockquote>
-      <code>valgrind --skin=cachegrind --I1=65535,2,64</code>
+      <code>valgrind --tool=cachegrind --I1=65535,2,64</code>
       </blockquote>
 
       You can specify one, two or three of the I1/D1/L2 caches.  Any level not
@@ -350,7 +349,7 @@
 </ul>
 
 Then follows summary statistics for the whole program. These are similar
-to the summary provided when running <code>valgrind --skin=cachegrind</code>.<p>
+to the summary provided when running <code>valgrind --tool=cachegrind</code>.<p>
   
 Then follows function-by-function statistics. Each function is
 identified by a <code>file_name:function_name</code> pair. If a column