diff --git a/dict.c b/dict.c
index 4a709421..fa7dff78 100644
--- a/dict.c
+++ b/dict.c
@@ -157,13 +157,11 @@ pic_dict_dict_for_each(pic_state *pic)
 void
 pic_init_dict(pic_state *pic)
 {
-  pic_deflibrary (pic, "(picrin dictionary)") {
-    pic_defun(pic, "make-dictionary", pic_dict_dict);
-    pic_defun(pic, "dictionary?", pic_dict_dict_p);
-    pic_defun(pic, "dictionary-ref", pic_dict_dict_ref);
-    pic_defun(pic, "dictionary-set!", pic_dict_dict_set);
-    pic_defun(pic, "dictionary-delete", pic_dict_dict_del);
-    pic_defun(pic, "dictionary-size", pic_dict_dict_size);
-    pic_defun(pic, "dictionary-for-each", pic_dict_dict_for_each);
-  }
+  pic_defun(pic, "make-dictionary", pic_dict_dict);
+  pic_defun(pic, "dictionary?", pic_dict_dict_p);
+  pic_defun(pic, "dictionary-ref", pic_dict_dict_ref);
+  pic_defun(pic, "dictionary-set!", pic_dict_dict_set);
+  pic_defun(pic, "dictionary-delete", pic_dict_dict_del);
+  pic_defun(pic, "dictionary-size", pic_dict_dict_size);
+  pic_defun(pic, "dictionary-for-each", pic_dict_dict_for_each);
 }
diff --git a/init.c b/init.c
index e0194f96..eaf0c005 100644
--- a/init.c
+++ b/init.c
@@ -38,7 +38,7 @@ pic_init_core(pic_state *pic)
 
   pic_init_reader(pic);
 
