diff --git a/src/async-functions/syntax/async-class-decl-private-method.template b/src/async-functions/syntax/async-class-decl-private-method.template
index 1d252d3f3a186ada0646ea8670b557ba31891c4e..aec9070e157666982092a06c6d28cb232c33d3ea 100644
--- a/src/async-functions/syntax/async-class-decl-private-method.template
+++ b/src/async-functions/syntax/async-class-decl-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-private-method/
+path: language/statements/class/elements/async-private-method/
 name: Async private method as a ClassDeclaration element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-decl-static-private-method.template b/src/async-functions/syntax/async-class-decl-static-private-method.template
index 98c9dbc45b01f500808b3d4e36c031227a09f7b5..4fdae2466e826abeccaa0292c028ac1d9ae6e731 100644
--- a/src/async-functions/syntax/async-class-decl-static-private-method.template
+++ b/src/async-functions/syntax/async-class-decl-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-private-method-static/
+path: language/statements/class/elements/async-private-method-static/
 name: Static async private method as a ClassDeclaration element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-expr-private-method.template b/src/async-functions/syntax/async-class-expr-private-method.template
index 7be79ef126c919e686757b5cbb6d05d7a947ebad..d75ed165121180597eae49181f411061664c5b9e 100644
--- a/src/async-functions/syntax/async-class-expr-private-method.template
+++ b/src/async-functions/syntax/async-class-expr-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-private-method/
+path: language/expressions/class/elements/async-private-method/
 name: Async private method as a ClassExpression element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-functions/syntax/async-class-expr-static-private-method.template b/src/async-functions/syntax/async-class-expr-static-private-method.template
index e38e4b70ebbc50957539498450229de7d16c1ed4..e4f3a50097e4a3ba40012e10ae6beae100a9ff63 100644
--- a/src/async-functions/syntax/async-class-expr-static-private-method.template
+++ b/src/async-functions/syntax/async-class-expr-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-private-method-static/
+path: language/expressions/class/elements/async-private-method-static/
 name: Static private async method as a ClassExpression element
 esid: prod-AsyncMethod
 info: |
diff --git a/src/async-generators/default/async-class-decl-private-method.template b/src/async-generators/default/async-class-decl-private-method.template
index 91a8b486083434ade603a73559924a6a39012b7c..9ca63b46127b1234eec78e6129d8532c89bc9743 100644
--- a/src/async-generators/default/async-class-decl-private-method.template
+++ b/src/async-generators/default/async-class-decl-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-private-method/
+path: language/statements/class/elements/async-gen-private-method/
 name: Async Generator method as a ClassDeclaration element
 esid: prod-AsyncGeneratorPrivateMethod
 info: |
diff --git a/src/async-generators/default/async-class-decl-static-private-method.template b/src/async-generators/default/async-class-decl-static-private-method.template
index 76cd2e0437cf23e049d637b0e26dddf03ed2f2eb..9b504e2695c0ab2a696a7f8974ed262773092fec 100644
--- a/src/async-generators/default/async-class-decl-static-private-method.template
+++ b/src/async-generators/default/async-class-decl-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-private-method-static/
+path: language/statements/class/elements/async-gen-private-method-static/
 name: Static async generator method as a ClassDeclaration element
 esid: prod-AsyncGeneratorPrivateMethod
 info: |
diff --git a/src/async-generators/default/async-class-expr-private-method.template b/src/async-generators/default/async-class-expr-private-method.template
index 72a6172e6a55212c109e3f3810838876f606650a..d42a79d86427d8ca581c132e4a7a4e801062cbc3 100644
--- a/src/async-generators/default/async-class-expr-private-method.template
+++ b/src/async-generators/default/async-class-expr-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-private-method/
+path: language/expressions/class/elements/async-gen-private-method/
 name: Async generator method as a ClassExpression element
 esid: prod-AsyncGeneratorPrivateMethod
 info: |
