diff --git a/test/language/statements/for-in/const-bound-names-fordecl-tdz-for-in.js b/test/language/statements/for-in/head-const-bound-names-fordecl-tdz.js
similarity index 100%
rename from test/language/statements/for-in/const-bound-names-fordecl-tdz-for-in.js
rename to test/language/statements/for-in/head-const-bound-names-fordecl-tdz.js
diff --git a/test/language/statements/for-in/const-fresh-binding-per-iteration-for-in.js b/test/language/statements/for-in/head-const-fresh-binding-per-iteration.js
similarity index 100%
rename from test/language/statements/for-in/const-fresh-binding-per-iteration-for-in.js
rename to test/language/statements/for-in/head-const-fresh-binding-per-iteration.js
diff --git a/test/language/statements/for-in/let-bound-names-fordecl-tdz-for-in.js b/test/language/statements/for-in/head-let-bound-names-fordecl-tdz.js
similarity index 100%
rename from test/language/statements/for-in/let-bound-names-fordecl-tdz-for-in.js
rename to test/language/statements/for-in/head-let-bound-names-fordecl-tdz.js
diff --git a/test/language/statements/for-in/let-fresh-binding-per-iteration-for-in.js b/test/language/statements/for-in/head-let-fresh-binding-per-iteration.js
similarity index 100%
rename from test/language/statements/for-in/let-fresh-binding-per-iteration-for-in.js
rename to test/language/statements/for-in/head-let-fresh-binding-per-iteration.js
diff --git a/test/language/statements/for-of/const-bound-names-fordecl-tdz-for-of.js b/test/language/statements/for-of/head-const-bound-names-fordecl-tdz.js
similarity index 100%
rename from test/language/statements/for-of/const-bound-names-fordecl-tdz-for-of.js
rename to test/language/statements/for-of/head-const-bound-names-fordecl-tdz.js
diff --git a/test/language/statements/for-of/const-fresh-binding-per-iteration-for-of.js b/test/language/statements/for-of/head-const-fresh-binding-per-iteration.js
similarity index 100%
rename from test/language/statements/for-of/const-fresh-binding-per-iteration-for-of.js
rename to test/language/statements/for-of/head-const-fresh-binding-per-iteration.js
diff --git a/test/language/statements/for-of/let-bound-names-fordecl-tdz-for-of.js b/test/language/statements/for-of/head-let-bound-names-fordecl-tdz.js
similarity index 100%
rename from test/language/statements/for-of/let-bound-names-fordecl-tdz-for-of.js
rename to test/language/statements/for-of/head-let-bound-names-fordecl-tdz.js
diff --git a/test/language/statements/for-of/let-fresh-binding-per-iteration-for-of.js b/test/language/statements/for-of/head-let-fresh-binding-per-iteration.js
similarity index 100%
rename from test/language/statements/for-of/let-fresh-binding-per-iteration-for-of.js
rename to test/language/statements/for-of/head-let-fresh-binding-per-iteration.js
diff --git a/test/language/statements/for/const-fresh-binding-per-iteration-for.js b/test/language/statements/for/head-const-fresh-binding-per-iteration.js
similarity index 100%
rename from test/language/statements/for/const-fresh-binding-per-iteration-for.js
rename to test/language/statements/for/head-const-fresh-binding-per-iteration.js
diff --git a/test/language/statements/for/let-fresh-binding-per-iteration-for.js b/test/language/statements/for/head-let-fresh-binding-per-iteration.js
similarity index 100%
rename from test/language/statements/for/let-fresh-binding-per-iteration-for.js
rename to test/language/statements/for/head-let-fresh-binding-per-iteration.js