2 files changed, 8 insertions, 8 deletions
diff --git a/include/ruby/backward/2/rmodule.h b/include/ruby/backward/2/rmodule.h
index 53b37831c0..76c0936462 100644
--- a/include/ruby/backward/2/rmodule.h
+++ b/include/ruby/backward/2/rmodule.h
@@ -23,7 +23,7 @@
  * who is implementing the internals) could have used those macros for a while.
  * Kept public as-is here to keep some theoretical backwards compatibility.
  */
-#define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m)
+#define RMODULE_IV_TBL(m) RCLASS_FIELDS(m)
 #define RMODULE_CONST_TBL(m) RCLASS_CONST_TBL(m)
 #define RMODULE_M_TBL(m) RCLASS_M_TBL(m)
 #define RMODULE_SUPER(m) RCLASS_SUPER(m)
diff --git a/include/ruby/internal/core/robject.h b/include/ruby/internal/core/robject.h
index 1f2b7168b8..d84e318a2c 100644
--- a/include/ruby/internal/core/robject.h
+++ b/include/ruby/internal/core/robject.h
@@ -42,10 +42,10 @@
  */
 #define ROBJECT(obj)          RBIMPL_CAST((struct RObject *)(obj))
 /** @cond INTERNAL_MACRO */
-#define ROBJECT_EMBED_LEN_MAX ROBJECT_EMBED_LEN_MAX
-#define ROBJECT_EMBED         ROBJECT_EMBED
-#define ROBJECT_IV_CAPACITY   ROBJECT_IV_CAPACITY
-#define ROBJECT_IVPTR         ROBJECT_IVPTR
+#define ROBJECT_EMBED_LEN_MAX       ROBJECT_EMBED_LEN_MAX
+#define ROBJECT_EMBED               ROBJECT_EMBED
+#define ROBJECT_FIELDS_CAPACITY     ROBJECT_FIELDS_CAPACITY
+#define ROBJECT_FIELDS              ROBJECT_FIELDS
 /** @endcond */
 
 /**
@@ -94,7 +94,7 @@ struct RObject {
          */
         struct {
             /** Pointer to a C array that holds instance variables. */
-            VALUE *ivptr;
+            VALUE *fields;
         } heap;
 
         /* Embedded instance variables. When an object is small enough, it
@@ -123,7 +123,7 @@ RBIMPL_ATTR_ARTIFICIAL()
  * @shyouhei finds no reason for this to be visible from extension libraries.
  */
 static inline VALUE *
-ROBJECT_IVPTR(VALUE obj)
+ROBJECT_FIELDS(VALUE obj)
 {
     RBIMPL_ASSERT_TYPE(obj, RUBY_T_OBJECT);
 
@@ -133,7 +133,7 @@ ROBJECT_IVPTR(VALUE obj)
         return ptr->as.ary;
     }
     else {
-        return ptr->as.heap.ivptr;
+        return ptr->as.heap.fields;
     }
 }