diff --git a/test/language/module-code/instn-iee-bndng-cls.js b/test/language/module-code/instn-iee-bndng-cls.js
index 07461cc0c3..65044bdba3 100644
--- a/test/language/module-code/instn-iee-bndng-cls.js
+++ b/test/language/module-code/instn-iee-bndng-cls.js
@@ -43,5 +43,5 @@ assert.throws(ReferenceError, function() {
   typeof B;
 }, 'binding is created but not initialized');
 
-import { B } from './instn-iee-bndng-cls_.js';
+import { B } from './instn-iee-bndng-cls_FIXTURE.js';
 export class A {}
diff --git a/test/language/module-code/instn-iee-bndng-cls_.js b/test/language/module-code/instn-iee-bndng-cls_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-bndng-cls_.js
rename to test/language/module-code/instn-iee-bndng-cls_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-bndng-const.js b/test/language/module-code/instn-iee-bndng-const.js
index 11cc633a5a..d5f04558ce 100644
--- a/test/language/module-code/instn-iee-bndng-const.js
+++ b/test/language/module-code/instn-iee-bndng-const.js
@@ -43,5 +43,5 @@ assert.throws(ReferenceError, function() {
   typeof y;
 }, 'binding is created but not initialized');
 
-import { y } from './instn-iee-bndng-const_.js';
+import { y } from './instn-iee-bndng-const_FIXTURE.js';
 export const x = null;