diff --git a/src/async-generators/default/async-class-expr-static-private-method.template b/src/async-generators/default/async-class-expr-static-private-method.template
index cb7f200eab9b4c3228f01a47820c140ee032d383..8d5fd8613ec5b343a80b522b1f278c15b22f7858 100644
--- a/src/async-generators/default/async-class-expr-static-private-method.template
+++ b/src/async-generators/default/async-class-expr-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-private-method-static/
+path: language/expressions/class/elements/async-gen-private-method-static/
 name: Static async generator method as a ClassExpression element
 esid: prod-AsyncGeneratorPrivateMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-decl-private-method.template b/src/async-generators/syntax/async-class-decl-private-method.template
index e74cfc11d4d8d1bea6cba1280787560262d52898..6bc7a240df24e39be3a62e1be800244bb1556a5a 100644
--- a/src/async-generators/syntax/async-class-decl-private-method.template
+++ b/src/async-generators/syntax/async-class-decl-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-private-method/
+path: language/statements/class/elements/async-gen-private-method/
 name: Async Generator private method as a ClassDeclaration element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-decl-static-private-method.template b/src/async-generators/syntax/async-class-decl-static-private-method.template
index ad9009af6d3758a28a1ce6c0898a8225a52ca9f2..6009a38bf6c7b6eae6b9168d6b3267888d20d854 100644
--- a/src/async-generators/syntax/async-class-decl-static-private-method.template
+++ b/src/async-generators/syntax/async-class-decl-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-gen-private-method-static/
+path: language/statements/class/elements/async-gen-private-method-static/
 name: Static async generator private method as a ClassDeclaration element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-expr-private-method.template b/src/async-generators/syntax/async-class-expr-private-method.template
index 178385f508355ae880edec14d77e538e50658ba5..4d2dc0a1683b60403ff4959234783016708feeab 100644
--- a/src/async-generators/syntax/async-class-expr-private-method.template
+++ b/src/async-generators/syntax/async-class-expr-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-private-method/
+path: language/expressions/class/elements/async-gen-private-method/
 name: Async generator private method as a ClassExpression element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/async-generators/syntax/async-class-expr-static-private-method.template b/src/async-generators/syntax/async-class-expr-static-private-method.template
index 3f804af8b4af6217b43e5ae8c0ef47017b910b66..4e2aa7eb449332b59f18c487cb8b3f3e49d17f33 100644
--- a/src/async-generators/syntax/async-class-expr-static-private-method.template
+++ b/src/async-generators/syntax/async-class-expr-static-private-method.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-gen-private-method-static/
+path: language/expressions/class/elements/async-gen-private-method-static/
 name: Static async generator private method as a ClassExpression element
 esid: prod-AsyncGeneratorMethod
 info: |
diff --git a/src/class-elements/private-methods/cls-decl.template b/src/class-elements/private-methods/cls-decl.template
index 3bc828c84cf5b8673b98048dc5e2d8b692a96578..c909d2a53b52a7b4ccda2a11fc47aedcf1e64f29 100644
--- a/src/class-elements/private-methods/cls-decl.template
+++ b/src/class-elements/private-methods/cls-decl.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/private-methods/
+path: language/statements/class/elements/private-methods/
 name: private method definitions in a class declaration
 features: [class, class-methods-private]
 info: |
diff --git a/src/class-elements/private-methods/cls-expr.template b/src/class-elements/private-methods/cls-expr.template
index 564e50acb34d938e38a24f29428e884e7c6553e9..3f207700e372c86c5c14312a7de43d716c35ab92 100644
--- a/src/class-elements/private-methods/cls-expr.template
+++ b/src/class-elements/private-methods/cls-expr.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/private-methods/
+path: language/expressions/class/elements/private-methods/
 name: private method definitions in a class expression
 features: [class, class-methods-private]
 info: |
diff --git a/src/function-forms/default/cls-decl-async-gen-meth-static.template b/src/function-forms/default/cls-decl-async-gen-meth-static.template
index d564d607992649c6a2dc39a5f2afb4d56f5f0cd4..aa727b7042d6f7a536cff976430ab61fdca53f25 100644
--- a/src/function-forms/default/cls-decl-async-gen-meth-static.template
+++ b/src/function-forms/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/async-gen-meth-static/
+path: language/statements/class/async-gen-method-static/
 name: static class declaration async generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-async-gen-meth.template b/src/function-forms/default/cls-decl-async-gen-meth.template
