diff --git a/test/language/expressions/async-generator/named-yield-star-sync-next.js b/test/language/expressions/async-generator/named-yield-star-sync-next.js
index 89635bd15f..277dfc962d 100644
--- a/test/language/expressions/async-generator/named-yield-star-sync-next.js
+++ b/test/language/expressions/async-generator/named-yield-star-sync-next.js
@@ -185,11 +185,11 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log[5].args.length, 1, "next args.length");
   assert.sameValue(log[5].args[0], undefined, "next args[0]");
 
-  assert.sameValue(log[6].name, "get next value (1)");
-  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next value thisValue");
+  assert.sameValue(log[6].name, "get next done (1)");
+  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next done thisValue");
 
-  assert.sameValue(log[7].name, "get next done (1)");
-  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next done thisValue");
+  assert.sameValue(log[7].name, "get next value (1)");
+  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next value thisValue");
 
   assert.sameValue(v.value, "next-value-1");
   assert.sameValue(v.done, false);
@@ -205,11 +205,11 @@ iter.next("next-arg-1").then(v => {
     assert.sameValue(log[9].args.length, 1, "next args.length");
     assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[10].name, "get next value (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
+    assert.sameValue(log[10].name, "get next done (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[11].name, "get next done (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[11].name, "get next value (2)");
+    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
 
     assert.sameValue(log[12].name, "after yield*");
     assert.sameValue(log[12].value, "next-value-2");
diff --git a/test/language/expressions/async-generator/named-yield-star-sync-return.js b/test/language/expressions/async-generator/named-yield-star-sync-return.js
index 77479612f8..890d88e675 100644
--- a/test/language/expressions/async-generator/named-yield-star-sync-return.js
+++ b/test/language/expressions/async-generator/named-yield-star-sync-return.js
@@ -159,11 +159,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "return args.length");
     assert.sameValue(log[3].args[0], "return-arg-1", "return args[0]");
 
-    assert.sameValue(log[4].name, "get return value (1)");
-    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return value thisValue");
+    assert.sameValue(log[4].name, "get return done (1)");
+    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return done thisValue");
 
-    assert.sameValue(log[5].name, "get return done (1)");
-    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return done thisValue");
+    assert.sameValue(log[5].name, "get return value (1)");
+    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return value thisValue");
 
     assert.sameValue(v.value, "return-value-1");
     assert.sameValue(v.done, false);
@@ -179,11 +179,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "return args.length");
       assert.sameValue(log[7].args[0], "return-arg-2", "return args[0]");
 
-      assert.sameValue(log[8].name, "get return value (2)");
-      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return value thisValue");
+      assert.sameValue(log[8].name, "get return done (2)");
+      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return done thisValue");
 
-      assert.sameValue(log[9].name, "get return done (2)");
-      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return done thisValue");
+      assert.sameValue(log[9].name, "get return value (2)");
+      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return value thisValue");
 
       assert.sameValue(v.value, "return-value-2");
       assert.sameValue(v.done, true);
diff --git a/test/language/expressions/async-generator/named-yield-star-sync-throw.js b/test/language/expressions/async-generator/named-yield-star-sync-throw.js
index e923a604c9..65c6c29d1a 100644
--- a/test/language/expressions/async-generator/named-yield-star-sync-throw.js
+++ b/test/language/expressions/async-generator/named-yield-star-sync-throw.js
@@ -162,11 +162,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "throw args.length");
     assert.sameValue(log[3].args[0], "throw-arg-1", "throw args[0]");
 
-    assert.sameValue(log[4].name, "get throw value (1)");
-    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw value thisValue");
+    assert.sameValue(log[4].name, "get throw done (1)");
+    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw done thisValue");
 
-    assert.sameValue(log[5].name, "get throw done (1)");
-    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw done thisValue");
+    assert.sameValue(log[5].name, "get throw value (1)");
+    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw value thisValue");
 
     assert.sameValue(v.value, "throw-value-1");
     assert.sameValue(v.done, false);
@@ -182,11 +182,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "throw args.length");
       assert.sameValue(log[7].args[0], "throw-arg-2", "throw args[0]");
 
-      assert.sameValue(log[8].name, "get throw value (2)");
-      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw value thisValue");
+      assert.sameValue(log[8].name, "get throw done (2)");
+      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw done thisValue");
 
-      assert.sameValue(log[9].name, "get throw done (2)");
-      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw done thisValue");
+      assert.sameValue(log[9].name, "get throw value (2)");
+      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw value thisValue");
 
       assert.sameValue(log[10].name, "after yield*");
       assert.sameValue(log[10].value, "throw-value-2");
