From 0304c66440a8100150867ffd2b5a1b13ffa05dea Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Fri, 21 Dec 2018 18:05:47 -0200
Subject: [PATCH] Make the folder names consistent

---
 .../syntax/async-class-decl-private-method.template             | 2 +-
 .../syntax/async-class-decl-static-private-method.template      | 2 +-
 .../syntax/async-class-expr-private-method.template             | 2 +-
 .../syntax/async-class-expr-static-private-method.template      | 2 +-
 .../default/async-class-decl-private-method.template            | 2 +-
 .../default/async-class-decl-static-private-method.template     | 2 +-
 .../default/async-class-expr-private-method.template            | 2 +-
 .../default/async-class-expr-static-private-method.template     | 2 +-
 .../syntax/async-class-decl-private-method.template             | 2 +-
 .../syntax/async-class-decl-static-private-method.template      | 2 +-
 .../syntax/async-class-expr-private-method.template             | 2 +-
 .../syntax/async-class-expr-static-private-method.template      | 2 +-
 src/class-elements/private-methods/cls-decl.template            | 2 +-
 src/class-elements/private-methods/cls-expr.template            | 2 +-
 .../default/cls-decl-async-gen-meth-static.template             | 2 +-
 src/function-forms/default/cls-decl-async-gen-meth.template     | 2 +-
 src/function-forms/default/cls-decl-async-meth-static.template  | 2 +-
 src/function-forms/default/cls-decl-async-meth.template         | 2 +-
 src/function-forms/default/cls-decl-gen-meth-static.template    | 2 +-
 src/function-forms/default/cls-decl-gen-meth.template           | 2 +-
 src/function-forms/default/cls-decl-meth-static.template        | 2 +-
 src/function-forms/default/cls-decl-meth.template               | 2 +-
 .../default/cls-expr-async-gen-meth-static.template             | 2 +-
 src/function-forms/default/cls-expr-async-gen-meth.template     | 2 +-
 src/function-forms/default/cls-expr-async-meth-static.template  | 2 +-
 src/function-forms/default/cls-expr-async-meth.template         | 2 +-
 src/function-forms/default/cls-expr-gen-meth-static.template    | 2 +-
 src/function-forms/default/cls-expr-gen-meth.template           | 2 +-
 src/function-forms/default/cls-expr-meth-static.template        | 2 +-
 src/function-forms/default/cls-expr-meth.template               | 2 +-
 .../error/cls-decl-async-gen-meth-static.template               | 2 +-
 src/function-forms/error/cls-decl-async-gen-meth.template       | 2 +-
 src/function-forms/error/cls-decl-async-meth-static.template    | 2 +-
 src/function-forms/error/cls-decl-async-meth.template           | 2 +-
 src/function-forms/error/cls-decl-gen-meth-static.template      | 2 +-
 src/function-forms/error/cls-decl-gen-meth.template             | 2 +-
 src/function-forms/error/cls-decl-meth-static.template          | 2 +-
 src/function-forms/error/cls-decl-meth.template                 | 2 +-
 .../error/cls-expr-async-gen-meth-static.template               | 2 +-
 src/function-forms/error/cls-expr-async-gen-meth.template       | 2 +-
 src/function-forms/error/cls-expr-async-meth-static.template    | 2 +-
 src/function-forms/error/cls-expr-async-meth.template           | 2 +-
 src/function-forms/error/cls-expr-gen-meth-static.template      | 2 +-
 src/function-forms/error/cls-expr-gen-meth.template             | 2 +-
 src/function-forms/error/cls-expr-meth-static.template          | 2 +-
 src/function-forms/error/cls-expr-meth.template                 | 2 +-
 .../syntax/cls-decl-async-gen-meth-static.template              | 2 +-
 src/function-forms/syntax/cls-decl-async-gen-meth.template      | 2 +-
 src/function-forms/syntax/cls-decl-async-meth-static.template   | 2 +-
 src/function-forms/syntax/cls-decl-async-meth.template          | 2 +-
 src/function-forms/syntax/cls-decl-gen-meth-static.template     | 2 +-
 src/function-forms/syntax/cls-decl-gen-meth.template            | 2 +-
 src/function-forms/syntax/cls-decl-meth-static.template         | 2 +-
 src/function-forms/syntax/cls-decl-meth.template                | 2 +-
 .../syntax/cls-expr-async-gen-meth-static.template              | 2 +-
 src/function-forms/syntax/cls-expr-async-gen-meth.template      | 2 +-
 src/function-forms/syntax/cls-expr-async-meth-static.template   | 2 +-
 src/function-forms/syntax/cls-expr-async-meth.template          | 2 +-
 src/function-forms/syntax/cls-expr-gen-meth-static.template     | 2 +-
 src/function-forms/syntax/cls-expr-gen-meth.template            | 2 +-
 src/function-forms/syntax/cls-expr-meth-static.template         | 2 +-
 src/function-forms/syntax/cls-expr-meth.template                | 2 +-
 src/generators/default/class-decl-private-method.template       | 2 +-
 .../default/class-decl-static-private-method.template           | 2 +-
 src/generators/default/class-expr-private-method.template       | 2 +-
 .../default/class-expr-static-private-method.template           | 2 +-
 src/generators/syntax/class-decl-private-method.template        | 2 +-
 src/generators/syntax/class-decl-static-private-method.template | 2 +-
 src/generators/syntax/class-expr-private-method.template        | 2 +-
 src/generators/syntax/class-expr-static-private-method.template | 2 +-
 70 files changed, 70 insertions(+), 70 deletions(-)

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 1d252d3f3a..aec9070e15 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 98c9dbc45b..4fdae2466e 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 7be79ef126..d75ed16512 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 e38e4b70eb..e4f3a50097 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 91a8b48608..9ca63b4612 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 76cd2e0437..9b504e2695 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 72a6172e6a..d42a79d864 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 cb7f200eab..8d5fd8613e 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 e74cfc11d4..6bc7a240df 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 ad9009af6d..6009a38bf6 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 178385f508..4d2dc0a168 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 3f804af8b4..4e2aa7eb44 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 3bc828c84c..c909d2a53b 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 564e50acb3..3f207700e3 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 d564d60799..aa727b7042 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 9ac00af96b..408b479c2a 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 0d43f58195..7bf781398a 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 873cb0fbc9..f07ad12e19 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 d6f14d6588..c20a30c8f6 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 fd7e975c27..182edb121f 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 ce90f407e5..4f62141a71 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 3ed7201e66..6dd47cc3c9 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 94229234c4..8ff4fd9d3f 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 6c26f31029..7676eb7e50 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 19738eb26f..c869992a1b 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 150b91e35b..e2268669d5 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 94f53cda00..2b7beda58b 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 0d47f8c579..6d8d173c18 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 7bc897aad1..a96e8f4c69 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 b6bf732ab3..d7ca186e16 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 efad52db0c..b290f07a68 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 541710ad4d..a07283cacb 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 5652a91cc3..a42cf83d78 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 fa1d23b912..70b7b693ba 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 48802287b9..72c9a88f2a 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 8e5def37b6..03a3df47fb 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 005ed11e15..a45d625983 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 911db8a773..6125e1949a 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 64779bd30c..fa410d4f7c 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 07bf7f9843..08bf9a81cc 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 5f6ff6f6cf..34f19bc78b 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 7e80b8b55e..265af2e851 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 7b9629cfbf..7b232bff16 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 3a6f2c9399..f7cd3b43cb 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 b271cc9763..a825353423 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 3b9f01931b..eae6645c68 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 04c3c7ccec..7cd312abe5 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 00bfd6960f..70d3d69afc 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 b355156e70..08d826fa4a 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 18f450d1a5..04e58fb049 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 cbbfa6fb1b..2fbce899bc 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 3fb269a899..9882150051 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 47f2dd28f6..a008af8fee 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 d0e554f95e..dcc5cb3bd5 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 f9823e4bb3..02da1f257f 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 86d96f3e58..e6e61c679b 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 a954c09e7b..7a02faad7e 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 83f82cb6d1..b850f236fe 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 6e54d7b0a2..041affb58f 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 7c013f636c..692a92295e 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 9cf5f711d1..9c1d3d8fec 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 6ee49c0fe6..e6a7c48639 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 6d955d1006..4085202f55 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 cd5be38b0d..83e865f3cd 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 7e775d67c7..f4813630d7 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 a84a691979..b42a00a2b2 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 0c6c71c540..44d22b1922 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 a2e7448b14..010ec0d4b3 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 5b4548f3a3..81cc48c65f 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 39a468170a..10aba18702 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: |
-- 
GitLab