index 9ac00af96b1da38e9f10be47efef38d52d5b5311..408b479c2af75c4c673833c24b8110bd0b88e37e 100644
--- a/src/function-forms/default/cls-decl-async-gen-meth.template
+++ b/src/function-forms/default/cls-decl-async-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/async-gen-meth/
+path: language/statements/class/async-gen-method/
 name: class declaration async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-async-meth-static.template b/src/function-forms/default/cls-decl-async-meth-static.template
index 0d43f58195080e6bd0942e562c5c93805c311a31..7bf781398ad60400eea5f57023a8e97fd448cba9 100644
--- a/src/function-forms/default/cls-decl-async-meth-static.template
+++ b/src/function-forms/default/cls-decl-async-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth-static/
+path: language/statements/class/async-method-static/
 name: static class declaration async method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-async-meth.template b/src/function-forms/default/cls-decl-async-meth.template
index 873cb0fbc97a46de5d50fbe183c4764d81ef7e92..f07ad12e19f1a2ad47751bee6a535e265b794c36 100644
--- a/src/function-forms/default/cls-decl-async-meth.template
+++ b/src/function-forms/default/cls-decl-async-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth/
+path: language/statements/class/async-method/
 name: class declaration async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-gen-meth-static.template b/src/function-forms/default/cls-decl-gen-meth-static.template
index d6f14d6588aa9b945ec8123ade4357ee3a695af6..c20a30c8f646141b86f48bd92f065b93398b2a88 100644
--- a/src/function-forms/default/cls-decl-gen-meth-static.template
+++ b/src/function-forms/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/gen-meth-static/
+path: language/statements/class/gen-method-static/
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-gen-meth.template b/src/function-forms/default/cls-decl-gen-meth.template
index fd7e975c27cbd2326973ff547e2c4768612b0b72..182edb121f06cf452386aec266668071b1cd180e 100644
--- a/src/function-forms/default/cls-decl-gen-meth.template
+++ b/src/function-forms/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/gen-meth/
+path: language/statements/class/gen-method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-meth-static.template b/src/function-forms/default/cls-decl-meth-static.template
index ce90f407e520368276466ba4580ef42564e25897..4f62141a7171031c56c97e48259ba98ff0f9e12b 100644
--- a/src/function-forms/default/cls-decl-meth-static.template
+++ b/src/function-forms/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/meth-static/
+path: language/statements/class/method-static/
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-decl-meth.template b/src/function-forms/default/cls-decl-meth.template
index 3ed7201e660f0a0769b5c179639df9a4937a112f..6dd47cc3c9d130db322e4302b5a7955a0b0990b6 100644
--- a/src/function-forms/default/cls-decl-meth.template
+++ b/src/function-forms/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/meth/
+path: language/statements/class/method/
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-async-gen-meth-static.template b/src/function-forms/default/cls-expr-async-gen-meth-static.template
index 94229234c450b091802371f7d6b9df8e6c43b318..8ff4fd9d3fe58d5c5d84da5997fa36f7a9b62d68 100644
--- a/src/function-forms/default/cls-expr-async-gen-meth-static.template
+++ b/src/function-forms/default/cls-expr-async-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/async-gen-meth-static/
+path: language/expressions/class/async-gen-method-static/
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-async-gen-meth.template b/src/function-forms/default/cls-expr-async-gen-meth.template
index 6c26f310296f6442cbf2374f6ec79772b6d92442..7676eb7e50647e84dae1ef686ccb1c2e96675724 100644
--- a/src/function-forms/default/cls-expr-async-gen-meth.template
+++ b/src/function-forms/default/cls-expr-async-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/async-gen-meth/
+path: language/expressions/class/async-gen-method/
 name: class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-async-meth-static.template b/src/function-forms/default/cls-expr-async-meth-static.template
index 19738eb26f7a0a7394b776fedfac92da4ccdc8fb..c869992a1b4a26b583f6de918fcf710c15c4c7c5 100644
--- a/src/function-forms/default/cls-expr-async-meth-static.template
+++ b/src/function-forms/default/cls-expr-async-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-meth-static/
+path: language/expressions/class/async-method-static/
 name: static class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-async-meth.template b/src/function-forms/default/cls-expr-async-meth.template
