diff --git a/include/mruby/proc.h b/include/mruby/proc.h
index f35d64df9..94d110b58 100644
--- a/include/mruby/proc.h
+++ b/include/mruby/proc.h
@@ -127,8 +127,8 @@ MRB_API mrb_value mrb_proc_cfunc_env_get(mrb_state *mrb, mrb_int idx);
 #define MRB_METHOD_PROC(m) ((m).as.proc)
 #define MRB_METHOD_UNDEF_P(m) ((m).as.proc==NULL)
 #define MRB_METHOD_VISIBILITY(m) ((m).flags & MRB_METHOD_VISIBILITY_MASK)
-#define MRB_SET_VISIBILITY(f,v) ((f)=(((f)&~MRB_METHOD_VISIBILITY_MASK)|(v)))
-#define MRB_METHOD_SET_VISIBILITY(m,v) MRB_SET_VISIBILITY((m).flags,(v))
+#define MRB_SET_VISIBILITY_FLAGS(f,v) ((f)=(((f)&~MRB_METHOD_VISIBILITY_MASK)|(v)))
+#define MRB_METHOD_SET_VISIBILITY(m,v) MRB_SET_VISIBILITY_FLAGS((m).flags,(v))
 
 #define MRB_METHOD_CFUNC_P(m) (MRB_METHOD_FUNC_P(m) || (MRB_METHOD_PROC(m)?(MRB_PROC_CFUNC_P(MRB_METHOD_PROC(m))):FALSE))
 /* use MRB_METHOD_CFUNC(m) only when MRB_METHOD_CFUNC_P(m) is true */
diff --git a/src/class.c b/src/class.c
index bbf9addc9..79a539745 100644
--- a/src/class.c
+++ b/src/class.c
@@ -809,11 +809,11 @@ mrb_define_method_raw(mrb_state *mrb, struct RClass *c, mrb_sym mid, mrb_method_
 
   int flags = MT_KEY_FLG(m.flags);
   if (mid == MRB_SYM(initialize)) {
-    MRB_SET_VISIBILITY(flags, MT_PRIVATE);
+    MRB_SET_VISIBILITY_FLAGS(flags, MT_PRIVATE);
   }
   else if ((flags & MT_VMASK) == MT_VDEFAULT) {
     mrb_callinfo *ci = find_visibility_ci(mrb, c, 0);
-    MRB_SET_VISIBILITY(flags, ci->vis);
+    MRB_SET_VISIBILITY_FLAGS(flags, ci->vis);
   }
   mt_put(mrb, h, mid, flags, ptr);
   mc_clear_by_id(mrb, mid);