-  pic_deflibrary (pic, "(picrin base core)") {
+  pic_deflibrary (pic, "(picrin base)") {
     pic_define_syntactic_keyword(pic, pic->lib->env, pic->sDEFINE, pic->rDEFINE);
     pic_define_syntactic_keyword(pic, pic->lib->env, pic->sSETBANG, pic->rSETBANG);
     pic_define_syntactic_keyword(pic, pic->lib->env, pic->sQUOTE, pic->rQUOTE);
@@ -46,9 +46,7 @@ pic_init_core(pic_state *pic)
     pic_define_syntactic_keyword(pic, pic->lib->env, pic->sIF, pic->rIF);
     pic_define_syntactic_keyword(pic, pic->lib->env, pic->sBEGIN, pic->rBEGIN);
     pic_define_syntactic_keyword(pic, pic->lib->env, pic->sDEFINE_SYNTAX, pic->rDEFINE_SYNTAX);
-  }
 
-  pic_deflibrary (pic, "(scheme base)") {
     pic_init_bool(pic); DONE;
     pic_init_pair(pic); DONE;
     pic_init_port(pic); DONE;
diff --git a/macro.c b/macro.c
index cc56ca3c..761f3399 100644
--- a/macro.c
+++ b/macro.c
@@ -430,8 +430,6 @@ pic_macro_make_identifier(pic_state *pic)
 void
 pic_init_macro(pic_state *pic)
 {
-  pic_deflibrary (pic, "(picrin base macro)") {
-    pic_defun(pic, "identifier?", pic_macro_identifier_p);
-    pic_defun(pic, "make-identifier", pic_macro_make_identifier);
-  }
+  pic_defun(pic, "identifier?", pic_macro_identifier_p);
+  pic_defun(pic, "make-identifier", pic_macro_make_identifier);
 }
diff --git a/number.c b/number.c
index 05b77046..27e9378f 100644
--- a/number.c
+++ b/number.c
@@ -922,20 +922,20 @@ pic_init_number(pic_state *pic)
   pic_defun(pic, "string->number", pic_number_string_to_number);
   pic_gc_arena_restore(pic, ai);
 
-  pic_deflibrary (pic, "(scheme inexact)") {
-    pic_defun(pic, "finite?", pic_number_finite_p);
-    pic_defun(pic, "infinite?", pic_number_infinite_p);
-    pic_defun(pic, "nan?", pic_number_nan_p);
+  pic_defun(pic, "finite?", pic_number_finite_p);
+  pic_defun(pic, "infinite?", pic_number_infinite_p);
+  pic_defun(pic, "nan?", pic_number_nan_p);
+  pic_gc_arena_restore(pic, ai);
 
-    pic_defun(pic, "exp", pic_number_exp);
-    pic_defun(pic, "log", pic_number_log);
-    pic_defun(pic, "sin", pic_number_sin);
-    pic_defun(pic, "cos", pic_number_cos);
-    pic_defun(pic, "tan", pic_number_tan);
-    pic_defun(pic, "acos", pic_number_acos);
-    pic_defun(pic, "asin", pic_number_asin);
-    pic_defun(pic, "atan", pic_number_atan);
+  pic_defun(pic, "exp", pic_number_exp);
+  pic_defun(pic, "log", pic_number_log);
+  pic_defun(pic, "sin", pic_number_sin);
+  pic_defun(pic, "cos", pic_number_cos);
+  pic_defun(pic, "tan", pic_number_tan);
+  pic_defun(pic, "acos", pic_number_acos);
+  pic_defun(pic, "asin", pic_number_asin);
+  pic_defun(pic, "atan", pic_number_atan);
+  pic_gc_arena_restore(pic, ai);
 
-    pic_defun(pic, "sqrt", pic_number_sqrt);
-  }
+  pic_defun(pic, "sqrt", pic_number_sqrt);
 }
diff --git a/pair.c b/pair.c
index 5b62ceaf..3ca55610 100644
--- a/pair.c
+++ b/pair.c
@@ -732,36 +732,32 @@ pic_pair_assoc(pic_state *pic)
 void
 pic_init_pair(pic_state *pic)
 {
-  pic_deflibrary (pic, "(picrin base list)") {
-    pic_defun(pic, "pair?", pic_pair_pair_p);
-    pic_defun(pic, "cons", pic_pair_cons);
-    pic_defun(pic, "car", pic_pair_car);
-    pic_defun(pic, "cdr", pic_pair_cdr);
-    pic_defun(pic, "set-car!", pic_pair_set_car);
-    pic_defun(pic, "set-cdr!", pic_pair_set_cdr);
-    pic_defun(pic, "null?", pic_pair_null_p);
-  }
+  pic_defun(pic, "pair?", pic_pair_pair_p);
+  pic_defun(pic, "cons", pic_pair_cons);
+  pic_defun(pic, "car", pic_pair_car);
+  pic_defun(pic, "cdr", pic_pair_cdr);
+  pic_defun(pic, "set-car!", pic_pair_set_car);
+  pic_defun(pic, "set-cdr!", pic_pair_set_cdr);
+  pic_defun(pic, "null?", pic_pair_null_p);
 
-  pic_deflibrary (pic, "(picrin list)") {
-    pic_defun(pic, "caar", pic_pair_caar);
-    pic_defun(pic, "cadr", pic_pair_cadr);
-    pic_defun(pic, "cdar", pic_pair_cdar);
-    pic_defun(pic, "cddr", pic_pair_cddr);
-    pic_defun(pic, "list?", pic_pair_list_p);
-    pic_defun(pic, "make-list", pic_pair_make_list);
-    pic_defun(pic, "list", pic_pair_list);
-    pic_defun(pic, "length", pic_pair_length);
-    pic_defun(pic, "append", pic_pair_append);
-    pic_defun(pic, "reverse", pic_pair_reverse);
-    pic_defun(pic, "list-tail", pic_pair_list_tail);
-    pic_defun(pic, "list-ref", pic_pair_list_ref);
-    pic_defun(pic, "list-set!", pic_pair_list_set);
-    pic_defun(pic, "list-copy", pic_pair_list_copy);
-    pic_defun(pic, "memq", pic_pair_memq);
-    pic_defun(pic, "memv", pic_pair_memv);
-    pic_defun(pic, "member", pic_pair_member);
-    pic_defun(pic, "assq", pic_pair_assq);
-    pic_defun(pic, "assv", pic_pair_assv);
-    pic_defun(pic, "assoc", pic_pair_assoc);
-  }
+  pic_defun(pic, "caar", pic_pair_caar);
+  pic_defun(pic, "cadr", pic_pair_cadr);
+  pic_defun(pic, "cdar", pic_pair_cdar);
+  pic_defun(pic, "cddr", pic_pair_cddr);
+  pic_defun(pic, "list?", pic_pair_list_p);
+  pic_defun(pic, "make-list", pic_pair_make_list);
+  pic_defun(pic, "list", pic_pair_list);
+  pic_defun(pic, "length", pic_pair_length);
+  pic_defun(pic, "append", pic_pair_append);
+  pic_defun(pic, "reverse", pic_pair_reverse);
+  pic_defun(pic, "list-tail", pic_pair_list_tail);
+  pic_defun(pic, "list-ref", pic_pair_list_ref);
+  pic_defun(pic, "list-set!", pic_pair_list_set);
+  pic_defun(pic, "list-copy", pic_pair_list_copy);
+  pic_defun(pic, "memq", pic_pair_memq);
+  pic_defun(pic, "memv", pic_pair_memv);
+  pic_defun(pic, "member", pic_pair_member);
+  pic_defun(pic, "assq", pic_pair_assq);
+  pic_defun(pic, "assv", pic_pair_assv);
+  pic_defun(pic, "assoc", pic_pair_assoc);
 }
diff --git a/port.c b/port.c
index b9790d06..0a6c6c1b 100644
--- a/port.c
+++ b/port.c
@@ -696,11 +696,9 @@ pic_init_port(pic_state *pic)
   STDOUT = port_new_stdport(pic, xstdout, PIC_PORT_OUT);
   STDERR = port_new_stdport(pic, xstderr, PIC_PORT_OUT);
 
-  pic_deflibrary (pic, "(picrin port)") {
-    pic_define(pic, "standard-input-port", pic_obj_value(STDIN));
-    pic_define(pic, "standard-output-port", pic_obj_value(STDOUT));
-    pic_define(pic, "standard-error-port", pic_obj_value(STDERR));
-  }
+  pic_define(pic, "standard-input-port", pic_obj_value(STDIN));
+  pic_define(pic, "standard-output-port", pic_obj_value(STDOUT));
+  pic_define(pic, "standard-error-port", pic_obj_value(STDERR));
 
   pic_define(pic, "current-input-port", pic_obj_value(pic_var_new(pic, pic_obj_value(STDIN), NULL)));
   pic_define(pic, "current-output-port", pic_obj_value(pic_var_new(pic, pic_obj_value(STDOUT), NULL)));
diff --git a/proc.c b/proc.c
index 889a621d..c06dce80 100644
--- a/proc.c
+++ b/proc.c
@@ -177,7 +177,5 @@ pic_init_proc(pic_state *pic)
   pic_defun(pic, "map", pic_proc_map);
   pic_defun(pic, "for-each", pic_proc_for_each);
 
-  pic_deflibrary (pic, "(picrin attribute)") {
-    pic_defun(pic, "attribute", pic_proc_attribute);
-  }
+  pic_defun(pic, "attribute", pic_proc_attribute);
 }
