rename mrb_intern2() to mrb_intern(); huge API incompatibility; close #1513

15 files changed, 117 insertions, 117 deletions

diff --git a/src/array.c b/src/array.c
index 966d4956c..3843339a1 100644
--- a/src/array.c
+++ b/src/array.c
@@ -309,7 +309,7 @@ mrb_ary_cmp(mrb_state *mrb, mrb_value ary1)
   a1 = RARRAY(ary1); a2 = RARRAY(ary2);
   if (a1->len == a2->len && a1->ptr == a2->ptr) return mrb_fixnum_value(0);
   else {
-    mrb_sym cmp = mrb_intern2(mrb, "<=>", 3);
+    mrb_sym cmp = mrb_intern(mrb, "<=>", 3);
 
     len = RARRAY_LEN(ary1);
     if (len > RARRAY_LEN(ary2)) {
@@ -1070,7 +1070,7 @@ mrb_ary_equal(mrb_state *mrb, mrb_value ary1)
   if (mrb_obj_equal(mrb, ary1, ary2)) return mrb_true_value();
   if (mrb_special_const_p(ary2)) return mrb_false_value();
   if (!mrb_array_p(ary2)) {
-    if (!mrb_respond_to(mrb, ary2, mrb_intern2(mrb, "to_ary", 6))) {
+    if (!mrb_respond_to(mrb, ary2, mrb_intern(mrb, "to_ary", 6))) {
       return mrb_false_value();
     }
     else {
diff --git a/src/backtrace.c b/src/backtrace.c
index 54927ec00..c86145e9f 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -65,7 +65,7 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
   int i, line;
 
   func(mrb, stream, 1, "trace:\n");
-  ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "ciidx", 5)));
+  ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern(mrb, "ciidx", 5)));
   if (ciidx >= mrb->c->ciend - mrb->c->cibase)
     ciidx = 10; /* ciidx is broken... */
 
@@ -88,7 +88,7 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
         pc = mrb->c->cibase[i+1].pc - 1;
       }
       else {
-        pc = (mrb_code*)mrb_cptr(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "lastpc", 6)));
+        pc = (mrb_code*)mrb_cptr(mrb_obj_iv_get(mrb, exc, mrb_intern(mrb, "lastpc", 6)));
       }
       filename = mrb_debug_get_filename(irep, pc - irep->iseq);
       line = mrb_debug_get_line(irep, pc - irep->iseq);
diff --git a/src/class.c b/src/class.c
index a07cf17e4..6f14ba399 100644
--- a/src/class.c
+++ b/src/class.c
@@ -53,7 +53,7 @@ void
 mrb_name_class(mrb_state *mrb, struct RClass *c, mrb_sym name)
 {
   mrb_obj_iv_set(mrb, (struct RObject*)c,
-                 mrb_intern2(mrb, "__classid__", 11), mrb_symbol_value(name));
+                 mrb_intern(mrb, "__classid__", 11), mrb_symbol_value(name));
 }
 
 #define make_metaclass(mrb, c) prepare_singleton_class((mrb), (struct RBasic*)(c))
@@ -89,7 +89,7 @@ prepare_singleton_class(mrb_state *mrb, struct RBasic *o)
   o->c = sc;
   mrb_field_write_barrier(mrb, (struct RBasic*)o, (struct RBasic*)sc);
   mrb_field_write_barrier(mrb, (struct RBasic*)sc, (struct RBasic*)o);
-  mrb_obj_iv_set(mrb, (struct RObject*)sc, mrb_intern2(mrb, "__attached__", 12), mrb_obj_value(o));
+  mrb_obj_iv_set(mrb, (struct RObject*)sc, mrb_intern(mrb, "__attached__", 12), mrb_obj_value(o));
 }
 
 struct RClass*
@@ -116,7 +116,7 @@ setup_class(mrb_state *mrb, mrb_value outer, struct RClass *c, mrb_sym id)
   mrb_name_class(mrb, c, id);
   mrb_const_set(mrb, outer, id, mrb_obj_value(c));
   mrb_obj_iv_set(mrb, (struct RObject*)c,
-                 mrb_intern2(mrb, "__outer__", 9), outer);
+                 mrb_intern(mrb, "__outer__", 9), outer);
 }
 
 struct RClass*
@@ -124,7 +124,7 @@ mrb_class_outer_module(mrb_state *mrb, struct RClass *c)
 {
   mrb_value outer;
 
-  outer = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern2(mrb, "__outer__", 9));
+  outer = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern(mrb, "__outer__", 9));
   if (mrb_nil_p(outer)) return 0;
   return mrb_class_ptr(outer);
 }
@@ -1061,7 +1061,7 @@ mrb_instance_new(mrb_state *mrb, mrb_value cv)
 
   obj = mrb_instance_alloc(mrb, cv);
   mrb_get_args(mrb, "*&", &argv, &argc, &blk);
-  mrb_funcall_with_block(mrb, obj, mrb_intern2(mrb, "initialize", 10), argc, argv, blk);
+  mrb_funcall_with_block(mrb, obj, mrb_intern(mrb, "initialize", 10), argc, argv, blk);
 
   return obj;
 }
@@ -1072,7 +1072,7 @@ mrb_obj_new(mrb_state *mrb, struct RClass *c, int argc, mrb_value *argv)
   mrb_value obj;
 
   obj = mrb_instance_alloc(mrb, mrb_obj_value(c));
-  mrb_funcall_argv(mrb, obj, mrb_intern2(mrb, "initialize", 10), argc, argv);
+  mrb_funcall_argv(mrb, obj, mrb_intern(mrb, "initialize", 10), argc, argv);
 
   return obj;
 }
@@ -1163,7 +1163,7 @@ mrb_bob_missing(mrb_state *mrb, mrb_value mod)
 
   mrb_get_args(mrb, "n*", &name, &a, &alen);
 
