diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 27ac7cf..1e78611 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -644,7 +644,7 @@
          break;
 
       default:
-         VG_(skin_panic)("mc_check_is_writable: unexpected CorePart");
+         VG_(tool_panic)("mc_check_is_writable: unexpected CorePart");
       }
    }
 
@@ -683,7 +683,7 @@
          break;
 
       default:
-         VG_(skin_panic)("mc_check_is_readable: unexpected CorePart");
+         VG_(tool_panic)("mc_check_is_readable: unexpected CorePart");
       }
    }
    VGP_POPCC(VgpCheckMem);
@@ -774,7 +774,7 @@
    case 4:  mask = 0xffffffff; break;
    case 2:  mask = 0xffff;     break;
    case 1:  mask = 0xff;       break;
-   default: VG_(skin_panic)("Unhandled size in mc_pre_reg_read");
+   default: VG_(tool_panic)("Unhandled size in mc_pre_reg_read");
    }
 
    if (VGM_WORD_VALID != (mask & VG_(get_thread_shadow_archreg)( tid, reg )) )
@@ -1237,7 +1237,7 @@
    }
 
    VG_(printf)("size is %d\n", size);
-   VG_(skin_panic)("MC_(fpu_read_check): unhandled size");
+   VG_(tool_panic)("MC_(fpu_read_check): unhandled size");
 #  endif
 }
 
@@ -1320,7 +1320,7 @@
    }
 
    VG_(printf)("size is %d\n", size);
-   VG_(skin_panic)("MC_(fpu_write_check): unhandled size");
+   VG_(tool_panic)("MC_(fpu_write_check): unhandled size");
 #  endif
 }