diff --git a/test/language/expressions/async-generator/yield-star-sync-next.js b/test/language/expressions/async-generator/yield-star-sync-next.js
index cd170c93fa..dc6d2e637b 100644
--- a/test/language/expressions/async-generator/yield-star-sync-next.js
+++ b/test/language/expressions/async-generator/yield-star-sync-next.js
@@ -185,11 +185,11 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log[5].args.length, 1, "next args.length");
   assert.sameValue(log[5].args[0], undefined, "next args[0]");
 
-  assert.sameValue(log[6].name, "get next value (1)");
-  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next value thisValue");
+  assert.sameValue(log[6].name, "get next done (1)");
+  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next done thisValue");
 
-  assert.sameValue(log[7].name, "get next done (1)");
-  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next done thisValue");
+  assert.sameValue(log[7].name, "get next value (1)");
+  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next value thisValue");
 
   assert.sameValue(v.value, "next-value-1");
   assert.sameValue(v.done, false);
@@ -205,11 +205,11 @@ iter.next("next-arg-1").then(v => {
     assert.sameValue(log[9].args.length, 1, "next args.length");
     assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[10].name, "get next value (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
+    assert.sameValue(log[10].name, "get next done (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[11].name, "get next done (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[11].name, "get next value (2)");
+    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
 
     assert.sameValue(log[12].name, "after yield*");
     assert.sameValue(log[12].value, "next-value-2");
diff --git a/test/language/expressions/async-generator/yield-star-sync-return.js b/test/language/expressions/async-generator/yield-star-sync-return.js
index 5d081b1b66..9e5a3cf92c 100644
--- a/test/language/expressions/async-generator/yield-star-sync-return.js
+++ b/test/language/expressions/async-generator/yield-star-sync-return.js
@@ -159,11 +159,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "return args.length");
     assert.sameValue(log[3].args[0], "return-arg-1", "return args[0]");
 
-    assert.sameValue(log[4].name, "get return value (1)");
-    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return value thisValue");
+    assert.sameValue(log[4].name, "get return done (1)");
+    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return done thisValue");
 
-    assert.sameValue(log[5].name, "get return done (1)");
-    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return done thisValue");
+    assert.sameValue(log[5].name, "get return value (1)");
+    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return value thisValue");
 
     assert.sameValue(v.value, "return-value-1");
     assert.sameValue(v.done, false);
@@ -179,11 +179,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "return args.length");
       assert.sameValue(log[7].args[0], "return-arg-2", "return args[0]");
 
-      assert.sameValue(log[8].name, "get return value (2)");
-      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return value thisValue");
+      assert.sameValue(log[8].name, "get return done (2)");
+      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return done thisValue");
 
-      assert.sameValue(log[9].name, "get return done (2)");
-      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return done thisValue");
+      assert.sameValue(log[9].name, "get return value (2)");
+      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return value thisValue");
 
       assert.sameValue(v.value, "return-value-2");
       assert.sameValue(v.done, true);
diff --git a/test/language/expressions/async-generator/yield-star-sync-throw.js b/test/language/expressions/async-generator/yield-star-sync-throw.js
index b0d8e0015b..aaafd376e3 100644
--- a/test/language/expressions/async-generator/yield-star-sync-throw.js
+++ b/test/language/expressions/async-generator/yield-star-sync-throw.js
@@ -162,11 +162,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "throw args.length");
     assert.sameValue(log[3].args[0], "throw-arg-1", "throw args[0]");
 
-    assert.sameValue(log[4].name, "get throw value (1)");
-    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw value thisValue");
+    assert.sameValue(log[4].name, "get throw done (1)");
+    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw done thisValue");
 
-    assert.sameValue(log[5].name, "get throw done (1)");
-    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw done thisValue");
+    assert.sameValue(log[5].name, "get throw value (1)");
+    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw value thisValue");
 
     assert.sameValue(v.value, "throw-value-1");
     assert.sameValue(v.done, false);
@@ -182,11 +182,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "throw args.length");
       assert.sameValue(log[7].args[0], "throw-arg-2", "throw args[0]");
 
-      assert.sameValue(log[8].name, "get throw value (2)");
-      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw value thisValue");
+      assert.sameValue(log[8].name, "get throw done (2)");
+      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw done thisValue");
 
-      assert.sameValue(log[9].name, "get throw done (2)");
-      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw done thisValue");
+      assert.sameValue(log[9].name, "get throw value (2)");
+      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw value thisValue");
 
       assert.sameValue(log[10].name, "after yield*");
       assert.sameValue(log[10].value, "throw-value-2");
diff --git a/test/language/expressions/class/async-gen-method-static-yield-star-sync-next.js b/test/language/expressions/class/async-gen-method-static-yield-star-sync-next.js
index ca93f9f57d..0bd18e9d25 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-star-sync-next.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-star-sync-next.js
@@ -192,11 +192,11 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log[5].args.length, 1, "next args.length");
   assert.sameValue(log[5].args[0], undefined, "next args[0]");
 
