diff --git a/lib/ext/cont.c b/lib/ext/cont.c
index feb63fb2..0ec6dc74 100644
--- a/lib/ext/cont.c
+++ b/lib/ext/cont.c
@@ -7,7 +7,7 @@
 #include "../object.h"
 #include "../state.h"
 
-#if PIC_USE_CALLCC
+#if PIC_USE_CONT
 
 /*
  * [(reset e)]k = k ([e] halt ())
diff --git a/lib/include/picconf.h b/lib/include/picconf.h
index 73ef7c21..580b11ec 100644
--- a/lib/include/picconf.h
+++ b/lib/include/picconf.h
@@ -6,14 +6,13 @@
  * enable libc
  */
 
-/* When PIC_USE_LIBC=0, users must supply panicf which never returns. */
 /* #define PIC_USE_LIBC 1 */
 
 /**
  * enable specific features
  */
 
-/* #define PIC_USE_CALLCC 1 */
+/* #define PIC_USE_CONT 1 */
 /* #define PIC_USE_PORT 1 */
 /* #define PIC_USE_READ 1 */
 /* #define PIC_USE_WRITE 1 */
diff --git a/lib/include/picrin/setup.h b/lib/include/picrin/setup.h
index 1ca446bd..e2b89d16 100644
--- a/lib/include/picrin/setup.h
+++ b/lib/include/picrin/setup.h
@@ -12,8 +12,8 @@
 # define PIC_USE_PORT 1
 #endif
 
-#ifndef PIC_USE_CALLCC
-# define PIC_USE_CALLCC 1
+#ifndef PIC_USE_CONT
+# define PIC_USE_CONT 1
 #endif
 
 #ifndef PIC_USE_READ
@@ -48,14 +48,14 @@
 #if !PIC_USE_LIBC && PIC_USE_FILE
 # error PIC_USE_FILE requires PIC_USE_LIBC
 #endif
-#if !PIC_USE_LIBC && PIC_USE_CALLCC
-# error PIC_USE_CALLCC requires PIC_USE_LIBC
+#if !PIC_USE_LIBC && PIC_USE_CONT
+# error PIC_USE_CONT requires PIC_USE_LIBC
 #endif
-#if !PIC_USE_CALLCC && PIC_USE_ERROR
-# error PIC_USE_ERROR requires PIC_USE_CALLCC
+#if !PIC_USE_CONT && PIC_USE_ERROR
+# error PIC_USE_ERROR requires PIC_USE_CONT
 #endif
 
-#if PIC_USE_CALLCC
+#if PIC_USE_CONT
 # include <setjmp.h>
 # define PIC_JMPBUF jmp_buf
 # define PIC_SETJMP(buf) setjmp(buf)
diff --git a/lib/state.c b/lib/state.c
index 7c41f672..76406f82 100644
--- a/lib/state.c
+++ b/lib/state.c
@@ -66,7 +66,7 @@ pic_init_core(pic_state *pic)
   pic_init_attr(pic); DONE;
   pic_init_state(pic); DONE;
 
-#if PIC_USE_CALLCC
+#if PIC_USE_CONT
   pic_init_cont(pic); DONE;
 #endif
 #if PIC_USE_READ