diff --git a/src/dstr-binding/default/arrow-function-dflt.template b/src/dstr-binding/default/arrow-function-dflt.template
index b6e0eabd9bf0ce0de7f5a3dc22d36cb4dcc84456..c38fe9a0e704eb31a48f532498e11794c9589e8f 100644
--- a/src/dstr-binding/default/arrow-function-dflt.template
+++ b/src/dstr-binding/default/arrow-function-dflt.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/dstr-dflt-
+path: language/expressions/arrow-function/dstr/dflt-
 name: arrow function expression (default parameter)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/dstr-binding/default/arrow-function.template b/src/dstr-binding/default/arrow-function.template
index 85969d4cbdc162aa2fa6a842a1f9629b4bb0e7d3..e9365deef61ea6bd36e4aa19dac2234227543e68 100644
--- a/src/dstr-binding/default/arrow-function.template
+++ b/src/dstr-binding/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/dstr-
+path: language/expressions/arrow-function/dstr/
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/dstr-binding/default/async-gen-func-decl-dflt.template b/src/dstr-binding/default/async-gen-func-decl-dflt.template
index 1f7045cd81c2f7e6a41eddc381b246cc9a5af6e4..22f6634eceda532c973eb09f3c2830908a724c6a 100644
--- a/src/dstr-binding/default/async-gen-func-decl-dflt.template
+++ b/src/dstr-binding/default/async-gen-func-decl-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/dstr-dflt-
+path: language/statements/async-generator/dstr/dflt-
 name: async generator function declaration (default parameter)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-decl.template b/src/dstr-binding/default/async-gen-func-decl.template
index 0eeb3eae209127dd35c71fb8c918d3d3a29d4630..524636c775da72c181a5ca9161852421bc81d030 100644
--- a/src/dstr-binding/default/async-gen-func-decl.template
+++ b/src/dstr-binding/default/async-gen-func-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/dstr-
+path: language/statements/async-generator/dstr/
 name: async generator function declaration
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-expr-dflt.template b/src/dstr-binding/default/async-gen-func-expr-dflt.template
index c514a6aa96d02411650f29299fd5965636f9caa9..af7f8b9b06ebfe3dbc67abeb715a36e9b4189b5b 100644
--- a/src/dstr-binding/default/async-gen-func-expr-dflt.template
+++ b/src/dstr-binding/default/async-gen-func-expr-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-dflt-
+path: language/expressions/async-generator/dstr/dflt-
 name: async generator function expression (default parameter)
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-expr.template b/src/dstr-binding/default/async-gen-func-expr.template
index 09e743cba2993279c16b00b1b3dea35c008851fa..9f2e339a7a8a9f0a5feffbfa57ad210ea8c364ec 100644
--- a/src/dstr-binding/default/async-gen-func-expr.template
+++ b/src/dstr-binding/default/async-gen-func-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-
+path: language/expressions/async-generator/dstr/
 name: async generator function expression
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-named-expr-dflt.template b/src/dstr-binding/default/async-gen-func-named-expr-dflt.template
index fb3dbaf1f5f8829668a1193cfda6028762cc4c6a..5e3d980f4b8a5011efedc462699d9be3849f568a 100644
--- a/src/dstr-binding/default/async-gen-func-named-expr-dflt.template
+++ b/src/dstr-binding/default/async-gen-func-named-expr-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-named-dflt-
+path: language/expressions/async-generator/dstr/named-dflt-
 name: async generator named function expression (default parameter)
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-func-named-expr.template b/src/dstr-binding/default/async-gen-func-named-expr.template
index f96bba409670e94ff218d9c66039ceffc26c82ba..f69b7d6e8438f57c28844ec35ecfd1ac5ec404f0 100644
--- a/src/dstr-binding/default/async-gen-func-named-expr.template
+++ b/src/dstr-binding/default/async-gen-func-named-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-named-
+path: language/expressions/async-generator/dstr/named-
 name: async generator named function expression
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-meth.template b/src/dstr-binding/default/async-gen-meth.template
index 71142977d840b434f863c911df61f213bfad2c73..3188c7d6c5014eb912f88fec846ab56272db61ed 100644
--- a/src/dstr-binding/default/async-gen-meth.template
+++ b/src/dstr-binding/default/async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/dstr-async-gen-meth-
+path: language/expressions/object/dstr/async-gen-meth-
 name: async generator method
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/async-gen-method-dflt.template b/src/dstr-binding/default/async-gen-method-dflt.template
index c0c98a853e50036d93b2dae38fbe5554be3d3e17..6b9a7f2083487a914b130689327c6d741ffe254d 100644
--- a/src/dstr-binding/default/async-gen-method-dflt.template
+++ b/src/dstr-binding/default/async-gen-method-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/dstr-async-gen-meth-dflt-
+path: language/expressions/object/dstr/async-gen-meth-dflt-
 name: async generator method (default parameter)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-async-gen-meth-dflt.template
index ab50758df8e5f9bc551e235bf8cfd9a08c760334..1cd56177509b205c4cad260de6e66aec2c55ca9d 100644
--- a/src/dstr-binding/default/cls-decl-async-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-async-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-dflt-
+path: language/statements/class/dstr/async-gen-meth-dflt-
 name: class expression async generator method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-async-gen-meth-static-dflt.template
index 2fc323229d1bd2533eaa319fa63c92799f52d48a..7ea8aa2a796ee8ef16396764349c95bf0c91c7c3 100644
--- a/src/dstr-binding/default/cls-decl-async-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-async-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-static-dflt-
+path: language/statements/class/dstr/async-gen-meth-static-dflt-
 name: static class expression async generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-gen-meth-static.template b/src/dstr-binding/default/cls-decl-async-gen-meth-static.template
index 8586b9227c3f5c947399bc7a05cd7ad01c6ce0bb..c8156d48d3d558e533004d69fe115effc948c654 100644
--- a/src/dstr-binding/default/cls-decl-async-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-static-
+path: language/statements/class/dstr/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-gen-meth.template b/src/dstr-binding/default/cls-decl-async-gen-meth.template
index 8ca3de418af6948dde6692c3bdb99bcb8ac29f4d..f55f6b686d01195bfae274cb5cb1eea6a735236a 100644
--- a/src/dstr-binding/default/cls-decl-async-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-
+path: language/statements/class/dstr/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-private-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-async-private-gen-meth-dflt.template
index 3d3bbfaaf63b3b3b300950df53917f68eb1f98cc..d976c15366783769df24c1efe12563934d79ba4c 100644
--- a/src/dstr-binding/default/cls-decl-async-private-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-async-private-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-private-gen-meth-dflt-
+path: language/statements/class/dstr/async-private-gen-meth-dflt-
 name: private class expression async generator method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-private-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-async-private-gen-meth-static-dflt.template
index dd431d635da8df1b1329c7dd2c276f7fcbdf09a0..5fef0ef1118fb1c67e3e66877dc4f7ef7add5ef9 100644
--- a/src/dstr-binding/default/cls-decl-async-private-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-async-private-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-private-gen-meth-static-dflt-
+path: language/statements/class/dstr/async-private-gen-meth-static-dflt-
 name: private static class expression async generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-private-gen-meth-static.template b/src/dstr-binding/default/cls-decl-async-private-gen-meth-static.template
index 39f44b4a434759bce98da0e6e216c9a5e9185cec..1a90beaaf1d735c3deba49fa99827a5cead8af5e 100644
--- a/src/dstr-binding/default/cls-decl-async-private-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-async-private-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-private-gen-meth-static-
+path: language/statements/class/dstr/async-private-gen-meth-static-
 name: private static class expression async generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-async-private-gen-meth.template b/src/dstr-binding/default/cls-decl-async-private-gen-meth.template