-  assert.sameValue(log[6].name, "get next value (1)");
-  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next value thisValue");
+  assert.sameValue(log[6].name, "get next done (1)");
+  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next done thisValue");
 
-  assert.sameValue(log[7].name, "get next done (1)");
-  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next done thisValue");
+  assert.sameValue(log[7].name, "get next value (1)");
+  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next value thisValue");
 
   assert.sameValue(v.value, "next-value-1");
   assert.sameValue(v.done, false);
@@ -212,11 +212,11 @@ iter.next("next-arg-1").then(v => {
     assert.sameValue(log[9].args.length, 1, "next args.length");
     assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[10].name, "get next value (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
+    assert.sameValue(log[10].name, "get next done (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[11].name, "get next done (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[11].name, "get next value (2)");
+    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
 
     assert.sameValue(log[12].name, "after yield*");
     assert.sameValue(log[12].value, "next-value-2");
diff --git a/test/language/expressions/class/async-gen-method-static-yield-star-sync-return.js b/test/language/expressions/class/async-gen-method-static-yield-star-sync-return.js
index 26377124ac..194a905477 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-star-sync-return.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-star-sync-return.js
@@ -166,11 +166,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "return args.length");
     assert.sameValue(log[3].args[0], "return-arg-1", "return args[0]");
 
-    assert.sameValue(log[4].name, "get return value (1)");
-    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return value thisValue");
+    assert.sameValue(log[4].name, "get return done (1)");
+    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return done thisValue");
 
-    assert.sameValue(log[5].name, "get return done (1)");
-    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return done thisValue");
+    assert.sameValue(log[5].name, "get return value (1)");
+    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return value thisValue");
 
     assert.sameValue(v.value, "return-value-1");
     assert.sameValue(v.done, false);
@@ -186,11 +186,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "return args.length");
       assert.sameValue(log[7].args[0], "return-arg-2", "return args[0]");
 
-      assert.sameValue(log[8].name, "get return value (2)");
-      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return value thisValue");
+      assert.sameValue(log[8].name, "get return done (2)");
+      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return done thisValue");
 
-      assert.sameValue(log[9].name, "get return done (2)");
-      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return done thisValue");
+      assert.sameValue(log[9].name, "get return value (2)");
+      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return value thisValue");
 
       assert.sameValue(v.value, "return-value-2");
       assert.sameValue(v.done, true);
diff --git a/test/language/expressions/class/async-gen-method-static-yield-star-sync-throw.js b/test/language/expressions/class/async-gen-method-static-yield-star-sync-throw.js
index 156e2ef859..ff2ffb9394 100644
--- a/test/language/expressions/class/async-gen-method-static-yield-star-sync-throw.js
+++ b/test/language/expressions/class/async-gen-method-static-yield-star-sync-throw.js
@@ -169,11 +169,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "throw args.length");
     assert.sameValue(log[3].args[0], "throw-arg-1", "throw args[0]");
 
-    assert.sameValue(log[4].name, "get throw value (1)");
-    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw value thisValue");
+    assert.sameValue(log[4].name, "get throw done (1)");
+    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw done thisValue");
 
-    assert.sameValue(log[5].name, "get throw done (1)");
-    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw done thisValue");
+    assert.sameValue(log[5].name, "get throw value (1)");
+    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw value thisValue");
 
     assert.sameValue(v.value, "throw-value-1");
     assert.sameValue(v.done, false);
@@ -189,11 +189,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "throw args.length");
       assert.sameValue(log[7].args[0], "throw-arg-2", "throw args[0]");
 
-      assert.sameValue(log[8].name, "get throw value (2)");
-      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw value thisValue");
+      assert.sameValue(log[8].name, "get throw done (2)");
+      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw done thisValue");
 
-      assert.sameValue(log[9].name, "get throw done (2)");
-      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw done thisValue");
+      assert.sameValue(log[9].name, "get throw value (2)");
+      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw value thisValue");
 
       assert.sameValue(log[10].name, "after yield*");
       assert.sameValue(log[10].value, "throw-value-2");
diff --git a/test/language/expressions/class/async-gen-method-yield-star-sync-next.js b/test/language/expressions/class/async-gen-method-yield-star-sync-next.js
index 7034de91f4..c92b516d94 100644
--- a/test/language/expressions/class/async-gen-method-yield-star-sync-next.js
+++ b/test/language/expressions/class/async-gen-method-yield-star-sync-next.js
@@ -192,11 +192,11 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log[5].args.length, 1, "next args.length");
   assert.sameValue(log[5].args[0], undefined, "next args[0]");
 
