diff --git a/baselines/audioworklet.asynciterable.generated.d.ts b/baselines/audioworklet.asynciterable.generated.d.ts
index cd2211e58..508560e16 100644
--- a/baselines/audioworklet.asynciterable.generated.d.ts
+++ b/baselines/audioworklet.asynciterable.generated.d.ts
@@ -3,6 +3,6 @@
 /////////////////////////////
 
 interface ReadableStream<R = any> {
-    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
-    values(options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
+    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
+    values(options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
 }
diff --git a/baselines/dom.asynciterable.generated.d.ts b/baselines/dom.asynciterable.generated.d.ts
index 28d15775c..f9b5ee374 100644
--- a/baselines/dom.asynciterable.generated.d.ts
+++ b/baselines/dom.asynciterable.generated.d.ts
@@ -3,13 +3,13 @@
 /////////////////////////////
 
 interface FileSystemDirectoryHandle {
-    [Symbol.asyncIterator](): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
-    entries(): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
-    keys(): AsyncBuiltinIterator<string, BuiltinIteratorReturn>;
-    values(): AsyncBuiltinIterator<FileSystemHandle, BuiltinIteratorReturn>;
+    [Symbol.asyncIterator](): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
+    entries(): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
+    keys(): BuiltinAsyncIterator<string, BuiltinIteratorReturn>;
+    values(): BuiltinAsyncIterator<FileSystemHandle, BuiltinIteratorReturn>;
 }
 
 interface ReadableStream<R = any> {
-    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
-    values(options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
+    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
+    values(options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
 }
diff --git a/baselines/serviceworker.asynciterable.generated.d.ts b/baselines/serviceworker.asynciterable.generated.d.ts
index 186baee78..6e6bab35e 100644
--- a/baselines/serviceworker.asynciterable.generated.d.ts
+++ b/baselines/serviceworker.asynciterable.generated.d.ts
@@ -3,13 +3,13 @@
 /////////////////////////////
 
 interface FileSystemDirectoryHandle {
-    [Symbol.asyncIterator](): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
-    entries(): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
-    keys(): AsyncBuiltinIterator<string, BuiltinIteratorReturn>;
-    values(): AsyncBuiltinIterator<FileSystemHandle, BuiltinIteratorReturn>;
+    [Symbol.asyncIterator](): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
+    entries(): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
+    keys(): BuiltinAsyncIterator<string, BuiltinIteratorReturn>;
+    values(): BuiltinAsyncIterator<FileSystemHandle, BuiltinIteratorReturn>;
 }
 
 interface ReadableStream<R = any> {
-    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
-    values(options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
+    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
+    values(options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
 }
diff --git a/baselines/sharedworker.asynciterable.generated.d.ts b/baselines/sharedworker.asynciterable.generated.d.ts
index ee69ffea1..96e3510dc 100644
--- a/baselines/sharedworker.asynciterable.generated.d.ts
+++ b/baselines/sharedworker.asynciterable.generated.d.ts
@@ -3,13 +3,13 @@
 /////////////////////////////
 
 interface FileSystemDirectoryHandle {
-    [Symbol.asyncIterator](): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
-    entries(): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
-    keys(): AsyncBuiltinIterator<string, BuiltinIteratorReturn>;
-    values(): AsyncBuiltinIterator<FileSystemHandle, BuiltinIteratorReturn>;
+    [Symbol.asyncIterator](): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
+    entries(): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
+    keys(): BuiltinAsyncIterator<string, BuiltinIteratorReturn>;
+    values(): BuiltinAsyncIterator<FileSystemHandle, BuiltinIteratorReturn>;
 }
 
 interface ReadableStream<R = any> {
-    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
-    values(options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
+    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
+    values(options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
 }
diff --git a/baselines/webworker.asynciterable.generated.d.ts b/baselines/webworker.asynciterable.generated.d.ts
index 0ade61069..cd2b63eb5 100644
--- a/baselines/webworker.asynciterable.generated.d.ts
+++ b/baselines/webworker.asynciterable.generated.d.ts
@@ -3,13 +3,13 @@
 /////////////////////////////
 
 interface FileSystemDirectoryHandle {
-    [Symbol.asyncIterator](): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
-    entries(): AsyncBuiltinIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
-    keys(): AsyncBuiltinIterator<string, BuiltinIteratorReturn>;
-    values(): AsyncBuiltinIterator<FileSystemHandle, BuiltinIteratorReturn>;
+    [Symbol.asyncIterator](): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
+    entries(): BuiltinAsyncIterator<[string, FileSystemHandle], BuiltinIteratorReturn>;
+    keys(): BuiltinAsyncIterator<string, BuiltinIteratorReturn>;
+    values(): BuiltinAsyncIterator<FileSystemHandle, BuiltinIteratorReturn>;
 }
 
 interface ReadableStream<R = any> {
-    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
-    values(options?: ReadableStreamIteratorOptions): AsyncBuiltinIterator<R, BuiltinIteratorReturn>;
+    [Symbol.asyncIterator](options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
+    values(options?: ReadableStreamIteratorOptions): BuiltinAsyncIterator<R, BuiltinIteratorReturn>;
 }
diff --git a/src/build/emitter.ts b/src/build/emitter.ts
index 98b9823f7..f8e79b649 100644
--- a/src/build/emitter.ts
+++ b/src/build/emitter.ts
@@ -1731,7 +1731,7 @@ export function emitWebIdl(
         methods = [
           {
             name: "values",
-            definition: `AsyncBuiltinIterator<${valueType}, BuiltinIteratorReturn>`,
+            definition: `BuiltinAsyncIterator<${valueType}, BuiltinIteratorReturn>`,
           },
         ];
       } else {
@@ -1740,15 +1740,15 @@ export function emitWebIdl(
         methods = [
           {
             name: "entries",
-            definition: `AsyncBuiltinIterator<[${keyType}, ${valueType}], BuiltinIteratorReturn>`,
+            definition: `BuiltinAsyncIterator<[${keyType}, ${valueType}], BuiltinIteratorReturn>`,
           },
           {
             name: "keys",
-            definition: `AsyncBuiltinIterator<${keyType}, BuiltinIteratorReturn>`,
+            definition: `BuiltinAsyncIterator<${keyType}, BuiltinIteratorReturn>`,
           },
           {
             name: "values",
-            definition: `AsyncBuiltinIterator<${valueType}, BuiltinIteratorReturn>`,
+            definition: `BuiltinAsyncIterator<${valueType}, BuiltinIteratorReturn>`,
           },
         ];
       }
@@ -1778,7 +1778,7 @@ export function emitWebIdl(
     printer.increaseIndent();
 
     printer.printLine(
-      `[Symbol.asyncIterator](${paramsString}): AsyncBuiltinIterator<${stringifySingleOrTupleTypes(
+      `[Symbol.asyncIterator](${paramsString}): BuiltinAsyncIterator<${stringifySingleOrTupleTypes(
         subtypes,
       )}, BuiltinIteratorReturn>;`,
     );