diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 8d90ecc..f849875 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -1809,7 +1809,7 @@
    Bool  ok;
    Addr  bad_addr;
 
-   if (!VG_IS_SKIN_USERREQ('M','C',arg[0])
+   if (!VG_IS_TOOL_USERREQ('M','C',arg[0])
     && VG_USERREQ__MALLOCLIKE_BLOCK != arg[0]
     && VG_USERREQ__FREELIKE_BLOCK   != arg[0]
     && VG_USERREQ__CREATE_MEMPOOL   != arg[0]
diff --git a/memcheck/memcheck.h b/memcheck/memcheck.h
index 4b2458d..c156ec1 100644
--- a/memcheck/memcheck.h
+++ b/memcheck/memcheck.h
@@ -72,7 +72,7 @@
 
 typedef
    enum { 
-      VG_USERREQ__MAKE_NOACCESS = VG_USERREQ_SKIN_BASE('M','C'),
+      VG_USERREQ__MAKE_NOACCESS = VG_USERREQ_TOOL_BASE('M','C'),
       VG_USERREQ__MAKE_WRITABLE,
       VG_USERREQ__MAKE_READABLE,
       VG_USERREQ__DISCARD,
@@ -92,7 +92,7 @@
       VG_USERREQ__SET_VBITS,
 
       /* This is just for memcheck's internal use - don't use it */
-      _VG_USERREQ__MEMCHECK_GET_RECORD_OVERLAP = VG_USERREQ_SKIN_BASE('M','C')+256
+      _VG_USERREQ__MEMCHECK_GET_RECORD_OVERLAP = VG_USERREQ_TOOL_BASE('M','C')+256
    } Vg_MemCheckClientRequest;