-  assert.sameValue(log[6].name, "get next value (1)");
-  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next value thisValue");
+  assert.sameValue(log[6].name, "get next done (1)");
+  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next done thisValue");
 
-  assert.sameValue(log[7].name, "get next done (1)");
-  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next done thisValue");
+  assert.sameValue(log[7].name, "get next value (1)");
+  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next value thisValue");
 
   assert.sameValue(v.value, "next-value-1");
   assert.sameValue(v.done, false);
@@ -212,11 +212,11 @@ iter.next("next-arg-1").then(v => {
     assert.sameValue(log[9].args.length, 1, "next args.length");
     assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[10].name, "get next value (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
+    assert.sameValue(log[10].name, "get next done (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[11].name, "get next done (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[11].name, "get next value (2)");
+    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
 
     assert.sameValue(log[12].name, "after yield*");
     assert.sameValue(log[12].value, "next-value-2");
diff --git a/test/language/expressions/class/async-gen-method-yield-star-sync-return.js b/test/language/expressions/class/async-gen-method-yield-star-sync-return.js
index 97c7c97a85..fa9dcb2cc1 100644
--- a/test/language/expressions/class/async-gen-method-yield-star-sync-return.js
+++ b/test/language/expressions/class/async-gen-method-yield-star-sync-return.js
@@ -166,11 +166,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "return args.length");
     assert.sameValue(log[3].args[0], "return-arg-1", "return args[0]");
 
-    assert.sameValue(log[4].name, "get return value (1)");
-    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return value thisValue");
+    assert.sameValue(log[4].name, "get return done (1)");
+    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return done thisValue");
 
-    assert.sameValue(log[5].name, "get return done (1)");
-    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return done thisValue");
+    assert.sameValue(log[5].name, "get return value (1)");
+    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return value thisValue");
 
     assert.sameValue(v.value, "return-value-1");
     assert.sameValue(v.done, false);
@@ -186,11 +186,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "return args.length");
       assert.sameValue(log[7].args[0], "return-arg-2", "return args[0]");
 
-      assert.sameValue(log[8].name, "get return value (2)");
-      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return value thisValue");
+      assert.sameValue(log[8].name, "get return done (2)");
+      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return done thisValue");
 
-      assert.sameValue(log[9].name, "get return done (2)");
-      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return done thisValue");
+      assert.sameValue(log[9].name, "get return value (2)");
+      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return value thisValue");
 
       assert.sameValue(v.value, "return-value-2");
       assert.sameValue(v.done, true);
diff --git a/test/language/expressions/class/async-gen-method-yield-star-sync-throw.js b/test/language/expressions/class/async-gen-method-yield-star-sync-throw.js
index ed940823b5..cbfe52bf02 100644
--- a/test/language/expressions/class/async-gen-method-yield-star-sync-throw.js
+++ b/test/language/expressions/class/async-gen-method-yield-star-sync-throw.js
@@ -169,11 +169,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "throw args.length");
     assert.sameValue(log[3].args[0], "throw-arg-1", "throw args[0]");
 
-    assert.sameValue(log[4].name, "get throw value (1)");
-    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw value thisValue");
+    assert.sameValue(log[4].name, "get throw done (1)");
+    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw done thisValue");
 
-    assert.sameValue(log[5].name, "get throw done (1)");
-    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw done thisValue");
+    assert.sameValue(log[5].name, "get throw value (1)");
+    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw value thisValue");
 
     assert.sameValue(v.value, "throw-value-1");
     assert.sameValue(v.done, false);
@@ -189,11 +189,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "throw args.length");
       assert.sameValue(log[7].args[0], "throw-arg-2", "throw args[0]");
 
-      assert.sameValue(log[8].name, "get throw value (2)");
-      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw value thisValue");
+      assert.sameValue(log[8].name, "get throw done (2)");
+      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw done thisValue");
 
-      assert.sameValue(log[9].name, "get throw done (2)");
-      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw done thisValue");
+      assert.sameValue(log[9].name, "get throw value (2)");
+      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw value thisValue");
 
       assert.sameValue(log[10].name, "after yield*");
       assert.sameValue(log[10].value, "throw-value-2");
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-star-sync-next.js b/test/language/expressions/object/method-definition/async-gen-yield-star-sync-next.js
index c83ffa16ef..bfe40e16ca 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-star-sync-next.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-star-sync-next.js
@@ -185,11 +185,11 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log[5].args.length, 1, "next args.length");
   assert.sameValue(log[5].args[0], undefined, "next args[0]");
 
-  assert.sameValue(log[6].name, "get next value (1)");
-  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next value thisValue");
+  assert.sameValue(log[6].name, "get next done (1)");
+  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next done thisValue");
 