-  if (mrb_respond_to(mrb,mod,mrb_intern2(mrb, "inspect",7))){
+  if (mrb_respond_to(mrb,mod,mrb_intern(mrb, "inspect",7))){
     inspect = mrb_funcall(mrb, mod, "inspect", 0);
     if (RSTRING_LEN(inspect) > 64) {
       inspect = mrb_any_to_s(mrb, mod);
@@ -1215,7 +1215,7 @@ mrb_class_path(mrb_state *mrb, struct RClass *c)
   mrb_value path;
   const char *name;
   size_t len;
-  mrb_sym classpath = mrb_intern2(mrb, "__classpath__", 13);
+  mrb_sym classpath = mrb_intern(mrb, "__classpath__", 13);
 
   path = mrb_obj_iv_get(mrb, (struct RObject*)c, classpath);
   if (mrb_nil_p(path)) {
@@ -1376,7 +1376,7 @@ mrb_mod_to_s(mrb_state *mrb, mrb_value klass)
   mrb_value str;
 
   if (mrb_type(klass) == MRB_TT_SCLASS) {
-    mrb_value v = mrb_iv_get(mrb, klass, mrb_intern2(mrb, "__attached__", 12));
+    mrb_value v = mrb_iv_get(mrb, klass, mrb_intern(mrb, "__attached__", 12));
 
     str = mrb_str_new(mrb, "#<Class:", 8);
 
@@ -1912,10 +1912,10 @@ mrb_init_class(mrb_state *mrb)
   mrb_define_const(mrb, obj, "Class",       mrb_obj_value(cls));
 
   /* name each classes */
-  mrb_name_class(mrb, bob, mrb_intern2(mrb, "BasicObject", 11));
-  mrb_name_class(mrb, obj, mrb_intern2(mrb, "Object", 6));
-  mrb_name_class(mrb, mod, mrb_intern2(mrb, "Module", 6));
-  mrb_name_class(mrb, cls, mrb_intern2(mrb, "Class", 5));
+  mrb_name_class(mrb, bob, mrb_intern(mrb, "BasicObject", 11));
+  mrb_name_class(mrb, obj, mrb_intern(mrb, "Object", 6));
+  mrb_name_class(mrb, mod, mrb_intern(mrb, "Module", 6));
+  mrb_name_class(mrb, cls, mrb_intern(mrb, "Class", 5));
 
   MRB_SET_INSTANCE_TT(cls, MRB_TT_CLASS);
   mrb_define_method(mrb, bob, "initialize",              mrb_bob_init,             MRB_ARGS_NONE());
diff --git a/src/codegen.c b/src/codegen.c
index 8c38615a4..5025f486b 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -565,7 +565,7 @@ for_body(codegen_scope *s, node *tree)
   s = prev;
   genop(s, MKOP_Abc(OP_LAMBDA, cursp(), s->irep->rlen-1, OP_L_BLOCK));
   pop();
-  idx = new_msym(s, mrb_intern2(s->mrb, "each", 4));
+  idx = new_msym(s, mrb_intern(s->mrb, "each", 4));
   genop(s, MKOP_ABC(OP_SENDB, cursp(), idx, 0));
 }
 
@@ -707,7 +707,7 @@ attrsym(codegen_scope *s, mrb_sym a)
   name2[len] = '=';
   name2[len+1] = '\0';
 
-  return mrb_intern2(s->mrb, name2, len+1);
+  return mrb_intern(s->mrb, name2, len+1);
 }
 
 static int
@@ -976,7 +976,7 @@ static void
 gen_send_intern(codegen_scope *s)
 {
   pop();
-  genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern2(s->mrb, "intern", 6)), 0));
+  genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern(s->mrb, "intern", 6)), 0));
   push();
 }
 static void
@@ -1176,12 +1176,12 @@ codegen(codegen_scope *s, node *tree, int val)
               codegen(s, n4->car, VAL);
             }
             else {
-              genop(s, MKOP_ABx(OP_GETCONST, cursp(), new_msym(s, mrb_intern2(s->mrb, "StandardError", 13))));
+              genop(s, MKOP_ABx(OP_GETCONST, cursp(), new_msym(s, mrb_intern(s->mrb, "StandardError", 13))));
               push();
             }
             genop(s, MKOP_AB(OP_MOVE, cursp(), exc));
             pop();
-            genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern2(s->mrb, "===", 3)), 1));
+            genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern(s->mrb, "===", 3)), 1));
             tmp = new_label(s);
             genop(s, MKOP_AsBx(OP_JMPIF, cursp(), pos2));
             pos2 = tmp;
@@ -1385,7 +1385,7 @@ codegen(codegen_scope *s, node *tree, int val)
           if (head) {
             genop(s, MKOP_AB(OP_MOVE, cursp(), head));
             pop();
-            genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern2(s->mrb, "===", 3)), 1));
+            genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern(s->mrb, "===", 3)), 1));
           }
           else {
             pop();
@@ -1725,7 +1725,7 @@ codegen(codegen_scope *s, node *tree, int val)
       }
       pop_n(n+1);
       if (sendv) n = CALL_MAXARGS;
-      genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern2(s->mrb, "call", 4)), n));
+      genop(s, MKOP_ABC(OP_SEND, cursp(), new_msym(s, mrb_intern(s->mrb, "call", 4)), n));
       if (val) push();
     }
     break;