diff --git a/test/language/module-code/instn-iee-bndng-const_.js b/test/language/module-code/instn-iee-bndng-const_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-bndng-const_.js
rename to test/language/module-code/instn-iee-bndng-const_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-bndng-fun.js b/test/language/module-code/instn-iee-bndng-fun.js
index 1b2f761bd6..e9d94da882 100644
--- a/test/language/module-code/instn-iee-bndng-fun.js
+++ b/test/language/module-code/instn-iee-bndng-fun.js
@@ -51,5 +51,5 @@ assert.throws(TypeError, function() {
 
 assert.sameValue(f2(), 77, 'binding value is immutable');
 
-import { f2 } from './instn-iee-bndng-fun_.js';
+import { f2 } from './instn-iee-bndng-fun_FIXTURE.js';
 export function f() { return 77; }
diff --git a/test/language/module-code/instn-iee-bndng-fun_.js b/test/language/module-code/instn-iee-bndng-fun_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-bndng-fun_.js
rename to test/language/module-code/instn-iee-bndng-fun_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-bndng-gen.js b/test/language/module-code/instn-iee-bndng-gen.js
index df3089f879..c32331ef50 100644
--- a/test/language/module-code/instn-iee-bndng-gen.js
+++ b/test/language/module-code/instn-iee-bndng-gen.js
@@ -52,5 +52,5 @@ assert.throws(TypeError, function() {
 
 assert.sameValue(g2().next().value, 455, 'binding value is immutable');
 
-import { g2 } from './instn-iee-bndng-gen_.js';
+import { g2 } from './instn-iee-bndng-gen_FIXTURE.js';
 export function* g () { return 455; }
diff --git a/test/language/module-code/instn-iee-bndng-gen_.js b/test/language/module-code/instn-iee-bndng-gen_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-bndng-gen_.js
rename to test/language/module-code/instn-iee-bndng-gen_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-bndng-let.js b/test/language/module-code/instn-iee-bndng-let.js
index 2e3c7f3ab4..38c5ab6435 100644
--- a/test/language/module-code/instn-iee-bndng-let.js
+++ b/test/language/module-code/instn-iee-bndng-let.js
@@ -43,5 +43,5 @@ assert.throws(ReferenceError, function() {
   typeof y;
 }, 'binding is created but not initialized');
 
-import { y } from './instn-iee-bndng-let_.js';
+import { y } from './instn-iee-bndng-let_FIXTURE.js';
 export let x;
diff --git a/test/language/module-code/instn-iee-bndng-let_.js b/test/language/module-code/instn-iee-bndng-let_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-bndng-let_.js
rename to test/language/module-code/instn-iee-bndng-let_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-bndng-var.js b/test/language/module-code/instn-iee-bndng-var.js
index 762d0603c4..aa1b3020e2 100644
--- a/test/language/module-code/instn-iee-bndng-var.js
+++ b/test/language/module-code/instn-iee-bndng-var.js
@@ -51,5 +51,5 @@ assert.throws(TypeError, function() {
 
 assert.sameValue(y, undefined, 'binding value is immutable');
 
-import { y } from './instn-iee-bndng-var_.js';
+import { y } from './instn-iee-bndng-var_FIXTURE.js';
 export var x = 99;
diff --git a/test/language/module-code/instn-iee-bndng-var_.js b/test/language/module-code/instn-iee-bndng-var_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-bndng-var_.js
rename to test/language/module-code/instn-iee-bndng-var_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-err-ambiguous-1_.js b/test/language/module-code/instn-iee-err-ambiguous-1_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-err-ambiguous-1_.js
rename to test/language/module-code/instn-iee-err-ambiguous-1_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-err-ambiguous-2_.js b/test/language/module-code/instn-iee-err-ambiguous-2_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-err-ambiguous-2_.js
rename to test/language/module-code/instn-iee-err-ambiguous-2_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-err-ambiguous-as.js b/test/language/module-code/instn-iee-err-ambiguous-as.js
index b231b3282b..944e948990 100644
--- a/test/language/module-code/instn-iee-err-ambiguous-as.js
+++ b/test/language/module-code/instn-iee-err-ambiguous-as.js
@@ -34,4 +34,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-export { x as y } from './instn-iee-err-ambiguous_.js';
+export { x as y } from './instn-iee-err-ambiguous_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-err-ambiguous.js b/test/language/module-code/instn-iee-err-ambiguous.js
index d3d1337440..e3f1275e19 100644
--- a/test/language/module-code/instn-iee-err-ambiguous.js
+++ b/test/language/module-code/instn-iee-err-ambiguous.js
@@ -34,4 +34,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-export { x } from './instn-iee-err-ambiguous_.js';
+export { x } from './instn-iee-err-ambiguous_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-err-ambiguous_.js b/test/language/module-code/instn-iee-err-ambiguous_FIXTURE.js
similarity index 55%
rename from test/language/module-code/instn-named-err-ambiguous_.js
rename to test/language/module-code/instn-iee-err-ambiguous_FIXTURE.js
index 9cb1b46cfc..7857161c3a 100644
--- a/test/language/module-code/instn-named-err-ambiguous_.js
+++ b/test/language/module-code/instn-iee-err-ambiguous_FIXTURE.js
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-export * from './instn-named-err-ambiguous-1_.js';
-export * from './instn-named-err-ambiguous-2_.js';
+export * from './instn-iee-err-ambiguous-1_FIXTURE.js';
+export * from './instn-iee-err-ambiguous-2_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-err-circular-as.js b/test/language/module-code/instn-iee-err-circular-as.js
index 28d0396ec0..da272aa2b8 100644
--- a/test/language/module-code/instn-iee-err-circular-as.js
+++ b/test/language/module-code/instn-iee-err-circular-as.js
@@ -23,4 +23,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-export { x as y } from './instn-iee-err-circular_.js';
+export { x as y } from './instn-iee-err-circular_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-err-circular.js b/test/language/module-code/instn-iee-err-circular.js
index 5336509498..6255577aa6 100644
--- a/test/language/module-code/instn-iee-err-circular.js
+++ b/test/language/module-code/instn-iee-err-circular.js
@@ -23,4 +23,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-export { x } from './instn-iee-err-circular_.js';
+export { x } from './instn-iee-err-circular_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-err-circular_.js b/test/language/module-code/instn-iee-err-circular_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-err-circular_.js
rename to test/language/module-code/instn-iee-err-circular_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-err-dflt-thru-star-as.js b/test/language/module-code/instn-iee-err-dflt-thru-star-as.js
index cfcad271b7..d7d7d992fc 100644
--- a/test/language/module-code/instn-iee-err-dflt-thru-star-as.js
+++ b/test/language/module-code/instn-iee-err-dflt-thru-star-as.js
@@ -22,4 +22,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-export { default as x } from './instn-iee-err-dflt-thru-star-int_.js';
+export { default as x } from './instn-iee-err-dflt-thru-star-int_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-err-dflt-thru-star-dflt_.js b/test/language/module-code/instn-iee-err-dflt-thru-star-dflt_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-err-dflt-thru-star-dflt_.js
rename to test/language/module-code/instn-iee-err-dflt-thru-star-dflt_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-err-dflt-thru-star-int_FIXTURE.js b/test/language/module-code/instn-iee-err-dflt-thru-star-int_FIXTURE.js
new file mode 100644
index 0000000000..86ecc623f8
--- /dev/null
+++ b/test/language/module-code/instn-iee-err-dflt-thru-star-int_FIXTURE.js
@@ -0,0 +1,4 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+export * from './instn-iee-err-dflt-thru-star-dflt_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-err-dflt-thru-star.js b/test/language/module-code/instn-iee-err-dflt-thru-star.js
index 45da1210ca..6d8093158c 100644
--- a/test/language/module-code/instn-iee-err-dflt-thru-star.js
+++ b/test/language/module-code/instn-iee-err-dflt-thru-star.js
@@ -22,4 +22,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-export { default } from './instn-iee-err-dflt-thru-star-int_.js';
+export { default } from './instn-iee-err-dflt-thru-star-int_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-err-not-found-as.js b/test/language/module-code/instn-iee-err-not-found-as.js
index d612a35cc9..1befd1bbb9 100644
--- a/test/language/module-code/instn-iee-err-not-found-as.js
+++ b/test/language/module-code/instn-iee-err-not-found-as.js
@@ -22,4 +22,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-export { x as y } from './instn-iee-err-not-found-empty_.js';
+export { x as y } from './instn-iee-err-not-found-empty_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-err-not-found-empty_.js b/test/language/module-code/instn-iee-err-not-found-empty_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-err-not-found-empty_.js
rename to test/language/module-code/instn-iee-err-not-found-empty_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-err-not-found.js b/test/language/module-code/instn-iee-err-not-found.js
index 94f8646396..349385247f 100644
--- a/test/language/module-code/instn-iee-err-not-found.js
+++ b/test/language/module-code/instn-iee-err-not-found.js
@@ -22,4 +22,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-export { x } from './instn-iee-err-not-found-empty_.js';
+export { x } from './instn-iee-err-not-found-empty_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-iee-cycle-2_.js b/test/language/module-code/instn-iee-iee-cycle-2_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-iee-cycle-2_.js
rename to test/language/module-code/instn-iee-iee-cycle-2_FIXTURE.js
diff --git a/test/language/module-code/instn-iee-iee-cycle.js b/test/language/module-code/instn-iee-iee-cycle.js
index 9607277b79..8ca7a06948 100644
--- a/test/language/module-code/instn-iee-iee-cycle.js
+++ b/test/language/module-code/instn-iee-iee-cycle.js
@@ -33,17 +33,17 @@ info: |
 flags: [module]
 ---*/
 
-export { a } from './instn-iee-iee-cycle-2_.js';
-export { c as b } from './instn-iee-iee-cycle-2_.js';
-export { e as d } from './instn-iee-iee-cycle-2_.js';
-export { g as f } from './instn-iee-iee-cycle-2_.js';
-export { i as h } from './instn-iee-iee-cycle-2_.js';
-export { k as j } from './instn-iee-iee-cycle-2_.js';
-export { m as l } from './instn-iee-iee-cycle-2_.js';
-export { o as n } from './instn-iee-iee-cycle-2_.js';
-export { q as p } from './instn-iee-iee-cycle-2_.js';
-export { s as r } from './instn-iee-iee-cycle-2_.js';
-export { u as t } from './instn-iee-iee-cycle-2_.js';
-export { w as v } from './instn-iee-iee-cycle-2_.js';
-export { y as x } from './instn-iee-iee-cycle-2_.js';
+export { a } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { c as b } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { e as d } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { g as f } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { i as h } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { k as j } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { m as l } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { o as n } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { q as p } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { s as r } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { u as t } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { w as v } from './instn-iee-iee-cycle-2_FIXTURE.js';
+export { y as x } from './instn-iee-iee-cycle-2_FIXTURE.js';
 export var z;
diff --git a/test/language/module-code/instn-iee-err-dflt-thru-star-int_.js b/test/language/module-code/instn-iee-star-cycle-2_FIXTURE.js
similarity index 69%
rename from test/language/module-code/instn-iee-err-dflt-thru-star-int_.js
rename to test/language/module-code/instn-iee-star-cycle-2_FIXTURE.js
index 025035eba7..d1a06b98a2 100644
--- a/test/language/module-code/instn-iee-err-dflt-thru-star-int_.js
+++ b/test/language/module-code/instn-iee-star-cycle-2_FIXTURE.js
@@ -1,4 +1,4 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-export * from './instn-iee-err-dflt-thru-star-dflt_.js';
+export * from './instn-iee-star-cycle-indirect-x_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-star-cycle-indirect-x_.js b/test/language/module-code/instn-iee-star-cycle-indirect-x_FIXTURE.js
similarity index 80%
rename from test/language/module-code/instn-named-star-cycle-indirect-x_.js
rename to test/language/module-code/instn-iee-star-cycle-indirect-x_FIXTURE.js
index d212ba5fc3..393d97e3fe 100644
--- a/test/language/module-code/instn-named-star-cycle-indirect-x_.js
+++ b/test/language/module-code/instn-iee-star-cycle-indirect-x_FIXTURE.js
@@ -3,5 +3,5 @@
 
 // This module should be visited exactly one time during resolution of the "x"
 // binding.
-export { y as x } from './instn-named-star-cycle-2_.js';
+export { y as x } from './instn-iee-star-cycle-2_FIXTURE.js';
 export var y = 45;
diff --git a/test/language/module-code/instn-iee-star-cycle.js b/test/language/module-code/instn-iee-star-cycle.js
index f6bbfa69f5..31c843d6e3 100644
--- a/test/language/module-code/instn-iee-star-cycle.js
+++ b/test/language/module-code/instn-iee-star-cycle.js
@@ -22,4 +22,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-export { x } from './instn-iee-star-cycle-2_.js';
+export { x } from './instn-iee-star-cycle-2_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-trlng-comma.js b/test/language/module-code/instn-iee-trlng-comma.js
index bcbd7000e1..34ffd266b2 100644
--- a/test/language/module-code/instn-iee-trlng-comma.js
+++ b/test/language/module-code/instn-iee-trlng-comma.js
@@ -12,8 +12,8 @@ info: |
 flags: [module]
 ---*/
 
-export { a , } from './instn-iee-trlng-comma_.js';
-export { a as b , } from './instn-iee-trlng-comma_.js';
+export { a , } from './instn-iee-trlng-comma_FIXTURE.js';
+export { a as b , } from './instn-iee-trlng-comma_FIXTURE.js';
 
 import { a, b } from './instn-iee-trlng-comma.js';
 
diff --git a/test/language/module-code/instn-iee-trlng-comma_.js b/test/language/module-code/instn-iee-trlng-comma_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-iee-trlng-comma_.js
rename to test/language/module-code/instn-iee-trlng-comma_FIXTURE.js
diff --git a/test/language/module-code/instn-named-err-ambiguous-1_.js b/test/language/module-code/instn-named-err-ambiguous-1_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-named-err-ambiguous-1_.js
rename to test/language/module-code/instn-named-err-ambiguous-1_FIXTURE.js
diff --git a/test/language/module-code/instn-named-err-ambiguous-2_.js b/test/language/module-code/instn-named-err-ambiguous-2_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-named-err-ambiguous-2_.js
rename to test/language/module-code/instn-named-err-ambiguous-2_FIXTURE.js
diff --git a/test/language/module-code/instn-named-err-ambiguous-as.js b/test/language/module-code/instn-named-err-ambiguous-as.js
index 6ab232a4d0..cf68ca0c5c 100644
--- a/test/language/module-code/instn-named-err-ambiguous-as.js
+++ b/test/language/module-code/instn-named-err-ambiguous-as.js
@@ -39,4 +39,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import { x as y } from './instn-named-err-ambiguous_.js';
+import { x as y } from './instn-named-err-ambiguous_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-err-ambiguous.js b/test/language/module-code/instn-named-err-ambiguous.js
index 0c53a94ea6..8e89f559d5 100644
--- a/test/language/module-code/instn-named-err-ambiguous.js
+++ b/test/language/module-code/instn-named-err-ambiguous.js
@@ -39,4 +39,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import { x } from './instn-named-err-ambiguous_.js';
+import { x } from './instn-named-err-ambiguous_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-err-ambiguous_FIXTURE.js b/test/language/module-code/instn-named-err-ambiguous_FIXTURE.js
new file mode 100644
index 0000000000..189dce172d
--- /dev/null
+++ b/test/language/module-code/instn-named-err-ambiguous_FIXTURE.js
@@ -0,0 +1,5 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+export * from './instn-named-err-ambiguous-1_FIXTURE.js';
+export * from './instn-named-err-ambiguous-2_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-err-dflt-thru-star-as.js b/test/language/module-code/instn-named-err-dflt-thru-star-as.js
index 16fc554cd7..7f73a48ee0 100644
--- a/test/language/module-code/instn-named-err-dflt-thru-star-as.js
+++ b/test/language/module-code/instn-named-err-dflt-thru-star-as.js
@@ -27,4 +27,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import { default as x } from './instn-named-err-dflt-thru-star-int_.js';
+import { default as x } from './instn-named-err-dflt-thru-star-int_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-err-dflt-thru-star-dflt.js b/test/language/module-code/instn-named-err-dflt-thru-star-dflt.js
index 1312a81bc4..e1a8e056c6 100644
--- a/test/language/module-code/instn-named-err-dflt-thru-star-dflt.js
+++ b/test/language/module-code/instn-named-err-dflt-thru-star-dflt.js
@@ -27,4 +27,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import x from './instn-named-err-dflt-thru-star-int_.js';
+import x from './instn-named-err-dflt-thru-star-int_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-err-dflt-thru-star-dflt_.js b/test/language/module-code/instn-named-err-dflt-thru-star-dflt_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-named-err-dflt-thru-star-dflt_.js
rename to test/language/module-code/instn-named-err-dflt-thru-star-dflt_FIXTURE.js
diff --git a/test/language/module-code/instn-named-err-dflt-thru-star-int_FIXTURE.js b/test/language/module-code/instn-named-err-dflt-thru-star-int_FIXTURE.js
new file mode 100644
index 0000000000..9e7adcabd3
--- /dev/null
+++ b/test/language/module-code/instn-named-err-dflt-thru-star-int_FIXTURE.js
@@ -0,0 +1,4 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+export * from './instn-named-err-dflt-thru-star-dflt_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-err-not-found-as.js b/test/language/module-code/instn-named-err-not-found-as.js
index df49d213d9..4d5c2f5ee2 100644
--- a/test/language/module-code/instn-named-err-not-found-as.js
+++ b/test/language/module-code/instn-named-err-not-found-as.js
@@ -27,4 +27,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import { x as y } from './instn-named-err-not-found-empty_.js';
+import { x as y } from './instn-named-err-not-found-empty_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-err-not-found-dflt.js b/test/language/module-code/instn-named-err-not-found-dflt.js
index fc649aaf74..81528910d9 100644
--- a/test/language/module-code/instn-named-err-not-found-dflt.js
+++ b/test/language/module-code/instn-named-err-not-found-dflt.js
@@ -27,4 +27,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import x from './instn-named-err-not-found-empty_.js';
+import x from './instn-named-err-not-found-empty_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-err-not-found-empty_.js b/test/language/module-code/instn-named-err-not-found-empty_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-named-err-not-found-empty_.js
rename to test/language/module-code/instn-named-err-not-found-empty_FIXTURE.js
diff --git a/test/language/module-code/instn-named-err-not-found.js b/test/language/module-code/instn-named-err-not-found.js
index 2e442d0dd8..135d8428c3 100644
--- a/test/language/module-code/instn-named-err-not-found.js
+++ b/test/language/module-code/instn-named-err-not-found.js
@@ -27,4 +27,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import { x } from './instn-named-err-not-found-empty_.js';
+import { x } from './instn-named-err-not-found-empty_FIXTURE.js';
diff --git a/test/language/module-code/instn-named-iee-cycle-2_.js b/test/language/module-code/instn-named-iee-cycle-2_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-named-iee-cycle-2_.js
rename to test/language/module-code/instn-named-iee-cycle-2_FIXTURE.js
diff --git a/test/language/module-code/instn-named-iee-cycle.js b/test/language/module-code/instn-named-iee-cycle.js
index ee4973adb8..db55c32ae0 100644
--- a/test/language/module-code/instn-named-iee-cycle.js
+++ b/test/language/module-code/instn-named-iee-cycle.js
@@ -42,19 +42,19 @@ info: |
 flags: [module]
 ---*/
 
-import { a } from './instn-named-iee-cycle-2_.js';
-export { c as b } from './instn-named-iee-cycle-2_.js';
-export { e as d } from './instn-named-iee-cycle-2_.js';
-export { g as f } from './instn-named-iee-cycle-2_.js';
-export { i as h } from './instn-named-iee-cycle-2_.js';
-export { k as j } from './instn-named-iee-cycle-2_.js';
-export { m as l } from './instn-named-iee-cycle-2_.js';
-export { o as n } from './instn-named-iee-cycle-2_.js';
-export { q as p } from './instn-named-iee-cycle-2_.js';
-export { s as r } from './instn-named-iee-cycle-2_.js';
-export { u as t } from './instn-named-iee-cycle-2_.js';
-export { w as v } from './instn-named-iee-cycle-2_.js';
-export { y as x } from './instn-named-iee-cycle-2_.js';
+import { a } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { c as b } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { e as d } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { g as f } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { i as h } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { k as j } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { m as l } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { o as n } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { q as p } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { s as r } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { u as t } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { w as v } from './instn-named-iee-cycle-2_FIXTURE.js';
+export { y as x } from './instn-named-iee-cycle-2_FIXTURE.js';
 export var z = 23;
 
 assert.sameValue(a, 23);
diff --git a/test/language/module-code/instn-named-star-cycle-2_FIXTURE.js b/test/language/module-code/instn-named-star-cycle-2_FIXTURE.js
new file mode 100644
index 0000000000..1e982e7ec1
--- /dev/null
+++ b/test/language/module-code/instn-named-star-cycle-2_FIXTURE.js
@@ -0,0 +1,4 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+export * from './instn-named-star-cycle-indirect-x_FIXTURE.js';
diff --git a/test/language/module-code/instn-iee-star-cycle-indirect-x_.js b/test/language/module-code/instn-named-star-cycle-indirect-x_FIXTURE.js
similarity index 79%
rename from test/language/module-code/instn-iee-star-cycle-indirect-x_.js
rename to test/language/module-code/instn-named-star-cycle-indirect-x_FIXTURE.js
index f729e84468..a9842d2341 100644
--- a/test/language/module-code/instn-iee-star-cycle-indirect-x_.js
+++ b/test/language/module-code/instn-named-star-cycle-indirect-x_FIXTURE.js
@@ -3,5 +3,5 @@
 
 // This module should be visited exactly one time during resolution of the "x"
 // binding.
-export { y as x } from './instn-iee-star-cycle-2_.js';
+export { y as x } from './instn-named-star-cycle-2_FIXTURE.js';
 export var y = 45;
diff --git a/test/language/module-code/instn-named-star-cycle.js b/test/language/module-code/instn-named-star-cycle.js
index b08b57120f..38749ea9fa 100644
--- a/test/language/module-code/instn-named-star-cycle.js
+++ b/test/language/module-code/instn-named-star-cycle.js
@@ -31,4 +31,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import { x } from './instn-named-star-cycle-2_.js';
+import { x } from './instn-named-star-cycle-2_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-empty-export.js b/test/language/module-code/instn-resolve-empty-export.js
index 24215e0d3c..c8309579e0 100644
--- a/test/language/module-code/instn-resolve-empty-export.js
+++ b/test/language/module-code/instn-resolve-empty-export.js
@@ -33,4 +33,4 @@ negative: ReferenceError
 flags: [module]
 ---*/
 
-export {} from './instn-resolve-empty-export_.js';
+export {} from './instn-resolve-empty-export_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-empty-export_.js b/test/language/module-code/instn-resolve-empty-export_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-resolve-empty-export_.js
rename to test/language/module-code/instn-resolve-empty-export_FIXTURE.js
diff --git a/test/language/module-code/instn-resolve-empty-import.js b/test/language/module-code/instn-resolve-empty-import.js
index 87fd8a1ae4..82bc3a240f 100644
--- a/test/language/module-code/instn-resolve-empty-import.js
+++ b/test/language/module-code/instn-resolve-empty-import.js
@@ -39,4 +39,4 @@ negative: ReferenceError
 flags: [module]
 ---*/
 
-import {} from './instn-resolve-empty-import_.js';
+import {} from './instn-resolve-empty-import_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-empty-import_.js b/test/language/module-code/instn-resolve-empty-import_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-resolve-empty-import_.js
rename to test/language/module-code/instn-resolve-empty-import_FIXTURE.js
diff --git a/test/language/module-code/instn-resolve-err-reference.js b/test/language/module-code/instn-resolve-err-reference.js
index b691f71b69..10649df49c 100644
--- a/test/language/module-code/instn-resolve-err-reference.js
+++ b/test/language/module-code/instn-resolve-err-reference.js
@@ -14,4 +14,4 @@ negative: ReferenceError
 flags: [module]
 ---*/
 
-import './instn-resolve-err-reference_.js';
+import './instn-resolve-err-reference_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-err-reference_.js b/test/language/module-code/instn-resolve-err-reference_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-resolve-err-reference_.js
rename to test/language/module-code/instn-resolve-err-reference_FIXTURE.js
diff --git a/test/language/module-code/instn-resolve-err-syntax.js b/test/language/module-code/instn-resolve-err-syntax.js
index b2787e788b..9c389ffcfa 100644
--- a/test/language/module-code/instn-resolve-err-syntax.js
+++ b/test/language/module-code/instn-resolve-err-syntax.js
@@ -14,4 +14,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import './instn-resolve-err-syntax_.js';
+import './instn-resolve-err-syntax_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-err-syntax_.js b/test/language/module-code/instn-resolve-err-syntax_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-resolve-err-syntax_.js
rename to test/language/module-code/instn-resolve-err-syntax_FIXTURE.js
diff --git a/test/language/module-code/instn-resolve-order-depth-child_.js b/test/language/module-code/instn-resolve-order-depth-child_.js
deleted file mode 100644
index b1b41e7000..0000000000
--- a/test/language/module-code/instn-resolve-order-depth-child_.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-import './instn-resolve-order-depth-reference_.js';
diff --git a/test/language/module-code/instn-named-star-cycle-2_.js b/test/language/module-code/instn-resolve-order-depth-child_FIXTURE.js
similarity index 70%
rename from test/language/module-code/instn-named-star-cycle-2_.js
rename to test/language/module-code/instn-resolve-order-depth-child_FIXTURE.js
index daeedae49a..1a72ed71ab 100644
--- a/test/language/module-code/instn-named-star-cycle-2_.js
+++ b/test/language/module-code/instn-resolve-order-depth-child_FIXTURE.js
@@ -1,4 +1,4 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-export * from './instn-named-star-cycle-indirect-x_.js';
+import './instn-resolve-order-depth-reference_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-order-depth-reference_.js b/test/language/module-code/instn-resolve-order-depth-reference_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-resolve-order-depth-reference_.js
rename to test/language/module-code/instn-resolve-order-depth-reference_FIXTURE.js
diff --git a/test/language/module-code/instn-resolve-order-depth-syntax_.js b/test/language/module-code/instn-resolve-order-depth-syntax_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-resolve-order-depth-syntax_.js
rename to test/language/module-code/instn-resolve-order-depth-syntax_FIXTURE.js
diff --git a/test/language/module-code/instn-resolve-order-depth.js b/test/language/module-code/instn-resolve-order-depth.js
index ffeb90a198..855b06432d 100644
--- a/test/language/module-code/instn-resolve-order-depth.js
+++ b/test/language/module-code/instn-resolve-order-depth.js
@@ -7,5 +7,5 @@ negative: ReferenceError
 flags: [module]
 ---*/
 
-import './instn-resolve-order-depth-child_.js';
-import './instn-resolve-order-depth-syntax_.js';
+import './instn-resolve-order-depth-child_FIXTURE.js';
+import './instn-resolve-order-depth-syntax_FIXTURE.js';
diff --git a/test/language/module-code/instn-resolve-order-src-reference_.js b/test/language/module-code/instn-resolve-order-src-reference_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-resolve-order-src-reference_.js
rename to test/language/module-code/instn-resolve-order-src-reference_FIXTURE.js
diff --git a/test/language/module-code/instn-resolve-order-src-syntax_.js b/test/language/module-code/instn-resolve-order-src-syntax_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-resolve-order-src-syntax_.js
rename to test/language/module-code/instn-resolve-order-src-syntax_FIXTURE.js
diff --git a/test/language/module-code/instn-resolve-order-src-valid_.js b/test/language/module-code/instn-resolve-order-src-valid_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-resolve-order-src-valid_.js
rename to test/language/module-code/instn-resolve-order-src-valid_FIXTURE.js
diff --git a/test/language/module-code/instn-resolve-order-src.js b/test/language/module-code/instn-resolve-order-src.js
index 501ebe138a..0b1482b477 100644
--- a/test/language/module-code/instn-resolve-order-src.js
+++ b/test/language/module-code/instn-resolve-order-src.js
@@ -7,6 +7,6 @@ negative: ReferenceError
 flags: [module]
 ---*/
 
-import './instn-resolve-order-src-valid_.js';
-import './instn-resolve-order-src-reference_.js';
-import './instn-resolve-order-src-syntax_.js';
+import './instn-resolve-order-src-valid_FIXTURE.js';
+import './instn-resolve-order-src-reference_FIXTURE.js';
+import './instn-resolve-order-src-syntax_FIXTURE.js';
diff --git a/test/language/module-code/instn-same-global-set_.js b/test/language/module-code/instn-same-global-set_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-same-global-set_.js
rename to test/language/module-code/instn-same-global-set_FIXTURE.js
diff --git a/test/language/module-code/instn-same-global.js b/test/language/module-code/instn-same-global.js
index f49d014b7f..4bcc50b446 100644
--- a/test/language/module-code/instn-same-global.js
+++ b/test/language/module-code/instn-same-global.js
@@ -12,7 +12,7 @@ includes: [fnGlobalObject.js]
 flags: [module]
 ---*/
 
-import './instn-same-global-set_.js';
+import './instn-same-global-set_FIXTURE.js';
 
 var global = fnGlobalObject();
 
diff --git a/test/language/module-code/instn-star-ambiguous-1_.js b/test/language/module-code/instn-star-ambiguous-1_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-ambiguous-1_.js
rename to test/language/module-code/instn-star-ambiguous-1_FIXTURE.js
diff --git a/test/language/module-code/instn-star-ambiguous-2_.js b/test/language/module-code/instn-star-ambiguous-2_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-ambiguous-2_.js
rename to test/language/module-code/instn-star-ambiguous-2_FIXTURE.js
diff --git a/test/language/module-code/instn-star-ambiguous.js b/test/language/module-code/instn-star-ambiguous.js
index 9e32067ee8..2154431e32 100644
--- a/test/language/module-code/instn-star-ambiguous.js
+++ b/test/language/module-code/instn-star-ambiguous.js
@@ -28,7 +28,7 @@ info: |
 flags: [module]
 ---*/
 
-import * as ns from './instn-star-ambiguous_.js';
+import * as ns from './instn-star-ambiguous_FIXTURE.js';
 
 assert('first' in ns, 'Non-ambiguous exports from first module are present');
 assert('second' in ns, 'Non-ambiguous exports from second module are present');
diff --git a/test/language/module-code/instn-star-ambiguous_.js b/test/language/module-code/instn-star-ambiguous_.js
deleted file mode 100644
index ab96a95cbc..0000000000
--- a/test/language/module-code/instn-star-ambiguous_.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-export * from './instn-star-ambiguous-1_.js';
-export * from './instn-star-ambiguous-2_.js';
diff --git a/test/language/module-code/instn-iee-err-ambiguous_.js b/test/language/module-code/instn-star-ambiguous_FIXTURE.js
similarity index 56%
rename from test/language/module-code/instn-iee-err-ambiguous_.js
rename to test/language/module-code/instn-star-ambiguous_FIXTURE.js
index 6984d00947..fe5de37390 100644
--- a/test/language/module-code/instn-iee-err-ambiguous_.js
+++ b/test/language/module-code/instn-star-ambiguous_FIXTURE.js
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-export * from './instn-iee-err-ambiguous-1_.js';
-export * from './instn-iee-err-ambiguous-2_.js';
+export * from './instn-star-ambiguous-1_FIXTURE.js';
+export * from './instn-star-ambiguous-2_FIXTURE.js';
diff --git a/test/language/module-code/instn-star-equality-other_.js b/test/language/module-code/instn-star-equality-other_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-equality-other_.js
rename to test/language/module-code/instn-star-equality-other_FIXTURE.js
diff --git a/test/language/module-code/instn-star-equality.js b/test/language/module-code/instn-star-equality.js
index f1b2e920fa..9b29971238 100644
--- a/test/language/module-code/instn-star-equality.js
+++ b/test/language/module-code/instn-star-equality.js
@@ -26,10 +26,10 @@ flags: [module]
 
 import * as self1 from './instn-star-equality.js';
 import * as self2 from './instn-star-equality.js';
-import * as other1 from './instn-star-equality-other_.js';
+import * as other1 from './instn-star-equality-other_FIXTURE.js';
 import * as self3 from './instn-star-equality.js';
-import * as other2 from './instn-star-equality-other_.js';
-import { testNs } from './instn-star-equality-other_.js';
+import * as other2 from './instn-star-equality-other_FIXTURE.js';
+import { testNs } from './instn-star-equality-other_FIXTURE.js';
 
 assert.sameValue(
   self1, self2, 'Local namespace objects from consecutive declarations'
diff --git a/test/language/module-code/instn-star-err-not-found-empty_.js b/test/language/module-code/instn-star-err-not-found-empty_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-err-not-found-empty_.js
rename to test/language/module-code/instn-star-err-not-found-empty_FIXTURE.js
diff --git a/test/language/module-code/instn-star-err-not-found-faulty_.js b/test/language/module-code/instn-star-err-not-found-faulty_.js
deleted file mode 100644
index e4bef5ebd6..0000000000
--- a/test/language/module-code/instn-star-err-not-found-faulty_.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-export { x } from './inst-import-star-err-not-found-empty_.js';
diff --git a/test/language/module-code/instn-star-err-not-found-faulty_FIXTURE.js b/test/language/module-code/instn-star-err-not-found-faulty_FIXTURE.js
new file mode 100644
index 0000000000..92e2510579
--- /dev/null
+++ b/test/language/module-code/instn-star-err-not-found-faulty_FIXTURE.js
@@ -0,0 +1,4 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+export { x } from './inst-import-star-err-not-found-empty_FIXTURE.js';
diff --git a/test/language/module-code/instn-star-err-not-found.js b/test/language/module-code/instn-star-err-not-found.js
index ece6a63beb..addab75a40 100644
--- a/test/language/module-code/instn-star-err-not-found.js
+++ b/test/language/module-code/instn-star-err-not-found.js
@@ -26,4 +26,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import * as ns from './inst-import-star-err-not-found-faulty_.js';
+import * as ns from './inst-import-star-err-not-found-faulty_FIXTURE.js';
diff --git a/test/language/module-code/instn-star-iee-cycle-2_.js b/test/language/module-code/instn-star-iee-cycle-2_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-iee-cycle-2_.js
rename to test/language/module-code/instn-star-iee-cycle-2_FIXTURE.js
diff --git a/test/language/module-code/instn-star-iee-cycle.js b/test/language/module-code/instn-star-iee-cycle.js
index c8b58d0aef..fdff93ed91 100644
--- a/test/language/module-code/instn-star-iee-cycle.js
+++ b/test/language/module-code/instn-star-iee-cycle.js
@@ -37,19 +37,19 @@ info: |
 flags: [module]
 ---*/
 
-import * as ns from './instn-star-iee-cycle-2_.js';
-export { c as b } from './instn-star-iee-cycle-2_.js';
-export { e as d } from './instn-star-iee-cycle-2_.js';
-export { g as f } from './instn-star-iee-cycle-2_.js';
-export { i as h } from './instn-star-iee-cycle-2_.js';
-export { k as j } from './instn-star-iee-cycle-2_.js';
-export { m as l } from './instn-star-iee-cycle-2_.js';
-export { o as n } from './instn-star-iee-cycle-2_.js';
-export { q as p } from './instn-star-iee-cycle-2_.js';
-export { s as r } from './instn-star-iee-cycle-2_.js';
-export { u as t } from './instn-star-iee-cycle-2_.js';
-export { w as v } from './instn-star-iee-cycle-2_.js';
-export { y as x } from './instn-star-iee-cycle-2_.js';
+import * as ns from './instn-star-iee-cycle-2_FIXTURE.js';
+export { c as b } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { e as d } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { g as f } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { i as h } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { k as j } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { m as l } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { o as n } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { q as p } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { s as r } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { u as t } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { w as v } from './instn-star-iee-cycle-2_FIXTURE.js';
+export { y as x } from './instn-star-iee-cycle-2_FIXTURE.js';
 export var z = 23;
 
 assert.sameValue(ns.a, 23);
diff --git a/test/language/module-code/instn-star-props-circular-a_.js b/test/language/module-code/instn-star-props-circular-a_FIXTURE.js
similarity index 73%
rename from test/language/module-code/instn-star-props-circular-a_.js
rename to test/language/module-code/instn-star-props-circular-a_FIXTURE.js
index 165a825fb9..75e234d8ab 100644
--- a/test/language/module-code/instn-star-props-circular-a_.js
+++ b/test/language/module-code/instn-star-props-circular-a_FIXTURE.js
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-export * from './instn-star-props-circular-b_.js';
+export * from './instn-star-props-circular-b_FIXTURE.js';
 export var fromA;
diff --git a/test/language/module-code/instn-star-props-circular-b_.js b/test/language/module-code/instn-star-props-circular-b_FIXTURE.js
similarity index 73%
rename from test/language/module-code/instn-star-props-circular-b_.js
rename to test/language/module-code/instn-star-props-circular-b_FIXTURE.js
index b12e23fec0..a1ba5ece76 100644
--- a/test/language/module-code/instn-star-props-circular-b_.js
+++ b/test/language/module-code/instn-star-props-circular-b_FIXTURE.js
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-export * from './instn-star-props-circular-a_.js';
+export * from './instn-star-props-circular-a_FIXTURE.js';
 export var fromB;
diff --git a/test/language/module-code/instn-star-props-circular.js b/test/language/module-code/instn-star-props-circular.js
index 1e6ffdbac6..7441bdb802 100644
--- a/test/language/module-code/instn-star-props-circular.js
+++ b/test/language/module-code/instn-star-props-circular.js
@@ -30,8 +30,8 @@ info: |
 flags: [module]
 ---*/
 
-import * as a from './instn-star-props-circular-a_.js';
-import * as b from './instn-star-props-circular-b_.js';
+import * as a from './instn-star-props-circular-a_FIXTURE.js';
+import * as b from './instn-star-props-circular-b_FIXTURE.js';
 
 assert('fromA' in a, 'entry for binding from "a" in namespace of module A');
 assert('fromB' in a, 'entry for binding from "b" in namespace of module A');
diff --git a/test/language/module-code/instn-star-props-dflt-keep-indirect-def_.js b/test/language/module-code/instn-star-props-dflt-keep-indirect-def_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-props-dflt-keep-indirect-def_.js
rename to test/language/module-code/instn-star-props-dflt-keep-indirect-def_FIXTURE.js
diff --git a/test/language/module-code/instn-star-props-dflt-keep-indirect-reexport_.js b/test/language/module-code/instn-star-props-dflt-keep-indirect-reexport_FIXTURE.js
similarity index 92%
rename from test/language/module-code/instn-star-props-dflt-keep-indirect-reexport_.js
rename to test/language/module-code/instn-star-props-dflt-keep-indirect-reexport_FIXTURE.js
index 16bd139704..bac4dcb397 100644
--- a/test/language/module-code/instn-star-props-dflt-keep-indirect-reexport_.js
+++ b/test/language/module-code/instn-star-props-dflt-keep-indirect-reexport_FIXTURE.js
@@ -1,4 +1,4 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-export { default } from './instn-star-props-dflt-keep-indirect-def_.js';
+export { default } from './instn-star-props-dflt-keep-indirect-def_FIXTURE.js';
diff --git a/test/language/module-code/instn-star-props-dflt-keep-indirect.js b/test/language/module-code/instn-star-props-dflt-keep-indirect.js
index 896b4dfe9e..8c5f7ddbd6 100644
--- a/test/language/module-code/instn-star-props-dflt-keep-indirect.js
+++ b/test/language/module-code/instn-star-props-dflt-keep-indirect.js
@@ -30,6 +30,6 @@ info: |
 flags: [module]
 ---*/
 
-import * as ns from './instn-star-props-dflt-keep-indirect-reexport_.js';
+import * as ns from './instn-star-props-dflt-keep-indirect-reexport_FIXTURE.js';
 
 assert.sameValue('default' in ns, true);
diff --git a/test/language/module-code/instn-star-props-dflt-keep-local-named_.js b/test/language/module-code/instn-star-props-dflt-keep-local-named_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-props-dflt-keep-local-named_.js
rename to test/language/module-code/instn-star-props-dflt-keep-local-named_FIXTURE.js
diff --git a/test/language/module-code/instn-star-props-dflt-keep-local-prod_.js b/test/language/module-code/instn-star-props-dflt-keep-local-prod_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-props-dflt-keep-local-prod_.js
rename to test/language/module-code/instn-star-props-dflt-keep-local-prod_FIXTURE.js
diff --git a/test/language/module-code/instn-star-props-dflt-keep-local.js b/test/language/module-code/instn-star-props-dflt-keep-local.js
index e1f838a6e2..925a881a46 100644
--- a/test/language/module-code/instn-star-props-dflt-keep-local.js
+++ b/test/language/module-code/instn-star-props-dflt-keep-local.js
@@ -30,8 +30,8 @@ info: |
 flags: [module]
 ---*/
 
-import * as named from './instn-star-props-dflt-keep-local-named_.js';
-import * as production from './instn-star-props-dflt-keep-local-prod_.js';
+import * as named from './instn-star-props-dflt-keep-local-named_FIXTURE.js';
+import * as production from './instn-star-props-dflt-keep-local-prod_FIXTURE.js';
 
 assert.sameValue('default' in named, true, 'default specified via identifier');
 
diff --git a/test/language/module-code/instn-star-props-dflt-skip-named_.js b/test/language/module-code/instn-star-props-dflt-skip-named_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-props-dflt-skip-named_.js
rename to test/language/module-code/instn-star-props-dflt-skip-named_FIXTURE.js
diff --git a/test/language/module-code/instn-star-props-dflt-skip-prod_.js b/test/language/module-code/instn-star-props-dflt-skip-prod_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-props-dflt-skip-prod_.js
rename to test/language/module-code/instn-star-props-dflt-skip-prod_FIXTURE.js
diff --git a/test/language/module-code/instn-star-props-dflt-skip-star-named_.js b/test/language/module-code/instn-star-props-dflt-skip-star-named_.js
deleted file mode 100644
index 05705983a9..0000000000
--- a/test/language/module-code/instn-star-props-dflt-skip-star-named_.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-export * from './instn-star-props-dflt-skip-named_.js';
diff --git a/test/language/module-code/instn-named-err-dflt-thru-star-int_.js b/test/language/module-code/instn-star-props-dflt-skip-star-named_FIXTURE.js
similarity index 68%
rename from test/language/module-code/instn-named-err-dflt-thru-star-int_.js
rename to test/language/module-code/instn-star-props-dflt-skip-star-named_FIXTURE.js
index fcd60646ef..abebc424b1 100644
--- a/test/language/module-code/instn-named-err-dflt-thru-star-int_.js
+++ b/test/language/module-code/instn-star-props-dflt-skip-star-named_FIXTURE.js
@@ -1,4 +1,4 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-export * from './instn-named-err-dflt-thru-star-dflt_.js';
+export * from './instn-star-props-dflt-skip-named_FIXTURE.js';
diff --git a/test/language/module-code/instn-star-props-dflt-skip-star-prod_.js b/test/language/module-code/instn-star-props-dflt-skip-star-prod_.js
deleted file mode 100644
index e3ec18109f..0000000000
--- a/test/language/module-code/instn-star-props-dflt-skip-star-prod_.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-export * from './instn-star-props-dflt-skip-prod_.js';
diff --git a/test/language/module-code/instn-iee-star-cycle-2_.js b/test/language/module-code/instn-star-props-dflt-skip-star-prod_FIXTURE.js
similarity index 69%
rename from test/language/module-code/instn-iee-star-cycle-2_.js
rename to test/language/module-code/instn-star-props-dflt-skip-star-prod_FIXTURE.js
index 1a023020ca..bf73bf5c05 100644
--- a/test/language/module-code/instn-iee-star-cycle-2_.js
+++ b/test/language/module-code/instn-star-props-dflt-skip-star-prod_FIXTURE.js
@@ -1,4 +1,4 @@
 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-export * from './instn-iee-star-cycle-indirect-x_.js';
+export * from './instn-star-props-dflt-skip-prod_FIXTURE.js';
diff --git a/test/language/module-code/instn-star-props-dflt-skip.js b/test/language/module-code/instn-star-props-dflt-skip.js
index 0e096b38ee..2eaf768000 100644
--- a/test/language/module-code/instn-star-props-dflt-skip.js
+++ b/test/language/module-code/instn-star-props-dflt-skip.js
@@ -31,8 +31,8 @@ info: |
 flags: [module]
 ---*/
 
-import * as named from './instn-star-props-dflt-skip-star-named_.js';
-import * as production from './instn-star-props-dflt-skip-star-prod_.js';
+import * as named from './instn-star-props-dflt-skip-star-named_FIXTURE.js';
+import * as production from './instn-star-props-dflt-skip-star-prod_FIXTURE.js';
 
 assert('namedOther' in named);
 assert.sameValue(
diff --git a/test/language/module-code/instn-star-props-nrml-1_.js b/test/language/module-code/instn-star-props-nrml-1_FIXTURE.js
similarity index 87%
rename from test/language/module-code/instn-star-props-nrml-1_.js
rename to test/language/module-code/instn-star-props-nrml-1_FIXTURE.js
index 5b70c0746c..72fe63809c 100644
--- a/test/language/module-code/instn-star-props-nrml-1_.js
+++ b/test/language/module-code/instn-star-props-nrml-1_FIXTURE.js
@@ -18,7 +18,7 @@ export function* localGenDecl() {}
 export class localClassDecl {}
 export { localBindingId };
 export { localBindingId as localIdName };
-export { indirectIdName } from './instn-star-props-nrml-indirect_.js';
-export { indirectIdName as indirectIdName2 } from './instn-star-props-nrml-indirect_.js';
+export { indirectIdName } from './instn-star-props-nrml-indirect_FIXTURE.js';
+export { indirectIdName as indirectIdName2 } from './instn-star-props-nrml-indirect_FIXTURE.js';
 
-export * from './instn-star-props-nrml-star_.js';
+export * from './instn-star-props-nrml-star_FIXTURE.js';
diff --git a/test/language/module-code/instn-star-props-nrml-indirect_.js b/test/language/module-code/instn-star-props-nrml-indirect_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-star-props-nrml-indirect_.js
rename to test/language/module-code/instn-star-props-nrml-indirect_FIXTURE.js
diff --git a/test/language/module-code/instn-star-props-nrml-star_.js b/test/language/module-code/instn-star-props-nrml-star_FIXTURE.js
similarity index 92%
rename from test/language/module-code/instn-star-props-nrml-star_.js
rename to test/language/module-code/instn-star-props-nrml-star_FIXTURE.js
index 9ae922721a..6c0d481d68 100644
--- a/test/language/module-code/instn-star-props-nrml-star_.js
+++ b/test/language/module-code/instn-star-props-nrml-star_FIXTURE.js
@@ -18,5 +18,5 @@ export function* starGenDecl() {}
 export class starClassDecl {}
 export { starBindingId };
 export { starBindingId as starIdName };
-export { starIndirectIdName } from './instn-star-props-nrml-indirect_.js';
-export { starIndirectIdName as starIndirectIdName2 } from './instn-star-props-nrml-indirect_.js';
+export { starIndirectIdName } from './instn-star-props-nrml-indirect_FIXTURE.js';
+export { starIndirectIdName as starIndirectIdName2 } from './instn-star-props-nrml-indirect_FIXTURE.js';
diff --git a/test/language/module-code/instn-star-props-nrml.js b/test/language/module-code/instn-star-props-nrml.js
index df2a9f1380..615044c0b5 100644
--- a/test/language/module-code/instn-star-props-nrml.js
+++ b/test/language/module-code/instn-star-props-nrml.js
@@ -27,7 +27,7 @@ info: |
 flags: [module]
 ---*/
 
-import * as ns from './instn-star-props-nrml-1_.js';
+import * as ns from './instn-star-props-nrml-1_FIXTURE.js';
 
 // Export entries defined by a directly-imported module
 assert('localVarDecl' in ns, 'localVarDecl');
diff --git a/test/language/module-code/instn-star-star-cycle-2_.js b/test/language/module-code/instn-star-star-cycle-2_.js
deleted file mode 100644
index fef0cb811d..0000000000
--- a/test/language/module-code/instn-star-star-cycle-2_.js
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright (C) 2016 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-export * from './instn-star-star-cycle-indirect-x_.js';
diff --git a/test/language/module-code/instn-star-star-cycle-2_FIXTURE.js b/test/language/module-code/instn-star-star-cycle-2_FIXTURE.js
new file mode 100644
index 0000000000..78173c4b57
--- /dev/null
+++ b/test/language/module-code/instn-star-star-cycle-2_FIXTURE.js
@@ -0,0 +1,4 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+export * from './instn-star-star-cycle-indirect-x_FIXTURE.js';
diff --git a/test/language/module-code/instn-star-star-cycle-indirect-x_.js b/test/language/module-code/instn-star-star-cycle-indirect-x_FIXTURE.js
similarity index 79%
rename from test/language/module-code/instn-star-star-cycle-indirect-x_.js
rename to test/language/module-code/instn-star-star-cycle-indirect-x_FIXTURE.js
index d8f4f09c91..4cfd80e477 100644
--- a/test/language/module-code/instn-star-star-cycle-indirect-x_.js
+++ b/test/language/module-code/instn-star-star-cycle-indirect-x_FIXTURE.js
@@ -3,5 +3,5 @@
 
 // This module should be visited exactly one time during resolution of the "x"
 // binding.
-export { y as x } from './instn-star-star-cycle-2_.js';
+export { y as x } from './instn-star-star-cycle-2_FIXTURE.js';
 export var y = 45;
diff --git a/test/language/module-code/instn-star-star-cycle.js b/test/language/module-code/instn-star-star-cycle.js
index 87282db695..69547618fe 100644
--- a/test/language/module-code/instn-star-star-cycle.js
+++ b/test/language/module-code/instn-star-star-cycle.js
@@ -26,4 +26,4 @@ negative: SyntaxError
 flags: [module]
 ---*/
 
-import * as ns from './instn-star-star-cycle-2_.js';
+import * as ns from './instn-star-star-cycle-2_FIXTURE.js';
diff --git a/test/language/module-code/instn-uniq-env-rec-other_.js b/test/language/module-code/instn-uniq-env-rec-other_FIXTURE.js
similarity index 100%
rename from test/language/module-code/instn-uniq-env-rec-other_.js
rename to test/language/module-code/instn-uniq-env-rec-other_FIXTURE.js
diff --git a/test/language/module-code/instn-uniq-env-rec.js b/test/language/module-code/instn-uniq-env-rec.js
index f413ed1c2d..2c5628f04d 100644
--- a/test/language/module-code/instn-uniq-env-rec.js
+++ b/test/language/module-code/instn-uniq-env-rec.js
@@ -16,7 +16,7 @@ info: |
 flags: [module]
 ---*/
 
-import './instn-uniq-env-rec-other_.js'
+import './instn-uniq-env-rec-other_FIXTURE.js'
 var first = 1;
 let second = 2;
 const third = 3;