-  assert.sameValue(log[7].name, "get next done (1)");
-  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next done thisValue");
+  assert.sameValue(log[7].name, "get next value (1)");
+  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next value thisValue");
 
   assert.sameValue(v.value, "next-value-1");
   assert.sameValue(v.done, false);
@@ -205,11 +205,11 @@ iter.next("next-arg-1").then(v => {
     assert.sameValue(log[9].args.length, 1, "next args.length");
     assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[10].name, "get next value (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
+    assert.sameValue(log[10].name, "get next done (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[11].name, "get next done (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[11].name, "get next value (2)");
+    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
 
     assert.sameValue(log[12].name, "after yield*");
     assert.sameValue(log[12].value, "next-value-2");
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-star-sync-return.js b/test/language/expressions/object/method-definition/async-gen-yield-star-sync-return.js
index 7f07943b5d..8575cf8ce8 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-star-sync-return.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-star-sync-return.js
@@ -159,11 +159,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "return args.length");
     assert.sameValue(log[3].args[0], "return-arg-1", "return args[0]");
 
-    assert.sameValue(log[4].name, "get return value (1)");
-    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return value thisValue");
+    assert.sameValue(log[4].name, "get return done (1)");
+    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return done thisValue");
 
-    assert.sameValue(log[5].name, "get return done (1)");
-    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return done thisValue");
+    assert.sameValue(log[5].name, "get return value (1)");
+    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return value thisValue");
 
     assert.sameValue(v.value, "return-value-1");
     assert.sameValue(v.done, false);
@@ -179,11 +179,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "return args.length");
       assert.sameValue(log[7].args[0], "return-arg-2", "return args[0]");
 
-      assert.sameValue(log[8].name, "get return value (2)");
-      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return value thisValue");
+      assert.sameValue(log[8].name, "get return done (2)");
+      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return done thisValue");
 
-      assert.sameValue(log[9].name, "get return done (2)");
-      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return done thisValue");
+      assert.sameValue(log[9].name, "get return value (2)");
+      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return value thisValue");
 
       assert.sameValue(v.value, "return-value-2");
       assert.sameValue(v.done, true);
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-star-sync-throw.js b/test/language/expressions/object/method-definition/async-gen-yield-star-sync-throw.js
index cf0d11135d..2f9038b54e 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-star-sync-throw.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-star-sync-throw.js
@@ -162,11 +162,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "throw args.length");
     assert.sameValue(log[3].args[0], "throw-arg-1", "throw args[0]");
 
-    assert.sameValue(log[4].name, "get throw value (1)");
-    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw value thisValue");
+    assert.sameValue(log[4].name, "get throw done (1)");
+    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw done thisValue");
 
-    assert.sameValue(log[5].name, "get throw done (1)");
-    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw done thisValue");
+    assert.sameValue(log[5].name, "get throw value (1)");
+    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw value thisValue");
 
     assert.sameValue(v.value, "throw-value-1");
     assert.sameValue(v.done, false);
@@ -182,11 +182,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "throw args.length");
       assert.sameValue(log[7].args[0], "throw-arg-2", "throw args[0]");
 
-      assert.sameValue(log[8].name, "get throw value (2)");
-      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw value thisValue");
+      assert.sameValue(log[8].name, "get throw done (2)");
+      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw done thisValue");
 
-      assert.sameValue(log[9].name, "get throw done (2)");
-      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw done thisValue");
+      assert.sameValue(log[9].name, "get throw value (2)");
+      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw value thisValue");
 
       assert.sameValue(log[10].name, "after yield*");
       assert.sameValue(log[10].value, "throw-value-2");
diff --git a/test/language/statements/async-generator/yield-star-sync-next.js b/test/language/statements/async-generator/yield-star-sync-next.js
index bf68fe614d..d9652b476d 100644
--- a/test/language/statements/async-generator/yield-star-sync-next.js
+++ b/test/language/statements/async-generator/yield-star-sync-next.js
@@ -185,11 +185,11 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log[5].args.length, 1, "next args.length");
   assert.sameValue(log[5].args[0], undefined, "next args[0]");
 
-  assert.sameValue(log[6].name, "get next value (1)");
-  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next value thisValue");
+  assert.sameValue(log[6].name, "get next done (1)");
+  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next done thisValue");
 
-  assert.sameValue(log[7].name, "get next done (1)");
-  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next done thisValue");
+  assert.sameValue(log[7].name, "get next value (1)");
+  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next value thisValue");
 
   assert.sameValue(v.value, "next-value-1");
   assert.sameValue(v.done, false);
