diff --git a/tests/baselines/reference/separateCompilationPlainFile-AMD.errors.txt b/tests/baselines/reference/separateCompilationPlainFile-AMD.errors.txt
index 3605dc7f44e..6b80da30d33 100644
--- a/tests/baselines/reference/separateCompilationPlainFile-AMD.errors.txt
+++ b/tests/baselines/reference/separateCompilationPlainFile-AMD.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/separateCompilationPlainFile-AMD.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+tests/cases/compiler/separateCompilationPlainFile-AMD.ts(2,1): error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
 
 
 ==== tests/cases/compiler/separateCompilationPlainFile-AMD.ts (1 errors) ====
     
     declare function run(a: number): void;
     ~~~~~~~
-!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+!!! error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
     run(1);
     
\ No newline at end of file
diff --git a/tests/baselines/reference/separateCompilationPlainFile-CommonJS.errors.txt b/tests/baselines/reference/separateCompilationPlainFile-CommonJS.errors.txt
index d56e82fd6e1..48a23a39653 100644
--- a/tests/baselines/reference/separateCompilationPlainFile-CommonJS.errors.txt
+++ b/tests/baselines/reference/separateCompilationPlainFile-CommonJS.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/separateCompilationPlainFile-CommonJS.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+tests/cases/compiler/separateCompilationPlainFile-CommonJS.ts(2,1): error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
 
 
 ==== tests/cases/compiler/separateCompilationPlainFile-CommonJS.ts (1 errors) ====
     
     declare function run(a: number): void;
     ~~~~~~~
-!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+!!! error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
     run(1);
     
\ No newline at end of file
diff --git a/tests/baselines/reference/separateCompilationPlainFile-ES6.errors.txt b/tests/baselines/reference/separateCompilationPlainFile-ES6.errors.txt
index 6054ab552c8..b0b059c73bd 100644
--- a/tests/baselines/reference/separateCompilationPlainFile-ES6.errors.txt
+++ b/tests/baselines/reference/separateCompilationPlainFile-ES6.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/separateCompilationPlainFile-ES6.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+tests/cases/compiler/separateCompilationPlainFile-ES6.ts(2,1): error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
 
 
 ==== tests/cases/compiler/separateCompilationPlainFile-ES6.ts (1 errors) ====
     
     declare function run(a: number): void;
     ~~~~~~~
-!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+!!! error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
     run(1);
     
\ No newline at end of file
diff --git a/tests/baselines/reference/separateCompilationPlainFile-System.errors.txt b/tests/baselines/reference/separateCompilationPlainFile-System.errors.txt
index 716909cee4f..c3161c57275 100644
--- a/tests/baselines/reference/separateCompilationPlainFile-System.errors.txt
+++ b/tests/baselines/reference/separateCompilationPlainFile-System.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/separateCompilationPlainFile-System.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+tests/cases/compiler/separateCompilationPlainFile-System.ts(2,1): error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
 
 
 ==== tests/cases/compiler/separateCompilationPlainFile-System.ts (1 errors) ====
     
     declare function run(a: number): void;
     ~~~~~~~
-!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+!!! error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
     run(1);
     
\ No newline at end of file
diff --git a/tests/baselines/reference/separateCompilationPlainFile-UMD.errors.txt b/tests/baselines/reference/separateCompilationPlainFile-UMD.errors.txt
index c86daeabddf..6a0fb1ac8df 100644
--- a/tests/baselines/reference/separateCompilationPlainFile-UMD.errors.txt
+++ b/tests/baselines/reference/separateCompilationPlainFile-UMD.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/separateCompilationPlainFile-UMD.ts(2,1): error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+tests/cases/compiler/separateCompilationPlainFile-UMD.ts(2,1): error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
 
 
 ==== tests/cases/compiler/separateCompilationPlainFile-UMD.ts (1 errors) ====
     
     declare function run(a: number): void;
     ~~~~~~~
-!!! error TS1208: Cannot compile non-external modules when the '--separateCompilation' flag is provided.
+!!! error TS1208: Cannot compile namespaces when the '--separateCompilation' flag is provided.
     run(1);
     
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule1.errors.txt b/tests/baselines/reference/systemModule1.errors.txt
index a01e4795d10..18b64607455 100644
--- a/tests/baselines/reference/systemModule1.errors.txt
+++ b/tests/baselines/reference/systemModule1.errors.txt
@@ -1,7 +1,7 @@
-error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
+error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
 
 
-!!! error TS1204: Cannot compile external modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
+!!! error TS1204: Cannot compile modules into 'commonjs', 'amd', 'system' or 'umd' when targeting 'ES6' or higher.
 ==== tests/cases/compiler/systemModule1.ts (0 errors) ====
     
     export var x = 1;
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule10.errors.txt b/tests/baselines/reference/systemModule10.errors.txt
index 9be815836aa..524e9bbe85d 100644
--- a/tests/baselines/reference/systemModule10.errors.txt
+++ b/tests/baselines/reference/systemModule10.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/compiler/systemModule10.ts(2,20): error TS2307: Cannot find external module 'file1'.
-tests/cases/compiler/systemModule10.ts(3,21): error TS2307: Cannot find external module 'file2'.
+tests/cases/compiler/systemModule10.ts(2,20): error TS2307: Cannot find module 'file1'.
+tests/cases/compiler/systemModule10.ts(3,21): error TS2307: Cannot find module 'file2'.
 
 
 ==== tests/cases/compiler/systemModule10.ts (2 errors) ====
     
     import n, {x} from 'file1'
                        ~~~~~~~