index 150b91e35be5385a482a26bf9ddcb3ab5c3a256c..e2268669d5ecf6dc6ee11e2e767149980f3cb782 100644
--- a/src/function-forms/default/cls-expr-async-meth.template
+++ b/src/function-forms/default/cls-expr-async-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-meth/
+path: language/expressions/class/async-method/
 name: class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-gen-meth-static.template b/src/function-forms/default/cls-expr-gen-meth-static.template
index 94f53cda0008ec3f03af0e2a6618862377413ef4..2b7beda58bdba691f69e301bd79bd4bbee892c21 100644
--- a/src/function-forms/default/cls-expr-gen-meth-static.template
+++ b/src/function-forms/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/gen-meth-static/
+path: language/expressions/class/gen-method-static/
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-gen-meth.template b/src/function-forms/default/cls-expr-gen-meth.template
index 0d47f8c579e93a227ccc46927faae25fcd83de26..6d8d173c180b80009f87405ab029cf8fc478baa2 100644
--- a/src/function-forms/default/cls-expr-gen-meth.template
+++ b/src/function-forms/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/gen-meth/
+path: language/expressions/class/gen-method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-meth-static.template b/src/function-forms/default/cls-expr-meth-static.template
index 7bc897aad136de74b5d1a9b7fb81bfb47c66a9df..a96e8f4c692ff10e72f839fd4c4fbf77a2b730f5 100644
--- a/src/function-forms/default/cls-expr-meth-static.template
+++ b/src/function-forms/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/meth-static/
+path: language/expressions/class/method-static/
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/default/cls-expr-meth.template b/src/function-forms/default/cls-expr-meth.template
index b6bf732ab3ff6e23737a3bbedbbf7e1008013611..d7ca186e165561a796840110621a28396b699fc3 100644
--- a/src/function-forms/default/cls-expr-meth.template
+++ b/src/function-forms/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/meth/
+path: language/expressions/class/method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-async-gen-meth-static.template b/src/function-forms/error/cls-decl-async-gen-meth-static.template
index efad52db0c813549dde9247cbb23ac06cc6d2f2c..b290f07a688963c525d5e369446b60dba7a6ad99 100644
--- a/src/function-forms/error/cls-decl-async-gen-meth-static.template
+++ b/src/function-forms/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/async-gen-meth-static/
+path: language/statements/class/async-gen-method-static/
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-async-gen-meth.template b/src/function-forms/error/cls-decl-async-gen-meth.template
index 541710ad4d257b96667951d0c10e5fd2903ee8e5..a07283cacb0e6625922414c0a6531b48564ebc70 100644
--- a/src/function-forms/error/cls-decl-async-gen-meth.template
+++ b/src/function-forms/error/cls-decl-async-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/async-gen-meth/
+path: language/statements/class/async-gen-method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-async-meth-static.template b/src/function-forms/error/cls-decl-async-meth-static.template
index 5652a91cc3bc3a283f1b704cba561108f018a5f5..a42cf83d78af517c0357c39f4c5149e39f801aae 100644
--- a/src/function-forms/error/cls-decl-async-meth-static.template
+++ b/src/function-forms/error/cls-decl-async-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth-static/
+path: language/statements/class/async-method-static/
 name: static class declaration async method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-async-meth.template b/src/function-forms/error/cls-decl-async-meth.template
index fa1d23b912e5c8baecf947dc210fc7a44c52164e..70b7b693baaf91a2ab4d1990a8e72077b8212205 100644
--- a/src/function-forms/error/cls-decl-async-meth.template
+++ b/src/function-forms/error/cls-decl-async-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth/
+path: language/statements/class/async-method/
 name: class declaration async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-gen-meth-static.template b/src/function-forms/error/cls-decl-gen-meth-static.template
