3 files changed, 7 insertions, 7 deletions
diff --git a/src/ir/child-typer.h b/src/ir/child-typer.h
index 499a7e4dd..154da0e45 100644
--- a/src/ir/child-typer.h
+++ b/src/ir/child-typer.h
@@ -78,7 +78,7 @@ template<typename Subtype> struct ChildTyper : OverriddenVisitor<Subtype> {
   }
 
   void notePointer(Expression** ptrp, Name mem) {
-    note(ptrp, wasm.getMemory(mem)->indexType);
+    note(ptrp, wasm.getMemory(mem)->addressType);
   }
 
   void noteAny(Expression** childp) { self().noteAnyType(childp); }
@@ -270,8 +270,8 @@ template<typename Subtype> struct ChildTyper : OverriddenVisitor<Subtype> {
   void visitDataDrop(DataDrop* curr) {}
 
   void visitMemoryCopy(MemoryCopy* curr) {
-    assert(wasm.getMemory(curr->destMemory)->indexType ==
-           wasm.getMemory(curr->sourceMemory)->indexType);
+    assert(wasm.getMemory(curr->destMemory)->addressType ==
+           wasm.getMemory(curr->sourceMemory)->addressType);
     notePointer(&curr->dest, curr->destMemory);
     notePointer(&curr->source, curr->sourceMemory);
     notePointer(&curr->size, curr->destMemory);
@@ -762,7 +762,7 @@ template<typename Subtype> struct ChildTyper : OverriddenVisitor<Subtype> {
   }
 
   void visitTableInit(TableInit* curr) {
-    note(&curr->dest, wasm.getTable(curr->table)->indexType);
+    note(&curr->dest, wasm.getTable(curr->table)->addressType);
     note(&curr->offset, Type::i32);
     note(&curr->size, Type::i32);
   }
diff --git a/src/ir/memory-utils.cpp b/src/ir/memory-utils.cpp
index 552e4ff9a..70f316028 100644
--- a/src/ir/memory-utils.cpp
+++ b/src/ir/memory-utils.cpp
@@ -110,7 +110,7 @@ bool flatten(Module& wasm) {
     std::copy(segment->data.begin(), segment->data.end(), data.begin() + start);
   }
   dataSegments[0]->offset->cast<Const>()->value =
-    Literal::makeFromInt32(0, wasm.memories[0]->indexType);
+    Literal::makeFromInt32(0, wasm.memories[0]->addressType);
   dataSegments[0]->data.swap(data);
   wasm.removeDataSegments(
     [&](DataSegment* curr) { return curr->name != dataSegments[0]->name; });
diff --git a/src/ir/module-utils.cpp b/src/ir/module-utils.cpp
index 7aed263a9..2fd129a9c 100644
--- a/src/ir/module-utils.cpp
+++ b/src/ir/module-utils.cpp
@@ -175,7 +175,7 @@ Table* copyTable(const Table* table, Module& out) {
 
   ret->initial = table->initial;
   ret->max = table->max;
-  ret->indexType = table->indexType;
+  ret->addressType = table->addressType;
 
   return out.addTable(std::move(ret));
 }
@@ -186,7 +186,7 @@ Memory* copyMemory(const Memory* memory, Module& out) {
   ret->initial = memory->initial;
   ret->max = memory->max;
   ret->shared = memory->shared;
-  ret->indexType = memory->indexType;
+  ret->addressType = memory->addressType;
   ret->module = memory->module;
   ret->base = memory->base;