@@ -1995,7 +1995,7 @@ codegen(codegen_scope *s, node *tree, int val)
 
       default:
         {
-          int sym = new_msym(s, mrb_intern2(s->mrb, "-", 1));
+          int sym = new_msym(s, mrb_intern(s->mrb, "-", 1));
 
           genop(s, MKOP_ABx(OP_LOADI, cursp(), 0));
           push();
@@ -2063,7 +2063,7 @@ codegen(codegen_scope *s, node *tree, int val)
       char *p = (char*)tree->car;
       size_t len = (intptr_t)tree->cdr;
       int ai = mrb_gc_arena_save(s->mrb);
-      int sym = new_sym(s, mrb_intern2(s->mrb, "Kernel", 6));
+      int sym = new_sym(s, mrb_intern(s->mrb, "Kernel", 6));
       int off = new_lit(s, mrb_str_new(s->mrb, p, len));
 
       genop(s, MKOP_A(OP_OCLASS, cursp()));
@@ -2071,7 +2071,7 @@ codegen(codegen_scope *s, node *tree, int val)
       push();
       genop(s, MKOP_ABx(OP_STRING, cursp(), off));
       pop();
-      sym = new_sym(s, mrb_intern2(s->mrb, "`", 1));
+      sym = new_sym(s, mrb_intern(s->mrb, "`", 1));
       genop(s, MKOP_ABC(OP_SEND, cursp(), sym, 1));
       mrb_gc_arena_restore(s->mrb, ai);
       push();
@@ -2083,7 +2083,7 @@ codegen(codegen_scope *s, node *tree, int val)
       char *p1 = (char*)tree->car;
       char *p2 = (char*)tree->cdr;
       int ai = mrb_gc_arena_save(s->mrb);
-      int sym = new_sym(s, mrb_intern2(s->mrb, REGEXP_CLASS, REGEXP_CLASS_CSTR_LEN));
+      int sym = new_sym(s, mrb_intern(s->mrb, REGEXP_CLASS, REGEXP_CLASS_CSTR_LEN));
       int off = new_lit(s, mrb_str_new(s->mrb, p1, strlen(p1)));
       int argc = 1;
 
@@ -2099,7 +2099,7 @@ codegen(codegen_scope *s, node *tree, int val)
         pop();
       }
       pop();
-      sym = new_sym(s, mrb_intern2(s->mrb, "compile", 7));
+      sym = new_sym(s, mrb_intern(s->mrb, "compile", 7));
       genop(s, MKOP_ABC(OP_SEND, cursp(), sym, argc));
       mrb_gc_arena_restore(s->mrb, ai);
       push();
@@ -2110,7 +2110,7 @@ codegen(codegen_scope *s, node *tree, int val)
     if (val) {
       node *n = tree->car;
       int ai = mrb_gc_arena_save(s->mrb);
-      int sym = new_sym(s, mrb_intern2(s->mrb, REGEXP_CLASS, REGEXP_CLASS_CSTR_LEN));
+      int sym = new_sym(s, mrb_intern(s->mrb, REGEXP_CLASS, REGEXP_CLASS_CSTR_LEN));
       int argc = 1;
       int off;
       char *p;
@@ -2147,7 +2147,7 @@ codegen(codegen_scope *s, node *tree, int val)
         pop();
       }
       pop();
-      sym = new_sym(s, mrb_intern2(s->mrb, "compile", 7));
+      sym = new_sym(s, mrb_intern(s->mrb, "compile", 7));
       genop(s, MKOP_ABC(OP_SEND, cursp(), sym, argc));
       mrb_gc_arena_restore(s->mrb, ai);
       push();