index 48802287b94a7ca3ef7154b374f13e48d56b9009..72c9a88f2ac99c7e1cd2e4885dac72e22b3fcd20 100644
--- a/src/function-forms/error/cls-decl-gen-meth-static.template
+++ b/src/function-forms/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/gen-meth-static/
+path: language/statements/class/gen-method-static/
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-gen-meth.template b/src/function-forms/error/cls-decl-gen-meth.template
index 8e5def37b65cbf8ed2704f3a8075ef3292ac8df0..03a3df47fb79181a1dbabdb29c9a8447d5f8373c 100644
--- a/src/function-forms/error/cls-decl-gen-meth.template
+++ b/src/function-forms/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/gen-meth/
+path: language/statements/class/gen-method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-meth-static.template b/src/function-forms/error/cls-decl-meth-static.template
index 005ed11e15b60696bc12d606da2e4bbc37d34ad5..a45d625983266f354b4afac54af507f40c48d305 100644
--- a/src/function-forms/error/cls-decl-meth-static.template
+++ b/src/function-forms/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/meth-static/
+path: language/statements/class/method-static/
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-decl-meth.template b/src/function-forms/error/cls-decl-meth.template
index 911db8a77311a3d6c6b6618ed1285785b8d4672c..6125e1949a59732cb9d6403579d5be023d67bc95 100644
--- a/src/function-forms/error/cls-decl-meth.template
+++ b/src/function-forms/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/meth/
+path: language/statements/class/method/
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-async-gen-meth-static.template b/src/function-forms/error/cls-expr-async-gen-meth-static.template
index 64779bd30c34bcc45d4b6bda505f1ce00ca31d2f..fa410d4f7ca8c6a7b27843ce989afdd01863db30 100644
--- a/src/function-forms/error/cls-expr-async-gen-meth-static.template
+++ b/src/function-forms/error/cls-expr-async-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/async-gen-meth-static/
+path: language/expressions/class/async-gen-method-static/
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-async-gen-meth.template b/src/function-forms/error/cls-expr-async-gen-meth.template
index 07bf7f9843d52fb1ee90f88e3a3a9564ae9325fe..08bf9a81cc558ae65cb7cc0c4496eb1a1c2d5bcf 100644
--- a/src/function-forms/error/cls-expr-async-gen-meth.template
+++ b/src/function-forms/error/cls-expr-async-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/async-gen-meth/
+path: language/expressions/class/async-gen-method/
 name: class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-async-meth-static.template b/src/function-forms/error/cls-expr-async-meth-static.template
index 5f6ff6f6cf5f5f8c79bd05ae0c55291c5c5c8ed3..34f19bc78b85ffc1a3d391aa6ac54c1199d61fa0 100644
--- a/src/function-forms/error/cls-expr-async-meth-static.template
+++ b/src/function-forms/error/cls-expr-async-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-meth-static/
+path: language/expressions/class/async-method-static/
 name: static class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-async-meth.template b/src/function-forms/error/cls-expr-async-meth.template
index 7e80b8b55ebf0261391ec49bb2bb58b0c61f6fab..265af2e851c155b7d3120a800d238517e18769a2 100644
--- a/src/function-forms/error/cls-expr-async-meth.template
+++ b/src/function-forms/error/cls-expr-async-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/expressions/class/async-meth/
+path: language/expressions/class/async-method/
 name: class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-gen-meth-static.template b/src/function-forms/error/cls-expr-gen-meth-static.template
