diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 92fbfebce6c..28dd477666b 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -863,15 +863,15 @@ namespace ts {
                         if (importedFile && resolution.isExternalLibraryImport) {
                             if (!isExternalModule(importedFile)) {
                                 let start = getTokenPosOfNode(file.imports[i], file)
-                                diagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.File_0_is_not_a_module, importedFile.fileName));
+                                fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.File_0_is_not_a_module, importedFile.fileName));
                             }
                             else if (!fileExtensionIs(importedFile.fileName, ".d.ts")) {
                                 let start = getTokenPosOfNode(file.imports[i], file)
-                                diagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
+                                fileProcessingDiagnostics.add(createFileDiagnostic(file, start, file.imports[i].end - start, Diagnostics.Exported_external_package_typings_can_only_be_in_d_ts_files_Please_contact_the_package_author_to_update_the_package_definition));
                             }
                             else if (importedFile.referencedFiles.length) {
                                 let firstRef = importedFile.referencedFiles[0];
-                                diagnostics.add(createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
+                                fileProcessingDiagnostics.add(createFileDiagnostic(importedFile, firstRef.pos, firstRef.end - firstRef.pos, Diagnostics.Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition));
                             }
                         }
                     }
diff --git a/tests/baselines/reference/nodeResolution6.errors.txt b/tests/baselines/reference/nodeResolution6.errors.txt
index 8a462043207..6bab6e34389 100644
--- a/tests/baselines/reference/nodeResolution6.errors.txt
+++ b/tests/baselines/reference/nodeResolution6.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/node_modules/a.d.ts(1,1): error TS2654: Proper external module that carries external typings cannot contain tripleslash references.
+tests/cases/compiler/node_modules/a.d.ts(1,1): error TS2654: Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.
 
 
 ==== tests/cases/compiler/b.ts (0 errors) ====
@@ -11,7 +11,7 @@ tests/cases/compiler/node_modules/a.d.ts(1,1): error TS2654: Proper external mod
 ==== tests/cases/compiler/node_modules/a.d.ts (1 errors) ====
     /// <reference path="ref.ts"/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2654: Proper external module that carries external typings cannot contain tripleslash references.
+!!! error TS2654: Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.
     export declare var y;
     
     
\ No newline at end of file
diff --git a/tests/baselines/reference/nodeResolution8.errors.txt b/tests/baselines/reference/nodeResolution8.errors.txt
index 82753a2049b..3f14a4313c8 100644
--- a/tests/baselines/reference/nodeResolution8.errors.txt
+++ b/tests/baselines/reference/nodeResolution8.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/node_modules/a/index.d.ts(1,1): error TS2654: Proper external module that carries external typings cannot contain tripleslash references.
+tests/cases/compiler/node_modules/a/index.d.ts(1,1): error TS2654: Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.
 
 
 ==== tests/cases/compiler/b.ts (0 errors) ====
@@ -10,7 +10,7 @@ tests/cases/compiler/node_modules/a/index.d.ts(1,1): error TS2654: Proper extern
 ==== tests/cases/compiler/node_modules/a/index.d.ts (1 errors) ====
     /// <reference path="ref.ts"/>
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2654: Proper external module that carries external typings cannot contain tripleslash references.
+!!! error TS2654: Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition.
     export declare var y;
     
     
\ No newline at end of file
diff --git a/tests/cases/unittests/moduleResolution.ts b/tests/cases/unittests/moduleResolution.ts
index ab12119ec5a..ed9f0b0a986 100644
--- a/tests/cases/unittests/moduleResolution.ts
+++ b/tests/cases/unittests/moduleResolution.ts
@@ -41,7 +41,7 @@ module ts {
                 let moduleFile = { name: moduleFileNameNoExt + ext }
                 let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, moduleFile));                
                 assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
-                assert.equal(!!resolution.resolvedModule.shouldBeProperExternalModule, false);
+                assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false);
 
                 let failedLookupLocations: string[] = [];
                 let dir = getDirectoryPath(containingFileName);
@@ -80,7 +80,7 @@ module ts {
             let moduleFile = { name: moduleFileName };
             let resolution = nodeModuleNameResolver(moduleName, containingFile.name, createModuleResolutionHost(containingFile, packageJson, moduleFile));
             assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
-            assert.equal(!!resolution.resolvedModule.shouldBeProperExternalModule, false);
+            assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false);
             // expect three failed lookup location - attempt to load module as file with all supported extensions
             assert.equal(resolution.failedLookupLocations.length, 3);
         }
@@ -98,7 +98,7 @@ module ts {
             let indexFile = { name: "/a/b/foo/index.d.ts" };
             let resolution = nodeModuleNameResolver("./foo", containingFile.name, createModuleResolutionHost(containingFile, packageJson, indexFile));
             assert.equal(resolution.resolvedModule.resolvedFileName, indexFile.name);
-            assert.equal(!!resolution.resolvedModule.shouldBeProperExternalModule, false);
+            assert.equal(!!resolution.resolvedModule.isExternalLibraryImport, false);
             assert.deepEqual(resolution.failedLookupLocations, [
                 "/a/b/foo.ts",
                 "/a/b/foo.tsx",
@@ -139,7 +139,7 @@ module ts {
             let moduleFile = { name: "/a/b/node_modules/foo.d.ts" };
             let resolution = nodeModuleNameResolver("foo", containingFile.name, createModuleResolutionHost(containingFile, moduleFile));
             assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
-            assert.equal(resolution.resolvedModule.shouldBeProperExternalModule, true);
+            assert.equal(resolution.resolvedModule.isExternalLibraryImport, true);
         });
         
         it("load module as directory", () => {
@@ -147,7 +147,7 @@ module ts {
             let moduleFile = { name: "/a/node_modules/foo/index.d.ts" };
             let resolution = nodeModuleNameResolver("foo", containingFile.name, createModuleResolutionHost(containingFile, moduleFile));
             assert.equal(resolution.resolvedModule.resolvedFileName, moduleFile.name);
-            assert.equal(resolution.resolvedModule.shouldBeProperExternalModule, true);
+            assert.equal(resolution.resolvedModule.isExternalLibraryImport, true);
             assert.deepEqual(resolution.failedLookupLocations, [
                 "/a/node_modules/b/c/node_modules/d/node_modules/foo.d.ts",
                 "/a/node_modules/b/c/node_modules/d/node_modules/foo/package.json",
diff --git a/tests/cases/unittests/reuseProgramStructure.ts b/tests/cases/unittests/reuseProgramStructure.ts
index 4d167cb1bb0..5f313eeae2b 100644
--- a/tests/cases/unittests/reuseProgramStructure.ts
+++ b/tests/cases/unittests/reuseProgramStructure.ts
@@ -180,7 +180,7 @@ module ts {
                         const actual = file.resolvedModules[id];
                         assert.isTrue(actual !== undefined);
                         assert.isTrue(expected.resolvedFileName === actual.resolvedFileName, `'resolvedFileName': expected '${expected.resolvedFileName}' to be equal to '${actual.resolvedFileName}'`);
-                        assert.isTrue(expected.shouldBeProperExternalModule === actual.shouldBeProperExternalModule, `'shouldBeProperExternalModule': expected '${expected.shouldBeProperExternalModule}' to be equal to '${actual.shouldBeProperExternalModule}'`);
+                        assert.isTrue(expected.isExternalLibraryImport === actual.isExternalLibraryImport, `'shouldBeProperExternalModule': expected '${expected.isExternalLibraryImport}' to be equal to '${actual.isExternalLibraryImport}'`);
                     }
                     else {
                         assert.isTrue(file.resolvedModules[id] === undefined);