Explicitly specify ES6 target in computed property test file names.

tests/baselines/reference/computedPropertyNames10_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames10.ts]
+//// [computedPropertyNames10_ES6.ts]
 var s: string;
 var n: number;
 var a: any;
@@ -16,7 +16,7 @@ var v = {
     [`hello ${a} bye`]() { }
 }
 
-//// [computedPropertyNames10.js]
+//// [computedPropertyNames10_ES6.js]
 var s;
 var n;
 var a;

tests/baselines/reference/computedPropertyNames10_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames10.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames10_ES6.ts ===
 var s: string;
 >s : string
 

tests/baselines/reference/computedPropertyNames11_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames11.ts]
+//// [computedPropertyNames11_ES6.ts]
 var s: string;
 var n: number;
 var a: any;
@@ -16,7 +16,7 @@ var v = {
     get [`hello ${a} bye`]() { return 0; }
 }
 
-//// [computedPropertyNames11.js]
+//// [computedPropertyNames11_ES6.js]
 var s;
 var n;
 var a;

tests/baselines/reference/computedPropertyNames11_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames11.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames11_ES6.ts ===
 var s: string;
 >s : string
 

tests/baselines/reference/computedPropertyNames12_ES6.errors.txt

@@ -1,17 +1,17 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(5,5): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(6,5): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(7,12): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(8,5): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(9,5): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(10,12): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(11,5): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(12,5): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(13,12): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(14,5): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts(15,12): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(5,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(6,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(7,12): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(8,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(9,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(10,12): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(11,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(12,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(13,12): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(14,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts(15,12): error TS1166: Computed property names are not allowed in class property declarations.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12.ts (11 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames12_ES6.ts (11 errors) ====
     var s: string;
     var n: number;
     var a: any;

tests/baselines/reference/computedPropertyNames12_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames12.ts]
+//// [computedPropertyNames12_ES6.ts]
 var s: string;
 var n: number;
 var a: any;
@@ -16,7 +16,7 @@ class C {
     static [`hello ${a} bye`] = 0
 }
 
-//// [computedPropertyNames12.js]
+//// [computedPropertyNames12_ES6.js]
 var s;
 var n;
 var a;

tests/baselines/reference/computedPropertyNames13_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames13.ts]
+//// [computedPropertyNames13_ES6.ts]
 var s: string;
 var n: number;
 var a: any;
@@ -16,7 +16,7 @@ class C {
     static [`hello ${a} bye`]() { }
 }
 
-//// [computedPropertyNames13.js]
+//// [computedPropertyNames13_ES6.js]
 var s;
 var n;
 var a;

tests/baselines/reference/computedPropertyNames13_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames13.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames13_ES6.ts ===
 var s: string;
 >s : string
 

tests/baselines/reference/computedPropertyNames14_ES6.errors.txt

@@ -1,12 +1,12 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(3,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(4,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(5,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(6,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts(8,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14_ES6.ts(3,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14_ES6.ts(4,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14_ES6.ts(5,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14_ES6.ts(6,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14_ES6.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames14_ES6.ts(8,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames14.ts (6 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames14_ES6.ts (6 errors) ====
     var b: boolean;
     class C {
         [b]() {}

tests/baselines/reference/computedPropertyNames14_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames14.ts]
+//// [computedPropertyNames14_ES6.ts]
 var b: boolean;
 class C {
     [b]() {}
@@ -9,7 +9,7 @@ class C {
     static [null]() { }
 }
 
-//// [computedPropertyNames14.js]
+//// [computedPropertyNames14_ES6.js]
 var b;
 var C = (function () {
     function C() {

tests/baselines/reference/computedPropertyNames15_ES6.errors.txt

@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames15.ts(6,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames15.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames15_ES6.ts(6,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames15_ES6.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames15.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames15_ES6.ts (2 errors) ====
     var p1: number | string;
     var p2: number | number[];
     var p3: string | boolean;

tests/baselines/reference/computedPropertyNames15_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames15.ts]
+//// [computedPropertyNames15_ES6.ts]
 var p1: number | string;
 var p2: number | number[];
 var p3: string | boolean;
@@ -8,7 +8,7 @@ class C {
     [p3]() { }
 }
 
-//// [computedPropertyNames15.js]
+//// [computedPropertyNames15_ES6.js]
 var p1;
 var p2;
 var p3;

tests/baselines/reference/computedPropertyNames16_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames16.ts]
+//// [computedPropertyNames16_ES6.ts]
 var s: string;
 var n: number;
 var a: any;
@@ -16,7 +16,7 @@ class C {
     get [`hello ${a} bye`]() { return 0; }
 }
 
-//// [computedPropertyNames16.js]
+//// [computedPropertyNames16_ES6.js]
 var s;
 var n;
 var a;

tests/baselines/reference/computedPropertyNames16_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames16.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames16_ES6.ts ===
 var s: string;
 >s : string
 

tests/baselines/reference/computedPropertyNames17_ES6.errors.txt

@@ -1,12 +1,12 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(3,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(4,16): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(7,16): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts(8,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts(3,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts(4,16): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts(7,16): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts(8,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames17.ts (6 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames17_ES6.ts (6 errors) ====
     var b: boolean;
     class C {
         get [b]() { return 0;}

tests/baselines/reference/computedPropertyNames17_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames17.ts]
+//// [computedPropertyNames17_ES6.ts]
 var b: boolean;
 class C {
     get [b]() { return 0;}
@@ -9,7 +9,7 @@ class C {
     set [null](v) { }
 }
 
-//// [computedPropertyNames17.js]
+//// [computedPropertyNames17_ES6.js]
 var b;
 var C = (function () {
     function C() {

tests/baselines/reference/computedPropertyNames18_ES6.js

@@ -1,11 +1,11 @@
-//// [computedPropertyNames18.ts]
+//// [computedPropertyNames18_ES6.ts]
 function foo() {
     var obj = {
         [this.bar]: 0
     }
 }
 
-//// [computedPropertyNames18.js]
+//// [computedPropertyNames18_ES6.js]
 function foo() {
     var obj = {
         [this.bar]: 0

tests/baselines/reference/computedPropertyNames18_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames18.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames18_ES6.ts ===
 function foo() {
 >foo : () => void
 

tests/baselines/reference/computedPropertyNames19_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames19.ts(3,10): error TS2331: 'this' cannot be referenced in a module body.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts(3,10): error TS2331: 'this' cannot be referenced in a module body.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames19.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames19_ES6.ts (1 errors) ====
     module M {
         var obj = {
             [this.bar]: 0

tests/baselines/reference/computedPropertyNames19_ES6.js

@@ -1,11 +1,11 @@
-//// [computedPropertyNames19.ts]
+//// [computedPropertyNames19_ES6.ts]
 module M {
     var obj = {
         [this.bar]: 0
     }
 }
 
-//// [computedPropertyNames19.js]
+//// [computedPropertyNames19_ES6.js]
 var M;
 (function (M) {
     var obj = {

tests/baselines/reference/computedPropertyNames1_ES6.js

@@ -1,10 +1,10 @@
-//// [computedPropertyNames1.ts]
+//// [computedPropertyNames1_ES6.ts]
 var v = {
     get [0 + 1]() { return 0 },
     set [0 + 1](v: string) { } //No error
 }
 
-//// [computedPropertyNames1.js]
+//// [computedPropertyNames1_ES6.js]
 var v = {
     get [0 + 1]() {
         return 0;

tests/baselines/reference/computedPropertyNames1_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames1.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames1_ES6.ts ===
 var v = {
 >v : {}
 >{    get [0 + 1]() { return 0 },    set [0 + 1](v: string) { } //No error} : {}

tests/baselines/reference/computedPropertyNames20.js

@@ -1,9 +0,0 @@
-//// [computedPropertyNames20.ts]
-var obj = {
-    [this.bar]: 0
-}
-
-//// [computedPropertyNames20.js]
-var obj = {
-    [this.bar]: 0
-};

tests/baselines/reference/computedPropertyNames20_ES6.js

@@ -0,0 +1,9 @@
+//// [computedPropertyNames20_ES6.ts]
+var obj = {
+    [this.bar]: 0
+}
+
+//// [computedPropertyNames20_ES6.js]
+var obj = {
+    [this.bar]: 0
+};

tests/baselines/reference/computedPropertyNames20_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames20.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames20_ES6.ts ===
 var obj = {
 >obj : {}
 >{    [this.bar]: 0} : {}

tests/baselines/reference/computedPropertyNames21_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames21.ts(5,6): error TS2465: 'this' cannot be referenced in a computed property name.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames21_ES6.ts(5,6): error TS2465: 'this' cannot be referenced in a computed property name.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames21.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames21_ES6.ts (1 errors) ====
     class C {
         bar() {
             return 0;

tests/baselines/reference/computedPropertyNames21_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames21.ts]
+//// [computedPropertyNames21_ES6.ts]
 class C {
     bar() {
         return 0;
@@ -6,7 +6,7 @@ class C {
     [this.bar()]() { }
 }
 
-//// [computedPropertyNames21.js]
+//// [computedPropertyNames21_ES6.js]
 var C = (function () {
     function C() {
     }

tests/baselines/reference/computedPropertyNames22_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames22.ts]
+//// [computedPropertyNames22_ES6.ts]
 class C {
     bar() {
         var obj = {
@@ -8,7 +8,7 @@ class C {
     }
 }
 
-//// [computedPropertyNames22.js]
+//// [computedPropertyNames22_ES6.js]
 var C = (function () {
     function C() {
     }

tests/baselines/reference/computedPropertyNames22_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames22.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames22_ES6.ts ===
 class C {
 >C : C
 

tests/baselines/reference/computedPropertyNames23_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames23.ts(6,12): error TS2465: 'this' cannot be referenced in a computed property name.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames23_ES6.ts(6,12): error TS2465: 'this' cannot be referenced in a computed property name.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames23.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames23_ES6.ts (1 errors) ====
     class C {
         bar() {
             return 0;

tests/baselines/reference/computedPropertyNames23_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames23.ts]
+//// [computedPropertyNames23_ES6.ts]
 class C {
     bar() {
         return 0;
@@ -8,7 +8,7 @@ class C {
     ]() { }
 }
 
-//// [computedPropertyNames23.js]
+//// [computedPropertyNames23_ES6.js]
 var C = (function () {
     function C() {
     }

tests/baselines/reference/computedPropertyNames24_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames24.ts(9,6): error TS2466: 'super' cannot be referenced in a computed property name.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts(9,6): error TS2466: 'super' cannot be referenced in a computed property name.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames24.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames24_ES6.ts (1 errors) ====
     class Base {
         bar() {
             return 0;

tests/baselines/reference/computedPropertyNames24_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames24.ts]
+//// [computedPropertyNames24_ES6.ts]
 class Base {
     bar() {
         return 0;
@@ -10,7 +10,7 @@ class C extends Base {
     [super.bar()]() { }
 }
 
-//// [computedPropertyNames24.js]
+//// [computedPropertyNames24_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames25_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames25.ts]
+//// [computedPropertyNames25_ES6.ts]
 class Base {
     bar() {
         return 0;
@@ -13,7 +13,7 @@ class C extends Base {
     }
 }
 
-//// [computedPropertyNames25.js]
+//// [computedPropertyNames25_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames25_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames25.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames25_ES6.ts ===
 class Base {
 >Base : Base
 

tests/baselines/reference/computedPropertyNames26_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames26.ts(10,12): error TS2466: 'super' cannot be referenced in a computed property name.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts(10,12): error TS2466: 'super' cannot be referenced in a computed property name.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames26.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames26_ES6.ts (1 errors) ====
     class Base {
         bar() {
             return 0;

tests/baselines/reference/computedPropertyNames26_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames26.ts]
+//// [computedPropertyNames26_ES6.ts]
 class Base {
     bar() {
         return 0;
@@ -12,7 +12,7 @@ class C extends Base {
     ]() { }
 }
 
-//// [computedPropertyNames26.js]
+//// [computedPropertyNames26_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames27_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames27.ts(4,7): error TS2466: 'super' cannot be referenced in a computed property name.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts(4,7): error TS2466: 'super' cannot be referenced in a computed property name.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames27.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames27_ES6.ts (1 errors) ====
     class Base {
     }
     class C extends Base {

tests/baselines/reference/computedPropertyNames27_ES6.js

@@ -1,11 +1,11 @@
-//// [computedPropertyNames27.ts]
+//// [computedPropertyNames27_ES6.ts]
 class Base {
 }
 class C extends Base {
     [(super(), "prop")]() { }
 }
 
-//// [computedPropertyNames27.js]
+//// [computedPropertyNames27_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames28_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames28.ts]
+//// [computedPropertyNames28_ES6.ts]
 class Base {
 }
 class C extends Base {
@@ -10,7 +10,7 @@ class C extends Base {
     }
 }
 
-//// [computedPropertyNames28.js]
+//// [computedPropertyNames28_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames28_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames28.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames28_ES6.ts ===
 class Base {
 >Base : Base
 }

tests/baselines/reference/computedPropertyNames29_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames29.ts]
+//// [computedPropertyNames29_ES6.ts]
 class C {
     bar() {
         () => {
@@ -10,7 +10,7 @@ class C {
     }
 }
 
-//// [computedPropertyNames29.js]
+//// [computedPropertyNames29_ES6.js]
 var C = (function () {
     function C() {
     }

tests/baselines/reference/computedPropertyNames29_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames29.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames29_ES6.ts ===
 class C {
 >C : C
 

tests/baselines/reference/computedPropertyNames2_ES6.errors.txt

@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(6,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(8,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts(6,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts(8,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames2_ES6.ts (2 errors) ====
     var methodName = "method";
     var accessorName = "accessor";
     class C {

tests/baselines/reference/computedPropertyNames2_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames2.ts]
+//// [computedPropertyNames2_ES6.ts]
 var methodName = "method";
 var accessorName = "accessor";
 class C {
@@ -10,7 +10,7 @@ class C {
     static set [accessorName](v) { }
 }
 
-//// [computedPropertyNames2.js]
+//// [computedPropertyNames2_ES6.js]
 var methodName = "method";
 var accessorName = "accessor";
 var C = (function () {

tests/baselines/reference/computedPropertyNames30_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames30.ts(11,19): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors
+tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES6.ts(11,19): error TS2337: Super calls are not permitted outside constructors or in nested functions inside constructors
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames30.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames30_ES6.ts (1 errors) ====
     class Base {
     }
     class C extends Base {

tests/baselines/reference/computedPropertyNames30_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames30.ts]
+//// [computedPropertyNames30_ES6.ts]
 class Base {
 }
 class C extends Base {
@@ -15,7 +15,7 @@ class C extends Base {
     }
 }
 
-//// [computedPropertyNames30.js]
+//// [computedPropertyNames30_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames31_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames31.ts]
+//// [computedPropertyNames31_ES6.ts]
 class Base {
     bar() {
         return 0;
@@ -15,7 +15,7 @@ class C extends Base {
     }
 }
 
-//// [computedPropertyNames31.js]
+//// [computedPropertyNames31_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames31_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames31.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames31_ES6.ts ===
 class Base {
 >Base : Base
 

tests/baselines/reference/computedPropertyNames32_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames32.ts(6,10): error TS2466: A computed property name cannot reference a type parameter from its containing type.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames32_ES6.ts(6,10): error TS2466: A computed property name cannot reference a type parameter from its containing type.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames32.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames32_ES6.ts (1 errors) ====
     function foo<T>() { return '' }
     class C<T> {
         bar() {

tests/baselines/reference/computedPropertyNames32_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames32.ts]
+//// [computedPropertyNames32_ES6.ts]
 function foo<T>() { return '' }
 class C<T> {
     bar() {
@@ -7,7 +7,7 @@ class C<T> {
     [foo<T>()]() { }
 }
 
-//// [computedPropertyNames32.js]
+//// [computedPropertyNames32_ES6.js]
 function foo() {
     return '';
 }

tests/baselines/reference/computedPropertyNames33_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames33.ts]
+//// [computedPropertyNames33_ES6.ts]
 function foo<T>() { return '' }
 class C<T> {
     bar() {
@@ -9,7 +9,7 @@ class C<T> {
     }
 }
 
-//// [computedPropertyNames33.js]
+//// [computedPropertyNames33_ES6.js]
 function foo() {
     return '';
 }

tests/baselines/reference/computedPropertyNames33_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames33.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames33_ES6.ts ===
 function foo<T>() { return '' }
 >foo : <T>() => string
 >T : T

tests/baselines/reference/computedPropertyNames34_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames34.ts(5,18): error TS2302: Static members cannot reference class type parameters.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames34_ES6.ts(5,18): error TS2302: Static members cannot reference class type parameters.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames34.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames34_ES6.ts (1 errors) ====
     function foo<T>() { return '' }
     class C<T> {
         static bar() {

tests/baselines/reference/computedPropertyNames34_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames34.ts]
+//// [computedPropertyNames34_ES6.ts]
 function foo<T>() { return '' }
 class C<T> {
     static bar() {
@@ -9,7 +9,7 @@ class C<T> {
     }
 }
 
-//// [computedPropertyNames34.js]
+//// [computedPropertyNames34_ES6.js]
 function foo() {
     return '';
 }

tests/baselines/reference/computedPropertyNames35_ES6.errors.txt

@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames35.ts(4,5): error TS1169: Computed property names are not allowed in interfaces.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames35.ts(4,10): error TS2466: A computed property name cannot reference a type parameter from its containing type.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames35_ES6.ts(4,5): error TS1169: Computed property names are not allowed in interfaces.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames35_ES6.ts(4,10): error TS2466: A computed property name cannot reference a type parameter from its containing type.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames35.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames35_ES6.ts (2 errors) ====
     function foo<T>() { return '' }
     interface I<T> {
         bar(): string;

tests/baselines/reference/computedPropertyNames35_ES6.js

@@ -1,11 +1,11 @@
-//// [computedPropertyNames35.ts]
+//// [computedPropertyNames35_ES6.ts]
 function foo<T>() { return '' }
 interface I<T> {
     bar(): string;
     [foo<T>()](): void;
 }
 
-//// [computedPropertyNames35.js]
+//// [computedPropertyNames35_ES6.js]
 function foo() {
     return '';
 }

tests/baselines/reference/computedPropertyNames36_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames36.ts(8,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts(8,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames36.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames36_ES6.ts (1 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     

tests/baselines/reference/computedPropertyNames36_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames36.ts]
+//// [computedPropertyNames36_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -10,7 +10,7 @@ class C {
     set ["set1"](p: Foo2) { }
 }
 
-//// [computedPropertyNames36.js]
+//// [computedPropertyNames36_ES6.js]
 var Foo = (function () {
     function Foo() {
     }

tests/baselines/reference/computedPropertyNames37_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames37.ts]
+//// [computedPropertyNames37_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -10,7 +10,7 @@ class C {
     set ["set1"](p: Foo2) { }
 }
 
-//// [computedPropertyNames37.js]
+//// [computedPropertyNames37_ES6.js]
 var Foo = (function () {
     function Foo() {
     }

tests/baselines/reference/computedPropertyNames37_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames37.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames37_ES6.ts ===
 class Foo { x }
 >Foo : Foo
 >x : any

tests/baselines/reference/computedPropertyNames38_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames38.ts(8,5): error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts(8,5): error TS2411: Property '[1 << 6]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames38.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames38_ES6.ts (1 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     

tests/baselines/reference/computedPropertyNames38_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames38.ts]
+//// [computedPropertyNames38_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -10,7 +10,7 @@ class C {
     set [1 << 6](p: Foo2) { }
 }
 
-//// [computedPropertyNames38.js]
+//// [computedPropertyNames38_ES6.js]
 var Foo = (function () {
     function Foo() {
     }

tests/baselines/reference/computedPropertyNames39_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames39.ts(8,5): error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts(8,5): error TS2412: Property '[1 << 6]' of type 'Foo' is not assignable to numeric index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames39.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames39_ES6.ts (1 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     

tests/baselines/reference/computedPropertyNames39_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames39.ts]
+//// [computedPropertyNames39_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -10,7 +10,7 @@ class C {
     set [1 << 6](p: Foo2) { }
 }
 
-//// [computedPropertyNames39.js]
+//// [computedPropertyNames39_ES6.js]
 var Foo = (function () {
     function Foo() {
     }

tests/baselines/reference/computedPropertyNames3_ES6.errors.txt

@@ -1,12 +1,12 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(4,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(5,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(7,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(7,16): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(4,12): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(5,9): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(7,16): error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts(7,16): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts (6 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames3_ES6.ts (6 errors) ====
     var id;
     class C {
         [0 + 1]() { }

tests/baselines/reference/computedPropertyNames3_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames3.ts]
+//// [computedPropertyNames3_ES6.ts]
 var id;
 class C {
     [0 + 1]() { }
@@ -9,7 +9,7 @@ class C {
     static set [id.toString()](v) { }
 }
 
-//// [computedPropertyNames3.js]
+//// [computedPropertyNames3_ES6.js]
 var id;
 var C = (function () {
     function C() {

tests/baselines/reference/computedPropertyNames40_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames40.ts(8,5): error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts(8,5): error TS2411: Property '[""]' of type '() => Foo' is not assignable to string index type '() => Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames40_ES6.ts (1 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     

tests/baselines/reference/computedPropertyNames40_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames40.ts]
+//// [computedPropertyNames40_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -10,7 +10,7 @@ class C {
     [""]() { return new Foo2 }
 }
 
-//// [computedPropertyNames40.js]
+//// [computedPropertyNames40_ES6.js]
 var Foo = (function () {
     function Foo() {
     }

tests/baselines/reference/computedPropertyNames41_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames41.ts]
+//// [computedPropertyNames41_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -9,7 +9,7 @@ class C {
     static [""]() { return new Foo }
 }
 
-//// [computedPropertyNames41.js]
+//// [computedPropertyNames41_ES6.js]
 var Foo = (function () {
     function Foo() {
     }

tests/baselines/reference/computedPropertyNames41_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames41.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames41_ES6.ts ===
 class Foo { x }
 >Foo : Foo
 >x : any

tests/baselines/reference/computedPropertyNames42_ES6.errors.txt

@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames42.ts(8,5): error TS1166: Computed property names are not allowed in class property declarations.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames42.ts(8,5): error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts(8,5): error TS1166: Computed property names are not allowed in class property declarations.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts(8,5): error TS2411: Property '[""]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames42_ES6.ts (2 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     

tests/baselines/reference/computedPropertyNames42_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames42.ts]
+//// [computedPropertyNames42_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -9,7 +9,7 @@ class C {
     [""]: Foo;
 }
 
-//// [computedPropertyNames42.js]
+//// [computedPropertyNames42_ES6.js]
 var Foo = (function () {
     function Foo() {
     }

tests/baselines/reference/computedPropertyNames43_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames43.ts(10,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts(10,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames43.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames43_ES6.ts (1 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     

tests/baselines/reference/computedPropertyNames43_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames43.ts]
+//// [computedPropertyNames43_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -12,7 +12,7 @@ class D extends C {
     set ["set1"](p: Foo2) { }
 }
 
-//// [computedPropertyNames43.js]
+//// [computedPropertyNames43_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames44_ES6.errors.txt

@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames44.ts(6,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames44.ts(10,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts(6,5): error TS2411: Property '["get1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts(10,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames44.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames44_ES6.ts (2 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     

tests/baselines/reference/computedPropertyNames44_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames44.ts]
+//// [computedPropertyNames44_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -11,7 +11,7 @@ class D extends C {
     set ["set1"](p: Foo) { }
 }
 
-//// [computedPropertyNames44.js]
+//// [computedPropertyNames44_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames45_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames45.ts(11,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts(11,5): error TS2411: Property '["set1"]' of type 'Foo' is not assignable to string index type 'Foo2'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames45_ES6.ts (1 errors) ====
     class Foo { x }
     class Foo2 { x; y }
     

tests/baselines/reference/computedPropertyNames45_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames45.ts]
+//// [computedPropertyNames45_ES6.ts]
 class Foo { x }
 class Foo2 { x; y }
 
@@ -12,7 +12,7 @@ class D extends C {
     set ["set1"](p: Foo) { }
 }
 
-//// [computedPropertyNames45.js]
+//// [computedPropertyNames45_ES6.js]
 var __extends = this.__extends || function (d, b) {
     for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function __() { this.constructor = d; }

tests/baselines/reference/computedPropertyNames46.js

@@ -1,9 +0,0 @@
-//// [computedPropertyNames46.ts]
-var o = {
-    ["" || 0]: 0
-};
-
-//// [computedPropertyNames46.js]
-var o = {
-    ["" || 0]: 0
-};

tests/baselines/reference/computedPropertyNames46_ES6.js

@@ -0,0 +1,9 @@
+//// [computedPropertyNames46_ES6.ts]
+var o = {
+    ["" || 0]: 0
+};
+
+//// [computedPropertyNames46_ES6.js]
+var o = {
+    ["" || 0]: 0
+};

tests/baselines/reference/computedPropertyNames46_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames46.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames46_ES6.ts ===
 var o = {
 >o : {}
 >{    ["" || 0]: 0} : {}

tests/baselines/reference/computedPropertyNames47_ES6.js

@@ -1,11 +1,11 @@
-//// [computedPropertyNames47.ts]
+//// [computedPropertyNames47_ES6.ts]
 enum E1 { x }
 enum E2 { x }
 var o = {
     [E1.x || E2.x]: 0
 };
 
-//// [computedPropertyNames47.js]
+//// [computedPropertyNames47_ES6.js]
 var E1;
 (function (E1) {
     E1[E1["x"] = 0] = "x";

tests/baselines/reference/computedPropertyNames47_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames47.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames47_ES6.ts ===
 enum E1 { x }
 >E1 : E1
 >x : E1

tests/baselines/reference/computedPropertyNames48_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames48.ts]
+//// [computedPropertyNames48_ES6.ts]
 declare function extractIndexer<T>(p: { [n: number]: T }): T;
 
 enum E { x }
@@ -17,7 +17,7 @@ extractIndexer({
     ["" || 0]: ""
 }); // Should return any (widened form of undefined)
 
-//// [computedPropertyNames48.js]
+//// [computedPropertyNames48_ES6.js]
 var E;
 (function (E) {
     E[E["x"] = 0] = "x";

tests/baselines/reference/computedPropertyNames48_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames48.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames48_ES6.ts ===
 declare function extractIndexer<T>(p: { [n: number]: T }): T;
 >extractIndexer : <T>(p: { [n: number]: T; }) => T
 >T : T

tests/baselines/reference/computedPropertyNames4_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames4.ts]
+//// [computedPropertyNames4_ES6.ts]
 var s: string;
 var n: number;
 var a: any;
@@ -16,7 +16,7 @@ var v = {
     [`hello ${a} bye`]: 0
 }
 
-//// [computedPropertyNames4.js]
+//// [computedPropertyNames4_ES6.js]
 var s;
 var n;
 var a;

tests/baselines/reference/computedPropertyNames4_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames4.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames4_ES6.ts ===
 var s: string;
 >s : string
 

tests/baselines/reference/computedPropertyNames5_ES6.errors.txt

@@ -1,12 +1,12 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(3,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(4,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(5,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(6,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts(8,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts(3,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts(4,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts(5,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts(6,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts(8,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames5.ts (6 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames5_ES6.ts (6 errors) ====
     var b: boolean;
     var v = {
         [b]: 0,

tests/baselines/reference/computedPropertyNames5_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames5.ts]
+//// [computedPropertyNames5_ES6.ts]
 var b: boolean;
 var v = {
     [b]: 0,
@@ -9,7 +9,7 @@ var v = {
     [null]: null
 }
 
-//// [computedPropertyNames5.js]
+//// [computedPropertyNames5_ES6.js]
 var b;
 var v = {
     [b]: 0,

tests/baselines/reference/computedPropertyNames6_ES6.errors.txt

@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames6.ts(6,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames6.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts(6,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts(7,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames6.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames6_ES6.ts (2 errors) ====
     var p1: number | string;
     var p2: number | number[];
     var p3: string | boolean;

tests/baselines/reference/computedPropertyNames6_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames6.ts]
+//// [computedPropertyNames6_ES6.ts]
 var p1: number | string;
 var p2: number | number[];
 var p3: string | boolean;
@@ -8,7 +8,7 @@ var v = {
     [p3]: 2
 }
 
-//// [computedPropertyNames6.js]
+//// [computedPropertyNames6_ES6.js]
 var p1;
 var p2;
 var p3;

tests/baselines/reference/computedPropertyNames7_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames7.ts]
+//// [computedPropertyNames7_ES6.ts]
 enum E {
     member
 }
@@ -6,7 +6,7 @@ var v = {
     [E.member]: 0
 }
 
-//// [computedPropertyNames7.js]
+//// [computedPropertyNames7_ES6.js]
 var E;
 (function (E) {
     E[E["member"] = 0] = "member";

tests/baselines/reference/computedPropertyNames7_ES6.types

@@ -1,4 +1,4 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames7.ts ===
+=== tests/cases/conformance/es6/computedProperties/computedPropertyNames7_ES6.ts ===
 enum E {
 >E : E
 

tests/baselines/reference/computedPropertyNames8_ES6.errors.txt

@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames8.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
-tests/cases/conformance/es6/computedProperties/computedPropertyNames8.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts(5,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts(6,9): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames8.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames8_ES6.ts (2 errors) ====
     function f<T, U extends string>() {
         var t: T;
         var u: U;

tests/baselines/reference/computedPropertyNames8_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames8.ts]
+//// [computedPropertyNames8_ES6.ts]
 function f<T, U extends string>() {
     var t: T;
     var u: U;
@@ -8,7 +8,7 @@ function f<T, U extends string>() {
     };
 }
 
-//// [computedPropertyNames8.js]
+//// [computedPropertyNames8_ES6.js]
 function f() {
     var t;
     var u;

tests/baselines/reference/computedPropertyNames9_ES6.errors.txt

@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNames9.ts(9,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES6.ts(9,5): error TS2464: A computed property name must be of type 'string', 'number', or 'any'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNames9.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames9_ES6.ts (1 errors) ====
     function f(s: string): string;
     function f(n: number): number;
     function f<T>(x: T): T;

tests/baselines/reference/computedPropertyNames9_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNames9.ts]
+//// [computedPropertyNames9_ES6.ts]
 function f(s: string): string;
 function f(n: number): number;
 function f<T>(x: T): T;
@@ -10,7 +10,7 @@ var v = {
     [f(true)]: 0
 }
 
-//// [computedPropertyNames9.js]
+//// [computedPropertyNames9_ES6.js]
 function f(x) {
 }
 var v = {

tests/baselines/reference/computedPropertyNamesContextualType10_ES6.errors.txt

@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10.ts(5,5): error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES6.ts(5,5): error TS2322: Type '{ [x: number]: string | number; }' is not assignable to type 'I'.
   Index signatures are incompatible.
     Type 'string | number' is not assignable to type 'boolean'.
       Type 'string' is not assignable to type 'boolean'.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10.ts (1 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesContextualType10_ES6.ts (1 errors) ====
     interface I {
         [s: number]: boolean;
     }

tests/baselines/reference/computedPropertyNamesContextualType10_ES6.js

@@ -1,4 +1,4 @@
-//// [computedPropertyNamesContextualType10.ts]
+//// [computedPropertyNamesContextualType10_ES6.ts]
 interface I {
     [s: number]: boolean;
 }
@@ -8,7 +8,7 @@ var o: I = {
     [+"bar"]: 0
 }
 
-//// [computedPropertyNamesContextualType10.js]
+//// [computedPropertyNamesContextualType10_ES6.js]
 var o = {
     [+"foo"]: "",
     [+"bar"]: 0