@@ -2212,7 +2212,7 @@ codegen(codegen_scope *s, node *tree, int val)
     {
       int a = new_msym(s, sym(tree->car));
       int b = new_msym(s, sym(tree->cdr));
-      int c = new_msym(s, mrb_intern2(s->mrb, "alias_method", 12));
+      int c = new_msym(s, mrb_intern(s->mrb,"alias_method", 12));
 
       genop(s, MKOP_A(OP_TCLASS, cursp()));
       push();
@@ -2231,7 +2231,7 @@ codegen(codegen_scope *s, node *tree, int val)
 
   case NODE_UNDEF:
     {
-      int undef = new_msym(s, mrb_intern2(s->mrb, "undef_method", 12));
+      int undef = new_msym(s, mrb_intern(s->mrb, "undef_method", 12));
       int num = 0;
       node *t = tree;
 
diff --git a/src/debug.c b/src/debug.c
index 8e4311f6c..075af5c24 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -154,7 +154,7 @@ mrb_debug_info_append_file(mrb_state *mrb, mrb_irep *irep,
   info->pc_count = end_pos;
 
   fn_len = strlen(irep->filename);
-  ret->filename_sym = mrb_intern2(mrb, irep->filename, fn_len);
+  ret->filename_sym = mrb_intern(mrb, irep->filename, fn_len);
   len = 0;
   ret->filename = mrb_sym2name_len(mrb, ret->filename_sym, &len);
 
diff --git a/src/error.c b/src/error.c
index c12d2ed71..3f911d91b 100644
--- a/src/error.c
+++ b/src/error.c
@@ -45,7 +45,7 @@ exc_initialize(mrb_state *mrb, mrb_value exc)
   mrb_value mesg;
 
   if (mrb_get_args(mrb, "|o", &mesg) == 1) {
-    mrb_iv_set(mrb, exc, mrb_intern2(mrb, "mesg", 4), mesg);
+    mrb_iv_set(mrb, exc, mrb_intern(mrb, "mesg", 4), mesg);
   }
   return exc;
 }
@@ -74,7 +74,7 @@ exc_exception(mrb_state *mrb, mrb_value self)
   if (argc == 0) return self;
   if (mrb_obj_equal(mrb, self, a)) return self;
   exc = mrb_obj_clone(mrb, self);
-  mrb_iv_set(mrb, exc, mrb_intern2(mrb, "mesg", 4), a);
+  mrb_iv_set(mrb, exc, mrb_intern(mrb, "mesg", 4), a);
 
   return exc;
 }
@@ -90,7 +90,7 @@ exc_exception(mrb_state *mrb, mrb_value self)
 static mrb_value
 exc_to_s(mrb_state *mrb, mrb_value exc)
 {
-  mrb_value mesg = mrb_attr_get(mrb, exc, mrb_intern2(mrb, "mesg", 4));
+  mrb_value mesg = mrb_attr_get(mrb, exc, mrb_intern(mrb, "mesg", 4));
 
   if (mrb_nil_p(mesg)) return mrb_str_new_cstr(mrb, mrb_obj_classname(mrb, exc));
   return mesg;
@@ -124,9 +124,9 @@ exc_inspect(mrb_state *mrb, mrb_value exc)
 {
   mrb_value str, mesg, file, line;
 
-  mesg = mrb_attr_get(mrb, exc, mrb_intern2(mrb, "mesg", 4));
-  file = mrb_attr_get(mrb, exc, mrb_intern2(mrb, "file", 4));
-  line = mrb_attr_get(mrb, exc, mrb_intern2(mrb, "line", 4));
+  mesg = mrb_attr_get(mrb, exc, mrb_intern(mrb, "mesg", 4));
+  file = mrb_attr_get(mrb, exc, mrb_intern(mrb, "file", 4));
+  line = mrb_attr_get(mrb, exc, mrb_intern(mrb, "line", 4));
 
   if (!mrb_nil_p(file) && !mrb_nil_p(line)) {
     str = file;
@@ -163,7 +163,7 @@ exc_equal(mrb_state *mrb, mrb_value exc)
   mrb_value obj;
   mrb_value mesg;
   mrb_bool equal_p;
-  mrb_sym id_mesg = mrb_intern2(mrb, "mesg", 4);
+  mrb_sym id_mesg = mrb_intern(mrb, "mesg", 4);
 
   mrb_get_args(mrb, "o", &obj);
   if (mrb_obj_equal(mrb, exc, obj)) {
@@ -171,7 +171,7 @@ exc_equal(mrb_state *mrb, mrb_value exc)
   }
   else {
     if (mrb_obj_class(mrb, exc) != mrb_obj_class(mrb, obj)) {
-      if (mrb_respond_to(mrb, obj, mrb_intern2(mrb, "message", 7))) {
+      if (mrb_respond_to(mrb, obj, mrb_intern(mrb, "message", 7))) {
         mesg = mrb_funcall(mrb, obj, "message", 0);
       }
       else
@@ -193,7 +193,7 @@ exc_debug_info(mrb_state *mrb, struct RObject *exc)
   mrb_callinfo *ci = mrb->c->ci;
   mrb_code *pc = ci->pc;
 
-  mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "ciidx", 5), mrb_fixnum_value(ci - mrb->c->cibase));
+  mrb_obj_iv_set(mrb, exc, mrb_intern(mrb, "ciidx", 5), mrb_fixnum_value(ci - mrb->c->cibase));
   while (ci >= mrb->c->cibase) {
     mrb_code *err = ci->err;
 
@@ -204,8 +204,8 @@ exc_debug_info(mrb_state *mrb, struct RObject *exc)
       int32_t const line = mrb_debug_get_line(irep, err - irep->iseq);
       char const* file = mrb_debug_get_filename(irep, err - irep->iseq);
       if (line != -1 && file) {
-        mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "file", 4), mrb_str_new_cstr(mrb, file));
-        mrb_obj_iv_set(mrb, exc, mrb_intern2(mrb, "line", 4), mrb_fixnum_value(line));
+        mrb_obj_iv_set(mrb, exc, mrb_intern(mrb, "file", 4), mrb_str_new_cstr(mrb, file));
+        mrb_obj_iv_set(mrb, exc, mrb_intern(mrb, "line", 4), mrb_fixnum_value(line));
         return;
       }
     }
@@ -350,7 +350,7 @@ mrb_bug(mrb_state *mrb, const char *fmt, ...)
 int
 sysexit_status(mrb_state *mrb, mrb_value err)
 {
-  mrb_value st = mrb_iv_get(mrb, err, mrb_intern2(mrb, "status", 6));
+  mrb_value st = mrb_iv_get(mrb, err, mrb_intern(mrb, "status", 6));
   return mrb_fixnum(st);
 }
 
@@ -388,7 +388,7 @@ make_exception(mrb_state *mrb, int argc, mrb_value *argv, int isstr)
       n = 1;
 exception_call:
       {
-        mrb_sym exc = mrb_intern2(mrb, "exception", 9);
+        mrb_sym exc = mrb_intern(mrb, "exception", 9);
         if (mrb_respond_to(mrb, argv[0], exc)) {
           mesg = mrb_funcall_argv(mrb, argv[0], exc, n, argv+1);
         }
diff --git a/src/hash.c b/src/hash.c
index 3684b3b40..70fcc5f1a 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -266,7 +266,7 @@ mrb_hash_init_core(mrb_state *mrb, mrb_value hash)
     RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT;
     ifnone = block;
   }
-  mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone);
+  mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone", 6), ifnone);
   return hash;
 }
 
@@ -425,7 +425,7 @@ mrb_hash_set_default(mrb_state *mrb, mrb_value hash)
 
   mrb_get_args(mrb, "o", &ifnone);
   mrb_hash_modify(mrb, hash);
-  mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone);
+  mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone", 6), ifnone);
   RHASH(hash)->flags &= ~(MRB_HASH_PROC_DEFAULT);
 
   return ifnone;
@@ -476,7 +476,7 @@ mrb_hash_set_default_proc(mrb_state *mrb, mrb_value hash)
 
   mrb_get_args(mrb, "o", &ifnone);
   mrb_hash_modify(mrb, hash);
-  mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone);
+  mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone", 6), ifnone);
   RHASH(hash)->flags |= MRB_HASH_PROC_DEFAULT;
 
   return ifnone;
@@ -734,7 +734,7 @@ mrb_hash_replace(mrb_state *mrb, mrb_value hash)
   else {
     ifnone = RHASH_IFNONE(hash2);
   }
-  mrb_iv_set(mrb, hash, mrb_intern2(mrb, "ifnone", 6), ifnone);
+  mrb_iv_set(mrb, hash, mrb_intern(mrb, "ifnone", 6), ifnone);
 
   return hash;
 }