@@ -205,11 +205,11 @@ iter.next("next-arg-1").then(v => {
     assert.sameValue(log[9].args.length, 1, "next args.length");
     assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[10].name, "get next value (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
+    assert.sameValue(log[10].name, "get next done (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[11].name, "get next done (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[11].name, "get next value (2)");
+    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
 
     assert.sameValue(log[12].name, "after yield*");
     assert.sameValue(log[12].value, "next-value-2");
diff --git a/test/language/statements/async-generator/yield-star-sync-return.js b/test/language/statements/async-generator/yield-star-sync-return.js
index a627e8fda7..013a3d0b66 100644
--- a/test/language/statements/async-generator/yield-star-sync-return.js
+++ b/test/language/statements/async-generator/yield-star-sync-return.js
@@ -159,11 +159,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "return args.length");
     assert.sameValue(log[3].args[0], "return-arg-1", "return args[0]");
 
-    assert.sameValue(log[4].name, "get return value (1)");
-    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return value thisValue");
+    assert.sameValue(log[4].name, "get return done (1)");
+    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return done thisValue");
 
-    assert.sameValue(log[5].name, "get return done (1)");
-    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return done thisValue");
+    assert.sameValue(log[5].name, "get return value (1)");
+    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return value thisValue");
 
     assert.sameValue(v.value, "return-value-1");
     assert.sameValue(v.done, false);
@@ -179,11 +179,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "return args.length");
       assert.sameValue(log[7].args[0], "return-arg-2", "return args[0]");
 
-      assert.sameValue(log[8].name, "get return value (2)");
-      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return value thisValue");
+      assert.sameValue(log[8].name, "get return done (2)");
+      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return done thisValue");
 
-      assert.sameValue(log[9].name, "get return done (2)");
-      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return done thisValue");
+      assert.sameValue(log[9].name, "get return value (2)");
+      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return value thisValue");
 
       assert.sameValue(v.value, "return-value-2");
       assert.sameValue(v.done, true);
diff --git a/test/language/statements/async-generator/yield-star-sync-throw.js b/test/language/statements/async-generator/yield-star-sync-throw.js
index 9c5e0b8d8b..7e343e745c 100644
--- a/test/language/statements/async-generator/yield-star-sync-throw.js
+++ b/test/language/statements/async-generator/yield-star-sync-throw.js
@@ -162,11 +162,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "throw args.length");
     assert.sameValue(log[3].args[0], "throw-arg-1", "throw args[0]");
 
-    assert.sameValue(log[4].name, "get throw value (1)");
-    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw value thisValue");
+    assert.sameValue(log[4].name, "get throw done (1)");
+    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw done thisValue");
 
-    assert.sameValue(log[5].name, "get throw done (1)");
-    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw done thisValue");
+    assert.sameValue(log[5].name, "get throw value (1)");
+    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw value thisValue");
 
     assert.sameValue(v.value, "throw-value-1");
     assert.sameValue(v.done, false);
@@ -182,11 +182,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "throw args.length");
       assert.sameValue(log[7].args[0], "throw-arg-2", "throw args[0]");
 
-      assert.sameValue(log[8].name, "get throw value (2)");
-      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw value thisValue");
+      assert.sameValue(log[8].name, "get throw done (2)");
+      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw done thisValue");
 
-      assert.sameValue(log[9].name, "get throw done (2)");
-      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw done thisValue");
+      assert.sameValue(log[9].name, "get throw value (2)");
+      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw value thisValue");
 
       assert.sameValue(log[10].name, "after yield*");
       assert.sameValue(log[10].value, "throw-value-2");
diff --git a/test/language/statements/class/async-gen-method-static-yield-star-sync-next.js b/test/language/statements/class/async-gen-method-static-yield-star-sync-next.js
index 408fbc79b6..46de363772 100644
--- a/test/language/statements/class/async-gen-method-static-yield-star-sync-next.js
+++ b/test/language/statements/class/async-gen-method-static-yield-star-sync-next.js
@@ -192,11 +192,11 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log[5].args.length, 1, "next args.length");
   assert.sameValue(log[5].args[0], undefined, "next args[0]");
 
-  assert.sameValue(log[6].name, "get next value (1)");
-  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next value thisValue");
+  assert.sameValue(log[6].name, "get next done (1)");
+  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next done thisValue");
 
-  assert.sameValue(log[7].name, "get next done (1)");
-  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next done thisValue");
+  assert.sameValue(log[7].name, "get next value (1)");
+  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next value thisValue");
 
   assert.sameValue(v.value, "next-value-1");
   assert.sameValue(v.done, false);
