diff --git a/src/dynamic-import/empty-args-early-error.case b/src/dynamic-import/empty-args-early-error.case
index 1d10aed93171224d2a96c8edc47cd246bdf2379c..20f6ffc490c8b8247dd2b1dbe9ca7621425c023d 100644
--- a/src/dynamic-import/empty-args-early-error.case
+++ b/src/dynamic-import/empty-args-early-error.case
@@ -9,7 +9,7 @@ info: |
       import()
 
 ---*/
-//- params
-
+//- import
+import()
 //- teardown
 /* The params region intentionally empty */
diff --git a/src/dynamic-import/empty-str-arg.case b/src/dynamic-import/empty-str-arg.case
index 0a83fe4979e3949244f00b602c6383c49985115a..4f88699afbd0c27dce690cd30cd4b993177c29f4 100644
--- a/src/dynamic-import/empty-str-arg.case
+++ b/src/dynamic-import/empty-str-arg.case
@@ -6,5 +6,5 @@ desc: Calling import('')
 template: syntax/valid
 ---*/
 
-//- params
-''
+//- import
+import('')
diff --git a/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template b/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
index d7ba06d126d4e91049ab1d162272555d2ecd0467..98ee16f6a1c89cd50bfe0f2040e04c876bd178d2 100644
--- a/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
+++ b/src/dynamic-import/syntax/invalid/nested-arrow-assignment-expression.template
@@ -28,4 +28,4 @@ negative:
 
 throw "Test262: This statement should not be evaluated.";
 
-let f = () => import(/*{ params }*/);
+let f = () => /*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-arrow.template b/src/dynamic-import/syntax/invalid/nested-arrow.template
index 87d81473acd432f0799501d05be8df1d85964854..5a50736bae763a2b1b30289b7c1b68a6949d22d6 100644
--- a/src/dynamic-import/syntax/invalid/nested-arrow.template
+++ b/src/dynamic-import/syntax/invalid/nested-arrow.template
@@ -29,5 +29,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 let f = () => {
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/invalid/nested-async-function-await.template b/src/dynamic-import/syntax/invalid/nested-async-function-await.template
index 36cf95be9773703f48fc5e07e2e654e0b1499d78..fb149cfabe6a01662134f265099a16c326cdae8f 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-function-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-function-await.template
@@ -29,5 +29,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 async function f() {
-  await import(/*{ params }*/);
+  await /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template b/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template
index 6d3c320b6fc61050c647fa7b8cc8c4bc50d2b271..ebcd0f8205eb661d0489c59038e53e946d2d15df 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-function-return-await.template
@@ -29,6 +29,6 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 async function f() {
-  return await import(/*{ params }*/);
+  return await /*{ import }*/;
 }
 
diff --git a/src/dynamic-import/syntax/invalid/nested-async-function.template b/src/dynamic-import/syntax/invalid/nested-async-function.template
index 30cff1cd0b32b0f945dc984e376187f244611fca..0ade145ee2b9fe667756fe8a4c2060579d5d8cd9 100644
--- a/src/dynamic-import/syntax/invalid/nested-async-function.template
+++ b/src/dynamic-import/syntax/invalid/nested-async-function.template
@@ -29,6 +29,6 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 async function f() {
-  import(/*{ params }*/);
+  /*{ import }*/;
 }
 