index 7b9629cfbf91bf0d7065bfeb71ddaee91978026a..7b232bff1665fe2ea2a144c493079b7b0b33b17f 100644
--- a/src/function-forms/error/cls-expr-gen-meth-static.template
+++ b/src/function-forms/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/gen-meth-static/
+path: language/expressions/class/gen-method-static/
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-gen-meth.template b/src/function-forms/error/cls-expr-gen-meth.template
index 3a6f2c939944ba55ece7a035b91547bc917bbcd5..f7cd3b43cbd13685843a6e8ac978587e2ebed9d4 100644
--- a/src/function-forms/error/cls-expr-gen-meth.template
+++ b/src/function-forms/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/gen-meth/
+path: language/expressions/class/gen-method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-meth-static.template b/src/function-forms/error/cls-expr-meth-static.template
index b271cc97639b40d4782753afacc46bd96c65ff70..a825353423b7ee3ec80b3f2b916f607ba0547d61 100644
--- a/src/function-forms/error/cls-expr-meth-static.template
+++ b/src/function-forms/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/meth-static/
+path: language/expressions/class/method-static/
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/error/cls-expr-meth.template b/src/function-forms/error/cls-expr-meth.template
index 3b9f01931b54856956b3f3856fcee19be41d2305..eae6645c686a98d259b7a78275152be190547a97 100644
--- a/src/function-forms/error/cls-expr-meth.template
+++ b/src/function-forms/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/meth/
+path: language/expressions/class/method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-async-gen-meth-static.template b/src/function-forms/syntax/cls-decl-async-gen-meth-static.template
index 04c3c7ccecc2f0ab9369c406b9e17813f3cf3c1e..7cd312abe5131bd9bae9da7fec995890c9a6ad06 100644
--- a/src/function-forms/syntax/cls-decl-async-gen-meth-static.template
+++ b/src/function-forms/syntax/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/async-gen-meth-static/
+path: language/statements/class/async-gen-method-static/
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-async-gen-meth.template b/src/function-forms/syntax/cls-decl-async-gen-meth.template
index 00bfd6960f7fffd9bd46bc5fa7015a19cacb3e0e..70d3d69afc70132069be88bdfa399f20f1ff9fcc 100644
--- a/src/function-forms/syntax/cls-decl-async-gen-meth.template
+++ b/src/function-forms/syntax/cls-decl-async-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/async-gen-meth/
+path: language/statements/class/async-gen-method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-async-meth-static.template b/src/function-forms/syntax/cls-decl-async-meth-static.template
index b355156e70fc80fd92c79b29f4e3c842d27cf3ae..08d826fa4a0974d02bb1836cc0468cf4ff1ab5b0 100644
--- a/src/function-forms/syntax/cls-decl-async-meth-static.template
+++ b/src/function-forms/syntax/cls-decl-async-meth-static.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth-static/
+path: language/statements/class/async-method-static/
 name: static class declaration async method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-async-meth.template b/src/function-forms/syntax/cls-decl-async-meth.template
index 18f450d1a58e5425fd1e9c4ead9ccd7834cd0a65..04e58fb0494699c351768f35650a51049e3b0343 100644
--- a/src/function-forms/syntax/cls-decl-async-meth.template
+++ b/src/function-forms/syntax/cls-decl-async-meth.template
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-path: language/statements/class/async-meth/
+path: language/statements/class/async-method/
 name: class declaration async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-gen-meth-static.template b/src/function-forms/syntax/cls-decl-gen-meth-static.template
index cbbfa6fb1ba8d3fd02730be70df45a62ce4528f0..2fbce899bc0bef975ceed48e22d11dd511b8b43e 100644
--- a/src/function-forms/syntax/cls-decl-gen-meth-static.template
+++ b/src/function-forms/syntax/cls-decl-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-meth-static/
+path: language/statements/class/gen-method-static/
 name: static class expression generator method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-gen-meth.template b/src/function-forms/syntax/cls-decl-gen-meth.template
index 3fb269a899cc530e0f84ef3224d7822a722e1ab9..9882150051c6ff1200c4b3dce55f9bdb10499a57 100644
--- a/src/function-forms/syntax/cls-decl-gen-meth.template
+++ b/src/function-forms/syntax/cls-decl-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-meth/
+path: language/statements/class/gen-method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-meth-static.template b/src/function-forms/syntax/cls-decl-meth-static.template
index 47f2dd28f6e6432ae5dd88ffef65c95e9408c862..a008af8feebef30ad657bb98b9f7df49b09d2aea 100644
--- a/src/function-forms/syntax/cls-decl-meth-static.template
+++ b/src/function-forms/syntax/cls-decl-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/meth-static/
+path: language/statements/class/method-static/
 name: static class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-decl-meth.template b/src/function-forms/syntax/cls-decl-meth.template
index d0e554f95e5dacf8561c36303f01b62a77cc47f0..dcc5cb3bd5c2ba44463722aeda98a9d2cf962e6c 100644
--- a/src/function-forms/syntax/cls-decl-meth.template
+++ b/src/function-forms/syntax/cls-decl-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/meth/
+path: language/statements/class/method/
 name: class expression method
 esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-async-gen-meth-static.template b/src/function-forms/syntax/cls-expr-async-gen-meth-static.template