@@ -212,11 +212,11 @@ iter.next("next-arg-1").then(v => {
     assert.sameValue(log[9].args.length, 1, "next args.length");
     assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[10].name, "get next value (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
+    assert.sameValue(log[10].name, "get next done (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[11].name, "get next done (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[11].name, "get next value (2)");
+    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
 
     assert.sameValue(log[12].name, "after yield*");
     assert.sameValue(log[12].value, "next-value-2");
diff --git a/test/language/statements/class/async-gen-method-static-yield-star-sync-return.js b/test/language/statements/class/async-gen-method-static-yield-star-sync-return.js
index e4b46aae32..ee5e953502 100644
--- a/test/language/statements/class/async-gen-method-static-yield-star-sync-return.js
+++ b/test/language/statements/class/async-gen-method-static-yield-star-sync-return.js
@@ -166,11 +166,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "return args.length");
     assert.sameValue(log[3].args[0], "return-arg-1", "return args[0]");
 
-    assert.sameValue(log[4].name, "get return value (1)");
-    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return value thisValue");
+    assert.sameValue(log[4].name, "get return done (1)");
+    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return done thisValue");
 
-    assert.sameValue(log[5].name, "get return done (1)");
-    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return done thisValue");
+    assert.sameValue(log[5].name, "get return value (1)");
+    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return value thisValue");
 
     assert.sameValue(v.value, "return-value-1");
     assert.sameValue(v.done, false);
@@ -186,11 +186,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "return args.length");
       assert.sameValue(log[7].args[0], "return-arg-2", "return args[0]");
 
-      assert.sameValue(log[8].name, "get return value (2)");
-      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return value thisValue");
+      assert.sameValue(log[8].name, "get return done (2)");
+      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return done thisValue");
 
-      assert.sameValue(log[9].name, "get return done (2)");
-      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return done thisValue");
+      assert.sameValue(log[9].name, "get return value (2)");
+      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return value thisValue");
 
       assert.sameValue(v.value, "return-value-2");
       assert.sameValue(v.done, true);
diff --git a/test/language/statements/class/async-gen-method-static-yield-star-sync-throw.js b/test/language/statements/class/async-gen-method-static-yield-star-sync-throw.js
index 3c265f5aec..6fbc8d0e9e 100644
--- a/test/language/statements/class/async-gen-method-static-yield-star-sync-throw.js
+++ b/test/language/statements/class/async-gen-method-static-yield-star-sync-throw.js
@@ -169,11 +169,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "throw args.length");
     assert.sameValue(log[3].args[0], "throw-arg-1", "throw args[0]");
 
-    assert.sameValue(log[4].name, "get throw value (1)");
-    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw value thisValue");
+    assert.sameValue(log[4].name, "get throw done (1)");
+    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw done thisValue");
 
-    assert.sameValue(log[5].name, "get throw done (1)");
-    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw done thisValue");
+    assert.sameValue(log[5].name, "get throw value (1)");
+    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw value thisValue");
 
     assert.sameValue(v.value, "throw-value-1");
     assert.sameValue(v.done, false);
@@ -189,11 +189,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "throw args.length");
       assert.sameValue(log[7].args[0], "throw-arg-2", "throw args[0]");
 
-      assert.sameValue(log[8].name, "get throw value (2)");
-      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw value thisValue");
+      assert.sameValue(log[8].name, "get throw done (2)");
+      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw done thisValue");
 
-      assert.sameValue(log[9].name, "get throw done (2)");
-      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw done thisValue");
+      assert.sameValue(log[9].name, "get throw value (2)");
+      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw value thisValue");
 
       assert.sameValue(log[10].name, "after yield*");
       assert.sameValue(log[10].value, "throw-value-2");