@@ -1004,7 +1004,7 @@ hash_equal(mrb_state *mrb, mrb_value hash1, mrb_value hash2, int eql)
 
   if (mrb_obj_equal(mrb, hash1, hash2)) return mrb_true_value();
   if (!mrb_hash_p(hash2)) {
-      if (!mrb_respond_to(mrb, hash2, mrb_intern2(mrb, "to_hash", 7))) {
+      if (!mrb_respond_to(mrb, hash2, mrb_intern(mrb, "to_hash", 7))) {
           return mrb_false_value();
       }
       if (eql)
diff --git a/src/kernel.c b/src/kernel.c
index f07fbbab1..91fa4f5c0 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -29,7 +29,7 @@ typedef enum {
 mrb_bool
 mrb_obj_basic_to_s_p(mrb_state *mrb, mrb_value obj)
 {
-    struct RProc *me = mrb_method_search(mrb, mrb_class(mrb, obj), mrb_intern2(mrb, "to_s", 4));
+    struct RProc *me = mrb_method_search(mrb, mrb_class(mrb, obj), mrb_intern(mrb, "to_s", 4));
     if (me && MRB_PROC_CFUNC_P(me) && (me->body.func == mrb_any_to_s))
       return TRUE;
     return FALSE;
@@ -280,7 +280,7 @@ mrb_singleton_class_clone(mrb_state *mrb, mrb_value obj)
     clone->super = klass->super;
     if (klass->iv) {
       mrb_iv_copy(mrb, mrb_obj_value(clone), mrb_obj_value(klass));
-      mrb_obj_iv_set(mrb, (struct RObject*)clone, mrb_intern2(mrb, "__attached__", 12), obj);
+      mrb_obj_iv_set(mrb, (struct RObject*)clone, mrb_intern(mrb, "__attached__", 12), obj);
     }
     if (klass->mt) {
       clone->mt = kh_copy(mt, mrb, klass->mt);
@@ -944,7 +944,7 @@ mrb_f_raise(mrb_state *mrb, mrb_value self)
     /* fall through */
   default:
     exc = mrb_make_exception(mrb, argc, a);
-    mrb_obj_iv_set(mrb, mrb_obj_ptr(exc), mrb_intern2(mrb, "lastpc", 6), mrb_cptr_value(mrb, mrb->c->ci->pc));
+    mrb_obj_iv_set(mrb, mrb_obj_ptr(exc), mrb_intern(mrb, "lastpc", 6), mrb_cptr_value(mrb, mrb->c->ci->pc));
     mrb_exc_raise(mrb, exc);
     break;
   }
@@ -1049,7 +1049,7 @@ obj_respond_to(mrb_state *mrb, mrb_value self)
   }
 
   if (!respond_to_p) {
-    rtm_id = mrb_intern2(mrb, "respond_to_missing?", 19);
+    rtm_id = mrb_intern(mrb, "respond_to_missing?", 19);
     if (basic_obj_respond_to(mrb, self, rtm_id, !mrb_test(priv))) {
       return mrb_funcall_argv(mrb, self, rtm_id, argc, argv);
     }
@@ -1151,5 +1151,5 @@ mrb_init_kernel(mrb_state *mrb)
   mrb_define_method(mrb, krn, "to_s",                       mrb_any_to_s,                    MRB_ARGS_NONE());    /* 15.3.1.3.46 */
 
   mrb_include_module(mrb, mrb->object_class, mrb->kernel_module);
-  mrb_alias_method(mrb, mrb->module_class, mrb_intern2(mrb, "dup", 3), mrb_intern2(mrb, "clone", 5));
+  mrb_alias_method(mrb, mrb->module_class, mrb_intern(mrb, "dup", 3), mrb_intern(mrb, "clone", 5));
 }
diff --git a/src/load.c b/src/load.c
index c60c393b8..dd7da725c 100644
--- a/src/load.c
+++ b/src/load.c
@@ -144,7 +144,7 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, uint32_t *len)
         continue;
       }
 
-      irep->syms[i] = mrb_intern2(mrb, (char *)src, snl);
+      irep->syms[i] = mrb_intern(mrb, (char *)src, snl);
       src += snl + 1;
 
       mrb_gc_arena_restore(mrb, ai);
@@ -364,7 +364,7 @@ read_section_debug(mrb_state *mrb, const uint8_t *start, mrb_irep *irep)
   for(i = 0; i < filenames_len; ++i) {
     uint16_t f_len = bin_to_uint16(bin);
     bin += sizeof(uint16_t);
-    filenames[i] = mrb_intern2(mrb, (const char *)bin, f_len);
+    filenames[i] = mrb_intern(mrb, (const char *)bin, f_len);
     bin += f_len;
   }
 
diff --git a/src/parse.y b/src/parse.y
index 63204dfb0..106076911 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -66,23 +66,23 @@ typedef unsigned int stack_type;
 #define nsym(x) ((node*)(intptr_t)(x))
 
 static inline mrb_sym
-intern_gen(parser_state *p, const char *s)
+intern_cstr_gen(parser_state *p, const char *s)
 {
   return mrb_intern_cstr(p->mrb, s);
 }
-#define intern(s) intern_gen(p,(s))
+#define intern_cstr(s) intern_cstr_gen(p,(s))
 
 static inline mrb_sym
-intern_gen2(parser_state *p, const char *s, size_t len)
+intern_gen(parser_state *p, const char *s, size_t len)
 {
-  return mrb_intern2(p->mrb, s, len);
+  return mrb_intern(p->mrb, s, len);
 }
-#define intern2(s,len) intern_gen2(p,(s),(len))
+#define intern(s,len) intern_gen(p,(s),(len))
 
 static inline mrb_sym
 intern_gen_c(parser_state *p, const char c)
 {
-  return mrb_intern2(p->mrb, &c, 1);
+  return mrb_intern(p->mrb, &c, 1);
 }
 #define intern_c(c) intern_gen_c(p,(c))
 
@@ -538,7 +538,7 @@ new_strsym(parser_state *p, node* str)
   const char *s = (const char*)str->cdr->car;
   size_t len = (size_t)str->cdr->cdr;
 
-  return mrb_intern2(p->mrb, s, len);
+  return mrb_intern(p->mrb, s, len);
 }
 
 // (:lvar . a)
