diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c b/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c
index 8b3f30ff3..49c93e21c 100644
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/apiprint.c
@@ -17,18 +17,18 @@
 static void
 mrdb_check_syntax(mrb_state *mrb, mrb_debug_context *dbg, const char *expr, size_t len)
 {
-  mrbc_context *c;
+  mrb_ccontext *c;
 
-  c = mrbc_context_new(mrb);
+  c = mrb_ccontext_new(mrb);
   c->no_exec = TRUE;
   c->capture_errors = TRUE;
-  mrbc_filename(mrb, c, (const char*)dbg->prvfile);
+  mrb_ccontext_filename(mrb, c, (const char*)dbg->prvfile);
   c->lineno = dbg->prvline;
 
   /* Load program */
   mrb_load_nstring_cxt(mrb, expr, len, c);
 
-  mrbc_context_free(mrb, c);
+  mrb_ccontext_free(mrb, c);
 }
 
 mrb_value
diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
index e0e3a96f6..6516c50a9 100644
--- a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
+++ b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c
@@ -706,10 +706,10 @@ main(int argc, char **argv)
     v = mrb_load_irep_file(mrb, args.rfp);
   }
   else {              /* .rb */
-    mrbc_context *cc = mrbc_context_new(mrb);
-    mrbc_filename(mrb, cc, args.fname);
+    mrb_ccontext *cc = mrb_ccontext_new(mrb);
+    mrb_ccontext_filename(mrb, cc, args.fname);
     v = mrb_load_file_cxt(mrb, args.rfp, cc);
-    mrbc_context_free(mrb, cc);
+    mrb_ccontext_free(mrb, cc);
   }
   if (mrdb->dbg->xm == DBG_QUIT && !mrb_undef_p(v) && mrb->exc) {
     const char *classname = mrb_obj_classname(mrb, mrb_obj_value(mrb->exc));