1 files changed, 22 insertions, 22 deletions

diff --git a/src/ir.cc b/src/ir.cc
index ce1188d8..cfece04c 100644
--- a/src/ir.cc
+++ b/src/ir.cc
@@ -121,8 +121,8 @@ Index Module::GetFuncTypeIndex(const Var& var) const {
   return func_type_bindings.FindIndex(var);
 }
 
-Index Module::GetExceptIndex(const Var& var) const {
-  return except_bindings.FindIndex(var);
+Index Module::GetEventIndex(const Var& var) const {
+  return event_bindings.FindIndex(var);
 }
 
 Index Module::GetDataSegmentIndex(const Var& var) const {
@@ -147,8 +147,8 @@ bool Module::IsImport(ExternalKind kind, const Var& var) const {
     case ExternalKind::Table:
       return GetTableIndex(var) < num_table_imports;
 
-    case ExternalKind::Except:
-      return GetExceptIndex(var) < num_except_imports;
+    case ExternalKind::Event:
+      return GetEventIndex(var) < num_event_imports;
 
     default:
       return false;
@@ -263,12 +263,12 @@ Memory* Module::GetMemory(const Var& var) {
   return memories[index];
 }
 
-Exception* Module::GetExcept(const Var& var) const {
-  Index index = GetExceptIndex(var);
-  if (index >= excepts.size()) {
+Event* Module::GetEvent(const Var& var) const {
+  Index index = GetEventIndex(var);
+  if (index >= events.size()) {
     return nullptr;
   }
-  return excepts[index];
+  return events[index];
 }
 
 const DataSegment* Module::GetDataSegment(const Var& var) const {
@@ -344,12 +344,12 @@ void Module::AppendField(std::unique_ptr<ElemSegmentModuleField> field) {
   fields.push_back(std::move(field));
 }
 
-void Module::AppendField(std::unique_ptr<ExceptionModuleField> field) {
-  Exception& except = field->except;
-  if (!except.name.empty()) {
-    except_bindings.emplace(except.name, Binding(field->loc, excepts.size()));
+void Module::AppendField(std::unique_ptr<EventModuleField> field) {
+  Event& event = field->event;
+  if (!event.name.empty()) {
+    event_bindings.emplace(event.name, Binding(field->loc, events.size()));
   }
-  excepts.push_back(&except);
+  events.push_back(&event);
   fields.push_back(std::move(field));
 }
 
@@ -436,13 +436,13 @@ void Module::AppendField(std::unique_ptr<ImportModuleField> field) {
       break;
     }
 
-    case ExternalKind::Except: {
-      Exception& except = cast<ExceptionImport>(import)->except;
-      name = &except.name;
-      bindings = &except_bindings;
-      index = excepts.size();
-      excepts.push_back(&except);
-      ++num_except_imports;
+    case ExternalKind::Event: {
+      Event& event = cast<EventImport>(import)->event;
+      name = &event.name;
+      bindings = &event_bindings;
+      index = events.size();
+      events.push_back(&event);
+      ++num_event_imports;
       break;
     }
   }
@@ -520,8 +520,8 @@ void Module::AppendField(std::unique_ptr<ModuleField> field) {
       AppendField(cast<StartModuleField>(std::move(field)));
       break;
 
-    case ModuleFieldType::Except:
-      AppendField(cast<ExceptionModuleField>(std::move(field)));
+    case ModuleFieldType::Event:
+      AppendField(cast<EventModuleField>(std::move(field)));
       break;
   }
 }