@@ -800,14 +800,14 @@ new_symbols(parser_state *p, node *a)
 static node*
 call_uni_op(parser_state *p, node *recv, char *m)
 {
-  return new_call(p, recv, intern(m), 0);
+  return new_call(p, recv, intern_cstr(m), 0);
 }
 
 // (:call a op b)
 static node*
 call_bin_op(parser_state *p, node *recv, char *m, node *arg1)
 {
-  return new_call(p, recv, intern(m), list1(list1(arg1)));
+  return new_call(p, recv, intern_cstr(m), list1(list1(arg1)));
 }
 
 static void
@@ -1284,7 +1284,7 @@ stmt		: keyword_alias fsym {p->lstate = EXPR_FNAME;} fsym
 		    }
 		| primary_value '[' opt_call_args rbracket tOP_ASGN command_call
 		    {
-		      $$ = new_op_asgn(p, new_call(p, $1, intern2("[]",2), $3), $5, $6);
+		      $$ = new_op_asgn(p, new_call(p, $1, intern("[]",2), $3), $5, $6);
 		    }
 		| primary_value '.' tIDENTIFIER tOP_ASGN command_call
 		    {
@@ -1523,7 +1523,7 @@ mlhs_node	: variable
 		    }
 		| primary_value '[' opt_call_args rbracket
 		    {
-		      $$ = new_call(p, $1, intern2("[]",2), $3);
+		      $$ = new_call(p, $1, intern("[]",2), $3);
 		    }
 		| primary_value '.' tIDENTIFIER
 		    {
@@ -1562,7 +1562,7 @@ lhs		: variable
 		    }
 		| primary_value '[' opt_call_args rbracket
 		    {
-		      $$ = new_call(p, $1, intern2("[]",2), $3);
+		      $$ = new_call(p, $1, intern("[]",2), $3);
 		    }
 		| primary_value '.' tIDENTIFIER
 		    {
@@ -1648,31 +1648,31 @@ undef_list	: fsym
 op		: '|'		{ $$ = intern_c('|'); }
 		| '^'		{ $$ = intern_c('^'); }
 		| '&'		{ $$ = intern_c('&'); }
-		| tCMP		{ $$ = intern2("<=>",3); }
-		| tEQ		{ $$ = intern2("==",2); }
-		| tEQQ		{ $$ = intern2("===",3); }
-		| tMATCH	{ $$ = intern2("=~",2); }
-		| tNMATCH	{ $$ = intern2("!~",2); }
+		| tCMP		{ $$ = intern("<=>",3); }
+		| tEQ		{ $$ = intern("==",2); }
+		| tEQQ		{ $$ = intern("===",3); }
+		| tMATCH	{ $$ = intern("=~",2); }
+		| tNMATCH	{ $$ = intern("!~",2); }
 		| '>'		{ $$ = intern_c('>'); }
-		| tGEQ		{ $$ = intern2(">=",2); }
+		| tGEQ		{ $$ = intern(">=",2); }
 		| '<'		{ $$ = intern_c('<'); }
-		| tLEQ		{ $$ = intern2("<=",2); }
-		| tNEQ		{ $$ = intern2("!=",2); }
-		| tLSHFT	{ $$ = intern2("<<",2); }
-		| tRSHFT	{ $$ = intern2(">>",2); }
+		| tLEQ		{ $$ = intern("<=",2); }
+		| tNEQ		{ $$ = intern("!=",2); }
+		| tLSHFT	{ $$ = intern("<<",2); }
+		| tRSHFT	{ $$ = intern(">>",2); }
 		| '+'		{ $$ = intern_c('+'); }
 		| '-'		{ $$ = intern_c('-'); }
 		| '*'		{ $$ = intern_c('*'); }
 		| tSTAR		{ $$ = intern_c('*'); }
 		| '/'		{ $$ = intern_c('/'); }
 		| '%'		{ $$ = intern_c('%'); }
-		| tPOW		{ $$ = intern2("**",2); }
+		| tPOW		{ $$ = intern("**",2); }
 		| '!'		{ $$ = intern_c('!'); }
 		| '~'		{ $$ = intern_c('~'); }
-		| tUPLUS	{ $$ = intern2("+@",2); }
-		| tUMINUS	{ $$ = intern2("-@",2); }
-		| tAREF		{ $$ = intern2("[]",2); }
-		| tASET		{ $$ = intern2("[]=",3); }
+		| tUPLUS	{ $$ = intern("+@",2); }
+		| tUMINUS	{ $$ = intern("-@",2); }
+		| tAREF		{ $$ = intern("[]",2); }
+		| tASET		{ $$ = intern("[]=",3); }
 		| '`'		{ $$ = intern_c('`'); }
 		;
 
@@ -1708,7 +1708,7 @@ arg		: lhs '=' arg
 		    }
 		| primary_value '[' opt_call_args rbracket tOP_ASGN arg
 		    {
-		      $$ = new_op_asgn(p, new_call(p, $1, intern2("[]",2), $3), $5, $6);
+		      $$ = new_op_asgn(p, new_call(p, $1, intern("[]",2), $3), $5, $6);
 		    }
 		| primary_value '.' tIDENTIFIER tOP_ASGN arg
 		    {
@@ -2520,11 +2520,11 @@ method_call	: operation paren_args
 		    }
 		| primary_value '.' paren_args
 		    {
-		      $$ = new_call(p, $1, intern2("call",4), $3);
+		      $$ = new_call(p, $1, intern("call",4), $3);
 		    }
 		| primary_value tCOLON2 paren_args
 		    {
-		      $$ = new_call(p, $1, intern2("call",4), $3);
+		      $$ = new_call(p, $1, intern("call",4), $3);
 		    }
 		| keyword_super paren_args
 		    {
@@ -2536,7 +2536,7 @@ method_call	: operation paren_args
 		    }
 		| primary_value '[' opt_call_args rbracket
 		    {
-		      $$ = new_call(p, $1, intern2("[]",2), $3);
+		      $$ = new_call(p, $1, intern("[]",2), $3);
 		    }
 		;
 
