diff --git a/src/dstr-assignment/default/assignment-expr.template b/src/dstr-assignment/default/assignment-expr.template
index 17c6a038707e2ed32097b8084f68057fb4e8e3c2..fe28f87b2acef9d4585be8463ce99e37d394b28a 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 36446c0af3de4f7c7e7084c708b2d749198bfad2..0572e41603a1fd58bc1eef8c70593cde333057da 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 4d9ece3757457040696578d10cb5dc7241b272af..ef3abc0ac904eea2b197e1365fd19193694ce17a 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 8484d8713500fb6b9192ab483bf3a8cac42693b3..9588488c089aa802bfe8ba2415d196ef92ed72b2 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 a93edd3e645593908b73035125ef343257bca0ca..f634ff68525abcbe49a1dd7ae69a3d3115455e32 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 279b319960176bc2d648acd34903619fc039bd78..d4ad97bcafb1b457832afd35d354e7dc1dcb7535 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 430550dd3cf5d798ccbafd146cf90b0e5e5e36cd..1a89eddaf6ccf0842d880baf51dd915937cb4e7d 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