diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt b/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
index df4f8f13c31..85dd29b78a3 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.errors.txt
@@ -1,21 +1,21 @@
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(24,15): error TS2395: Individual declarations in merged declaration I must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(25,22): error TS2395: Individual declarations in merged declaration I must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(26,22): error TS2395: Individual declarations in merged declaration E must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(27,15): error TS2395: Individual declarations in merged declaration E must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(32,12): error TS2395: Individual declarations in merged declaration inst must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(35,19): error TS2395: Individual declarations in merged declaration inst must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(42,9): error TS2395: Individual declarations in merged declaration v must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(43,16): error TS2395: Individual declarations in merged declaration v must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(44,9): error TS2395: Individual declarations in merged declaration w must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(45,16): error TS2395: Individual declarations in merged declaration w must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(49,12): error TS2395: Individual declarations in merged declaration F must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(24,15): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(25,22): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(26,22): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(27,15): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(32,12): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(35,19): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(42,9): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(43,16): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(44,9): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(45,16): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(49,12): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
 tests/cases/compiler/duplicateSymbolsExportMatching.ts(49,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(52,21): error TS2395: Individual declarations in merged declaration F must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(56,11): error TS2395: Individual declarations in merged declaration C must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(57,12): error TS2395: Individual declarations in merged declaration C must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(58,19): error TS2395: Individual declarations in merged declaration C must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(64,11): error TS2395: Individual declarations in merged declaration D must be all exported or all local.
-tests/cases/compiler/duplicateSymbolsExportMatching.ts(65,18): error TS2395: Individual declarations in merged declaration D must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(52,21): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(56,11): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(57,12): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(58,19): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(64,11): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
+tests/cases/compiler/duplicateSymbolsExportMatching.ts(65,18): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
 
 
 ==== tests/cases/compiler/duplicateSymbolsExportMatching.ts (18 errors) ====
@@ -44,28 +44,28 @@ tests/cases/compiler/duplicateSymbolsExportMatching.ts(65,18): error TS2395: Ind
     module N2 {
         interface I { }
                   ~
-!!! error TS2395: Individual declarations in merged declaration I must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
         export interface I { } // error
                          ~
-!!! error TS2395: Individual declarations in merged declaration I must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local.
         export interface E { }
                          ~
-!!! error TS2395: Individual declarations in merged declaration E must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
         interface E { } // error
                   ~
-!!! error TS2395: Individual declarations in merged declaration E must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local.
     }
     
     // Should report error only once for instantiated module
     module M {
         module inst {
                ~~~~
-!!! error TS2395: Individual declarations in merged declaration inst must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
             var t;
         }
         export module inst { // one error
                       ~~~~
-!!! error TS2395: Individual declarations in merged declaration inst must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local.
             var t;
         }
     }
@@ -74,41 +74,41 @@ tests/cases/compiler/duplicateSymbolsExportMatching.ts(65,18): error TS2395: Ind
     module M2 {
         var v: string;
             ~
-!!! error TS2395: Individual declarations in merged declaration v must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
         export var v: string; // one error (visibility)
                    ~
-!!! error TS2395: Individual declarations in merged declaration v must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local.
         var w: number;
             ~
-!!! error TS2395: Individual declarations in merged declaration w must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
         export var w: string; // two errors (visibility and type mismatch)
                    ~
-!!! error TS2395: Individual declarations in merged declaration w must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local.
     }
     
     module M {
         module F {
                ~
-!!! error TS2395: Individual declarations in merged declaration F must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
                ~
 !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged
             var t;
         }
         export function F() { } // Only one error for duplicate identifier (don't consider visibility)
                         ~
-!!! error TS2395: Individual declarations in merged declaration F must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local.
     }
     
     module M {
         class C { }
               ~
-!!! error TS2395: Individual declarations in merged declaration C must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
         module C { }
                ~
-!!! error TS2395: Individual declarations in merged declaration C must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
         export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol)
                       ~
-!!! error TS2395: Individual declarations in merged declaration C must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local.
             var t;
         }
     }