diff --git a/read.c b/read.c
index 2eb12829..0a25c61d 100644
--- a/read.c
+++ b/read.c
@@ -970,7 +970,5 @@ pic_read_read(pic_state *pic)
 void
 pic_init_read(pic_state *pic)
 {
-  pic_deflibrary (pic, "(scheme read)") {
-    pic_defun(pic, "read", pic_read_read);
-  }
+  pic_defun(pic, "read", pic_read_read);
 }
diff --git a/record.c b/record.c
index d62776ca..2137e4f1 100644
--- a/record.c
+++ b/record.c
@@ -105,11 +105,9 @@ pic_record_record_set(pic_state *pic)
 void
 pic_init_record(pic_state *pic)
 {
-  pic_deflibrary (pic, "(picrin record)") {
-    pic_defun(pic, "make-record", pic_record_make_record);
-    pic_defun(pic, "record?", pic_record_record_p);
-    pic_defun(pic, "record-type", pic_record_record_type);
-    pic_defun(pic, "record-ref", pic_record_record_ref);
-    pic_defun(pic, "record-set!", pic_record_record_set);
-  }
+  pic_defun(pic, "make-record", pic_record_make_record);
+  pic_defun(pic, "record?", pic_record_record_p);
+  pic_defun(pic, "record-type", pic_record_record_type);
+  pic_defun(pic, "record-ref", pic_record_record_ref);
+  pic_defun(pic, "record-set!", pic_record_record_set);
 }