diff --git a/src/dynamic-import/syntax/invalid/nested-block-labeled.template b/src/dynamic-import/syntax/invalid/nested-block-labeled.template
index e4f3060026cb511c6d2f42245419cd76bc5d591b..2c37acf00882df555a819ec3971bbac7b8759101 100644
--- a/src/dynamic-import/syntax/invalid/nested-block-labeled.template
+++ b/src/dynamic-import/syntax/invalid/nested-block-labeled.template
@@ -29,5 +29,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 label: {
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/invalid/nested-block.template b/src/dynamic-import/syntax/invalid/nested-block.template
index 402289a11aae1582ee5182149f295af82cbbfb72..d569536bb9b182f364db6140b6e0b82e310f762e 100644
--- a/src/dynamic-import/syntax/invalid/nested-block.template
+++ b/src/dynamic-import/syntax/invalid/nested-block.template
@@ -29,5 +29,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 {
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/invalid/nested-do-while.template b/src/dynamic-import/syntax/invalid/nested-do-while.template
index 2e4e386913a3de03315a916580ab8f1d79419cac..bf86ff049990a910e50c8c385b4695dbe839cae9 100644
--- a/src/dynamic-import/syntax/invalid/nested-do-while.template
+++ b/src/dynamic-import/syntax/invalid/nested-do-while.template
@@ -29,5 +29,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 do {
-  import(/*{ params }*/);
+  /*{ import }*/;
 } while (false);
diff --git a/src/dynamic-import/syntax/invalid/nested-do.template b/src/dynamic-import/syntax/invalid/nested-do.template
index 0b02887b2179a2618f39cb7fe69d9f73a406a8bd..b308638e802889e439382c69e0442c4bd78628d1 100644
--- a/src/dynamic-import/syntax/invalid/nested-do.template
+++ b/src/dynamic-import/syntax/invalid/nested-do.template
@@ -31,5 +31,5 @@ throw "Test262: This statement should not be evaluated.";
 let x = 0;
 do {
   x++;
-  import(/*{ params }*/);
+  /*{ import }*/;
 } while (!x);
diff --git a/src/dynamic-import/syntax/invalid/nested-else-braceless.template b/src/dynamic-import/syntax/invalid/nested-else-braceless.template
index 71ee8417d3ee114edf4dace0f234fce0c04e86fc..61989c9b593a7df1a19766f4166bc257ffadc919 100644
--- a/src/dynamic-import/syntax/invalid/nested-else-braceless.template
+++ b/src/dynamic-import/syntax/invalid/nested-else-braceless.template
@@ -30,4 +30,4 @@ throw "Test262: This statement should not be evaluated.";
 
 if (false) {
 
-} else import(/*{ params }*/);
+} else /*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-else.template b/src/dynamic-import/syntax/invalid/nested-else.template
index 09f8144185d70bec5cf13c549ce3b6058ee0b9ab..14017d2c5e1a3771b8625d563a0fe4f8262193e6 100644
--- a/src/dynamic-import/syntax/invalid/nested-else.template
+++ b/src/dynamic-import/syntax/invalid/nested-else.template
@@ -31,5 +31,5 @@ throw "Test262: This statement should not be evaluated.";
 if (false) {
 
 } else {
-  import(/*{ params }*/);
+  /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/invalid/nested-function-return.template b/src/dynamic-import/syntax/invalid/nested-function-return.template
index 855b080e11cfe179c3a77970781747ba0856bda1..1590943656cdf40e32c8816de85f3b77d416a6c1 100644
--- a/src/dynamic-import/syntax/invalid/nested-function-return.template
+++ b/src/dynamic-import/syntax/invalid/nested-function-return.template
@@ -29,5 +29,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 function fn() {
-  return import(/*{ params }*/);
+  return /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/invalid/nested-function.template b/src/dynamic-import/syntax/invalid/nested-function.template
index 595ef5f31c64f2259ce3637b89d7869e9a04e715..e81ddf9c9aa66d8f9967bcab9f39f7e738a05d9c 100644
--- a/src/dynamic-import/syntax/invalid/nested-function.template
+++ b/src/dynamic-import/syntax/invalid/nested-function.template
@@ -29,5 +29,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 function fn() {
-  import(/*{ params }*/);
+  /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/invalid/nested-if-braceless.template b/src/dynamic-import/syntax/invalid/nested-if-braceless.template
index 5855636f365a99b676542a68fd5158c1be7c77da..7f51cb411b9cb75a27d811ad2d6444aef1366443 100644
--- a/src/dynamic-import/syntax/invalid/nested-if-braceless.template
+++ b/src/dynamic-import/syntax/invalid/nested-if-braceless.template
@@ -28,4 +28,4 @@ negative:
 
 throw "Test262: This statement should not be evaluated.";
 
-if (true) import(/*{ params }*/);
+if (true) /*{ import }*/;
diff --git a/src/dynamic-import/syntax/invalid/nested-if.template b/src/dynamic-import/syntax/invalid/nested-if.template
index 365e293d89ae040e7ab2cad477a364811ae87ea3..830eab471b025d4d06cbbb6463cdbcac8f58d54d 100644
--- a/src/dynamic-import/syntax/invalid/nested-if.template
+++ b/src/dynamic-import/syntax/invalid/nested-if.template
@@ -29,5 +29,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 if (true) {
-  import(/*{ params }*/);
+  /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/invalid/nested-labeled.template b/src/dynamic-import/syntax/invalid/nested-labeled.template
index bfaf1267c7d3b49e50259b9e4b4d700e819d965c..83e13bec5e7c64c27c76c3e03ae3effa67249f20 100644
--- a/src/dynamic-import/syntax/invalid/nested-labeled.template
+++ b/src/dynamic-import/syntax/invalid/nested-labeled.template
@@ -29,5 +29,5 @@ negative:
 throw "Test262: This statement should not be evaluated.";
 
 {
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/invalid/nested-while.template b/src/dynamic-import/syntax/invalid/nested-while.template
index 33deb3305d34df06dc0da1ece6cadeb32a178615..daeb7b4a447d5642feba19a29c80b43390a02477 100644
--- a/src/dynamic-import/syntax/invalid/nested-while.template
+++ b/src/dynamic-import/syntax/invalid/nested-while.template
@@ -31,5 +31,5 @@ throw "Test262: This statement should not be evaluated.";
 let x = 0;
 while (!x) {
   x++;
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/invalid/top-level.template b/src/dynamic-import/syntax/invalid/top-level.template
index 400baa31a4690c9e6197f23d2a355982d7dcf7f0..c85c6393ebc57c599eefbdec79b04e75215e228f 100644
--- a/src/dynamic-import/syntax/invalid/top-level.template
+++ b/src/dynamic-import/syntax/invalid/top-level.template
@@ -18,4 +18,4 @@ negative:
 
 throw "Test262: This statement should not be evaluated.";
 
-import(/*{ params }*/);
+/*{ import }*/;
diff --git a/src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template b/src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template
index 054ee113f1d8db10814ef072c934460e5a506feb..1e3b61b9d5ada4716d1c963c0b84e6eb122eaf1d 100644
--- a/src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template
+++ b/src/dynamic-import/syntax/valid/nested-arrow-assignment-expression.template
@@ -23,4 +23,4 @@ flags: [module]
 features: [dynamic-import]
 ---*/
 
-let f = () => import(/*{ params }*/);
+let f = () => /*{ import }*/;
diff --git a/src/dynamic-import/syntax/valid/nested-arrow.template b/src/dynamic-import/syntax/valid/nested-arrow.template
index a30d99b7f102decf79dcc530d6592e58aa1af6b2..f906eaa4dd1de93639cc8d51f69f290711ca2624 100644
--- a/src/dynamic-import/syntax/valid/nested-arrow.template
+++ b/src/dynamic-import/syntax/valid/nested-arrow.template
@@ -24,5 +24,5 @@ features: [dynamic-import]
 ---*/
 
 let f = () => {
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/valid/nested-async-function-await.template b/src/dynamic-import/syntax/valid/nested-async-function-await.template
index 4fbcf30651db1c791e368b826d5aea414ec0827b..5b8adb2ad22d066f924c154e68d2e0ee51e13dad 100644
--- a/src/dynamic-import/syntax/valid/nested-async-function-await.template
+++ b/src/dynamic-import/syntax/valid/nested-async-function-await.template
@@ -24,5 +24,5 @@ features: [dynamic-import]
 ---*/
 
 async function f() {
-  await import(/*{ params }*/);
+  await /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/valid/nested-async-function-return-await.template b/src/dynamic-import/syntax/valid/nested-async-function-return-await.template
index f693b00d2b3a6f60f1d38b7a7c356c71df0c5442..8d5fc085236297c1039f8bab0d1c5bcc7d8f2a28 100644
--- a/src/dynamic-import/syntax/valid/nested-async-function-return-await.template
+++ b/src/dynamic-import/syntax/valid/nested-async-function-return-await.template
@@ -24,6 +24,6 @@ features: [dynamic-import]
 ---*/
 
 async function f() {
-  return await import(/*{ params }*/);
+  return await /*{ import }*/;
 }
 
diff --git a/src/dynamic-import/syntax/valid/nested-async-function.template b/src/dynamic-import/syntax/valid/nested-async-function.template
index 003d6b36b7466f068ac41473bf011a24b195273e..1f9367b5aecbcd42d074f8e1a72c0b96d1466e68 100644
--- a/src/dynamic-import/syntax/valid/nested-async-function.template
+++ b/src/dynamic-import/syntax/valid/nested-async-function.template
@@ -24,6 +24,6 @@ features: [dynamic-import]
 ---*/
 
 async function f() {
-  import(/*{ params }*/);
+  /*{ import }*/;
 }
 
diff --git a/src/dynamic-import/syntax/valid/nested-block-labeled.template b/src/dynamic-import/syntax/valid/nested-block-labeled.template
index d61a3660ab9702eed06af7216721bd76618a980c..970edc5fb7805d1de5f93140ab1087ea622a6f83 100644
--- a/src/dynamic-import/syntax/valid/nested-block-labeled.template
+++ b/src/dynamic-import/syntax/valid/nested-block-labeled.template
@@ -24,5 +24,5 @@ features: [dynamic-import]
 ---*/
 
 label: {
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/valid/nested-block.template b/src/dynamic-import/syntax/valid/nested-block.template
index d4426718be773ace648a9f33000de457aa4eba68..38e23565162dd9059e1cf146cf12957963ce19c6 100644
--- a/src/dynamic-import/syntax/valid/nested-block.template
+++ b/src/dynamic-import/syntax/valid/nested-block.template
@@ -24,5 +24,5 @@ features: [dynamic-import]
 ---*/
 
 {
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/valid/nested-do-while.template b/src/dynamic-import/syntax/valid/nested-do-while.template
index 6f45278a4e23f1c27779f36878a20b60bc042fca..1b5a391c025131e51e5156a42202d43a7e0cee21 100644
--- a/src/dynamic-import/syntax/valid/nested-do-while.template
+++ b/src/dynamic-import/syntax/valid/nested-do-while.template
@@ -24,5 +24,5 @@ features: [dynamic-import]
 ---*/
 
 do {
-  import(/*{ params }*/);
+  /*{ import }*/;
 } while (false);
diff --git a/src/dynamic-import/syntax/valid/nested-do.template b/src/dynamic-import/syntax/valid/nested-do.template
index ee1c149d7040ad789a0e0f90f01e8dfa529b3d36..8545c440b94277028e17ae32d1e88573ec29b4cb 100644
--- a/src/dynamic-import/syntax/valid/nested-do.template
+++ b/src/dynamic-import/syntax/valid/nested-do.template
@@ -25,5 +25,5 @@ features: [dynamic-import]
 let x = 0;
 do {
   x++;
-  import(/*{ params }*/);
+  /*{ import }*/;
 } while (!x);
diff --git a/src/dynamic-import/syntax/valid/nested-else-braceless.template b/src/dynamic-import/syntax/valid/nested-else-braceless.template
index b020744eab9db2db52b3b9b3a54c4c3bb7528fb3..86948d93027255caa641f42b8a49ffcb67be71a9 100644
--- a/src/dynamic-import/syntax/valid/nested-else-braceless.template
+++ b/src/dynamic-import/syntax/valid/nested-else-braceless.template
@@ -25,4 +25,4 @@ features: [dynamic-import]
 
 if (false) {
 
-} else import(/*{ params }*/);
+} else /*{ import }*/;
diff --git a/src/dynamic-import/syntax/valid/nested-else.template b/src/dynamic-import/syntax/valid/nested-else.template
index 3189049b788beca064a6e35b6d652856573e480f..1f93708b692cff40108c74e62aa6a4c9f696e49e 100644
--- a/src/dynamic-import/syntax/valid/nested-else.template
+++ b/src/dynamic-import/syntax/valid/nested-else.template
@@ -26,5 +26,5 @@ features: [dynamic-import]
 if (false) {
 
 } else {
-  import(/*{ params }*/);
+  /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/valid/nested-function-return.template b/src/dynamic-import/syntax/valid/nested-function-return.template
index 640468fb3495644c82a12cb15f8da2d599a5995d..db04a04757e54297c28c37b36f171b06939e7e9c 100644
--- a/src/dynamic-import/syntax/valid/nested-function-return.template
+++ b/src/dynamic-import/syntax/valid/nested-function-return.template
@@ -24,5 +24,5 @@ features: [dynamic-import]
 ---*/
 
 function fn() {
-  return import(/*{ params }*/);
+  return /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/valid/nested-function.template b/src/dynamic-import/syntax/valid/nested-function.template
index 7a599c4d3eafd16c1d3484931bb6494d6b87d07c..8fd7eff00dce5e181c62ac57c9c947eafcaf8fa9 100644
--- a/src/dynamic-import/syntax/valid/nested-function.template
+++ b/src/dynamic-import/syntax/valid/nested-function.template
@@ -24,5 +24,5 @@ features: [dynamic-import]
 ---*/
 
 function fn() {
-  import(/*{ params }*/);
+  /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/valid/nested-if-braceless.template b/src/dynamic-import/syntax/valid/nested-if-braceless.template
index 93d067376104e25c2ffa60e6f1667c1e8c81bd37..0cd924889fd8bd33ee1ee3fd0b773f347bb53a22 100644
--- a/src/dynamic-import/syntax/valid/nested-if-braceless.template
+++ b/src/dynamic-import/syntax/valid/nested-if-braceless.template
@@ -23,4 +23,4 @@ info: |
 features: [dynamic-import]
 ---*/
 
-if (true) import(/*{ params }*/);
+if (true) /*{ import }*/;
diff --git a/src/dynamic-import/syntax/valid/nested-if.template b/src/dynamic-import/syntax/valid/nested-if.template
index a58c649ba5c5d3dbb7d19cb66df8368efd8688c3..5cebc7a6281d20e9929f310973ffc1962b4e71fd 100644
--- a/src/dynamic-import/syntax/valid/nested-if.template
+++ b/src/dynamic-import/syntax/valid/nested-if.template
@@ -24,5 +24,5 @@ features: [dynamic-import]
 ---*/
 
 if (true) {
-  import(/*{ params }*/);
+  /*{ import }*/;
 }
diff --git a/src/dynamic-import/syntax/valid/nested-labeled.template b/src/dynamic-import/syntax/valid/nested-labeled.template
index c58078c523f373b3c8409df83a3c2161b670dbe8..31b65b5627931f268ea7b5ee50463352db579a50 100644
--- a/src/dynamic-import/syntax/valid/nested-labeled.template
+++ b/src/dynamic-import/syntax/valid/nested-labeled.template
@@ -24,5 +24,5 @@ features: [dynamic-import]
 ---*/
 
 {
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/valid/nested-while.template b/src/dynamic-import/syntax/valid/nested-while.template
index 6a4c4ab8148c289041e7616340a2ff81d9a443fa..ac2cd12bf151a4e3e503c4b2a1752ad62cf7bd96 100644
--- a/src/dynamic-import/syntax/valid/nested-while.template
+++ b/src/dynamic-import/syntax/valid/nested-while.template
@@ -26,5 +26,5 @@ features: [dynamic-import]
 let x = 0;
 while (!x) {
   x++;
-  import(/*{ params }*/);
+  /*{ import }*/;
 };
diff --git a/src/dynamic-import/syntax/valid/top-level.template b/src/dynamic-import/syntax/valid/top-level.template
index 6782aee0bd53dd8dca11ba4001d1d5e135bacfe7..33387103d8542a4d6c411b15b86086592f399cf2 100644
--- a/src/dynamic-import/syntax/valid/top-level.template
+++ b/src/dynamic-import/syntax/valid/top-level.template
@@ -13,4 +13,4 @@ flags: [module]
 features: [dynamic-import]
 ---*/
 
-import(/*{ params }*/);
+/*{ import }*/;