index 6072ee707badf76f04990d4ae48c5fbafab9ab28..fc698e674b3ac93e80fdadd440bfeb6ea7936dee 100644
--- a/src/dstr-binding/default/cls-decl-async-private-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-async-private-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-private-gen-meth-
+path: language/statements/class/dstr/async-private-gen-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
index c486163c4c9f91b1ef16993444894e8109ebf57f..5ccfc2e57867b30cdc7ebd436f259f5ed4bb51b6 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-dflt.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/dstr-gen-meth-dflt-
+path: language/statements/class/dstr/gen-meth-dflt-
 name: class expression method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
index 2541351951f363a955e9176b1bb2e30942f66420..655c47ba39639853826fdf2a2e83b44867834ed4 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-static-dflt.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/dstr-gen-meth-static-dflt-
+path: language/statements/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-static.template b/src/dstr-binding/default/cls-decl-gen-meth-static.template
index 150c19e2a9e1cd752df2a97fad31780e33c83797..570b70bbd03add6e47fcccc3a973bd4bcfbbf895 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-static.template
+++ b/src/dstr-binding/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/dstr-gen-meth-static-
+path: language/statements/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-gen-meth.template b/src/dstr-binding/default/cls-decl-gen-meth.template
index 2df18311d5d5122902a235b29792f7303de1a815..41f7fbc6391d47bbef230835d7277a0c442f5d80 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth.template
+++ b/src/dstr-binding/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/dstr-gen-meth-
+path: language/statements/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-decl-meth-dflt.template b/src/dstr-binding/default/cls-decl-meth-dflt.template
index 9a073c5b74ca0d4bca3c21ac16dc060f2312cebd..6a3139a96e6e9b66ca635c4b50eeb360feb610e1 100644
--- a/src/dstr-binding/default/cls-decl-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-meth-dflt.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/dstr-meth-dflt-
+path: language/statements/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-meth-static-dflt.template
index 07f25960ab35389eaf0cce0cb890ffc4f11d8229..f19012837de080dd1adcfbd8cabe8433fad94497 100644
--- a/src/dstr-binding/default/cls-decl-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-meth-static-dflt.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/dstr-meth-static-dflt-
+path: language/statements/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-meth-static.template b/src/dstr-binding/default/cls-decl-meth-static.template
index 40197a50f050dfaf4aa9313cf848d616b5feff36..3814c1aee16c3ec60681b11fde075b41e6a3ae08 100644
--- a/src/dstr-binding/default/cls-decl-meth-static.template
+++ b/src/dstr-binding/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/dstr-meth-static-
+path: language/statements/class/dstr/meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-meth.template b/src/dstr-binding/default/cls-decl-meth.template
index 29fdbcffea3f15c75f71e0af48480d139530a529..ee4384f25d6a5e83031522560b672841782a1d99 100644
--- a/src/dstr-binding/default/cls-decl-meth.template
+++ b/src/dstr-binding/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/dstr-meth-
+path: language/statements/class/dstr/meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/default/cls-decl-private-gen-meth-dflt.template b/src/dstr-binding/default/cls-decl-private-gen-meth-dflt.template
index 48914f6caf86493e1ea5d7bd9697c284d5c15e62..d99ed07d41657b17dce2bdd0403a18375036bd13 100644
--- a/src/dstr-binding/default/cls-decl-private-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-private-gen-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-gen-meth-dflt-
+path: language/statements/class/dstr/private-gen-meth-dflt-
 name: private class expression method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, generators, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-decl-private-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-private-gen-meth-static-dflt.template
index 667c0abc4a3ddc5191a6f3ef6a7c0e6a8459aa38..c7f21f468ee7017108dc57ee2a21952023eccfb1 100644
--- a/src/dstr-binding/default/cls-decl-private-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-private-gen-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-gen-meth-static-dflt-
+path: language/statements/class/dstr/private-gen-meth-static-dflt-
 name: private static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, generators, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-decl-private-gen-meth-static.template b/src/dstr-binding/default/cls-decl-private-gen-meth-static.template
index 0768037c061ad76b04f96ab487eb6c4bfe5435aa..16fc11316ceb6a2837d1d0d5513c46db72b14d96 100644
--- a/src/dstr-binding/default/cls-decl-private-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-private-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-gen-meth-static-
+path: language/statements/class/dstr/private-gen-meth-static-
 name: private static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, generators, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-decl-private-gen-meth.template b/src/dstr-binding/default/cls-decl-private-gen-meth.template
index e4b3a1f1ad0a955586e3f3a6c8e1db5f0ec1d20b..1ca444260e420047011d0a601488a36fd6a02b68 100644
--- a/src/dstr-binding/default/cls-decl-private-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-private-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-gen-meth-
+path: language/statements/class/dstr/private-gen-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, generators, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-decl-private-meth-dflt.template b/src/dstr-binding/default/cls-decl-private-meth-dflt.template
index b69eb1f7082d784e1f41d217556dbc08a6f5818c..7ce3b32c7c9163121853fe6ad6bdd24996d08b2a 100644
--- a/src/dstr-binding/default/cls-decl-private-meth-dflt.template
+++ b/src/dstr-binding/default/cls-decl-private-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-meth-dflt-
+path: language/statements/class/dstr/private-meth-dflt-
 name: private class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-methods-private, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-decl-private-meth-static-dflt.template b/src/dstr-binding/default/cls-decl-private-meth-static-dflt.template
index 380d0c6bac5581c364b0c0309af9e3278a2a7109..93c25dcca3f2eda423eb33357cf7c326f06ad8db 100644
--- a/src/dstr-binding/default/cls-decl-private-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-decl-private-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-meth-static-dflt-
+path: language/statements/class/dstr/private-meth-static-dflt-
 name: private static class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-decl-private-meth-static.template b/src/dstr-binding/default/cls-decl-private-meth-static.template
index bcf1dfd3d1dc4dc3eabf2dfe95b6b9a39e1eb08c..7404703e68498737ea2635cc238d7fad84c69aff 100644
--- a/src/dstr-binding/default/cls-decl-private-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-private-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-meth-static-
+path: language/statements/class/dstr/private-meth-static-
 name: private static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-static-methods-private, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-decl-private-meth.template b/src/dstr-binding/default/cls-decl-private-meth.template
