diff --git a/src/dstr-assignment/default/assignment-expr.template b/src/dstr-assignment/default/assignment-expr.template
index 17c6a03870..fe28f87b2a 100644
--- a/src/dstr-assignment/default/assignment-expr.template
+++ b/src/dstr-assignment/default/assignment-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/assignment/dstr-
+path: language/expressions/assignment/dstr/
 name: >
     AssignmentExpression
 esid: sec-variable-statement-runtime-semantics-evaluation
diff --git a/src/dstr-assignment/default/for-of.template b/src/dstr-assignment/default/for-of.template
index 36446c0af3..0572e41603 100644
--- a/src/dstr-assignment/default/for-of.template
+++ b/src/dstr-assignment/default/for-of.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-
+path: language/statements/for-of/dstr/
 name: >
     For..of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
diff --git a/src/dstr-assignment/error/assignment-expr.template b/src/dstr-assignment/error/assignment-expr.template
index 4d9ece3757..ef3abc0ac9 100644
--- a/src/dstr-assignment/error/assignment-expr.template
+++ b/src/dstr-assignment/error/assignment-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/assignment/dstr-
+path: language/expressions/assignment/dstr/
 name: >
     AssignmentExpression
 esid: sec-variable-statement-runtime-semantics-evaluation
diff --git a/src/dstr-assignment/error/for-of.template b/src/dstr-assignment/error/for-of.template
index 8484d87135..9588488c08 100644
--- a/src/dstr-assignment/error/for-of.template
+++ b/src/dstr-assignment/error/for-of.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-
+path: language/statements/for-of/dstr/
 name: >
     For..of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
diff --git a/src/dstr-assignment/syntax/assignment-expr.template b/src/dstr-assignment/syntax/assignment-expr.template
index a93edd3e64..f634ff6852 100644
--- a/src/dstr-assignment/syntax/assignment-expr.template
+++ b/src/dstr-assignment/syntax/assignment-expr.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/expressions/assignment/dstr-
+path: language/expressions/assignment/dstr/
 name: >
     AssignmentExpression
 esid: sec-variable-statement-runtime-semantics-evaluation
diff --git a/src/dstr-assignment/syntax/for-in.template b/src/dstr-assignment/syntax/for-in.template
index 279b319960..d4ad97bcaf 100644
--- a/src/dstr-assignment/syntax/for-in.template
+++ b/src/dstr-assignment/syntax/for-in.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-in/dstr-
+path: language/statements/for-in/dstr/
 name: >
     For..in statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation
diff --git a/src/dstr-assignment/syntax/for-of.template b/src/dstr-assignment/syntax/for-of.template
index 430550dd3c..1a89eddaf6 100644
--- a/src/dstr-assignment/syntax/for-of.template
+++ b/src/dstr-assignment/syntax/for-of.template
@@ -1,7 +1,7 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-path: language/statements/for-of/dstr-
+path: language/statements/for-of/dstr/
 name: >
     For..of statement
 esid: sec-for-in-and-for-of-statements-runtime-semantics-labelledevaluation