@@ -116,7 +116,7 @@ tests/cases/compiler/duplicateSymbolsExportMatching.ts(65,18): error TS2395: Ind
     // Top level
     interface D { }
               ~
-!!! error TS2395: Individual declarations in merged declaration D must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
     export interface D { }
                      ~
-!!! error TS2395: Individual declarations in merged declaration D must be all exported or all local.
\ No newline at end of file
+!!! error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local.
\ No newline at end of file
diff --git a/tests/baselines/reference/innerModExport2.errors.txt b/tests/baselines/reference/innerModExport2.errors.txt
index 52a9d01c997..f9568bb45a4 100644
--- a/tests/baselines/reference/innerModExport2.errors.txt
+++ b/tests/baselines/reference/innerModExport2.errors.txt
@@ -1,7 +1,7 @@
 tests/cases/compiler/innerModExport2.ts(5,5): error TS2304: Cannot find name 'module'.
 tests/cases/compiler/innerModExport2.ts(5,12): error TS1005: ';' expected.
-tests/cases/compiler/innerModExport2.ts(7,20): error TS2395: Individual declarations in merged declaration export_var must be all exported or all local.
-tests/cases/compiler/innerModExport2.ts(13,9): error TS2395: Individual declarations in merged declaration export_var must be all exported or all local.
+tests/cases/compiler/innerModExport2.ts(7,20): error TS2395: Individual declarations in merged declaration 'export_var' must be all exported or all local.
+tests/cases/compiler/innerModExport2.ts(13,9): error TS2395: Individual declarations in merged declaration 'export_var' must be all exported or all local.
 tests/cases/compiler/innerModExport2.ts(20,7): error TS2339: Property 'NonExportFunc' does not exist on type 'typeof Outer'.
 
 
@@ -18,7 +18,7 @@ tests/cases/compiler/innerModExport2.ts(20,7): error TS2339: Property 'NonExport
             var non_export_var = 0;
             export var export_var = 1;
                        ~~~~~~~~~~
-!!! error TS2395: Individual declarations in merged declaration export_var must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'export_var' must be all exported or all local.
     
             function NonExportFunc() { return 0; }
     
@@ -26,7 +26,7 @@ tests/cases/compiler/innerModExport2.ts(20,7): error TS2339: Property 'NonExport
         }
         var export_var: number;
             ~~~~~~~~~~
-!!! error TS2395: Individual declarations in merged declaration export_var must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'export_var' must be all exported or all local.
     
         export var outer_var_export = 0;
         export function outerFuncExport() { return 0; }
diff --git a/tests/baselines/reference/multivar.errors.txt b/tests/baselines/reference/multivar.errors.txt
index 931e61de5ae..44061b9d74c 100644
--- a/tests/baselines/reference/multivar.errors.txt
+++ b/tests/baselines/reference/multivar.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/multivar.ts(6,19): error TS2395: Individual declarations in merged declaration b2 must be all exported or all local.
-tests/cases/compiler/multivar.ts(22,9): error TS2395: Individual declarations in merged declaration b2 must be all exported or all local.
+tests/cases/compiler/multivar.ts(6,19): error TS2395: Individual declarations in merged declaration 'b2' must be all exported or all local.
+tests/cases/compiler/multivar.ts(22,9): error TS2395: Individual declarations in merged declaration 'b2' must be all exported or all local.
 
 
 ==== tests/cases/compiler/multivar.ts (2 errors) ====
@@ -10,7 +10,7 @@ tests/cases/compiler/multivar.ts(22,9): error TS2395: Individual declarations in
     
         export var a, b2: number = 10, b;
                       ~~
-!!! error TS2395: Individual declarations in merged declaration b2 must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'b2' must be all exported or all local.
         var m1;
         var a2, b22: number = 10, b222;
         var m3;
@@ -28,7 +28,7 @@ tests/cases/compiler/multivar.ts(22,9): error TS2395: Individual declarations in
         declare var d1, d2;
         var b2;
             ~~
-!!! error TS2395: Individual declarations in merged declaration b2 must be all exported or all local.
+!!! error TS2395: Individual declarations in merged declaration 'b2' must be all exported or all local.
     
         declare var v1;
     }