diff --git a/test/language/statements/class/async-gen-method-yield-star-sync-next.js b/test/language/statements/class/async-gen-method-yield-star-sync-next.js
index 3d139fb47c..88998e86f5 100644
--- a/test/language/statements/class/async-gen-method-yield-star-sync-next.js
+++ b/test/language/statements/class/async-gen-method-yield-star-sync-next.js
@@ -192,11 +192,11 @@ iter.next("next-arg-1").then(v => {
   assert.sameValue(log[5].args.length, 1, "next args.length");
   assert.sameValue(log[5].args[0], undefined, "next args[0]");
 
-  assert.sameValue(log[6].name, "get next value (1)");
-  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next value thisValue");
+  assert.sameValue(log[6].name, "get next done (1)");
+  assert.sameValue(log[6].thisValue.name, "next-result-1", "get next done thisValue");
 
-  assert.sameValue(log[7].name, "get next done (1)");
-  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next done thisValue");
+  assert.sameValue(log[7].name, "get next value (1)");
+  assert.sameValue(log[7].thisValue.name, "next-result-1", "get next value thisValue");
 
   assert.sameValue(v.value, "next-value-1");
   assert.sameValue(v.done, false);
@@ -212,11 +212,11 @@ iter.next("next-arg-1").then(v => {
     assert.sameValue(log[9].args.length, 1, "next args.length");
     assert.sameValue(log[9].args[0], "next-arg-2", "next args[0]");
 
-    assert.sameValue(log[10].name, "get next value (2)");
-    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next value thisValue");
+    assert.sameValue(log[10].name, "get next done (2)");
+    assert.sameValue(log[10].thisValue.name, "next-result-2", "get next done thisValue");
 
-    assert.sameValue(log[11].name, "get next done (2)");
-    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next done thisValue");
+    assert.sameValue(log[11].name, "get next value (2)");
+    assert.sameValue(log[11].thisValue.name, "next-result-2", "get next value thisValue");
 
     assert.sameValue(log[12].name, "after yield*");
     assert.sameValue(log[12].value, "next-value-2");
diff --git a/test/language/statements/class/async-gen-method-yield-star-sync-return.js b/test/language/statements/class/async-gen-method-yield-star-sync-return.js
index 790ab29223..278d79a931 100644
--- a/test/language/statements/class/async-gen-method-yield-star-sync-return.js
+++ b/test/language/statements/class/async-gen-method-yield-star-sync-return.js
@@ -166,11 +166,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "return args.length");
     assert.sameValue(log[3].args[0], "return-arg-1", "return args[0]");
 
-    assert.sameValue(log[4].name, "get return value (1)");
-    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return value thisValue");
+    assert.sameValue(log[4].name, "get return done (1)");
+    assert.sameValue(log[4].thisValue.name, "return-result-1", "get return done thisValue");
 
-    assert.sameValue(log[5].name, "get return done (1)");
-    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return done thisValue");
+    assert.sameValue(log[5].name, "get return value (1)");
+    assert.sameValue(log[5].thisValue.name, "return-result-1", "get return value thisValue");
 
     assert.sameValue(v.value, "return-value-1");
     assert.sameValue(v.done, false);
@@ -186,11 +186,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "return args.length");
       assert.sameValue(log[7].args[0], "return-arg-2", "return args[0]");
 
-      assert.sameValue(log[8].name, "get return value (2)");
-      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return value thisValue");
+      assert.sameValue(log[8].name, "get return done (2)");
+      assert.sameValue(log[8].thisValue.name, "return-result-2", "get return done thisValue");
 
-      assert.sameValue(log[9].name, "get return done (2)");
-      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return done thisValue");
+      assert.sameValue(log[9].name, "get return value (2)");
+      assert.sameValue(log[9].thisValue.name, "return-result-2", "get return value thisValue");
 
       assert.sameValue(v.value, "return-value-2");
       assert.sameValue(v.done, true);
diff --git a/test/language/statements/class/async-gen-method-yield-star-sync-throw.js b/test/language/statements/class/async-gen-method-yield-star-sync-throw.js
index 75dc626762..28e612637f 100644
--- a/test/language/statements/class/async-gen-method-yield-star-sync-throw.js
+++ b/test/language/statements/class/async-gen-method-yield-star-sync-throw.js
@@ -169,11 +169,11 @@ iter.next().then(v => {
     assert.sameValue(log[3].args.length, 1, "throw args.length");
     assert.sameValue(log[3].args[0], "throw-arg-1", "throw args[0]");
 
-    assert.sameValue(log[4].name, "get throw value (1)");
-    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw value thisValue");
+    assert.sameValue(log[4].name, "get throw done (1)");
+    assert.sameValue(log[4].thisValue.name, "throw-result-1", "get throw done thisValue");
 
-    assert.sameValue(log[5].name, "get throw done (1)");
-    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw done thisValue");
+    assert.sameValue(log[5].name, "get throw value (1)");
+    assert.sameValue(log[5].thisValue.name, "throw-result-1", "get throw value thisValue");
 
     assert.sameValue(v.value, "throw-value-1");
     assert.sameValue(v.done, false);
@@ -189,11 +189,11 @@ iter.next().then(v => {
       assert.sameValue(log[7].args.length, 1, "throw args.length");
       assert.sameValue(log[7].args[0], "throw-arg-2", "throw args[0]");
 
-      assert.sameValue(log[8].name, "get throw value (2)");
-      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw value thisValue");
+      assert.sameValue(log[8].name, "get throw done (2)");
+      assert.sameValue(log[8].thisValue.name, "throw-result-2", "get throw done thisValue");
 
-      assert.sameValue(log[9].name, "get throw done (2)");
-      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw done thisValue");
+      assert.sameValue(log[9].name, "get throw value (2)");
+      assert.sameValue(log[9].thisValue.name, "throw-result-2", "get throw value thisValue");
 
       assert.sameValue(log[10].name, "after yield*");
       assert.sameValue(log[10].value, "throw-value-2");