index fd44964fbc95edf6fbfe0fcb929b817e3987ba6c..db7dda7a3782a092b7b74b9ce2405fde8e01cbe8 100644
--- a/src/dstr-binding/default/cls-decl-private-meth.template
+++ b/src/dstr-binding/default/cls-decl-private-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/dstr-private-meth-
+path: language/statements/class/dstr/private-meth-
 name: private class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [class, class-methods-private, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-expr-async-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-async-gen-meth-dflt.template
index 4e0acac1ed6acf35de936d5b2540ea3b6a926b60..effe6ada363472b8c7cdf6bbb0dd847400160f0c 100644
--- a/src/dstr-binding/default/cls-expr-async-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-async-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-dflt-
+path: language/expressions/class/dstr/async-gen-meth-dflt-
 name: class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-async-gen-meth-static-dflt.template
index 3dbcf59e2abf27bbf5eed523879965ef3cb96769..5752db2e898db3994f429b157c8fc59ce8998d45 100644
--- a/src/dstr-binding/default/cls-expr-async-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-async-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-static-dflt-
+path: language/expressions/class/dstr/async-gen-meth-static-dflt-
 name: static class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-gen-meth-static.template b/src/dstr-binding/default/cls-expr-async-gen-meth-static.template
index 003cd8cb353d75afb42770cbc8831ffcd277adf5..228334a2cddde43f502415ca717dad4b4c285cef 100644
--- a/src/dstr-binding/default/cls-expr-async-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-static-
+path: language/expressions/class/dstr/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-gen-meth.template b/src/dstr-binding/default/cls-expr-async-gen-meth.template
index 5ef3e6228e5c0c5c8ac728a584d1768bb6b266e2..f2ef576d177fb06d7a4376beb9e00d680dedc130 100644
--- a/src/dstr-binding/default/cls-expr-async-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-
+path: language/expressions/class/dstr/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-private-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-async-private-gen-meth-dflt.template
index 1b9fbb0d63ead554f66029a31d6fbe1536f14dd2..5aebd9dda6941e763aeaed1c00c623ae506c0f85 100644
--- a/src/dstr-binding/default/cls-expr-async-private-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-async-private-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-private-gen-meth-dflt-
+path: language/expressions/class/dstr/async-private-gen-meth-dflt-
 name: private class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-private-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-async-private-gen-meth-static-dflt.template
index 87d74e51388bbf3cc9e41ccaf08a794cebd149a4..c61f3f093c14b847280606bbf8c4fda2e1d60e20 100644
--- a/src/dstr-binding/default/cls-expr-async-private-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-async-private-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-private-gen-meth-static-dflt-
+path: language/expressions/class/dstr/async-private-gen-meth-static-dflt-
 name: private static class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-private-gen-meth-static.template b/src/dstr-binding/default/cls-expr-async-private-gen-meth-static.template
index 66c01f3c29cf2a341c971d28dfae9fb7d5ca91cd..08863dfd97bde4480888011a120dec9d78b43520 100644
--- a/src/dstr-binding/default/cls-expr-async-private-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-async-private-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-private-gen-meth-static-
+path: language/expressions/class/dstr/async-private-gen-meth-static-
 name: private static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-async-private-gen-meth.template b/src/dstr-binding/default/cls-expr-async-private-gen-meth.template
index 89aec57a6a54a782367040dc24e8a5be330988ad..36df2dcc5cae1925221e64b9e11ef956dbb44775 100644
--- a/src/dstr-binding/default/cls-expr-async-private-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-async-private-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-private-gen-meth-
+path: language/expressions/class/dstr/async-private-gen-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, async-iteration]
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
index 29d90bd76e0c82f3784b92430c68e203d40b7b6a..037fb1da27fb3deb63f5c8ba81b42233a3ec076b 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-dflt.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/dstr-gen-meth-dflt-
+path: language/expressions/class/dstr/gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
index 652189ce248ea2ab2a56e2bc475e1e0e6814ca01..09071348a3f098c2b5468172561542d0c534a6d4 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-static-dflt.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/dstr-gen-meth-static-dflt-
+path: language/expressions/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-static.template b/src/dstr-binding/default/cls-expr-gen-meth-static.template
index 9bcb541a3b8ff52233948ae7e343370099b19042..99922668343f70ddd17695dd6dde2d481d92d7b4 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-static.template
+++ b/src/dstr-binding/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/dstr-gen-meth-static-
+path: language/expressions/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-gen-meth.template b/src/dstr-binding/default/cls-expr-gen-meth.template
index 1f1e47904f74c5a2b5e5939c54869f271ce8ce1b..06faa0450b6bd8c6017b37a8d964e8f2fd974f21 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth.template
+++ b/src/dstr-binding/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/dstr-gen-meth-
+path: language/expressions/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-meth-dflt.template b/src/dstr-binding/default/cls-expr-meth-dflt.template
index c2a5f0e4add23d31da980c6dc28e63191a07abfa..94636d46036b21836c11e2b5df76e2521b54b2d3 100644
--- a/src/dstr-binding/default/cls-expr-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-meth-dflt.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/dstr-meth-dflt-
+path: language/expressions/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-meth-static-dflt.template
index 831d74e41adb94d458900ba408d7f43aab137aa3..55b947ee9b753c943682a3e9e46a3e90d42b7ef5 100644
--- a/src/dstr-binding/default/cls-expr-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-meth-static-dflt.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/dstr-meth-static-dflt-
+path: language/expressions/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-meth-static.template b/src/dstr-binding/default/cls-expr-meth-static.template
index d8e8b9841a3087fc3db6af1f2947375b7bca1413..7413426a03578143c1349d32db16ace10cd8b07a 100644
--- a/src/dstr-binding/default/cls-expr-meth-static.template
+++ b/src/dstr-binding/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/dstr-meth-static-
+path: language/expressions/class/dstr/meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-meth.template b/src/dstr-binding/default/cls-expr-meth.template
index fd9b1075d4ccde56bc915f13b6e417333f47ea74..355cb82fd6292503d2eca0b6bbd8711d7b60af80 100644
--- a/src/dstr-binding/default/cls-expr-meth.template
+++ b/src/dstr-binding/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/dstr-meth-
+path: language/expressions/class/dstr/meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/default/cls-expr-private-gen-meth-dflt.template b/src/dstr-binding/default/cls-expr-private-gen-meth-dflt.template
index e0657f8fc2fffaa034edb7baab902e89b6c35f16..e656f2f009249527be32a1504c66db60aab02ec7 100644
--- a/src/dstr-binding/default/cls-expr-private-gen-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-private-gen-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-gen-meth-dflt-
+path: language/expressions/class/dstr/private-gen-meth-dflt-
 name: private class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, generators, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-expr-private-gen-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-private-gen-meth-static-dflt.template
index 3a8c8dabcf050b4136e0e5a846318830e4ae423f..f5229ac91debb98ba3d66e7b9756600439013d83 100644
--- a/src/dstr-binding/default/cls-expr-private-gen-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-private-gen-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-gen-meth-static-dflt-
+path: language/expressions/class/dstr/private-gen-meth-static-dflt-
 name: private static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, generators, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-expr-private-gen-meth-static.template b/src/dstr-binding/default/cls-expr-private-gen-meth-static.template
index 971b5fe726f14138fb9eb90c0595772814081905..7df96902cd81ec1bfc5bbd1c66cfba50e13bfd83 100644
--- a/src/dstr-binding/default/cls-expr-private-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-private-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-gen-meth-static-
+path: language/expressions/class/dstr/private-gen-meth-static-
 name: private static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, generators, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-expr-private-gen-meth.template b/src/dstr-binding/default/cls-expr-private-gen-meth.template
index fa1343f423ffb585954760a640e5bfd5171a45ee..3a935ef924ee4e86d3d181ba6691ce8e36cd49ce 100644
--- a/src/dstr-binding/default/cls-expr-private-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-private-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-gen-meth-
+path: language/expressions/class/dstr/private-gen-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, generators, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-expr-private-meth-dflt.template b/src/dstr-binding/default/cls-expr-private-meth-dflt.template
index 9be9a7625588abbd60e1565b9ad9d1cbf11d0bec..0a453ea7f2ba414fe19c7ca81fab758efea960b0 100644
--- a/src/dstr-binding/default/cls-expr-private-meth-dflt.template
+++ b/src/dstr-binding/default/cls-expr-private-meth-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-meth-dflt-
+path: language/expressions/class/dstr/private-meth-dflt-
 name: private class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-expr-private-meth-static-dflt.template b/src/dstr-binding/default/cls-expr-private-meth-static-dflt.template
index af8fb29214600e39626ea3cd244f23489f2df9f6..6f04e8c48b8eddd70c8b8dc1759f5aa096674455 100644
--- a/src/dstr-binding/default/cls-expr-private-meth-static-dflt.template
+++ b/src/dstr-binding/default/cls-expr-private-meth-static-dflt.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-meth-static-dflt-
+path: language/expressions/class/dstr/private-meth-static-dflt-
 name: private static class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, destructuring-binding, default-parameters]
