diff --git a/src/async-generators/yield-star-sync-next.case b/src/async-generators/yield-star-sync-next.case
index 7f69790e0706d237a216b60def8a9fa7a05c2983..b75f882d03f73a2555a9adc21bca233353cc1ec3 100644
--- a/src/async-generators/yield-star-sync-next.case
+++ b/src/async-generators/yield-star-sync-next.case
@@ -172,11 +172,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);
@@ -192,11 +192,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/src/async-generators/yield-star-sync-return.case b/src/async-generators/yield-star-sync-return.case
index 8566d0e123c483d35cbd29a99336d29f06173d15..3153987158fe8f249e08967db0f517bfca3a5da0 100644
--- a/src/async-generators/yield-star-sync-return.case
+++ b/src/async-generators/yield-star-sync-return.case
@@ -146,11 +146,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);
@@ -166,11 +166,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/src/async-generators/yield-star-sync-throw.case b/src/async-generators/yield-star-sync-throw.case
index fd1d49651fec2e39d175422dd0b4879e32825418..903a2daeafd1e2d96a3a105a2e0ecba4468aa52d 100644
--- a/src/async-generators/yield-star-sync-throw.case
+++ b/src/async-generators/yield-star-sync-throw.case
@@ -149,11 +149,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);
@@ -169,11 +169,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/named-yield-star-sync-next.js b/test/language/expressions/async-generator/named-yield-star-sync-next.js
index 89635bd15fc8c9af958a5055c0818612cf03e535..277dfc962d7b91e7b3e159d4f22b95301cd3bab1 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 77479612f8308d63dcc5085a90900fe37a22befc..890d88e67568a39ba3846e1c7f60b524002f0020 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 e923a604c9f79830f57426c14fa7819456c7b0f5..65c6c29d1af48b5089389640d3b4809ab53bfcd7 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 cd170c93fac7774685a74989c4b2455a9da75099..dc6d2e637bd7bb8c28c9afc8c30401c918be8e1a 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 5d081b1b664a2e086f1ec7855cac2ba09b7aa7ce..9e5a3cf92c084a6474d9a7b3913fe71b575881ee 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 b0d8e0015bd56a71bb77517abdffe4993ae8d65f..aaafd376e3073ad663e291018fea16b2d1942600 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 ca93f9f57d0c40db79d8abcedf9becc1ca519c31..0bd18e9d255c12ea7fb4b8678eb514723697b1b4 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 26377124acc09d145c6aa5472637242c61302071..194a905477851c8fbef6bade951011a0f599881a 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 156e2ef8594b52f6e80df3812f350a11e1c39a45..ff2ffb939452f20157becb888a4093cc7b5d1049 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 7034de91f4a6e030040ef7d99ab486c7420779e4..c92b516d9499e88fb812200b11e0bc38c9797412 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 97c7c97a85a3598ef90cac244478bd081b61f885..fa9dcb2cc1ec7c4704d5d7a9eba2a69f2b9887c3 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 ed940823b5bd663f84a689ebc29469c48245bd49..cbfe52bf02945d4114eb715173dd4a9fdf9e4ca1 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 c83ffa16efb673355c08da13c5a2cee1a704480d..bfe40e16cab9db4fcdcb07cc7e53c5e74a2cceba 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 7f07943b5dd7aa9676104657a6fad2835873b466..8575cf8ce85d14f61af84f16cdd1021d6117c1d8 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 cf0d11135d123449ccfff9b09ddff95225172526..2f9038b54eb49195fce185829edbc199aee08207 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 bf68fe614db7954cf19dd21e3c41ce35bb0cb012..d9652b476d7ebc8b2f1689d714e132d244e94239 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 a627e8fda7e9e8c3e82219c5d4854e2a867f94bc..013a3d0b66b03b9d5ec39dbf36e08937e683b542 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 9c5e0b8d8b08bc33b98b0b66c8897eaaf7dffffc..7e343e745c29d2fbece66f2240cdd2c2588ad5b1 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 408fbc79b6d881126cac760abc5d0477e82fc7ba..46de363772df3e2433cdf614cdfcc8312281e3a5 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 e4b46aae32ac37134f62752b22810478f1e3d95a..ee5e953502a373e9428498d1588cb4921c6b307d 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 3c265f5aecddaad6ed1b852e478fb73d8443633b..6fbc8d0e9e8a4110f7a06eafa1c523b9b60ff289 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 3d139fb47caed782ff6f9f554ff1a7e0658e14c3..88998e86f55caab62f460adbf4e6581dd2f8ee1a 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 790ab292236082088be81e7f0a0895d38599a4ba..278d79a9312c08f3769942401d80844504499e9f 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 75dc626762bf14dd45bba471dea906035d483a51..28e612637f875fed580dd6f3fa8659f0c099373d 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");