@@ -3996,7 +3996,7 @@ parser_yylex(parser_state *p)
   case '*':
     if ((c = nextc(p)) == '*') {
       if ((c = nextc(p)) == '=') {
-	yylval.id = intern2("**",2);
+	yylval.id = intern("**",2);
 	p->lstate = EXPR_BEG;
 	return tOP_ASGN;
       }
@@ -4105,7 +4105,7 @@ parser_yylex(parser_state *p)
     }
     if (c == '<') {
       if ((c = nextc(p)) == '=') {
-	yylval.id = intern2("<<",2);
+	yylval.id = intern("<<",2);
 	p->lstate = EXPR_BEG;
 	return tOP_ASGN;
       }
@@ -4126,7 +4126,7 @@ parser_yylex(parser_state *p)
     }
     if (c == '>') {
       if ((c = nextc(p)) == '=') {
-	yylval.id = intern2(">>",2);
+	yylval.id = intern(">>",2);
 	p->lstate = EXPR_BEG;
 	return tOP_ASGN;
       }
@@ -4240,7 +4240,7 @@ parser_yylex(parser_state *p)
     if ((c = nextc(p)) == '&') {
       p->lstate = EXPR_BEG;
       if ((c = nextc(p)) == '=') {
-	yylval.id = intern2("&&",2);
+	yylval.id = intern("&&",2);
 	p->lstate = EXPR_BEG;
 	return tOP_ASGN;
       }
@@ -4274,7 +4274,7 @@ parser_yylex(parser_state *p)
     if ((c = nextc(p)) == '|') {
       p->lstate = EXPR_BEG;
       if ((c = nextc(p)) == '=') {
-	yylval.id = intern2("||",2);
+	yylval.id = intern("||",2);
 	p->lstate = EXPR_BEG;
 	return tOP_ASGN;
       }
@@ -4878,7 +4878,7 @@ parser_yylex(parser_state *p)
       tokadd(p, '$');
       tokadd(p, c);
       tokfix(p);
-      yylval.id = intern(tok(p));
+      yylval.id = intern_cstr(tok(p));
       return tGVAR;
 
     case '-':
@@ -4888,7 +4888,7 @@ parser_yylex(parser_state *p)
       pushback(p, c);
     gvar:
       tokfix(p);
-      yylval.id = intern(tok(p));
+      yylval.id = intern_cstr(tok(p));
       return tGVAR;
 
     case '&':     /* $&: last match */
@@ -5040,7 +5040,7 @@ parser_yylex(parser_state *p)
 	  p->lstate = EXPR_BEG;
 	  nextc(p);
 	  tokfix(p);
-	  yylval.id = intern(tok(p));
+	  yylval.id = intern_cstr(tok(p));
 	  return tLABEL;
 	}
       }
@@ -5053,7 +5053,7 @@ parser_yylex(parser_state *p)
 	  enum mrb_lex_state_enum state = p->lstate;
 	  p->lstate = kw->state;
 	  if (state == EXPR_FNAME) {
-	    yylval.id = intern(kw->name);
+	    yylval.id = intern_cstr(kw->name);
 	    return kw->id[0];
 	  }
 	  if (p->lstate == EXPR_BEG) {
@@ -5098,7 +5098,7 @@ parser_yylex(parser_state *p)
       }
     }
     {
-      mrb_sym ident = intern(tok(p));
+      mrb_sym ident = intern_cstr(tok(p));
 
       yylval.id = ident;
 #if 0
diff --git a/src/proc.c b/src/proc.c
index cfb677f0a..471126b6d 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -204,8 +204,8 @@ mrb_init_proc(mrb_state *mrb)
   mrb_define_method(mrb, mrb->proc_class, "arity", mrb_proc_arity, MRB_ARGS_NONE());
 
   m = mrb_proc_new(mrb, call_irep);
-  mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern2(mrb, "call", 4), m);
-  mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern2(mrb, "[]", 2), m);
+  mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern(mrb, "call", 4), m);
+  mrb_define_method_raw(mrb, mrb->proc_class, mrb_intern(mrb, "[]", 2), m);
 
   mrb_define_class_method(mrb, mrb->kernel_module, "lambda", proc_lambda, MRB_ARGS_NONE()); /* 15.3.1.2.6  */
   mrb_define_method(mrb, mrb->kernel_module,       "lambda", proc_lambda, MRB_ARGS_NONE()); /* 15.3.1.3.27 */
