diff --git a/src/params/default/arrow-function.template b/src/params/default/arrow-function.template
index d6b94de60aef06b116c98336dab2d01f91626af5..725c6cf187410c84e7143799c1fb1249e333223e 100644
--- a/src/params/default/arrow-function.template
+++ b/src/params/default/arrow-function.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/params-dflt-
+path: language/expressions/arrow-function/params-
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/params/default/cls-decl-gen-meth-static.template b/src/params/default/cls-decl-gen-meth-static.template
index a617fc6d6f5bb3a82bb694eff106d0ab609326c0..5d284d9bf876994fbd7fa6be4ca2b5d42b0967c8 100644
--- a/src/params/default/cls-decl-gen-meth-static.template
+++ b/src/params/default/cls-decl-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-gen-meth-static-
+path: language/statements/class/params-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/params/default/cls-decl-gen-meth.template b/src/params/default/cls-decl-gen-meth.template
index ba80c6ecd2caa7f5580688ed177820ecadc5ecc0..877f483ed0ee701eea9078133297f66c870a10c2 100644
--- a/src/params/default/cls-decl-gen-meth.template
+++ b/src/params/default/cls-decl-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-gen-meth-
+path: language/statements/class/params-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/default/cls-decl-meth-static.template b/src/params/default/cls-decl-meth-static.template
index 637db4ac8d4b584602eeef1163f8df735e25fd7e..248856e4404ababc6109de7921d91b3d9ad61fc7 100644
--- a/src/params/default/cls-decl-meth-static.template
+++ b/src/params/default/cls-decl-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-meth-static-
+path: language/statements/class/params-meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/params/default/cls-decl-meth.template b/src/params/default/cls-decl-meth.template
index 9c5eabaa95ea0812dce2104c4a3289122d0f56c4..c115dec274f5869769ff264d7e4e836aadd54ebb 100644
--- a/src/params/default/cls-decl-meth.template
+++ b/src/params/default/cls-decl-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-meth-
+path: language/statements/class/params-meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/params/default/cls-expr-gen-meth-static.template b/src/params/default/cls-expr-gen-meth-static.template
index 1964116f891d0a77a281b761489c4646e0e3a4d3..b655b61f69d179191a4cbfa7da16543e0192b8c9 100644
--- a/src/params/default/cls-expr-gen-meth-static.template
+++ b/src/params/default/cls-expr-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-gen-meth-static-
+path: language/expressions/class/params-gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/default/cls-expr-gen-meth.template b/src/params/default/cls-expr-gen-meth.template
index a02781a19d501dce452e4defb7d570a71c39d88c..2bcd9a88263f2e6163d3fe5775d733f1ff76f7de 100644
--- a/src/params/default/cls-expr-gen-meth.template
+++ b/src/params/default/cls-expr-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-gen-meth-
+path: language/expressions/class/params-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/default/cls-expr-meth-static.template b/src/params/default/cls-expr-meth-static.template
index 1906dc9d1fac3e9457239803badcdddfb19a85e8..370f93e0f34fb46976c08fde574b9acc6b853cde 100644
--- a/src/params/default/cls-expr-meth-static.template
+++ b/src/params/default/cls-expr-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-meth-static-
+path: language/expressions/class/params-meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/default/cls-expr-meth.template b/src/params/default/cls-expr-meth.template
index 0220880d470283fbe0e430559adaf90997af573e..5eb2f548e9e6dcd350e1014093d54ca9136f33f1 100644
--- a/src/params/default/cls-expr-meth.template
+++ b/src/params/default/cls-expr-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-meth-
+path: language/expressions/class/params-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/default/func-decl.template b/src/params/default/func-decl.template
index d6cdb614b6f199635c2c878e51fa5e78276e5261..eca0735f2ca2d0c27334687c4b797aa59c059686 100644
--- a/src/params/default/func-decl.template
+++ b/src/params/default/func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/params-dflt-
+path: language/statements/function/params-
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/params/default/func-expr.template b/src/params/default/func-expr.template
index 75cbfecf45e7dd0e28e43796c460ef865770bb0a..525930ab7d2d311638a0514a4a5d3900af732791 100644
--- a/src/params/default/func-expr.template
+++ b/src/params/default/func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/params-dflt-
+path: language/expressions/function/params-
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/params/default/gen-func-decl.template b/src/params/default/gen-func-decl.template
index c3d38a37617e49324e107b5cfb511714dd69016f..e4a1818e7c9d37d22b898088c130e9a656ea70f2 100644
--- a/src/params/default/gen-func-decl.template
+++ b/src/params/default/gen-func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/params-dflt-
+path: language/statements/generators/params-
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/params/default/gen-func-expr.template b/src/params/default/gen-func-expr.template
index c95d116be60cdc1330920468d7f545235ec3fdca..303888c9b01ea04fe5941a4f18970b6098bb9a51 100644
--- a/src/params/default/gen-func-expr.template
+++ b/src/params/default/gen-func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/params-dflt-
+path: language/expressions/generators/params-
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/params/default/gen-meth.template b/src/params/default/gen-meth.template
index a302e616015d251591ac7c601a7f4fc91f66ada7..5c40373b3bcfa42db168bea00a7413e1117e4ce1 100644
--- a/src/params/default/gen-meth.template
+++ b/src/params/default/gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-dflt-gen-meth-
+path: language/expressions/object/method-definition/params-gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/params/default/meth.template b/src/params/default/meth.template
index 48f25bdfd0c8995a0bf4e2ff2628cc3a3dde241f..aaea3c73f4f6576ef3a9707517d8fc99ae25b550 100644
--- a/src/params/default/meth.template
+++ b/src/params/default/meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-dflt-meth-
+path: language/expressions/object/method-definition/params-meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/params/abrupt.case b/src/params/dflt-abrupt.case
similarity index 100%
rename from src/params/abrupt.case
rename to src/params/dflt-abrupt.case
diff --git a/src/params/arg-val-not-undefined.case b/src/params/dflt-arg-val-not-undefined.case
similarity index 100%
rename from src/params/arg-val-not-undefined.case
rename to src/params/dflt-arg-val-not-undefined.case
diff --git a/src/params/arg-val-undefined.case b/src/params/dflt-arg-val-undefined.case
similarity index 100%
rename from src/params/arg-val-undefined.case
rename to src/params/dflt-arg-val-undefined.case
diff --git a/src/params/duplicates.case b/src/params/dflt-duplicates.case
similarity index 100%
rename from src/params/duplicates.case
rename to src/params/dflt-duplicates.case
diff --git a/src/params/ref-later.case b/src/params/dflt-ref-later.case
similarity index 100%
rename from src/params/ref-later.case
rename to src/params/dflt-ref-later.case
diff --git a/src/params/ref-prior.case b/src/params/dflt-ref-prior.case
similarity index 100%
rename from src/params/ref-prior.case
rename to src/params/dflt-ref-prior.case
diff --git a/src/params/ref-self.case b/src/params/dflt-ref-self.case
similarity index 100%
rename from src/params/ref-self.case
rename to src/params/dflt-ref-self.case
diff --git a/src/params/rest.case b/src/params/dflt-rest.case
similarity index 100%
rename from src/params/rest.case
rename to src/params/dflt-rest.case
diff --git a/src/params/error/arrow-function.template b/src/params/error/arrow-function.template
index 80e76e09b30bf11e9033048771fe13f55df85276..e56377ab94d74e69d4976deed958cac8ca1ff87a 100644
--- a/src/params/error/arrow-function.template
+++ b/src/params/error/arrow-function.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/params-dflt-
+path: language/expressions/arrow-function/params-
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/params/error/cls-decl-gen-meth-static.template b/src/params/error/cls-decl-gen-meth-static.template
index 91132c062ea9fbfa58faa6964a2c72075197de5d..e05e4b3d33c27f5a95f529df73044e64632d9aa7 100644
--- a/src/params/error/cls-decl-gen-meth-static.template
+++ b/src/params/error/cls-decl-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-gen-meth-static-
+path: language/statements/class/params-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/params/error/cls-decl-gen-meth.template b/src/params/error/cls-decl-gen-meth.template
index a27716832bfeba8a93861f2c11669af2dd8984ba..84b5389fc0440074cfed32ceb835c846921769cd 100644
--- a/src/params/error/cls-decl-gen-meth.template
+++ b/src/params/error/cls-decl-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-gen-meth-
+path: language/statements/class/params-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/error/cls-decl-meth-static.template b/src/params/error/cls-decl-meth-static.template
index 204380ef3602183d0d5aa10c6dee0b0c14f054d6..197efa6b4c3b25b22c9d3d867840ecea1f1ed2cb 100644
--- a/src/params/error/cls-decl-meth-static.template
+++ b/src/params/error/cls-decl-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-meth-static-
+path: language/statements/class/params-meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/params/error/cls-decl-meth.template b/src/params/error/cls-decl-meth.template
index 3242269590f1ce4b342d5dec44399d2e32a052e9..c9517e4663f654983e18db330c93a4b0cd0053f1 100644
--- a/src/params/error/cls-decl-meth.template
+++ b/src/params/error/cls-decl-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-meth-
+path: language/statements/class/params-meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/params/error/cls-expr-gen-meth-static.template b/src/params/error/cls-expr-gen-meth-static.template
index 9c43e710f6ce2a2fb235c202e47965a6f937d386..1b36e160e491d0274a4203e00e16f4e8cf425b13 100644
--- a/src/params/error/cls-expr-gen-meth-static.template
+++ b/src/params/error/cls-expr-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-gen-meth-static-
+path: language/expressions/class/params-gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/error/cls-expr-gen-meth.template b/src/params/error/cls-expr-gen-meth.template
index f1603cf651d8f3860d3be238060b5f4a33207d82..e1c22d5a5428381301e82ce2459595080af9e893 100644
--- a/src/params/error/cls-expr-gen-meth.template
+++ b/src/params/error/cls-expr-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-gen-meth-
+path: language/expressions/class/params-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/error/cls-expr-meth-static.template b/src/params/error/cls-expr-meth-static.template
index 05bed0933b0f5e28f3e794aed0ea045bb8f85642..554c4d8222a90a7ca01cae36704c77e5c03afc37 100644
--- a/src/params/error/cls-expr-meth-static.template
+++ b/src/params/error/cls-expr-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-meth-static-
+path: language/expressions/class/params-meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/error/cls-expr-meth.template b/src/params/error/cls-expr-meth.template
index b89ff9944f717fc8fd5924117725c2d73944532c..c0a2942c5c8b118314b486cc3dca4f88142a0450 100644
--- a/src/params/error/cls-expr-meth.template
+++ b/src/params/error/cls-expr-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-meth-
+path: language/expressions/class/params-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/error/func-decl.template b/src/params/error/func-decl.template
index 81e5da3712cb361fb435fc17e485a190b4726cf4..4d7eeb10f4e6e355bebade43fce3280b5114c974 100644
--- a/src/params/error/func-decl.template
+++ b/src/params/error/func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/params-dflt-
+path: language/statements/function/params-
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/params/error/func-expr.template b/src/params/error/func-expr.template
index 2d38723ca11b28385440de2ff4f4cde18e25a1b3..0f31508fc091259ef36a93599a14cf05c28e7c93 100644
--- a/src/params/error/func-expr.template
+++ b/src/params/error/func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/params-dflt-
+path: language/expressions/function/params-
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/params/error/gen-func-decl.template b/src/params/error/gen-func-decl.template
index 74d7e3e33b74677b1f603ece56e105ff3054363f..d3a4c204c2408cb01badf73bc6f38daa433b18c9 100644
--- a/src/params/error/gen-func-decl.template
+++ b/src/params/error/gen-func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/params-dflt-
+path: language/statements/generators/params-
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/params/error/gen-func-expr.template b/src/params/error/gen-func-expr.template
index 950d3e132bd49f5d304c7727d53abf0a32910d37..7c550a0d5b1525a6fbaed16754e575456a3237d1 100644
--- a/src/params/error/gen-func-expr.template
+++ b/src/params/error/gen-func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/params-dflt-
+path: language/expressions/generators/params-
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/params/error/gen-meth.template b/src/params/error/gen-meth.template
index 3862e08507c2efab5644447ffa5a8e2028aa5d49..1c1597ef5d09cadf5581cd4f2395dd96719af4bc 100644
--- a/src/params/error/gen-meth.template
+++ b/src/params/error/gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-dflt-gen-meth-
+path: language/expressions/object/method-definition/params-gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/params/error/meth.template b/src/params/error/meth.template
index 3683dbbedf0fae2d8176d5949aa16cc6e488d1bd..694adc88a956575a8d8c8b4653633438d868a461 100644
--- a/src/params/error/meth.template
+++ b/src/params/error/meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-dflt-meth-
+path: language/expressions/object/method-definition/params-meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/params/syntax/arrow-function.template b/src/params/syntax/arrow-function.template
index 46f6eabab0c30b48e216b3cf096a53b108676d53..a4db919e21c5bf55815e90f7ee1f1bba7328af99 100644
--- a/src/params/syntax/arrow-function.template
+++ b/src/params/syntax/arrow-function.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/arrow-function/params-dflt-
+path: language/expressions/arrow-function/params-
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/params/syntax/cls-decl-gen-meth-static.template b/src/params/syntax/cls-decl-gen-meth-static.template
index 50414c1ada5c8c616b2c490061f82699fc247f93..2286a7590582f245812d74a45a2c703fa9c08b4a 100644
--- a/src/params/syntax/cls-decl-gen-meth-static.template
+++ b/src/params/syntax/cls-decl-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-gen-meth-static-
+path: language/statements/class/params-gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/params/syntax/cls-decl-gen-meth.template b/src/params/syntax/cls-decl-gen-meth.template
index fe6c08640341c83f6a4c087bde20c74f4b50102b..e110d5f9a8f050ae0f462c82a7cfef54abf2fe19 100644
--- a/src/params/syntax/cls-decl-gen-meth.template
+++ b/src/params/syntax/cls-decl-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-gen-meth-
+path: language/statements/class/params-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/syntax/cls-decl-meth-static.template b/src/params/syntax/cls-decl-meth-static.template
index b3c8b8709d19a082b8fbb138570dcbac29b298bc..f627d88d8929949b3f3dc213eb7c48d40319e7cf 100644
--- a/src/params/syntax/cls-decl-meth-static.template
+++ b/src/params/syntax/cls-decl-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-meth-static-
+path: language/statements/class/params-meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/params/syntax/cls-decl-meth.template b/src/params/syntax/cls-decl-meth.template
index f6cdd67e5d4dfede29cc85f12992d0a9cc8c7fef..94fbbca6be58848a668e5113042e6e91226c793e 100644
--- a/src/params/syntax/cls-decl-meth.template
+++ b/src/params/syntax/cls-decl-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/params-dflt-meth-
+path: language/statements/class/params-meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/params/syntax/cls-expr-gen-meth-static.template b/src/params/syntax/cls-expr-gen-meth-static.template
index dad86689916260cdc55ef3310997dabbc73a9037..46d11dfbe18e2a66539216fea6526e48b936784e 100644
--- a/src/params/syntax/cls-expr-gen-meth-static.template
+++ b/src/params/syntax/cls-expr-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-gen-meth-static-
+path: language/expressions/class/params-gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/syntax/cls-expr-gen-meth.template b/src/params/syntax/cls-expr-gen-meth.template
index 65572962268170a6755ca156e13af7e796e9615c..783da77f0d54c41d75cd42bd7c2788836f2f0a05 100644
--- a/src/params/syntax/cls-expr-gen-meth.template
+++ b/src/params/syntax/cls-expr-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-gen-meth-
+path: language/expressions/class/params-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/syntax/cls-expr-meth-static.template b/src/params/syntax/cls-expr-meth-static.template
index f90fa8dccb8340bcc0ffd4dad93cde1740c95029..815e07d67e239a5905c18257d5a1eb18eecd435f 100644
--- a/src/params/syntax/cls-expr-meth-static.template
+++ b/src/params/syntax/cls-expr-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-meth-static-
+path: language/expressions/class/params-meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/syntax/cls-expr-meth.template b/src/params/syntax/cls-expr-meth.template
index 88f862d083636a1cb1a79690d12ea2d7c090d8cd..b79ec9c7dff861ffee808439131027124ff1c25d 100644
--- a/src/params/syntax/cls-expr-meth.template
+++ b/src/params/syntax/cls-expr-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/params-dflt-meth-
+path: language/expressions/class/params-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/params/syntax/func-decl.template b/src/params/syntax/func-decl.template
index 601a9826b25652ccb61ebc930481c423e6bfc6fc..a2366f7baae4ac00cbd465b442a3410fb30229f9 100644
--- a/src/params/syntax/func-decl.template
+++ b/src/params/syntax/func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/function/params-dflt-
+path: language/statements/function/params-
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/params/syntax/func-expr.template b/src/params/syntax/func-expr.template
index 8407f2df2aaec3f189d5b4152ba7bb0f901c31e8..bc5c878588d2fcaeaccee5fc372adefabb9849ed 100644
--- a/src/params/syntax/func-expr.template
+++ b/src/params/syntax/func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/function/params-dflt-
+path: language/expressions/function/params-
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/params/syntax/gen-func-decl.template b/src/params/syntax/gen-func-decl.template
index 79b7683c9641c060068a86cab1fbcc0017ffc29e..36f3050e897c15378926f1a1be06ebf19468ac2a 100644
--- a/src/params/syntax/gen-func-decl.template
+++ b/src/params/syntax/gen-func-decl.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/generators/params-dflt-
+path: language/statements/generators/params-
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/params/syntax/gen-func-expr.template b/src/params/syntax/gen-func-expr.template
index 0ef6dbe35af70f0e1e09bd6a39a97f2190eb675e..ae6d3357181abf8c1212f2da5db2a86f15b8669c 100644
--- a/src/params/syntax/gen-func-expr.template
+++ b/src/params/syntax/gen-func-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/generators/params-dflt-
+path: language/expressions/generators/params-
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/params/syntax/gen-meth.template b/src/params/syntax/gen-meth.template
index f9125cff5933bb5c9adc06f818c3f1c654f06257..7ca68bf5d8f9dee302e615dbcc363e8f095642cf 100644
--- a/src/params/syntax/gen-meth.template
+++ b/src/params/syntax/gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-dflt-gen-meth-
+path: language/expressions/object/method-definition/params-gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/params/syntax/meth.template b/src/params/syntax/meth.template
index b9f3c8310983d177896007b61ea7ce99601a3373..427c272d42edeb4d7490daf035249d50ab06f798 100644
--- a/src/params/syntax/meth.template
+++ b/src/params/syntax/meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/object/method-definition/params-dflt-meth-
+path: language/expressions/object/method-definition/params-meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8