index f9823e4bb3cf509d2c94f4d93593ca5d13821654..02da1f257f1788c4ca910e7580eeda2ab7405a54 100644
--- a/src/function-forms/syntax/cls-expr-async-gen-meth-static.template
+++ b/src/function-forms/syntax/cls-expr-async-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/async-gen-meth-static/
+path: language/expressions/class/async-gen-method-static/
 name: static class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-async-gen-meth.template b/src/function-forms/syntax/cls-expr-async-gen-meth.template
index 86d96f3e580f607ca546fde5b5c7eda9df7620e4..e6e61c679b9b4aa559f0f77a3d61e6baf0f0f934 100644
--- a/src/function-forms/syntax/cls-expr-async-gen-meth.template
+++ b/src/function-forms/syntax/cls-expr-async-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/async-gen-meth/
+path: language/expressions/class/async-gen-method/
 name: class expression async generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-async-meth-static.template b/src/function-forms/syntax/cls-expr-async-meth-static.template
index a954c09e7be69d48daaeb0c09ad8ef24e6d38e15..7a02faad7ee3bf40f880b039f59a514fe55ced05 100644
--- a/src/function-forms/syntax/cls-expr-async-meth-static.template
+++ b/src/function-forms/syntax/cls-expr-async-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-meth-static/
+path: language/expressions/class/async-method-static/
 name: static class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-async-meth.template b/src/function-forms/syntax/cls-expr-async-meth.template
index 83f82cb6d19d5b766f2d8d62778f871e221e6454..b850f236fe36bfe02fff3c87ae4cd2cf0836ca49 100644
--- a/src/function-forms/syntax/cls-expr-async-meth.template
+++ b/src/function-forms/syntax/cls-expr-async-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2017 Leo Balter. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/async-meth/
+path: language/expressions/class/async-method/
 name: class expression async method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-gen-meth-static.template b/src/function-forms/syntax/cls-expr-gen-meth-static.template
index 6e54d7b0a203f313890ab0ecec5930d6147fdb64..041affb58f847392efa1985404f59295f45580b8 100644
--- a/src/function-forms/syntax/cls-expr-gen-meth-static.template
+++ b/src/function-forms/syntax/cls-expr-gen-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-meth-static/
+path: language/expressions/class/gen-method-static/
 name: static class expression generator method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-gen-meth.template b/src/function-forms/syntax/cls-expr-gen-meth.template
index 7c013f636c608962c083ec2b416e784162a7b2c1..692a92295e80470b83aa35cb2d8eb7041b2f7bac 100644
--- a/src/function-forms/syntax/cls-expr-gen-meth.template
+++ b/src/function-forms/syntax/cls-expr-gen-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-meth/
+path: language/expressions/class/gen-method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-meth-static.template b/src/function-forms/syntax/cls-expr-meth-static.template
index 9cf5f711d17799428f9f2bdc940ec599a5838d76..9c1d3d8feca4804ffcdfcd23f85bd3f7e22ce068 100644
--- a/src/function-forms/syntax/cls-expr-meth-static.template
+++ b/src/function-forms/syntax/cls-expr-meth-static.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/meth-static/
+path: language/expressions/class/method-static/
 name: static class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/function-forms/syntax/cls-expr-meth.template b/src/function-forms/syntax/cls-expr-meth.template
index 6ee49c0fe658959d0458446b643e465f119a9a5e..e6a7c486391f482534f8d3aa0bd438ba948dfdda 100644
--- a/src/function-forms/syntax/cls-expr-meth.template
+++ b/src/function-forms/syntax/cls-expr-meth.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/meth/
+path: language/expressions/class/method/
 name: class expression method
 esid: sec-class-definitions-runtime-semantics-evaluation
 info: |