diff --git a/symbol.c b/symbol.c
index b936f48f..9a1d7d8d 100644
--- a/symbol.c
+++ b/symbol.c
@@ -155,13 +155,9 @@ pic_symbol_string_to_symbol(pic_state *pic)
 void
 pic_init_symbol(pic_state *pic)
 {
-  pic_deflibrary (pic, "(picrin base symbol)") {
-    pic_defun(pic, "symbol?", pic_symbol_symbol_p);
-    pic_defun(pic, "symbol->string", pic_symbol_symbol_to_string);
-    pic_defun(pic, "string->symbol", pic_symbol_string_to_symbol);
-  }
+  pic_defun(pic, "symbol?", pic_symbol_symbol_p);
+  pic_defun(pic, "symbol->string", pic_symbol_symbol_to_string);
+  pic_defun(pic, "string->symbol", pic_symbol_string_to_symbol);
 
-  pic_deflibrary (pic, "(picrin symbol)") {
-    pic_defun(pic, "symbol=?", pic_symbol_symbol_eq_p);
-  }
+  pic_defun(pic, "symbol=?", pic_symbol_symbol_eq_p);
 }
diff --git a/var.c b/var.c
index a5836797..71f605e8 100644
--- a/var.c
+++ b/var.c
@@ -124,11 +124,9 @@ pic_var_parameter_pop(pic_state *pic)
 void
 pic_init_var(pic_state *pic)
 {
-  pic_deflibrary (pic, "(picrin parameter)") {
-    pic_defun(pic, "make-parameter", pic_var_make_parameter);
-    pic_defun(pic, "parameter-ref", pic_var_parameter_ref);
-    pic_defun(pic, "parameter-set!", pic_var_parameter_set);
-    pic_defun(pic, "parameter-push!", pic_var_parameter_push);
-    pic_defun(pic, "parameter-pop!", pic_var_parameter_pop);
-  }
+  pic_defun(pic, "make-parameter", pic_var_make_parameter);
+  pic_defun(pic, "parameter-ref", pic_var_parameter_ref);
+  pic_defun(pic, "parameter-set!", pic_var_parameter_set);
+  pic_defun(pic, "parameter-push!", pic_var_parameter_push);
+  pic_defun(pic, "parameter-pop!", pic_var_parameter_pop);
 }
diff --git a/write.c b/write.c
index 1ae61195..d552721f 100644
--- a/write.c
+++ b/write.c
@@ -497,10 +497,8 @@ pic_write_display(pic_state *pic)
 void
 pic_init_write(pic_state *pic)
 {
-  pic_deflibrary (pic, "(scheme write)") {
-    pic_defun(pic, "write", pic_write_write);
-    pic_defun(pic, "write-simple", pic_write_write_simple);
-    pic_defun(pic, "write-shared", pic_write_write_shared);
-    pic_defun(pic, "display", pic_write_display);
-  }
+  pic_defun(pic, "write", pic_write_write);
+  pic_defun(pic, "write-simple", pic_write_write_simple);
+  pic_defun(pic, "write-shared", pic_write_write_shared);
+  pic_defun(pic, "display", pic_write_display);
 }