diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index e565734f64..6517233397 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -435,6 +435,7 @@ module ts {
         Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: DiagnosticCategory.Error, key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
         You_cannot_rename_this_element: { code: 8000, category: DiagnosticCategory.Error, key: "You cannot rename this element." },
         yield_expressions_are_not_currently_supported: { code: 9000, category: DiagnosticCategory.Error, key: "'yield' expressions are not currently supported." },
-        generators_are_not_currently_supported: { code: 9001, category: DiagnosticCategory.Error, key: "'generators' are not currently supported." },
+        Generators_are_not_currently_supported: { code: 9001, category: DiagnosticCategory.Error, key: "Generators are not currently supported." },
+        Computed_property_names_are_not_currently_supported: { code: 9002, category: DiagnosticCategory.Error, key: "Computed property names are not currently supported." },
     };
 }
\ No newline at end of file
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 9285b4c509..36b4075a2c 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1740,8 +1740,12 @@
         "category": "Error",
         "code": 9000
     },
-    "'generators' are not currently supported.": {
+    "Generators are not currently supported.": {
         "category": "Error",
         "code": 9001
+    },
+    "Computed property names are not currently supported.": {
+        "category": "Error",
+        "code": 9002
     }
 }
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index ee63b0f380..6d23bd51c1 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -4491,7 +4491,7 @@ module ts {
 
         function checkForGenerator(node: FunctionLikeDeclaration) {
             if (node.asteriskToken) {
-                return grammarErrorOnNode(node.asteriskToken, Diagnostics.generators_are_not_currently_supported);
+                return grammarErrorOnNode(node.asteriskToken, Diagnostics.Generators_are_not_currently_supported);
             }
         }
 
@@ -4984,6 +4984,10 @@ module ts {
         }
 
         function checkComputedPropertyName(node: ComputedPropertyName) {
+            // Since computed properties are not supported in the type checker, disallow them in TypeScript 1.4
+            // Once full support is added, remove this error.
+            return grammarErrorOnNode(node, Diagnostics.Computed_property_names_are_not_currently_supported);
+            
             if (languageVersion < ScriptTarget.ES6) {
                 return grammarErrorOnNode(node, Diagnostics.Computed_property_names_are_only_available_when_targeting_ECMAScript_6_and_higher);
             }
diff --git a/tests/baselines/reference/FunctionDeclaration10_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration10_es6.errors.txt
index 8c1585c2ec..8c6b09c82d 100644
--- a/tests/baselines/reference/FunctionDeclaration10_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration10_es6.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts(1,10): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts(1,10): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration10_es6.ts (1 errors) ====
     function * foo(a = yield => yield) {
              ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration11_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration11_es6.errors.txt
index ae307281b7..1dd8c3f6a1 100644
--- a/tests/baselines/reference/FunctionDeclaration11_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration11_es6.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration11_es6.ts(1,10): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration11_es6.ts(1,10): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration11_es6.ts (1 errors) ====
     function * yield() {
              ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration13_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration13_es6.errors.txt
index 50b6b15d70..a46097e8a1 100644
--- a/tests/baselines/reference/FunctionDeclaration13_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration13_es6.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13_es6.ts(1,10): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13_es6.ts(1,10): error TS9001: Generators are not currently supported.
 tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13_es6.ts(3,11): error TS2304: Cannot find name 'yield'.
 
 
 ==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration13_es6.ts (2 errors) ====
     function * foo() {
              ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
        // Legal to use 'yield' in a type context.
        var v: yield;
               ~~~~~
diff --git a/tests/baselines/reference/FunctionDeclaration1_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration1_es6.errors.txt
index b2fdfba350..71b0998393 100644
--- a/tests/baselines/reference/FunctionDeclaration1_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration1_es6.errors.txt
@@ -1,8 +1,8 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration1_es6.ts(1,10): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration1_es6.ts(1,10): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration1_es6.ts (1 errors) ====
     function * foo() {
              ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration6_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration6_es6.errors.txt
index 657a227822..b5ea3f494a 100644
--- a/tests/baselines/reference/FunctionDeclaration6_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration6_es6.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration6_es6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration6_es6.ts(1,9): error TS9001: Generators are not currently supported.
 tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration6_es6.ts(1,18): error TS2304: Cannot find name 'yield'.
 
 
 ==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration6_es6.ts (2 errors) ====
     function*foo(a = yield) {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
                      ~~~~~
 !!! error TS2304: Cannot find name 'yield'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration7_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration7_es6.errors.txt
index f81fd628eb..71aff1e248 100644
--- a/tests/baselines/reference/FunctionDeclaration7_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration7_es6.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration7_es6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration7_es6.ts(1,9): error TS9001: Generators are not currently supported.
 tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration7_es6.ts(3,20): error TS2304: Cannot find name 'yield'.
 
 
 ==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration7_es6.ts (2 errors) ====
     function*bar() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       // 'yield' here is an identifier, and not a yield expression.
       function*foo(a = yield) {
                        ~~~~~
diff --git a/tests/baselines/reference/FunctionDeclaration8_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration8_es6.errors.txt
index 5232c8f160..08d151203c 100644
--- a/tests/baselines/reference/FunctionDeclaration8_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration8_es6.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,11): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts(1,11): error TS9002: Computed property names are not currently supported.
 
 
 ==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration8_es6.ts (1 errors) ====
     var v = { [yield]: foo }
               ~~~~~~~
-!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
\ No newline at end of file
+!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionDeclaration9_es6.errors.txt b/tests/baselines/reference/FunctionDeclaration9_es6.errors.txt
index 7d51bf56ca..8de32cf0a0 100644
--- a/tests/baselines/reference/FunctionDeclaration9_es6.errors.txt
+++ b/tests/baselines/reference/FunctionDeclaration9_es6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts(1,10): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts(1,10): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/functionDeclarations/FunctionDeclaration9_es6.ts (1 errors) ====
     function * foo() {
              ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       var v = { [yield]: foo }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionExpression1_es6.errors.txt b/tests/baselines/reference/FunctionExpression1_es6.errors.txt
index 10ac337922..979178fd4b 100644
--- a/tests/baselines/reference/FunctionExpression1_es6.errors.txt
+++ b/tests/baselines/reference/FunctionExpression1_es6.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionExpressions/FunctionExpression1_es6.ts(1,18): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionExpressions/FunctionExpression1_es6.ts(1,18): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/functionExpressions/FunctionExpression1_es6.ts (1 errors) ====
     var v = function * () { }
                      ~
-!!! error TS9001: 'generators' are not currently supported.
\ No newline at end of file
+!!! error TS9001: Generators are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionExpression2_es6.errors.txt b/tests/baselines/reference/FunctionExpression2_es6.errors.txt
index a95cffcdbe..ab27947d7c 100644
--- a/tests/baselines/reference/FunctionExpression2_es6.errors.txt
+++ b/tests/baselines/reference/FunctionExpression2_es6.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionExpressions/FunctionExpression2_es6.ts(1,18): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionExpressions/FunctionExpression2_es6.ts(1,18): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/functionExpressions/FunctionExpression2_es6.ts (1 errors) ====
     var v = function * foo() { }
                      ~
-!!! error TS9001: 'generators' are not currently supported.
\ No newline at end of file
+!!! error TS9001: Generators are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionPropertyAssignments1_es6.errors.txt b/tests/baselines/reference/FunctionPropertyAssignments1_es6.errors.txt
index 53b2a01631..bbabbc9746 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments1_es6.errors.txt
+++ b/tests/baselines/reference/FunctionPropertyAssignments1_es6.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments1_es6.ts(1,11): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments1_es6.ts(1,11): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments1_es6.ts (1 errors) ====
     var v = { *foo() { } }
               ~
-!!! error TS9001: 'generators' are not currently supported.
\ No newline at end of file
+!!! error TS9001: Generators are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/FunctionPropertyAssignments5_es6.errors.txt b/tests/baselines/reference/FunctionPropertyAssignments5_es6.errors.txt
index b3415c27f2..393ede66a6 100644
--- a/tests/baselines/reference/FunctionPropertyAssignments5_es6.errors.txt
+++ b/tests/baselines/reference/FunctionPropertyAssignments5_es6.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,11): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts(1,11): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/functionPropertyAssignments/FunctionPropertyAssignments5_es6.ts (1 errors) ====
     var v = { *[foo()]() { } }
               ~
-!!! error TS9001: 'generators' are not currently supported.
\ No newline at end of file
+!!! error TS9001: Generators are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration1_es6.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration1_es6.errors.txt
index f50934ea70..9d4e312ed2 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration1_es6.errors.txt
+++ b/tests/baselines/reference/MemberFunctionDeclaration1_es6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration1_es6.ts(2,4): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration1_es6.ts(2,4): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration1_es6.ts (1 errors) ====
     class C {
        *foo() { }
        ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration2_es6.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration2_es6.errors.txt
index 667e0e5e58..6373c80099 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration2_es6.errors.txt
+++ b/tests/baselines/reference/MemberFunctionDeclaration2_es6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration2_es6.ts(2,11): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration2_es6.ts(2,11): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration2_es6.ts (1 errors) ====
     class C {
        public * foo() { }
               ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration3_es6.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration3_es6.errors.txt
index b61137f1f3..b43e266e2a 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration3_es6.errors.txt
+++ b/tests/baselines/reference/MemberFunctionDeclaration3_es6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts(2,4): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts(2,4): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration3_es6.ts (1 errors) ====
     class C {
        *[foo]() { }
        ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/MemberFunctionDeclaration7_es6.errors.txt b/tests/baselines/reference/MemberFunctionDeclaration7_es6.errors.txt
index 40afaf5bc6..ea87da50ed 100644
--- a/tests/baselines/reference/MemberFunctionDeclaration7_es6.errors.txt
+++ b/tests/baselines/reference/MemberFunctionDeclaration7_es6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration7_es6.ts(2,4): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration7_es6.ts(2,4): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/memberFunctionDeclarations/MemberFunctionDeclaration7_es6.ts (1 errors) ====
     class C {
        *foo<T>() { }
        ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression10_es6.errors.txt b/tests/baselines/reference/YieldExpression10_es6.errors.txt
index e2e52a0c5b..41d6bb5bf2 100644
--- a/tests/baselines/reference/YieldExpression10_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression10_es6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression10_es6.ts(1,11): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression10_es6.ts(1,11): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression10_es6.ts (1 errors) ====
     var v = { * foo() {
               ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
         yield(foo);
       }
     }
diff --git a/tests/baselines/reference/YieldExpression11_es6.errors.txt b/tests/baselines/reference/YieldExpression11_es6.errors.txt
index 534d8b17bf..eea108619b 100644
--- a/tests/baselines/reference/YieldExpression11_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression11_es6.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(2,3): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts(2,3): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression11_es6.ts (1 errors) ====
     class C {
       *foo() {
       ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
         yield(foo);
       }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression13_es6.errors.txt b/tests/baselines/reference/YieldExpression13_es6.errors.txt
index 1d2cd4e3c2..185fb2f619 100644
--- a/tests/baselines/reference/YieldExpression13_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression13_es6.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression13_es6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression13_es6.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression13_es6.ts (1 errors) ====
     function* foo() { yield }
             ~
-!!! error TS9001: 'generators' are not currently supported.
\ No newline at end of file
+!!! error TS9001: Generators are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression16_es6.errors.txt b/tests/baselines/reference/YieldExpression16_es6.errors.txt
index 1963539d4a..54536a7d4f 100644
--- a/tests/baselines/reference/YieldExpression16_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression16_es6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression16_es6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression16_es6.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression16_es6.ts (1 errors) ====
     function* foo() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       function bar() {
         yield foo;
       }
diff --git a/tests/baselines/reference/YieldExpression19_es6.errors.txt b/tests/baselines/reference/YieldExpression19_es6.errors.txt
index a427ab18f7..81cf0e2063 100644
--- a/tests/baselines/reference/YieldExpression19_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression19_es6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression19_es6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression19_es6.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression19_es6.ts (1 errors) ====
     function*foo() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       function bar() {
         function* quux() {
           yield(foo);
diff --git a/tests/baselines/reference/YieldExpression3_es6.errors.txt b/tests/baselines/reference/YieldExpression3_es6.errors.txt
index 9983eefc9a..91da79fbb5 100644
--- a/tests/baselines/reference/YieldExpression3_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression3_es6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression3_es6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression3_es6.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression3_es6.ts (1 errors) ====
     function* foo() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       yield
       yield
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression4_es6.errors.txt b/tests/baselines/reference/YieldExpression4_es6.errors.txt
index 58d1326ba5..ca7ed3d354 100644
--- a/tests/baselines/reference/YieldExpression4_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression4_es6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression4_es6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression4_es6.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression4_es6.ts (1 errors) ====
     function* foo() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       yield;
       yield;
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression6_es6.errors.txt b/tests/baselines/reference/YieldExpression6_es6.errors.txt
index 5ef38d249d..d8ce78a300 100644
--- a/tests/baselines/reference/YieldExpression6_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression6_es6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression6_es6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression6_es6.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression6_es6.ts (1 errors) ====
     function* foo() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       yield*foo
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression7_es6.errors.txt b/tests/baselines/reference/YieldExpression7_es6.errors.txt
index 11914f6fbb..87b15ac9f7 100644
--- a/tests/baselines/reference/YieldExpression7_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression7_es6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression7_es6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression7_es6.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression7_es6.ts (1 errors) ====
     function* foo() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       yield foo
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression8_es6.errors.txt b/tests/baselines/reference/YieldExpression8_es6.errors.txt
index 591c1fade0..77bd03382a 100644
--- a/tests/baselines/reference/YieldExpression8_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression8_es6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression8_es6.ts(2,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression8_es6.ts(2,9): error TS9001: Generators are not currently supported.
 tests/cases/conformance/es6/yieldExpressions/YieldExpression8_es6.ts(1,1): error TS2304: Cannot find name 'yield'.
 
 
@@ -8,6 +8,6 @@ tests/cases/conformance/es6/yieldExpressions/YieldExpression8_es6.ts(1,1): error
 !!! error TS2304: Cannot find name 'yield'.
     function* foo() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       yield(foo);
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/YieldExpression9_es6.errors.txt b/tests/baselines/reference/YieldExpression9_es6.errors.txt
index 108028d228..ae1b105903 100644
--- a/tests/baselines/reference/YieldExpression9_es6.errors.txt
+++ b/tests/baselines/reference/YieldExpression9_es6.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/es6/yieldExpressions/YieldExpression9_es6.ts(1,17): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/yieldExpressions/YieldExpression9_es6.ts(1,17): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/yieldExpressions/YieldExpression9_es6.ts (1 errors) ====
     var v = function*() {
                     ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
       yield(foo);
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames1.errors.txt b/tests/baselines/reference/computedPropertyNames1.errors.txt
new file mode 100644
index 0000000000..02abbcd6b2
--- /dev/null
+++ b/tests/baselines/reference/computedPropertyNames1.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames1.ts(2,9): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames1.ts(3,9): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames1.ts (2 errors) ====
+    var v = {
+        get [0 + 1]() { return 0 },
+            ~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+        set [0 + 1](v: string) { } //No error
+            ~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames1.js b/tests/baselines/reference/computedPropertyNames1.js
deleted file mode 100644
index 8f3e448d69..0000000000
--- a/tests/baselines/reference/computedPropertyNames1.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//// [computedPropertyNames1.ts]
-var v = {
-    get [0 + 1]() { return 0 },
-    set [0 + 1](v: string) { } //No error
-}
-
-//// [computedPropertyNames1.js]
-var v = {
-    get [0 + 1]() {
-        return 0;
-    },
-    set [0 + 1](v) {
-    } //No error
-};
diff --git a/tests/baselines/reference/computedPropertyNames1.types b/tests/baselines/reference/computedPropertyNames1.types
deleted file mode 100644
index b44aa3c69d..0000000000
--- a/tests/baselines/reference/computedPropertyNames1.types
+++ /dev/null
@@ -1,12 +0,0 @@
-=== tests/cases/conformance/es6/computedProperties/computedPropertyNames1.ts ===
-var v = {
->v : {}
->{    get [0 + 1]() { return 0 },    set [0 + 1](v: string) { } //No error} : {}
-
-    get [0 + 1]() { return 0 },
->0 + 1 : number
-
-    set [0 + 1](v: string) { } //No error
->0 + 1 : number
->v : string
-}
diff --git a/tests/baselines/reference/computedPropertyNames2.errors.txt b/tests/baselines/reference/computedPropertyNames2.errors.txt
index d0fd1de457..e7cc84a8f6 100644
--- a/tests/baselines/reference/computedPropertyNames2.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames2.errors.txt
@@ -1,19 +1,37 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(4,5): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(5,12): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(6,9): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(7,9): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(8,16): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts(9,16): error TS9002: Computed property names are not currently supported.
 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.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames2.ts (8 errors) ====
     var methodName = "method";
     var accessorName = "accessor";
     class C {
         [methodName]() { }
+        ~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
         static [methodName]() { }
+               ~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
         get [accessorName]() { }
             ~~~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+            ~~~~~~~~~~~~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
         set [accessorName](v) { }
+            ~~~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
         static get [accessorName]() { }
                    ~~~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+                   ~~~~~~~~~~~~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
         static set [accessorName](v) { }
+                   ~~~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames2.js b/tests/baselines/reference/computedPropertyNames2.js
deleted file mode 100644
index 78d53ef94f..0000000000
--- a/tests/baselines/reference/computedPropertyNames2.js
+++ /dev/null
@@ -1,48 +0,0 @@
-//// [computedPropertyNames2.ts]
-var methodName = "method";
-var accessorName = "accessor";
-class C {
-    [methodName]() { }
-    static [methodName]() { }
-    get [accessorName]() { }
-    set [accessorName](v) { }
-    static get [accessorName]() { }
-    static set [accessorName](v) { }
-}
-
-//// [computedPropertyNames2.js]
-var methodName = "method";
-var accessorName = "accessor";
-var C = (function () {
-    function C() {
-    }
-    C.prototype[methodName] = function () {
-    };
-    C[methodName] = function () {
-    };
-    Object.defineProperty(C.prototype, accessorName, {
-        get: function () {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C.prototype, accessorName, {
-        set: function (v) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C, accessorName, {
-        get: function () {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C, accessorName, {
-        set: function (v) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/computedPropertyNames3.errors.txt b/tests/baselines/reference/computedPropertyNames3.errors.txt
index 37a4ddaf1c..a1d6e09421 100644
--- a/tests/baselines/reference/computedPropertyNames3.errors.txt
+++ b/tests/baselines/reference/computedPropertyNames3.errors.txt
@@ -1,18 +1,36 @@
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(3,5): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(4,12): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(5,9): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(6,9): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(7,16): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts(8,16): error TS9002: Computed property names are not currently supported.
 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(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 (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNames3.ts (8 errors) ====
     var id;
     class C {
         [0 + 1]() { }
+        ~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
         static [() => { }]() { }
+               ~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
         get [delete id]() { }
             ~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+            ~~~~~~~~~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
         set [[0, 1]](v) { }
+            ~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
         static get [<String>""]() { }
                    ~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+                   ~~~~~~~~~~~~
 !!! error TS2378: A 'get' accessor must return a value or consist of a single 'throw' statement.
         static set [id.toString()](v) { }
+                   ~~~~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames3.js b/tests/baselines/reference/computedPropertyNames3.js
deleted file mode 100644
index fbd76bf48f..0000000000
--- a/tests/baselines/reference/computedPropertyNames3.js
+++ /dev/null
@@ -1,47 +0,0 @@
-//// [computedPropertyNames3.ts]
-var id;
-class C {
-    [0 + 1]() { }
-    static [() => { }]() { }
-    get [delete id]() { }
-    set [[0, 1]](v) { }
-    static get [<String>""]() { }
-    static set [id.toString()](v) { }
-}
-
-//// [computedPropertyNames3.js]
-var id;
-var C = (function () {
-    function C() {
-    }
-    C.prototype[0 + 1] = function () {
-    };
-    C[function () {
-    }] = function () {
-    };
-    Object.defineProperty(C.prototype, delete id, {
-        get: function () {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C.prototype, [0, 1], {
-        set: function (v) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C, "", {
-        get: function () {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(C, id.toString(), {
-        set: function (v) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/computedPropertyNamesOnOverloads.errors.txt b/tests/baselines/reference/computedPropertyNamesOnOverloads.errors.txt
index b3c2957a13..6329ab39f0 100644
--- a/tests/baselines/reference/computedPropertyNamesOnOverloads.errors.txt
+++ b/tests/baselines/reference/computedPropertyNamesOnOverloads.errors.txt
@@ -1,8 +1,9 @@
 tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts(4,5): error TS1168: Computed property names are not allowed in method overloads.
 tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts(5,5): error TS1168: Computed property names are not allowed in method overloads.
+tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts(6,5): error TS9002: Computed property names are not currently supported.
 
 
-==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts (2 errors) ====
+==== tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.ts (3 errors) ====
     var methodName = "method";
     var accessorName = "accessor";
     class C {
@@ -13,4 +14,6 @@ tests/cases/conformance/es6/computedProperties/computedPropertyNamesOnOverloads.
         ~~~~~~~~~~~~
 !!! error TS1168: Computed property names are not allowed in method overloads.
         [methodName](v?: string) { }
+        ~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName12.errors.txt b/tests/baselines/reference/parserComputedPropertyName12.errors.txt
new file mode 100644
index 0000000000..c028275369
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName12.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12.ts(2,4): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12.ts (1 errors) ====
+    class C {
+       [e]() { }
+       ~~~
+!!! error TS9002: Computed property names are not currently supported.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName12.js b/tests/baselines/reference/parserComputedPropertyName12.js
deleted file mode 100644
index 96e62b626e..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName12.js
+++ /dev/null
@@ -1,13 +0,0 @@
-//// [parserComputedPropertyName12.ts]
-class C {
-   [e]() { }
-}
-
-//// [parserComputedPropertyName12.js]
-var C = (function () {
-    function C() {
-    }
-    C.prototype[e] = function () {
-    };
-    return C;
-})();
diff --git a/tests/baselines/reference/parserComputedPropertyName12.types b/tests/baselines/reference/parserComputedPropertyName12.types
deleted file mode 100644
index fcc96bc4d5..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName12.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName12.ts ===
-class C {
->C : C
-
-   [e]() { }
->e : unknown
-}
diff --git a/tests/baselines/reference/parserComputedPropertyName17.errors.txt b/tests/baselines/reference/parserComputedPropertyName17.errors.txt
new file mode 100644
index 0000000000..f8b1a4866e
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName17.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts(1,15): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts (1 errors) ====
+    var v = { set [e](v) { } }
+                  ~~~
+!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName17.js b/tests/baselines/reference/parserComputedPropertyName17.js
deleted file mode 100644
index 98d61ab8bc..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName17.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [parserComputedPropertyName17.ts]
-var v = { set [e](v) { } }
-
-//// [parserComputedPropertyName17.js]
-var v = { set [e](v) {
-} };
diff --git a/tests/baselines/reference/parserComputedPropertyName17.types b/tests/baselines/reference/parserComputedPropertyName17.types
deleted file mode 100644
index 8ae109dda3..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName17.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName17.ts ===
-var v = { set [e](v) { } }
->v : {}
->{ set [e](v) { } } : {}
->e : unknown
->v : any
-
diff --git a/tests/baselines/reference/parserComputedPropertyName2.errors.txt b/tests/baselines/reference/parserComputedPropertyName2.errors.txt
new file mode 100644
index 0000000000..9eb6cdd600
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName2.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2.ts(1,11): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2.ts (1 errors) ====
+    var v = { [e]: 1 };
+              ~~~
+!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName2.js b/tests/baselines/reference/parserComputedPropertyName2.js
deleted file mode 100644
index f3c41f963f..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName2.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserComputedPropertyName2.ts]
-var v = { [e]: 1 };
-
-//// [parserComputedPropertyName2.js]
-var v = { [e]: 1 };
diff --git a/tests/baselines/reference/parserComputedPropertyName2.types b/tests/baselines/reference/parserComputedPropertyName2.types
deleted file mode 100644
index 8e533282e2..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName2.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName2.ts ===
-var v = { [e]: 1 };
->v : {}
->{ [e]: 1 } : {}
->e : unknown
-
diff --git a/tests/baselines/reference/parserComputedPropertyName24.errors.txt b/tests/baselines/reference/parserComputedPropertyName24.errors.txt
new file mode 100644
index 0000000000..fa7280a93e
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName24.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts(2,9): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts (1 errors) ====
+    class C {
+        set [e](v) { }
+            ~~~
+!!! error TS9002: Computed property names are not currently supported.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName24.js b/tests/baselines/reference/parserComputedPropertyName24.js
deleted file mode 100644
index 0b9467fb26..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName24.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//// [parserComputedPropertyName24.ts]
-class C {
-    set [e](v) { }
-}
-
-//// [parserComputedPropertyName24.js]
-var C = (function () {
-    function C() {
-    }
-    Object.defineProperty(C.prototype, e, {
-        set: function (v) {
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return C;
-})();
diff --git a/tests/baselines/reference/parserComputedPropertyName24.types b/tests/baselines/reference/parserComputedPropertyName24.types
deleted file mode 100644
index d2de524405..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName24.types
+++ /dev/null
@@ -1,8 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName24.ts ===
-class C {
->C : C
-
-    set [e](v) { }
->e : unknown
->v : any
-}
diff --git a/tests/baselines/reference/parserComputedPropertyName3.errors.txt b/tests/baselines/reference/parserComputedPropertyName3.errors.txt
new file mode 100644
index 0000000000..b13f453cb8
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName3.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3.ts(1,11): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3.ts (1 errors) ====
+    var v = { [e]() { } };
+              ~~~
+!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName3.js b/tests/baselines/reference/parserComputedPropertyName3.js
deleted file mode 100644
index 2e73fe87d3..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName3.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [parserComputedPropertyName3.ts]
-var v = { [e]() { } };
-
-//// [parserComputedPropertyName3.js]
-var v = { [e]() {
-} };
diff --git a/tests/baselines/reference/parserComputedPropertyName3.types b/tests/baselines/reference/parserComputedPropertyName3.types
deleted file mode 100644
index 8a5cfafbd4..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName3.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName3.ts ===
-var v = { [e]() { } };
->v : {}
->{ [e]() { } } : {}
->e : unknown
-
diff --git a/tests/baselines/reference/parserComputedPropertyName35.errors.txt b/tests/baselines/reference/parserComputedPropertyName35.errors.txt
index e603d1c73f..d68f0eb1ec 100644
--- a/tests/baselines/reference/parserComputedPropertyName35.errors.txt
+++ b/tests/baselines/reference/parserComputedPropertyName35.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName35.ts(2,6): error TS1171: A comma expression is not allowed in a computed property name.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName35.ts(2,5): error TS9002: Computed property names are not currently supported.
 
 
 ==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName35.ts (1 errors) ====
     var x = {
         [0, 1]: { }
-         ~~~~
-!!! error TS1171: A comma expression is not allowed in a computed property name.
+        ~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName37.errors.txt b/tests/baselines/reference/parserComputedPropertyName37.errors.txt
new file mode 100644
index 0000000000..fa1acd5dbe
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName37.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37.ts(2,5): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37.ts (1 errors) ====
+    var v = {
+        [public]: 0
+        ~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+    };
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName37.js b/tests/baselines/reference/parserComputedPropertyName37.js
deleted file mode 100644
index eb16d5ade3..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName37.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//// [parserComputedPropertyName37.ts]
-var v = {
-    [public]: 0
-};
-
-//// [parserComputedPropertyName37.js]
-var v = {
-    [public]: 0
-};
diff --git a/tests/baselines/reference/parserComputedPropertyName37.types b/tests/baselines/reference/parserComputedPropertyName37.types
deleted file mode 100644
index ebcd0ca276..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName37.types
+++ /dev/null
@@ -1,9 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName37.ts ===
-var v = {
->v : {}
->{    [public]: 0} : {}
-
-    [public]: 0
->public : unknown
-
-};
diff --git a/tests/baselines/reference/parserComputedPropertyName38.errors.txt b/tests/baselines/reference/parserComputedPropertyName38.errors.txt
new file mode 100644
index 0000000000..910a907ee0
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName38.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName38.ts(2,5): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName38.ts (1 errors) ====
+    class C {
+        [public]() { }
+        ~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName38.js b/tests/baselines/reference/parserComputedPropertyName38.js
deleted file mode 100644
index 487ff4078f..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName38.js
+++ /dev/null
@@ -1,13 +0,0 @@
-//// [parserComputedPropertyName38.ts]
-class C {
-    [public]() { }
-}
-
-//// [parserComputedPropertyName38.js]
-var C = (function () {
-    function C() {
-    }
-    C.prototype[public] = function () {
-    };
-    return C;
-})();
diff --git a/tests/baselines/reference/parserComputedPropertyName38.types b/tests/baselines/reference/parserComputedPropertyName38.types
deleted file mode 100644
index c77b9fcc67..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName38.types
+++ /dev/null
@@ -1,7 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName38.ts ===
-class C {
->C : C
-
-    [public]() { }
->public : unknown
-}
diff --git a/tests/baselines/reference/parserComputedPropertyName4.errors.txt b/tests/baselines/reference/parserComputedPropertyName4.errors.txt
new file mode 100644
index 0000000000..c1137b1587
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName4.errors.txt
@@ -0,0 +1,7 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts(1,15): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts (1 errors) ====
+    var v = { get [e]() { } };
+                  ~~~
+!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName4.js b/tests/baselines/reference/parserComputedPropertyName4.js
deleted file mode 100644
index a88545566e..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName4.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [parserComputedPropertyName4.ts]
-var v = { get [e]() { } };
-
-//// [parserComputedPropertyName4.js]
-var v = { get [e]() {
-} };
diff --git a/tests/baselines/reference/parserComputedPropertyName4.types b/tests/baselines/reference/parserComputedPropertyName4.types
deleted file mode 100644
index 32a1b44efe..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName4.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName4.ts ===
-var v = { get [e]() { } };
->v : {}
->{ get [e]() { } } : {}
->e : unknown
-
diff --git a/tests/baselines/reference/parserComputedPropertyName40.errors.txt b/tests/baselines/reference/parserComputedPropertyName40.errors.txt
new file mode 100644
index 0000000000..93be0ad51b
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName40.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40.ts(2,5): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40.ts (1 errors) ====
+    class C {
+        [a ? "" : ""]() {}
+        ~~~~~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName40.js b/tests/baselines/reference/parserComputedPropertyName40.js
deleted file mode 100644
index 5f6381360f..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName40.js
+++ /dev/null
@@ -1,13 +0,0 @@
-//// [parserComputedPropertyName40.ts]
-class C {
-    [a ? "" : ""]() {}
-}
-
-//// [parserComputedPropertyName40.js]
-var C = (function () {
-    function C() {
-    }
-    C.prototype[a ? "" : ""] = function () {
-    };
-    return C;
-})();
diff --git a/tests/baselines/reference/parserComputedPropertyName40.types b/tests/baselines/reference/parserComputedPropertyName40.types
deleted file mode 100644
index 1b0b3ae49f..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName40.types
+++ /dev/null
@@ -1,8 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName40.ts ===
-class C {
->C : C
-
-    [a ? "" : ""]() {}
->a ? "" : "" : string
->a : unknown
-}
diff --git a/tests/baselines/reference/parserComputedPropertyName41.errors.txt b/tests/baselines/reference/parserComputedPropertyName41.errors.txt
new file mode 100644
index 0000000000..eb5e9a9ebb
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName41.errors.txt
@@ -0,0 +1,9 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41.ts(2,5): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41.ts (1 errors) ====
+    var v = {
+        [0 in []]: true
+        ~~~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName41.js b/tests/baselines/reference/parserComputedPropertyName41.js
deleted file mode 100644
index b19cc3e7b3..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName41.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//// [parserComputedPropertyName41.ts]
-var v = {
-    [0 in []]: true
-}
-
-//// [parserComputedPropertyName41.js]
-var v = {
-    [0 in []]: true
-};
diff --git a/tests/baselines/reference/parserComputedPropertyName41.types b/tests/baselines/reference/parserComputedPropertyName41.types
deleted file mode 100644
index 468a44e6b9..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName41.types
+++ /dev/null
@@ -1,9 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName41.ts ===
-var v = {
->v : {}
->{    [0 in []]: true} : {}
-
-    [0 in []]: true
->0 in [] : boolean
->[] : undefined[]
-}
diff --git a/tests/baselines/reference/parserComputedPropertyName6.errors.txt b/tests/baselines/reference/parserComputedPropertyName6.errors.txt
new file mode 100644
index 0000000000..893bf3da71
--- /dev/null
+++ b/tests/baselines/reference/parserComputedPropertyName6.errors.txt
@@ -0,0 +1,10 @@
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts(1,11): error TS9002: Computed property names are not currently supported.
+tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts(1,19): error TS9002: Computed property names are not currently supported.
+
+
+==== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts (2 errors) ====
+    var v = { [e]: 1, [e + e]: 2 };
+              ~~~
+!!! error TS9002: Computed property names are not currently supported.
+                      ~~~~~~~
+!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserComputedPropertyName6.js b/tests/baselines/reference/parserComputedPropertyName6.js
deleted file mode 100644
index b60ad66a9d..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName6.js
+++ /dev/null
@@ -1,5 +0,0 @@
-//// [parserComputedPropertyName6.ts]
-var v = { [e]: 1, [e + e]: 2 };
-
-//// [parserComputedPropertyName6.js]
-var v = { [e]: 1, [e + e]: 2 };
diff --git a/tests/baselines/reference/parserComputedPropertyName6.types b/tests/baselines/reference/parserComputedPropertyName6.types
deleted file mode 100644
index 5fa7e79c32..0000000000
--- a/tests/baselines/reference/parserComputedPropertyName6.types
+++ /dev/null
@@ -1,9 +0,0 @@
-=== tests/cases/conformance/parser/ecmascript6/ComputedPropertyNames/parserComputedPropertyName6.ts ===
-var v = { [e]: 1, [e + e]: 2 };
->v : {}
->{ [e]: 1, [e + e]: 2 } : {}
->e : unknown
->e + e : any
->e : unknown
->e : unknown
-
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName2.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName2.errors.txt
index dc7d7e7ba3..7b6b74b8fd 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName2.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName2.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2.ts(1,11): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2.ts(1,11): error TS9002: Computed property names are not currently supported.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName2.ts (1 errors) ====
     var v = { [e]: 1 };
               ~~~
-!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
\ No newline at end of file
+!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName3.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName3.errors.txt
index 376c1a29ae..669fd19026 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName3.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName3.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3.ts(1,11): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3.ts(1,11): error TS9002: Computed property names are not currently supported.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName3.ts (1 errors) ====
     var v = { [e]() { } };
               ~~~
-!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
\ No newline at end of file
+!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt b/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt
index e0b816f157..af0c6e858a 100644
--- a/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt
+++ b/tests/baselines/reference/parserES5ComputedPropertyName4.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts(1,15): error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
+tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts(1,15): error TS9002: Computed property names are not currently supported.
 
 
 ==== tests/cases/conformance/parser/ecmascript5/ComputedPropertyNames/parserES5ComputedPropertyName4.ts (1 errors) ====
     var v = { get [e]() { } };
                   ~~~
-!!! error TS1167: Computed property names are only available when targeting ECMAScript 6 and higher.
\ No newline at end of file
+!!! error TS9002: Computed property names are not currently supported.
\ No newline at end of file
diff --git a/tests/baselines/reference/templateStringInYieldKeyword.errors.txt b/tests/baselines/reference/templateStringInYieldKeyword.errors.txt
index b12b552d5f..24d64d8f29 100644
--- a/tests/baselines/reference/templateStringInYieldKeyword.errors.txt
+++ b/tests/baselines/reference/templateStringInYieldKeyword.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/templates/templateStringInYieldKeyword.ts (1 errors) ====
     function* gen() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
         // Once this is supported, the inner expression does not need to be parenthesized.
         var x = yield `abc${ x }def`;
     }
diff --git a/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.errors.txt b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.errors.txt
index 5270e79679..20542cb12b 100644
--- a/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.errors.txt
+++ b/tests/baselines/reference/templateStringWithEmbeddedYieldKeywordES6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/conformance/es6/templates/templateStringWithEmbeddedYieldKeywordES6.ts (1 errors) ====
     function* gen() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
         // Once this is supported, yield *must* be parenthesized.
         var x = `abc${ yield 10 }def`;
     }
diff --git a/tests/baselines/reference/yieldExpression1.errors.txt b/tests/baselines/reference/yieldExpression1.errors.txt
index ecac77698c..33d9c1bf62 100644
--- a/tests/baselines/reference/yieldExpression1.errors.txt
+++ b/tests/baselines/reference/yieldExpression1.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/yieldExpression1.ts(1,9): error TS9001: 'generators' are not currently supported.
+tests/cases/compiler/yieldExpression1.ts(1,9): error TS9001: Generators are not currently supported.
 
 
 ==== tests/cases/compiler/yieldExpression1.ts (1 errors) ====
     function* foo() {
             ~
-!!! error TS9001: 'generators' are not currently supported.
+!!! error TS9001: Generators are not currently supported.
         yield
     }
\ No newline at end of file