diff --git a/src/generators/default/class-decl-private-method.template b/src/generators/default/class-decl-private-method.template
index 6d955d100632b7b0e3d658d94afb10780835603a..4085202f555b54656460129cdfa513ae9a1488b6 100644
--- a/src/generators/default/class-decl-private-method.template
+++ b/src/generators/default/class-decl-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-private-method/
+path: language/statements/class/elements/gen-private-method/
 name: Generator private method as a ClassDeclaration element
 esid: prod-GeneratorPrivateMethod
 info: |
diff --git a/src/generators/default/class-decl-static-private-method.template b/src/generators/default/class-decl-static-private-method.template
index cd5be38b0d577d0f242a9120720ed58f71629a93..83e865f3cd202f5578c395791d5a397bedd88d31 100644
--- a/src/generators/default/class-decl-static-private-method.template
+++ b/src/generators/default/class-decl-static-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-private-method-static/
+path: language/statements/class/elements/gen-private-method-static/
 name: Static generator private method as a ClassDeclaration element
 esid: prod-GeneratorPrivateMethod
 info: |
diff --git a/src/generators/default/class-expr-private-method.template b/src/generators/default/class-expr-private-method.template
index 7e775d67c70e8315beca1ee117ded38c480a980a..f4813630d7d4baf931a12414f396e302fb9cfebe 100644
--- a/src/generators/default/class-expr-private-method.template
+++ b/src/generators/default/class-expr-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-private-method/
+path: language/expressions/class/elements/gen-private-method/
 name: Generator private method as a ClassExpression element
 esid: prod-GeneratorPrivateMethod
 info: |
diff --git a/src/generators/default/class-expr-static-private-method.template b/src/generators/default/class-expr-static-private-method.template
index a84a691979d8dad345b65e54408b34b900cf8fb4..b42a00a2b2ba3649a92192558dafd67ead5f3f5f 100644
--- a/src/generators/default/class-expr-static-private-method.template
+++ b/src/generators/default/class-expr-static-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-private-method-static/
+path: language/expressions/class/elements/gen-private-method-static/
 name: Static generator private method as a ClassExpression element
 esid: prod-GeneratorPrivateMethod
 info: |
diff --git a/src/generators/syntax/class-decl-private-method.template b/src/generators/syntax/class-decl-private-method.template
index 0c6c71c54077e9fe9015ad2b9e16d0c67f0101c1..44d22b19229115d3c8a03ad3be9b349f2f276903 100644
--- a/src/generators/syntax/class-decl-private-method.template
+++ b/src/generators/syntax/class-decl-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-private-method/
+path: language/statements/class/elements/gen-private-method/
 name: Generator method as a ClassDeclaration element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-decl-static-private-method.template b/src/generators/syntax/class-decl-static-private-method.template
index a2e7448b141e4dbd32bcb1c72a160ec4df0bcdf6..010ec0d4b38619b7be061f5058a11098fe72d238 100644
--- a/src/generators/syntax/class-decl-static-private-method.template
+++ b/src/generators/syntax/class-decl-static-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/class/gen-private-method-static/
+path: language/statements/class/elements/gen-private-method-static/
 name: Static generator method as a ClassDeclaration element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-expr-private-method.template b/src/generators/syntax/class-expr-private-method.template
index 5b4548f3a32a6894f69ad43b1f6c2b8a7a9a5fd9..81cc48c65ff2010ec5142f75079594ebde27624f 100644
--- a/src/generators/syntax/class-expr-private-method.template
+++ b/src/generators/syntax/class-expr-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-private-method/
+path: language/expressions/class/elements/gen-private-method/
 name: Generator private method as a ClassExpression element
 esid: prod-GeneratorMethod
 info: |
diff --git a/src/generators/syntax/class-expr-static-private-method.template b/src/generators/syntax/class-expr-static-private-method.template
index 39a468170aea99c13c9f51ce84f0a446c1132da6..10aba187025fe1cc9eb2e3a0c073cd68ac9700a4 100644
--- a/src/generators/syntax/class-expr-static-private-method.template
+++ b/src/generators/syntax/class-expr-static-private-method.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2018 Bloomberg LP. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/class/gen-private-method-static/
+path: language/expressions/class/elements/gen-private-method-static/
 name: Static generator private method as a ClassExpression element
 esid: prod-GeneratorMethod
 info: |