diff --git a/src/dstr-binding/default/cls-expr-private-meth-static.template b/src/dstr-binding/default/cls-expr-private-meth-static.template
index ccaec8e2024109dde912a489b10d3aa3c85843fb..a7a57e9c8fd8584c55865cf2f67e48fd52dfb17f 100644
--- a/src/dstr-binding/default/cls-expr-private-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-private-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-meth-static-
+path: language/expressions/class/dstr/private-meth-static-
 name: private static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-static-methods-private, destructuring-binding]
diff --git a/src/dstr-binding/default/cls-expr-private-meth.template b/src/dstr-binding/default/cls-expr-private-meth.template
index 065c11441f76ea795ca276f374b6503bc6051ab6..4679b00b9ca506ee064512680f6dbaa02ef64544 100644
--- a/src/dstr-binding/default/cls-expr-private-meth.template
+++ b/src/dstr-binding/default/cls-expr-private-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/dstr-private-meth-
+path: language/expressions/class/dstr/private-meth-
 name: private class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [class, class-methods-private, destructuring-binding]
diff --git a/src/dstr-binding/default/const-stmt.template b/src/dstr-binding/default/const-stmt.template
index d3d75575c90e9759eb9f850cf0309eed019cfd0c..0ee88b6cf5db549d78f162a570d60de8932ee588 100644
--- a/src/dstr-binding/default/const-stmt.template
+++ b/src/dstr-binding/default/const-stmt.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/const/dstr-
+path: language/statements/const/dstr/
 name: >
     `const` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
diff --git a/src/dstr-binding/default/for-const.template b/src/dstr-binding/default/for-const.template
index cc89ba30d46abb92d800c0122871b40c06a2451f..32c1ae7561a1a0e6591a46a9272c685db8b923af 100644
--- a/src/dstr-binding/default/for-const.template
+++ b/src/dstr-binding/default/for-const.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/for/dstr-const-
+path: language/statements/for/dstr/const-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/default/for-let.template b/src/dstr-binding/default/for-let.template
index d904941088f3b9cba418a1914db25a26354913f5..87260f26b6aeef2e7ef4919a99fdc44db7132510 100644
--- a/src/dstr-binding/default/for-let.template
+++ b/src/dstr-binding/default/for-let.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/for/dstr-let-
+path: language/statements/for/dstr/let-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/default/for-of-const.template b/src/dstr-binding/default/for-of-const.template
index c84dfa74a353e946da56ce428e1c8126304e58e1..103f4435c8b010cd93590f9a3439eefb411508fe 100644
--- a/src/dstr-binding/default/for-of-const.template
+++ b/src/dstr-binding/default/for-of-const.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/for-of/dstr-const-
+path: language/statements/for-of/dstr/const-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/default/for-of-let.template b/src/dstr-binding/default/for-of-let.template
index c4366ad2c0fabb43fdb0535a9aff70ab5f40037c..65137c6f745872a408d7042f25139fbbec394120 100644
--- a/src/dstr-binding/default/for-of-let.template
+++ b/src/dstr-binding/default/for-of-let.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/for-of/dstr-let-
+path: language/statements/for-of/dstr/let-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/default/for-of-var.template b/src/dstr-binding/default/for-of-var.template
index 53feb6f43882859a5dd7b3a063b945b8d31dd323..09929fd013768c078e63e60b835910877343dee0 100644
--- a/src/dstr-binding/default/for-of-var.template
+++ b/src/dstr-binding/default/for-of-var.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/for-of/dstr-var-
+path: language/statements/for-of/dstr/var-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/default/for-var.template b/src/dstr-binding/default/for-var.template
index e2122ecd7038887dd4de0a5a14cc45d3526cc582..66dbf194ca8b8e742e084feb6c44c8bbb8aea93b 100644
--- a/src/dstr-binding/default/for-var.template
+++ b/src/dstr-binding/default/for-var.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/for/dstr-var-
+path: language/statements/for/dstr/var-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/default/func-decl-dflt.template b/src/dstr-binding/default/func-decl-dflt.template
index 9b58d5a198f2175993a2283a828346e8cc790312..9543ca1c08366fb9986b915242d8c7800f5bf5cb 100644
--- a/src/dstr-binding/default/func-decl-dflt.template
+++ b/src/dstr-binding/default/func-decl-dflt.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/dstr-dflt-
+path: language/statements/function/dstr/dflt-
 name: function declaration (default parameter)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/dstr-binding/default/func-decl.template b/src/dstr-binding/default/func-decl.template