diff --git a/src/string.c b/src/string.c
index af70e8e45..42f0353f2 100644
--- a/src/string.c
+++ b/src/string.c
@@ -546,10 +546,10 @@ mrb_str_cmp_m(mrb_state *mrb, mrb_value str1)
 
   mrb_get_args(mrb, "o", &str2);
   if (!mrb_string_p(str2)) {
-    if (!mrb_respond_to(mrb, str2, mrb_intern2(mrb, "to_s", 4))) {
+    if (!mrb_respond_to(mrb, str2, mrb_intern(mrb, "to_s", 4))) {
       return mrb_nil_value();
     }
-    else if (!mrb_respond_to(mrb, str2, mrb_intern2(mrb, "<=>", 3))) {
+    else if (!mrb_respond_to(mrb, str2, mrb_intern(mrb, "<=>", 3))) {
       return mrb_nil_value();
     }
     else {
@@ -585,7 +585,7 @@ mrb_str_equal(mrb_state *mrb, mrb_value str1, mrb_value str2)
   if (mrb_obj_equal(mrb, str1, str2)) return TRUE;
   if (!mrb_string_p(str2)) {
     if (mrb_nil_p(str2)) return FALSE;
-    if (!mrb_respond_to(mrb, str2, mrb_intern2(mrb, "to_str", 6))) {
+    if (!mrb_respond_to(mrb, str2, mrb_intern(mrb, "to_str", 6))) {
       return FALSE;
     }
     str2 = mrb_funcall(mrb, str2, "to_str", 0);
diff --git a/src/symbol.c b/src/symbol.c
index e49462e27..1dbc9a7bd 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -35,7 +35,7 @@ KHASH_DECLARE(n2s, symbol_name, mrb_sym, 1)
 KHASH_DEFINE (n2s, symbol_name, mrb_sym, 1, sym_hash_func, sym_hash_equal)
 /* ------------------------------------------------------ */
 mrb_sym
-mrb_intern2(mrb_state *mrb, const char *name, size_t len)
+mrb_intern(mrb_state *mrb, const char *name, size_t len)
 {
   khash_t(n2s) *h = mrb->name2sym;
   symbol_name sname;
@@ -63,13 +63,13 @@ mrb_intern2(mrb_state *mrb, const char *name, size_t len)
 mrb_sym
 mrb_intern_cstr(mrb_state *mrb, const char *name)
 {
-  return mrb_intern2(mrb, name, strlen(name));
+  return mrb_intern(mrb, name, strlen(name));
 }
 
 mrb_sym
 mrb_intern_str(mrb_state *mrb, mrb_value str)
 {
-  return mrb_intern2(mrb, RSTRING_PTR(str), RSTRING_LEN(str));
+  return mrb_intern(mrb, RSTRING_PTR(str), RSTRING_LEN(str));
 }
 
 mrb_value
diff --git a/src/variable.c b/src/variable.c
index ffad3dad3..edfce99f9 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -884,7 +884,7 @@ L_RETRY:
     goto L_RETRY;
   }
   name = mrb_symbol_value(sym);
-  return mrb_funcall_argv(mrb, mrb_obj_value(base), mrb_intern2(mrb, "const_missing", 13), 1, &name);
+  return mrb_funcall_argv(mrb, mrb_obj_value(base), mrb_intern(mrb, "const_missing", 13), 1, &name);
 }
 
 mrb_value
@@ -1064,7 +1064,7 @@ mrb_f_global_variables(mrb_state *mrb, mrb_value self)
   buf[2] = 0;
   for (i = 1; i <= 9; ++i) {
     buf[1] = (char)(i + '0');
-    mrb_ary_push(mrb, ary, mrb_symbol_value(mrb_intern2(mrb, buf, 2)));
+    mrb_ary_push(mrb, ary, mrb_symbol_value(mrb_intern(mrb, buf, 2)));
   }
   return ary;
 }
@@ -1127,7 +1127,7 @@ mrb_class_sym(mrb_state *mrb, struct RClass *c, struct RClass *outer)
 {
   mrb_value name;
 
-  name = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern2(mrb, "__classid__", 11));
+  name = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern(mrb, "__classid__", 11));
   if (mrb_nil_p(name)) {
 
     if (!outer) return 0;
diff --git a/src/vm.c b/src/vm.c
index 66541e4b1..e8ac92c93 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -357,7 +357,7 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
     p = mrb_method_search_vm(mrb, &c, mid);
     if (!p) {
       undef = mid;
-      mid = mrb_intern2(mrb, "method_missing", 14);
+      mid = mrb_intern(mrb, "method_missing", 14);
       p = mrb_method_search_vm(mrb, &c, mid);
       n++; argc++;
     }
@@ -897,7 +897,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
       if (!m) {
         mrb_value sym = mrb_symbol_value(mid);
 
-        mid = mrb_intern2(mrb, "method_missing", 14);
+        mid = mrb_intern(mrb, "method_missing", 14);
         m = mrb_method_search_vm(mrb, &c, mid);
         if (n == CALL_MAXARGS) {
           mrb_ary_unshift(mrb, regs[a+1], sym);
@@ -1054,7 +1054,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
       c = mrb->c->ci->target_class->super;
       m = mrb_method_search_vm(mrb, &c, mid);
       if (!m) {
-        mid = mrb_intern2(mrb, "method_missing", 14);
+        mid = mrb_intern(mrb, "method_missing", 14);
         m = mrb_method_search_vm(mrb, &c, mid);
         if (n == CALL_MAXARGS) {
           mrb_ary_unshift(mrb, regs[a+1], mrb_symbol_value(ci->mid));
@@ -1267,8 +1267,8 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
 
       L_RAISE:
         ci = mrb->c->ci;
-        mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern2(mrb, "lastpc", 6), mrb_cptr_value(mrb, pc));
-        mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern2(mrb, "ciidx", 5), mrb_fixnum_value(ci - mrb->c->cibase));
+        mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern(mrb, "lastpc", 6), mrb_cptr_value(mrb, pc));
+        mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern(mrb, "ciidx", 5), mrb_fixnum_value(ci - mrb->c->cibase));
         eidx = ci->eidx;
         if (ci == mrb->c->cibase) {
           if (ci->ridx == 0) goto L_STOP;
@@ -1393,7 +1393,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
       if (!m) {
         mrb_value sym = mrb_symbol_value(mid);
 
-        mid = mrb_intern2(mrb, "method_missing", 14);
+        mid = mrb_intern(mrb, "method_missing", 14);
         m = mrb_method_search_vm(mrb, &c, mid);
         if (n == CALL_MAXARGS) {
           mrb_ary_unshift(mrb, regs[a+1], sym);