diff --git a/coregrind/gen_toolint.pl b/coregrind/gen_toolint.pl
index 95f93c1..841396a 100644
--- a/coregrind/gen_toolint.pl
+++ b/coregrind/gen_toolint.pl
@@ -36,9 +36,9 @@
 
 my $struct = "VG_(tool_interface)";
 
-my %pfxmap = ("track" => "SK_",
-	      "tool"  => "SK_",
-	      "malloc"=> "SK_",
+my %pfxmap = ("track" => "TL_",
+	      "tool"  => "TL_",
+	      "malloc"=> "TL_",
 	     );
 
 sub getargnames(@) {
@@ -152,7 +152,7 @@
 		func = missing_${pfx}_$func;
 	if (VG_(defined_$func)())
 		VG_(printf)("Warning tool is redefining $func\\n");
-	if (func == SK_($func))
+	if (func == TL_($func))
 		VG_(printf)("Warning tool is defining $func recursively\\n");
 	$struct.${pfx}_$func = func;
 }
@@ -183,7 +183,7 @@
 	my $args = join ", ", getargtypes(@args);
 
 	print <<EOF;
-   ret = dlsym(dlhandle, "vgSkin_$func");
+   ret = dlsym(dlhandle, "vgTool_$func");
    if (ret != NULL)
       VG_(init_$func)(($ret (*)($args))ret);