index 9565daf6cf2c7760c7b7b68d33a789000315ef83..f45aad790cf6a836ce1464097e839a1f5abdbc79 100644
--- a/src/dstr-binding/default/func-decl.template
+++ b/src/dstr-binding/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/dstr-
+path: language/statements/function/dstr/
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/dstr-binding/default/func-expr-dflt.template b/src/dstr-binding/default/func-expr-dflt.template
index bee2b4aa225e405f979a0e21045aca1b8e6772cf..2f2a9237bad07da0385b623ca3414a8cb2534f51 100644
--- a/src/dstr-binding/default/func-expr-dflt.template
+++ b/src/dstr-binding/default/func-expr-dflt.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/dstr-dflt-
+path: language/expressions/function/dstr/dflt-
 name: function expression (default parameter)
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/dstr-binding/default/func-expr.template b/src/dstr-binding/default/func-expr.template
index a48fb7c4c7eebf610a9ffca799b5c03e6a7b7a19..b29195dc5ab32da0ce2cc6a47711afc42840030b 100644
--- a/src/dstr-binding/default/func-expr.template
+++ b/src/dstr-binding/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/dstr-
+path: language/expressions/function/dstr/
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/dstr-binding/default/gen-func-decl-dflt.template b/src/dstr-binding/default/gen-func-decl-dflt.template
index 52f8d9cb584a6ed76d5eacc3bffd082fbef3d3a0..34a3f0d8b904ad0763e9df22c9323fe6f7122e2f 100644
--- a/src/dstr-binding/default/gen-func-decl-dflt.template
+++ b/src/dstr-binding/default/gen-func-decl-dflt.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/dstr-dflt-
+path: language/statements/generators/dstr/dflt-
 name: generator function declaration (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/dstr-binding/default/gen-func-decl.template b/src/dstr-binding/default/gen-func-decl.template
index 68f176115fd76575b596ff4122e699554bdef97f..23d1b876c97dc82a4a03956821c4fb458608f884 100644
--- a/src/dstr-binding/default/gen-func-decl.template
+++ b/src/dstr-binding/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/dstr-
+path: language/statements/generators/dstr/
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/dstr-binding/default/gen-func-expr-dflt.template b/src/dstr-binding/default/gen-func-expr-dflt.template
index 87ed77993a92903150930e5bf21482124c011ce6..5e2d0b926da7be9757ce509148704d3336d55ade 100644
--- a/src/dstr-binding/default/gen-func-expr-dflt.template
+++ b/src/dstr-binding/default/gen-func-expr-dflt.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/dstr-dflt-
+path: language/expressions/generators/dstr/dflt-
 name: generator function expression (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/dstr-binding/default/gen-func-expr.template b/src/dstr-binding/default/gen-func-expr.template
index bbcea8cc0275c50ecc13e9f00eceb1830377df8e..74d2caadaf14f00e4c608704751c7e561c71d47d 100644
--- a/src/dstr-binding/default/gen-func-expr.template
+++ b/src/dstr-binding/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/dstr-
+path: language/expressions/generators/dstr/
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/dstr-binding/default/gen-meth.template b/src/dstr-binding/default/gen-meth.template
index 50bf051055d483fa53e38d10d714dd0755040b87..0c4fc28aad770b01fe7122528e1c4a3b12f15405 100644
--- a/src/dstr-binding/default/gen-meth.template
+++ b/src/dstr-binding/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/dstr-gen-meth-
+path: language/expressions/object/dstr/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/dstr-binding/default/gen-method-dflt.template b/src/dstr-binding/default/gen-method-dflt.template
index 59aa756e31737539407ad0f97890e7974b51df20..d51f4cc552ee08d45267edfc66de52d4018b0dfd 100644
--- a/src/dstr-binding/default/gen-method-dflt.template
+++ b/src/dstr-binding/default/gen-method-dflt.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/dstr-gen-meth-dflt-
+path: language/expressions/object/dstr/gen-meth-dflt-
 name: generator method (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/dstr-binding/default/let-stmt.template b/src/dstr-binding/default/let-stmt.template
index 953a998698dae134fe94eccbb9a5ea070570b387..3569d17c2ebb07a93015f78b5ee5dd37c4af1549 100644
--- a/src/dstr-binding/default/let-stmt.template
+++ b/src/dstr-binding/default/let-stmt.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/let/dstr-
+path: language/statements/let/dstr/
 name: >
     `let` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
diff --git a/src/dstr-binding/default/meth-dflt.template b/src/dstr-binding/default/meth-dflt.template
index 3a8b825e7e632e6c4cd45cfe28a3d8a11b916aa0..bc77ee0e1b0335273a3b10b03daa8088ab0e1cb0 100644
--- a/src/dstr-binding/default/meth-dflt.template
+++ b/src/dstr-binding/default/meth-dflt.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/dstr-meth-dflt-
+path: language/expressions/object/dstr/meth-dflt-
 name: method (default parameter)
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/dstr-binding/default/meth.template b/src/dstr-binding/default/meth.template
index 675a81770f2e0b482ea825d4ed9cd66f6928d828..77376c53a5c48723f87b245426876fdf49a38509 100644
--- a/src/dstr-binding/default/meth.template
+++ b/src/dstr-binding/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/dstr-meth-
+path: language/expressions/object/dstr/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/dstr-binding/default/try.template b/src/dstr-binding/default/try.template
index da603c64b603a1b0efd4cc0621ddff938cf303fa..fb1881b68e8e88f7e36ba63db2241b89234d9326 100644
--- a/src/dstr-binding/default/try.template
+++ b/src/dstr-binding/default/try.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/try/dstr-
+path: language/statements/try/dstr/
 name: try statement
 esid: sec-runtime-semantics-catchclauseevaluation
 es6id: 13.15.7
diff --git a/src/dstr-binding/default/var-stmt.template b/src/dstr-binding/default/var-stmt.template
index 23c94ba5957fc752b2eae45dc104c46ac18586fb..5650469c3ec6fa2187d93e3426d94aa22d2b39c9 100644
--- a/src/dstr-binding/default/var-stmt.template
+++ b/src/dstr-binding/default/var-stmt.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/variable/dstr-
+path: language/statements/variable/dstr/
 name: >
     `var` statement
 esid: sec-variable-statement-runtime-semantics-evaluation
diff --git a/src/dstr-binding/error/arrow-function-dflt.template b/src/dstr-binding/error/arrow-function-dflt.template
index 268fbe58b880c07b490b9d30e1f61e4457ba98b0..7cbabac815b410740a4bdb4ba3b2ca0e8b8610ca 100644
--- a/src/dstr-binding/error/arrow-function-dflt.template
+++ b/src/dstr-binding/error/arrow-function-dflt.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/dstr-dflt-
+path: language/expressions/arrow-function/dstr/dflt-
 name: arrow function expression (default parameter)
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/dstr-binding/error/arrow-function.template b/src/dstr-binding/error/arrow-function.template
index 92b1a41c45afbbd7c37d38de6d2a215516298e7b..407ad123003b39a5a06e42b0b42e30a5ea926669 100644
--- a/src/dstr-binding/error/arrow-function.template
+++ b/src/dstr-binding/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/dstr-
+path: language/expressions/arrow-function/dstr/
 name: arrow function expression
 esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
diff --git a/src/dstr-binding/error/async-gen-func-decl-dflt.template b/src/dstr-binding/error/async-gen-func-decl-dflt.template
index 73788c2574d72fd1e00beefb0c31127d77e620cb..3395da2e25277910bdd892379d6b03b9a497df98 100644
--- a/src/dstr-binding/error/async-gen-func-decl-dflt.template
+++ b/src/dstr-binding/error/async-gen-func-decl-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/dstr-dflt-
+path: language/statements/async-generator/dstr/dflt-
 name: async generator function declaration (default parameter)
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-decl.template b/src/dstr-binding/error/async-gen-func-decl.template
index 50e3ca2c775f64d1da9b033cf59417c7f0077cd8..8da6f7d36cadb0929ba4a01123f85273c063027d 100644
--- a/src/dstr-binding/error/async-gen-func-decl.template
+++ b/src/dstr-binding/error/async-gen-func-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/async-generator/dstr-
+path: language/statements/async-generator/dstr/
 name: async generator function declaration
 esid: sec-asyncgenerator-definitions-instantiatefunctionobject
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-expr-dflt.template b/src/dstr-binding/error/async-gen-func-expr-dflt.template
index c7c9d3457c727727f238387d05481a2a007b2416..fb9045ddb8320db057c40f7a9c2d7c4b41ade7c1 100644
--- a/src/dstr-binding/error/async-gen-func-expr-dflt.template
+++ b/src/dstr-binding/error/async-gen-func-expr-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-dflt-
+path: language/expressions/async-generator/dstr/dflt-
 name: async generator function expression (default parameter)
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-expr.template b/src/dstr-binding/error/async-gen-func-expr.template
index 8da6fd8cde9562d82a195b844f8fc865078b51ff..a52354682b075afb93dcbdb64311aa505830134a 100644
--- a/src/dstr-binding/error/async-gen-func-expr.template
+++ b/src/dstr-binding/error/async-gen-func-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-
+path: language/expressions/async-generator/dstr/
 name: async generator function expression
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-named-expr-dflt.template b/src/dstr-binding/error/async-gen-func-named-expr-dflt.template
index d75f5e71970523e480879ff07f7f9b30d0d64d3c..b6731c1daace445e7746abfe1ae2c5eed9cd548b 100644
--- a/src/dstr-binding/error/async-gen-func-named-expr-dflt.template
+++ b/src/dstr-binding/error/async-gen-func-named-expr-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-named-dflt-
+path: language/expressions/async-generator/dstr/named-dflt-
 name: async generator named function expression (default parameter)
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-func-named-expr.template b/src/dstr-binding/error/async-gen-func-named-expr.template
index cf9176ff2466edd61e51da6f027ed35f028f3708..cd659836cf3b36af0ad2a86811825819a6e6f7a6 100644
--- a/src/dstr-binding/error/async-gen-func-named-expr.template
+++ b/src/dstr-binding/error/async-gen-func-named-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/async-generator/dstr-named-
+path: language/expressions/async-generator/dstr/named-
 name: async generator named function expression
 esid: sec-asyncgenerator-definitions-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-meth.template b/src/dstr-binding/error/async-gen-meth.template
index a98c034f7ad6b29b5ec6396b4484fd12864c3da9..7c0763d4d03eb7d8d937b754d5e979fc51092f06 100644
--- a/src/dstr-binding/error/async-gen-meth.template
+++ b/src/dstr-binding/error/async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/dstr-async-gen-meth-
+path: language/expressions/object/dstr/async-gen-meth-
 name: async generator method
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/async-gen-method-dflt.template b/src/dstr-binding/error/async-gen-method-dflt.template
index fd787e49c5af689101e43c20690992e7ddd60e07..9a3948f17d211b3b3dba977f18521cb5b7ac07e1 100644
--- a/src/dstr-binding/error/async-gen-method-dflt.template
+++ b/src/dstr-binding/error/async-gen-method-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/object/dstr-async-gen-meth-dflt-
+path: language/expressions/object/dstr/async-gen-meth-dflt-
 name: async generator method (default parameter)
 esid: sec-asyncgenerator-definitions-propertydefinitionevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-async-gen-meth-dflt.template b/src/dstr-binding/error/cls-decl-async-gen-meth-dflt.template
index 4a2bcc6aa3576abab785f0f11f131a56215d0c36..542695776bf257ba3e732182d58431692d591b6b 100644
--- a/src/dstr-binding/error/cls-decl-async-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-decl-async-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-dflt-
+path: language/statements/class/dstr/async-gen-meth-dflt-
 name: class expression async generator method (default parameters)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-async-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-decl-async-gen-meth-static-dflt.template
index 1794cd64e77d6bdff6e84dbe0c54d2bb78edab80..c3367a665aa89e3e92f46187c1a9e2f317b3358a 100644
--- a/src/dstr-binding/error/cls-decl-async-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-decl-async-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-static-dflt-
+path: language/statements/class/dstr/async-gen-meth-static-dflt-
 name: static class expression async generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-async-gen-meth-static.template b/src/dstr-binding/error/cls-decl-async-gen-meth-static.template
index 98038e374a280eace00d182b613d87b93bb6ca21..718d09b347fd67921df79230b585bc205695ebbb 100644
--- a/src/dstr-binding/error/cls-decl-async-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-decl-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-static-
+path: language/statements/class/dstr/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-async-gen-meth.template b/src/dstr-binding/error/cls-decl-async-gen-meth.template
index 25745f17c3592de050bf9e5a1d6a3d9c1bd73678..277dde2aed1f97ff516d09839e7c66d48be07181 100644
--- a/src/dstr-binding/error/cls-decl-async-gen-meth.template
+++ b/src/dstr-binding/error/cls-decl-async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/dstr-async-gen-meth-
+path: language/statements/class/dstr/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-dflt.template b/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
index 4f51d6a21ccd2113a7b1136c0cc8593910a63d50..b35bedb50d625a320a7221cf194b1db23156f034 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-dflt.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/dstr-gen-meth-dflt-
+path: language/statements/class/dstr/gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
index d722764253d251559f771f87a6b1ef7875575388..88b8065b10ae81bbf620d164b206bbb2e40196a4 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-decl-gen-meth-static-dflt.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/dstr-gen-meth-static-dflt-
+path: language/statements/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-gen-meth-static.template b/src/dstr-binding/error/cls-decl-gen-meth-static.template
index 7785f7ec7d4984e5ddfe434b84e562978b743546..7f3a2399f8145265bbb7a9d9e39b5ff32d33f72a 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth-static.template
+++ b/src/dstr-binding/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/dstr-gen-meth-static-
+path: language/statements/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-gen-meth.template b/src/dstr-binding/error/cls-decl-gen-meth.template
index f313d1c0ec02a2e5b280918dee97b9b681d3f9a0..2ebbcb7b91c5ba4e62a8584ba191127a770d7ca6 100644
--- a/src/dstr-binding/error/cls-decl-gen-meth.template
+++ b/src/dstr-binding/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/dstr-gen-meth-
+path: language/statements/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-decl-meth-dflt.template b/src/dstr-binding/error/cls-decl-meth-dflt.template
index 6824a0a039f0263682bd3ca213febaae3613b82a..9175802c68b0a66143371357c83fd4eea2d4e004 100644
--- a/src/dstr-binding/error/cls-decl-meth-dflt.template
+++ b/src/dstr-binding/error/cls-decl-meth-dflt.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/dstr-meth-dflt-
+path: language/statements/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-meth-static-dflt.template b/src/dstr-binding/error/cls-decl-meth-static-dflt.template
index 7c86010dbf9f8a896404e1f8ffcbeaeb7f822b46..228ef40527325d7a661f0fe0e3c333a90639738c 100644
--- a/src/dstr-binding/error/cls-decl-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-decl-meth-static-dflt.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/dstr-meth-static-dflt-
+path: language/statements/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-meth-static.template b/src/dstr-binding/error/cls-decl-meth-static.template
index d299bd0f05b3f98ed13ebe71f80f8efec64072f8..8cbf39a94ca893f29c1f7f6b45c8e38cf4fa4b6e 100644
--- a/src/dstr-binding/error/cls-decl-meth-static.template
+++ b/src/dstr-binding/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/dstr-meth-static-
+path: language/statements/class/dstr/meth-static-
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-decl-meth.template b/src/dstr-binding/error/cls-decl-meth.template
index e1738089d29d511a570b646e37ebd4f2d9163f1a..96ac5d49b9eb92d5666a2050e34ecc4ae22d465c 100644
--- a/src/dstr-binding/error/cls-decl-meth.template
+++ b/src/dstr-binding/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/dstr-meth-
+path: language/statements/class/dstr/meth-
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
diff --git a/src/dstr-binding/error/cls-expr-async-gen-meth-dflt.template b/src/dstr-binding/error/cls-expr-async-gen-meth-dflt.template
index 05f0c41e20f248c33e81be5c6729face17e4b37b..0f1345c16fba00a3513db26615cf0abcf54b41ed 100644
--- a/src/dstr-binding/error/cls-expr-async-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-expr-async-gen-meth-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-dflt-
+path: language/expressions/class/dstr/async-gen-meth-dflt-
 name: class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-expr-async-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-expr-async-gen-meth-static-dflt.template
index 37fc8cb668f82dac29b8684b259287147415543c..8b1ab24cf3fcbd3bb45e8527cb666da574fea4ec 100644
--- a/src/dstr-binding/error/cls-expr-async-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-expr-async-gen-meth-static-dflt.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-static-dflt-
+path: language/expressions/class/dstr/async-gen-meth-static-dflt-
 name: static class expression async generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-expr-async-gen-meth-static.template b/src/dstr-binding/error/cls-expr-async-gen-meth-static.template
index 0830cf44707e1063f5baa88dae5b7ecbe5b446d7..02ef79d2110f4a821de65d78acf464d76d3da16a 100644
--- a/src/dstr-binding/error/cls-expr-async-gen-meth-static.template
+++ b/src/dstr-binding/error/cls-expr-async-gen-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-static-
+path: language/expressions/class/dstr/async-gen-meth-static-
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-expr-async-gen-meth.template b/src/dstr-binding/error/cls-expr-async-gen-meth.template
index 0e7433a4d7347d0ca6082dae49438ce561f4ecb4..749d1c8810ba0e60479de2f156d5069dadfe6e8b 100644
--- a/src/dstr-binding/error/cls-expr-async-gen-meth.template
+++ b/src/dstr-binding/error/cls-expr-async-gen-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/dstr-async-gen-meth-
+path: language/expressions/class/dstr/async-gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 features: [async-iteration]
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-dflt.template b/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
index 9595e42c9e58082dfa47a6f48fa4b3325e24da36..2b3a806fccf81fc87bcd9bf64189ed1bacdd6c64 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-dflt.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-dflt.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/dstr-gen-meth-dflt-
+path: language/expressions/class/dstr/gen-meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template b/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
index 6a4aaec82cbb4abc88252c0a1a283bab234a29ca..a7046384a0120f6d0d25277b919057f01f9861ed 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-expr-gen-meth-static-dflt.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/dstr-gen-meth-static-dflt-
+path: language/expressions/class/dstr/gen-meth-static-dflt-
 name: static class expression generator method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-gen-meth-static.template b/src/dstr-binding/error/cls-expr-gen-meth-static.template
index a1304926caaf2d16ae0ba13c6f531ea4986b8194..74f572754df38545d39b59291e95ae5ae5c7fd60 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth-static.template
+++ b/src/dstr-binding/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/dstr-gen-meth-static-
+path: language/expressions/class/dstr/gen-meth-static-
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-gen-meth.template b/src/dstr-binding/error/cls-expr-gen-meth.template
index c1734390670bd6c12f3d0255106188d44a737d63..47e8b370facf92d55a08f18e98b094d399ebae53 100644
--- a/src/dstr-binding/error/cls-expr-gen-meth.template
+++ b/src/dstr-binding/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/dstr-gen-meth-
+path: language/expressions/class/dstr/gen-meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-meth-dflt.template b/src/dstr-binding/error/cls-expr-meth-dflt.template
index 0f1465a2b1592e5f5ab5237f4b252327e18e7ab6..d3ebdab173acbd721f5fff4c26affdfb364b65b6 100644
--- a/src/dstr-binding/error/cls-expr-meth-dflt.template
+++ b/src/dstr-binding/error/cls-expr-meth-dflt.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/dstr-meth-dflt-
+path: language/expressions/class/dstr/meth-dflt-
 name: class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-meth-static-dflt.template b/src/dstr-binding/error/cls-expr-meth-static-dflt.template
index e623115df5f40f38b0037abb4652afda753f868d..d5aa14738e58da7199c4bec562cb706c04d5f565 100644
--- a/src/dstr-binding/error/cls-expr-meth-static-dflt.template
+++ b/src/dstr-binding/error/cls-expr-meth-static-dflt.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/dstr-meth-static-dflt-
+path: language/expressions/class/dstr/meth-static-dflt-
 name: static class expression method (default parameter)
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-meth-static.template b/src/dstr-binding/error/cls-expr-meth-static.template
index ce97598e6a204d0faad47345630d8357de4ada2b..296d65ff38a8cffd236f0a8652d403de2b982c12 100644
--- a/src/dstr-binding/error/cls-expr-meth-static.template
+++ b/src/dstr-binding/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/dstr-meth-static-
+path: language/expressions/class/dstr/meth-static-
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/cls-expr-meth.template b/src/dstr-binding/error/cls-expr-meth.template
index ff07a66968562c28bae44bd1f2d8d842b5a1d268..494cec232ff3a666cb0a0f6612384ef1aedd6a75 100644
--- a/src/dstr-binding/error/cls-expr-meth.template
+++ b/src/dstr-binding/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/dstr-meth-
+path: language/expressions/class/dstr/meth-
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
diff --git a/src/dstr-binding/error/const-stmt.template b/src/dstr-binding/error/const-stmt.template
index 4016210c2dba0ea74415e4a0d20dfab245459300..19fe7ede2c7718b6203e8665e2e4d382c3d842cd 100644
--- a/src/dstr-binding/error/const-stmt.template
+++ b/src/dstr-binding/error/const-stmt.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/const/dstr-
+path: language/statements/const/dstr/
 name: >
     `const` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
diff --git a/src/dstr-binding/error/for-const.template b/src/dstr-binding/error/for-const.template
index c3e47fe797a175102250113ec29308060d2441e3..2990bc8850fe22d9e12aa388a82bbb306b1ab6ac 100644
--- a/src/dstr-binding/error/for-const.template
+++ b/src/dstr-binding/error/for-const.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/for/dstr-const-
+path: language/statements/for/dstr/const-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/error/for-let.template b/src/dstr-binding/error/for-let.template
index 8efd2feaadeb4a8598dbce823fdeecb38817bf84..237a248413a4933282c68cd22cabc2b73c8995ff 100644
--- a/src/dstr-binding/error/for-let.template
+++ b/src/dstr-binding/error/for-let.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/for/dstr-let-
+path: language/statements/for/dstr/let-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/error/for-of-const.template b/src/dstr-binding/error/for-of-const.template
index 4b3bcbd5295a6ad6af6fd2fe958ab5b36d02843c..0bc9bbb64b4560088eacf1dc27071db69ef13840 100644
--- a/src/dstr-binding/error/for-of-const.template
+++ b/src/dstr-binding/error/for-of-const.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/for-of/dstr-const-
+path: language/statements/for-of/dstr/const-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/error/for-of-let.template b/src/dstr-binding/error/for-of-let.template
index 73f3e2175b87fc20a1ca754a9dc72a01bf8284f3..37109515bbc92d2fdf224f8d3ed20c15442fd0cd 100644
--- a/src/dstr-binding/error/for-of-let.template
+++ b/src/dstr-binding/error/for-of-let.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/for-of/dstr-let-
+path: language/statements/for-of/dstr/let-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/error/for-of-var.template b/src/dstr-binding/error/for-of-var.template
index a16c42556cc8a50f6fe65420731aaa78be223fde..7bc1bba89eb183b0aed7a6d282f4101e0a6c6034 100644
--- a/src/dstr-binding/error/for-of-var.template
+++ b/src/dstr-binding/error/for-of-var.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/for-of/dstr-var-
+path: language/statements/for-of/dstr/var-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/error/for-var.template b/src/dstr-binding/error/for-var.template
index 7780e112abee33f9b4a161356ae9e9229ff9e257..9b7eec2ab17ea1898c2d7ebf4158c51ef09c5a0c 100644
--- a/src/dstr-binding/error/for-var.template
+++ b/src/dstr-binding/error/for-var.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/for/dstr-var-
+path: language/statements/for/dstr/var-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/error/func-decl-dflt.template b/src/dstr-binding/error/func-decl-dflt.template
index ebadbe395ea78ab2b39b0df2e43b48e5ee572575..f0fada3da2631e11dca1d48778e6984fe8241fee 100644
--- a/src/dstr-binding/error/func-decl-dflt.template
+++ b/src/dstr-binding/error/func-decl-dflt.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/dstr-dflt-
+path: language/statements/function/dstr/dflt-
 name: function declaration (default parameter)
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/dstr-binding/error/func-decl.template b/src/dstr-binding/error/func-decl.template
index 13dff2719999cf05276718cd8819d440362f28fc..103f71434379dadf9b6adf6bacc4e9ac65232835 100644
--- a/src/dstr-binding/error/func-decl.template
+++ b/src/dstr-binding/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/dstr-
+path: language/statements/function/dstr/
 name: function declaration
 esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
diff --git a/src/dstr-binding/error/func-expr-dflt.template b/src/dstr-binding/error/func-expr-dflt.template
index 29c03f558e98ff014123c73416999f731239df0f..06546ee61bffe56c7e49761caad8e1e17af43aca 100644
--- a/src/dstr-binding/error/func-expr-dflt.template
+++ b/src/dstr-binding/error/func-expr-dflt.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/dstr-dflt-
+path: language/expressions/function/dstr/dflt-
 name: function expression (default parameter)
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/dstr-binding/error/func-expr.template b/src/dstr-binding/error/func-expr.template
index 4ee783d95048b4a9462431098bca85ddd592962e..aafedd0e6a8b1b6f6ace6630c229c25b0c9a70c7 100644
--- a/src/dstr-binding/error/func-expr.template
+++ b/src/dstr-binding/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/dstr-
+path: language/expressions/function/dstr/
 name: function expression
 esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
diff --git a/src/dstr-binding/error/gen-func-decl-dflt.template b/src/dstr-binding/error/gen-func-decl-dflt.template
index f88a13f08c5ac66064f2e44a344cb7e816d15665..24ad152a9a8e6b00cd384a6e8459b80adf11e2bf 100644
--- a/src/dstr-binding/error/gen-func-decl-dflt.template
+++ b/src/dstr-binding/error/gen-func-decl-dflt.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/dstr-dflt-
+path: language/statements/generators/dstr/dflt-
 name: generator function declaration (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/dstr-binding/error/gen-func-decl.template b/src/dstr-binding/error/gen-func-decl.template
index 1a507ccd78541f7a275da5da9f20430e8e2859a9..b3058a7578a53be5c13e5327db507b6f37547bb4 100644
--- a/src/dstr-binding/error/gen-func-decl.template
+++ b/src/dstr-binding/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/dstr-
+path: language/statements/generators/dstr/
 name: generator function declaration
 esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
diff --git a/src/dstr-binding/error/gen-func-expr-dflt.template b/src/dstr-binding/error/gen-func-expr-dflt.template
index e45f94ec9d08736908402fa96c00d0c72af036fc..982b6e417fdc64a3f9ae88be18cd31c1e4081766 100644
--- a/src/dstr-binding/error/gen-func-expr-dflt.template
+++ b/src/dstr-binding/error/gen-func-expr-dflt.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/dstr-dflt-
+path: language/expressions/generators/dstr/dflt-
 name: generator function expression (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/dstr-binding/error/gen-func-expr.template b/src/dstr-binding/error/gen-func-expr.template
index 7554ef722e89658988e3d72d2437785ce8a41d32..de951c4a3eee97bc3599d57ca8ef8f24b7b954ec 100644
--- a/src/dstr-binding/error/gen-func-expr.template
+++ b/src/dstr-binding/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/dstr-
+path: language/expressions/generators/dstr/
 name: generator function expression
 esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
diff --git a/src/dstr-binding/error/gen-meth-dflt.template b/src/dstr-binding/error/gen-meth-dflt.template
index 24e7aa2bc0926dc083f1f04faa50f743f5001595..178174ebb01af5a37a1cb2e66264d7baec08ecaa 100644
--- a/src/dstr-binding/error/gen-meth-dflt.template
+++ b/src/dstr-binding/error/gen-meth-dflt.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/dstr-gen-meth-dflt-
+path: language/expressions/object/dstr/gen-meth-dflt-
 name: generator method (default parameter)
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/dstr-binding/error/gen-meth.template b/src/dstr-binding/error/gen-meth.template
index 821d08a2d93106bfb6783b7bbe58f63b929f7379..2e4c09aa4f55fb7a6f50501abf510ed049a962f4 100644
--- a/src/dstr-binding/error/gen-meth.template
+++ b/src/dstr-binding/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/dstr-gen-meth-
+path: language/expressions/object/dstr/gen-meth-
 name: generator method
 esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
diff --git a/src/dstr-binding/error/let-stmt.template b/src/dstr-binding/error/let-stmt.template
index 66ba68be67efee56d4f099ae82f2e461cf14e7eb..dbef6eca0727149c06b9443a4029e3e9a05d303f 100644
--- a/src/dstr-binding/error/let-stmt.template
+++ b/src/dstr-binding/error/let-stmt.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/let/dstr-
+path: language/statements/let/dstr/
 name: >
     `let` statement
 esid: sec-let-and-const-declarations-runtime-semantics-evaluation
diff --git a/src/dstr-binding/error/meth-dflt.template b/src/dstr-binding/error/meth-dflt.template
index e56ffd0b2c314c7f73876ee6b3c5f8628d2eaa57..b1faa121ec47b102e03a0267ad919567209b44f5 100644
--- a/src/dstr-binding/error/meth-dflt.template
+++ b/src/dstr-binding/error/meth-dflt.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/dstr-meth-dflt-
+path: language/expressions/object/dstr/meth-dflt-
 name: method (default parameter)
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/dstr-binding/error/meth.template b/src/dstr-binding/error/meth.template
index b0fdecc58dc3b3cd3d4f2bdec08b2bb789d83003..f0f26bbb63a5eeba2a8283dc0de40733205f469f 100644
--- a/src/dstr-binding/error/meth.template
+++ b/src/dstr-binding/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/dstr-meth-
+path: language/expressions/object/dstr/meth-
 name: method
 esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
diff --git a/src/dstr-binding/error/try.template b/src/dstr-binding/error/try.template
index a7a83647cad1cf9352c94836fce9e10e852f314f..611365d5672ed73215b44304c51ad6ef8d207ae4 100644
--- a/src/dstr-binding/error/try.template
+++ b/src/dstr-binding/error/try.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/try/dstr-
+path: language/statements/try/dstr/
 name: try statement
 esid: sec-runtime-semantics-catchclauseevaluation
 es6id: 13.15.7
diff --git a/src/dstr-binding/error/var-stmt.template b/src/dstr-binding/error/var-stmt.template
index f3adc65f602c77e900736bfa0dcd1ff493303404..0a1b9b72a782e5408d72f8f812df4c2124c252ea 100644
--- a/src/dstr-binding/error/var-stmt.template
+++ b/src/dstr-binding/error/var-stmt.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/variable/dstr-
+path: language/statements/variable/dstr/
 name: >
     `var` statement
 esid: sec-variable-statement-runtime-semantics-evaluation
diff --git a/src/dstr-binding/iter-close/for-const.template b/src/dstr-binding/iter-close/for-const.template
index bcd66ebf180643dc8938046b0d4d6aa50281e331..1ad33ac052364fa9d3566d20e79f5066ce369dcc 100644
--- a/src/dstr-binding/iter-close/for-const.template
+++ b/src/dstr-binding/iter-close/for-const.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/for/dstr-const-
+path: language/statements/for/dstr/const-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/iter-close/for-let.template b/src/dstr-binding/iter-close/for-let.template
index 1dd2ea3d68e3cb7b68f4596383062f717b51e3d7..185a814481580710771a3a2385608f1174ee532c 100644
--- a/src/dstr-binding/iter-close/for-let.template
+++ b/src/dstr-binding/iter-close/for-let.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/for/dstr-let-
+path: language/statements/for/dstr/let-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7
diff --git a/src/dstr-binding/iter-close/for-of-const.template b/src/dstr-binding/iter-close/for-of-const.template
index 15fc0d18ce024b415b93ed0dd099821be5ad4898..fd0ece582cb7dadaff1bf3803668ee1cb34e27a8 100644
--- a/src/dstr-binding/iter-close/for-of-const.template
+++ b/src/dstr-binding/iter-close/for-of-const.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/for-of/dstr-const-
+path: language/statements/for-of/dstr/const-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/iter-close/for-of-let.template b/src/dstr-binding/iter-close/for-of-let.template
index c0b49b7dc5ff0d33bfb9309c8e6e93896697d178..393b7ed5487c05b3f671c128398ddcd48b4079a1 100644
--- a/src/dstr-binding/iter-close/for-of-let.template
+++ b/src/dstr-binding/iter-close/for-of-let.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/for-of/dstr-let-
+path: language/statements/for-of/dstr/let-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/iter-close/for-of-var.template b/src/dstr-binding/iter-close/for-of-var.template
index d945561a2e1946fc36c78bd5499547b28c09c138..0cabbb93b4b528e5dfe1525e201b493cfe7de416 100644
--- a/src/dstr-binding/iter-close/for-of-var.template
+++ b/src/dstr-binding/iter-close/for-of-var.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/for-of/dstr-var-
+path: language/statements/for-of/dstr/var-
 name: for-of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
 es6id: 13.7.5.11
diff --git a/src/dstr-binding/iter-close/for-var.template b/src/dstr-binding/iter-close/for-var.template
index 8dce099d1dc7642caf6a08b8955fcd0c5c824345..62fabb5d339b4b3ceca345a3c609c5b80e9faf8c 100644
--- a/src/dstr-binding/iter-close/for-var.template
+++ b/src/dstr-binding/iter-close/for-var.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/for/dstr-var-
+path: language/statements/for/dstr/var-
 name: for statement
 esid: sec-for-statement-runtime-semantics-labelledevaluation
 es6id: 13.7.4.7