diff --git a/src/dstr-binding/default/arrow-function.template b/src/dstr-binding/default/arrow-function.template
index 7e87227e9977a10d1761305727780b658a390fb3..fb7394330fb2ba66b60f64c9974591f5d146b091 100644
--- a/src/dstr-binding/default/arrow-function.template
+++ b/src/dstr-binding/default/arrow-function.template
@@ -3,6 +3,7 @@
 /*---
 path: language/expressions/arrow-function/dstr-
 name: arrow function expression
+esid: sec-arrow-function-definitions-runtime-semantics-evaluation
 es6id: 14.2.16
 info: |
     ArrowFunction : ArrowParameters => ConciseBody
diff --git a/src/dstr-binding/default/cls-decl-gen-meth-static.template b/src/dstr-binding/default/cls-decl-gen-meth-static.template
index 3f6b55e17548cdce6411c6c383ebd9ed3a68ea14..89d0a491a9dfc94a9e06200079f751d54571a1d5 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth-static.template
@@ -3,6 +3,7 @@
 /*---
 path: language/statements/class/dstr-gen-meth-static-
 name: static class expression generator method
+esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-gen-meth.template b/src/dstr-binding/default/cls-decl-gen-meth.template
index 0579b3ca6f12f3f159fe01b8ca514f2ec6d47be5..540134667b599369120206a7d15bd950029f7fd3 100644
--- a/src/dstr-binding/default/cls-decl-gen-meth.template
+++ b/src/dstr-binding/default/cls-decl-gen-meth.template
@@ -3,6 +3,7 @@
 /*---
 path: language/statements/class/dstr-gen-meth-
 name: class expression method
+esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-meth-static.template b/src/dstr-binding/default/cls-decl-meth-static.template
index 0f1fff2b7ecfd692a52a8e1dbf02da67e339ec9f..49ec0f5fb9223eef6c9aedbb5f81025e54622692 100644
--- a/src/dstr-binding/default/cls-decl-meth-static.template
+++ b/src/dstr-binding/default/cls-decl-meth-static.template
@@ -3,6 +3,7 @@
 /*---
 path: language/statements/class/dstr-meth-static-
 name: static class expression method
+esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-decl-meth.template b/src/dstr-binding/default/cls-decl-meth.template
index 1a7ba2fc24d0458d7cbae586c1fb21a86cfb6c31..6893ae27ddb0420aaae361adbf714d35add53427 100644
--- a/src/dstr-binding/default/cls-decl-meth.template
+++ b/src/dstr-binding/default/cls-decl-meth.template
@@ -3,6 +3,7 @@
 /*---
 path: language/statements/class/dstr-meth-
 name: class expression method
+esid: sec-runtime-semantics-bindingclassdeclarationevaluation
 es6id: 14.5.15
 info: |
     ClassDeclaration : class BindingIdentifier ClassTail
diff --git a/src/dstr-binding/default/cls-expr-gen-meth-static.template b/src/dstr-binding/default/cls-expr-gen-meth-static.template
index 340945db7b3fb9a07f5fac3fe2bb69a2b31ee674..5c77aa0ce4f580081c06a9f62e86535c87719d66 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth-static.template
@@ -3,6 +3,7 @@
 /*---
 path: language/expressions/class/dstr-gen-meth-static-
 name: static class expression generator method
+esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-gen-meth.template b/src/dstr-binding/default/cls-expr-gen-meth.template
index c4c0d4c8f4c72189295d3da7564e6cb9566a0067..64f122facdf0ab33aba23647a3caf60aa670bf53 100644
--- a/src/dstr-binding/default/cls-expr-gen-meth.template
+++ b/src/dstr-binding/default/cls-expr-gen-meth.template
@@ -3,6 +3,7 @@
 /*---
 path: language/expressions/class/dstr-gen-meth-
 name: class expression method
+esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-meth-static.template b/src/dstr-binding/default/cls-expr-meth-static.template
index aff8b8a63e6f1248325b56674b1e7e1de248d6cc..a2da084d606db4ec2107a15b9117aae498c95ba4 100644
--- a/src/dstr-binding/default/cls-expr-meth-static.template
+++ b/src/dstr-binding/default/cls-expr-meth-static.template
@@ -3,6 +3,7 @@
 /*---
 path: language/expressions/class/dstr-meth-static-
 name: static class expression method
+esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/cls-expr-meth.template b/src/dstr-binding/default/cls-expr-meth.template
index a97f94827c94f09f57fab1b996fb2d81bcd3a491..258daef47019be75afa604afde0bd2914812af85 100644
--- a/src/dstr-binding/default/cls-expr-meth.template
+++ b/src/dstr-binding/default/cls-expr-meth.template
@@ -3,6 +3,7 @@
 /*---
 path: language/expressions/class/dstr-meth-
 name: class expression method
+esid: sec-class-definitions-runtime-semantics-evaluation
 es6id: 14.5.16
 info: |
     ClassExpression : class BindingIdentifieropt ClassTail
diff --git a/src/dstr-binding/default/const-stmt.template b/src/dstr-binding/default/const-stmt.template
index aeddb7a8fc24c393c087bb885011591d831d6d19..716a5ec1a971003c9c42f8e237045f850c8fc88c 100644
--- a/src/dstr-binding/default/const-stmt.template
+++ b/src/dstr-binding/default/const-stmt.template
@@ -4,6 +4,7 @@
 path: language/statements/const/dstr-
 name: >
     `const` statement
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
 es6id: 13.3.1.4
 info: |
     LexicalBinding : BindingPattern Initializer
diff --git a/src/dstr-binding/default/func-decl.template b/src/dstr-binding/default/func-decl.template
index 7dd6b58f26fd3419151e220862982193b6dfcd49..009e4a5d4c417fe9a826a7c098c98b776f5bc2af 100644
--- a/src/dstr-binding/default/func-decl.template
+++ b/src/dstr-binding/default/func-decl.template
@@ -3,6 +3,7 @@
 /*---
 path: language/statements/function/dstr-
 name: function declaration
+esid: sec-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.1.19
 info: |
     FunctionDeclaration :
diff --git a/src/dstr-binding/default/func-expr.template b/src/dstr-binding/default/func-expr.template
index 58d7cd99ac1a5b7f5c149e76b0a299f1b333bd21..eff40fa1cc838b4524ee59a6bea89966c97cda9b 100644
--- a/src/dstr-binding/default/func-expr.template
+++ b/src/dstr-binding/default/func-expr.template
@@ -3,6 +3,7 @@
 /*---
 path: language/expressions/function/dstr-
 name: function expression
+esid: sec-function-definitions-runtime-semantics-evaluation
 es6id: 14.1.20
 info: |
     FunctionExpression : function ( FormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/default/gen-func-decl.template b/src/dstr-binding/default/gen-func-decl.template
index 4e0403562e0975deaf258ae257d0f79b768d66a7..1dcfd5aeafa6a4a122f6de3bf305323eeef2dba7 100644
--- a/src/dstr-binding/default/gen-func-decl.template
+++ b/src/dstr-binding/default/gen-func-decl.template
@@ -3,6 +3,7 @@
 /*---
 path: language/statements/generators/dstr-
 name: generator function declaration
+esid: sec-generator-function-definitions-runtime-semantics-instantiatefunctionobject
 es6id: 14.4.12
 info: |
     GeneratorDeclaration : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/default/gen-func-expr.template b/src/dstr-binding/default/gen-func-expr.template
index b930bc59e25c218a37fdc482a988e6ba42c5bd52..c7af4de38cbb581ff3e426077fa050759dd9db73 100644
--- a/src/dstr-binding/default/gen-func-expr.template
+++ b/src/dstr-binding/default/gen-func-expr.template
@@ -3,6 +3,7 @@
 /*---
 path: language/expressions/generators/dstr-
 name: generator function expression
+esid: sec-generator-function-definitions-runtime-semantics-evaluation
 es6id: 14.4.14
 info: |
     GeneratorExpression : function * ( FormalParameters ) { GeneratorBody }
diff --git a/src/dstr-binding/default/gen-meth.template b/src/dstr-binding/default/gen-meth.template
index 5119178207320614e839f4ec566511c7e964ebec..0fbf8aad562d16ec40fea42370056efb7f733c10 100644
--- a/src/dstr-binding/default/gen-meth.template
+++ b/src/dstr-binding/default/gen-meth.template
@@ -3,6 +3,7 @@
 /*---
 path: language/expressions/object/dstr-gen-meth-
 name: generator method
+esid: sec-generator-function-definitions-runtime-semantics-propertydefinitionevaluation
 es6id: 14.4.13
 info: |
     GeneratorMethod :
diff --git a/src/dstr-binding/default/let-stmt.template b/src/dstr-binding/default/let-stmt.template
index 33ffd86125af3e509c0c2b865cad33a467a74e7e..f74870527fe5b638daa81def9cadcb332fbf7183 100644
--- a/src/dstr-binding/default/let-stmt.template
+++ b/src/dstr-binding/default/let-stmt.template
@@ -4,6 +4,7 @@
 path: language/statements/let/dstr-
 name: >
     `let` statement
+esid: sec-let-and-const-declarations-runtime-semantics-evaluation
 es6id: 13.3.1.4
 info: |
     LexicalBinding : BindingPattern Initializer
diff --git a/src/dstr-binding/default/meth.template b/src/dstr-binding/default/meth.template
index 363cc16840169b37ae9e2cdc1099fa4e45d5adfe..46e8e0aa50bf7f0d0ee47313c9ec403e66d1a8d6 100644
--- a/src/dstr-binding/default/meth.template
+++ b/src/dstr-binding/default/meth.template
@@ -3,6 +3,7 @@
 /*---
 path: language/expressions/object/dstr-meth-
 name: method
+esid: sec-runtime-semantics-definemethod
 es6id: 14.3.8
 info: |
     MethodDefinition : PropertyName ( StrictFormalParameters ) { FunctionBody }
diff --git a/src/dstr-binding/default/var-stmt.template b/src/dstr-binding/default/var-stmt.template
index a4511eb3b4a292919c0881ae7c5929ef7a5c72e3..b64cf266f0868933fd1872e0cfd4d361ed339917 100644
--- a/src/dstr-binding/default/var-stmt.template
+++ b/src/dstr-binding/default/var-stmt.template
@@ -4,6 +4,7 @@
 path: language/statements/variable/dstr-
 name: >
     `var` statement
+esid: sec-variable-statement-runtime-semantics-evaluation
 es6id: 13.3.2.4
 info: |
     VariableDeclaration : BindingPattern Initializer