-!!! error TS2307: Cannot find external module 'file1'.
+!!! error TS2307: Cannot find module 'file1'.
     import n2 = require('file2');
                         ~~~~~~~
-!!! error TS2307: Cannot find external module 'file2'.
+!!! error TS2307: Cannot find module 'file2'.
     export {x}
     export {x as y}
     export {n}
diff --git a/tests/baselines/reference/systemModule10_ES5.errors.txt b/tests/baselines/reference/systemModule10_ES5.errors.txt
index 5c384837a84..6f0e5305166 100644
--- a/tests/baselines/reference/systemModule10_ES5.errors.txt
+++ b/tests/baselines/reference/systemModule10_ES5.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/compiler/systemModule10_ES5.ts(2,20): error TS2307: Cannot find external module 'file1'.
-tests/cases/compiler/systemModule10_ES5.ts(3,21): error TS2307: Cannot find external module 'file2'.
+tests/cases/compiler/systemModule10_ES5.ts(2,20): error TS2307: Cannot find module 'file1'.
+tests/cases/compiler/systemModule10_ES5.ts(3,21): error TS2307: Cannot find module 'file2'.
 
 
 ==== tests/cases/compiler/systemModule10_ES5.ts (2 errors) ====
     
     import n, {x} from 'file1'
                        ~~~~~~~
-!!! error TS2307: Cannot find external module 'file1'.
+!!! error TS2307: Cannot find module 'file1'.
     import n2 = require('file2');
                         ~~~~~~~
-!!! error TS2307: Cannot find external module 'file2'.
+!!! error TS2307: Cannot find module 'file2'.
     export {x}
     export {x as y}
     export {n}
diff --git a/tests/baselines/reference/systemModule11.errors.txt b/tests/baselines/reference/systemModule11.errors.txt
index a2c30e5fa64..daa830b565a 100644
--- a/tests/baselines/reference/systemModule11.errors.txt
+++ b/tests/baselines/reference/systemModule11.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/systemModule11.ts(3,17): error TS2307: Cannot find external module 'bar'.
+tests/cases/compiler/systemModule11.ts(3,17): error TS2307: Cannot find module 'bar'.
 
 
 ==== tests/cases/compiler/systemModule11.ts (1 errors) ====
@@ -6,6 +6,6 @@ tests/cases/compiler/systemModule11.ts(3,17): error TS2307: Cannot find external
     import 'foo'
     import {f} from 'bar';
                     ~~~~~
-!!! error TS2307: Cannot find external module 'bar'.
+!!! error TS2307: Cannot find module 'bar'.
     
     f();
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule9.errors.txt b/tests/baselines/reference/systemModule9.errors.txt
index f997ed97703..27af70cce6a 100644
--- a/tests/baselines/reference/systemModule9.errors.txt
+++ b/tests/baselines/reference/systemModule9.errors.txt
@@ -1,29 +1,29 @@
-tests/cases/compiler/systemModule9.ts(2,21): error TS2307: Cannot find external module 'file1'.
-tests/cases/compiler/systemModule9.ts(3,25): error TS2307: Cannot find external module 'file2'.
-tests/cases/compiler/systemModule9.ts(4,15): error TS2307: Cannot find external module 'file3'.
-tests/cases/compiler/systemModule9.ts(6,25): error TS2307: Cannot find external module 'file5'.
-tests/cases/compiler/systemModule9.ts(7,22): error TS2307: Cannot find external module 'file6'.
-tests/cases/compiler/systemModule9.ts(17,15): error TS2307: Cannot find external module 'file7'.
+tests/cases/compiler/systemModule9.ts(2,21): error TS2307: Cannot find module 'file1'.
+tests/cases/compiler/systemModule9.ts(3,25): error TS2307: Cannot find module 'file2'.
+tests/cases/compiler/systemModule9.ts(4,15): error TS2307: Cannot find module 'file3'.
+tests/cases/compiler/systemModule9.ts(6,25): error TS2307: Cannot find module 'file5'.
+tests/cases/compiler/systemModule9.ts(7,22): error TS2307: Cannot find module 'file6'.
+tests/cases/compiler/systemModule9.ts(17,15): error TS2307: Cannot find module 'file7'.
 
 
 ==== tests/cases/compiler/systemModule9.ts (6 errors) ====
     
     import * as ns from 'file1';
                         ~~~~~~~
-!!! error TS2307: Cannot find external module 'file1'.
+!!! error TS2307: Cannot find module 'file1'.
     import {a, b as c} from 'file2';
                             ~~~~~~~
-!!! error TS2307: Cannot find external module 'file2'.
+!!! error TS2307: Cannot find module 'file2'.
     import d from 'file3'
                   ~~~~~~~
-!!! error TS2307: Cannot find external module 'file3'.
+!!! error TS2307: Cannot find module 'file3'.
     import 'file4'
     import e, * as ns2 from 'file5';
                             ~~~~~~~
-!!! error TS2307: Cannot find external module 'file5'.
+!!! error TS2307: Cannot find module 'file5'.
     import ns3 = require('file6');
                          ~~~~~~~
-!!! error TS2307: Cannot find external module 'file6'.
+!!! error TS2307: Cannot find module 'file6'.
     
     ns.f();
     a();
@@ -35,7 +35,7 @@ tests/cases/compiler/systemModule9.ts(17,15): error TS2307: Cannot find external
     
     export * from 'file7';
                   ~~~~~~~
-!!! error TS2307: Cannot find external module 'file7'.
+!!! error TS2307: Cannot find module 'file7'.
     
     var x, y = true;
     export {x};