diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 7d635c2aaf5..957b38c67de 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -322,7 +322,7 @@ namespace ts {
             description: Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
         },
         {
-            name: "emitModulesInLooseMode",
+            name: "emitNonStrictModules",
             type: "boolean",
             description: Diagnostics.Do_not_emit_use_strict_directives_in_module_output
         }
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 92cb3334f63..15edb022b11 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -7179,7 +7179,7 @@ const _super = (function (geti, seti) {
                 write(`], function(${exportFunctionForFile}, ${contextObjectForFile}) {`);
                 writeLine();
                 increaseIndent();
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.emitModulesInLooseMode);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.emitNonStrictModules);
                 writeLine();
                 write(`var __moduleName = ${contextObjectForFile} && ${contextObjectForFile}.id;`);
                 writeLine();
@@ -7285,7 +7285,7 @@ const _super = (function (geti, seti) {
                 writeModuleName(node, emitRelativePathAsModuleName);
                 emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
                 increaseIndent();
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/!compilerOptions.emitModulesInLooseMode);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/!compilerOptions.emitNonStrictModules);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
@@ -7297,7 +7297,7 @@ const _super = (function (geti, seti) {
             }
 
             function emitCommonJSModule(node: SourceFile) {
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ !compilerOptions.emitModulesInLooseMode);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ !compilerOptions.emitNonStrictModules);
                 emitEmitHelpers(node);
                 collectExternalModuleInfo(node);
                 emitExportStarHelper();
@@ -7326,7 +7326,7 @@ const _super = (function (geti, seti) {
 })(`);
                 emitAMDFactoryHeader(dependencyNames);
                 increaseIndent();
-                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.emitModulesInLooseMode);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.emitNonStrictModules);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 97cf2fff3b5..90a6a9a6752 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2422,7 +2422,7 @@ namespace ts {
         traceModuleResolution?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowJs?: boolean;
-        emitModulesInLooseMode?: boolean;
+        emitNonStrictModules?: boolean;
         /* @internal */ stripInternal?: boolean;
 
         // Skip checking lib.d.ts to help speed up tests.
diff --git a/tests/baselines/reference/emitModulesInLooseMode_amd.symbols b/tests/baselines/reference/emitModulesInLooseMode_amd.symbols
deleted file mode 100644
index d76fea8b7b8..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_amd.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_amd.ts ===
-
-export var x = 0;
->x : Symbol(x, Decl(emitModulesInLooseMode_amd.ts, 1, 10))
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_amd.types b/tests/baselines/reference/emitModulesInLooseMode_amd.types
deleted file mode 100644
index 1c070cc95fa..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_amd.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_amd.ts ===
-
-export var x = 0;
->x : number
->0 : number
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_commonjs.js b/tests/baselines/reference/emitModulesInLooseMode_commonjs.js
deleted file mode 100644
index be24cdf6b91..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_commonjs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [emitModulesInLooseMode_commonjs.ts]
-
-export var x = 0;
-
-//// [emitModulesInLooseMode_commonjs.js]
-exports.x = 0;
diff --git a/tests/baselines/reference/emitModulesInLooseMode_commonjs.symbols b/tests/baselines/reference/emitModulesInLooseMode_commonjs.symbols
deleted file mode 100644
index 225286c74de..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_commonjs.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_commonjs.ts ===
-
-export var x = 0;
->x : Symbol(x, Decl(emitModulesInLooseMode_commonjs.ts, 1, 10))
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_commonjs.types b/tests/baselines/reference/emitModulesInLooseMode_commonjs.types
deleted file mode 100644
index b37bb9667ab..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_commonjs.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_commonjs.ts ===
-
-export var x = 0;
->x : number
->0 : number
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_es6.js b/tests/baselines/reference/emitModulesInLooseMode_es6.js
deleted file mode 100644
index 95cc14ff609..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_es6.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [emitModulesInLooseMode_es6.ts]
-
-export var x = 0;
-
-//// [emitModulesInLooseMode_es6.js]
-export var x = 0;
diff --git a/tests/baselines/reference/emitModulesInLooseMode_es6.symbols b/tests/baselines/reference/emitModulesInLooseMode_es6.symbols
deleted file mode 100644
index 4f3c073f7ee..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_es6.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_es6.ts ===
-
-export var x = 0;
->x : Symbol(x, Decl(emitModulesInLooseMode_es6.ts, 1, 10))
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_es6.types b/tests/baselines/reference/emitModulesInLooseMode_es6.types
deleted file mode 100644
index 84631ede00f..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_es6.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_es6.ts ===
-
-export var x = 0;
->x : number
->0 : number
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_system.symbols b/tests/baselines/reference/emitModulesInLooseMode_system.symbols
deleted file mode 100644
index 0682b2b648f..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_system.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_system.ts ===
-
-export var x = 0;
->x : Symbol(x, Decl(emitModulesInLooseMode_system.ts, 1, 10))
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_system.types b/tests/baselines/reference/emitModulesInLooseMode_system.types
deleted file mode 100644
index 429908c1de4..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_system.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_system.ts ===
-
-export var x = 0;
->x : number
->0 : number
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_umd.symbols b/tests/baselines/reference/emitModulesInLooseMode_umd.symbols
deleted file mode 100644
index 86c9e9b200c..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_umd.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_umd.ts ===
-
-export var x = 0;
->x : Symbol(x, Decl(emitModulesInLooseMode_umd.ts, 1, 10))
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_umd.types b/tests/baselines/reference/emitModulesInLooseMode_umd.types
deleted file mode 100644
index 98a32838eb6..00000000000
--- a/tests/baselines/reference/emitModulesInLooseMode_umd.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/compiler/emitModulesInLooseMode_umd.ts ===
-
-export var x = 0;
->x : number
->0 : number
-
diff --git a/tests/baselines/reference/emitModulesInLooseMode_amd.js b/tests/baselines/reference/emitNonStrictModules_amd.js
similarity index 56%
rename from tests/baselines/reference/emitModulesInLooseMode_amd.js
rename to tests/baselines/reference/emitNonStrictModules_amd.js
index a93ca62de0e..f2a746280ac 100644
--- a/tests/baselines/reference/emitModulesInLooseMode_amd.js
+++ b/tests/baselines/reference/emitNonStrictModules_amd.js
@@ -1,8 +1,8 @@
-//// [emitModulesInLooseMode_amd.ts]
+//// [emitNonStrictModules_amd.ts]
 
 export var x = 0;
 
-//// [emitModulesInLooseMode_amd.js]
+//// [emitNonStrictModules_amd.js]
 define(["require", "exports"], function (require, exports) {
     exports.x = 0;
 });
diff --git a/tests/baselines/reference/emitNonStrictModules_amd.symbols b/tests/baselines/reference/emitNonStrictModules_amd.symbols
new file mode 100644
index 00000000000..1590ea05ad4
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_amd.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/emitNonStrictModules_amd.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(emitNonStrictModules_amd.ts, 1, 10))
+
diff --git a/tests/baselines/reference/emitNonStrictModules_amd.types b/tests/baselines/reference/emitNonStrictModules_amd.types
new file mode 100644
index 00000000000..650df648d8d
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_amd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/emitNonStrictModules_amd.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/emitNonStrictModules_commonjs.js b/tests/baselines/reference/emitNonStrictModules_commonjs.js
new file mode 100644
index 00000000000..7a2d0720015
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_commonjs.js
@@ -0,0 +1,6 @@
+//// [emitNonStrictModules_commonjs.ts]
+
+export var x = 0;
+
+//// [emitNonStrictModules_commonjs.js]
+exports.x = 0;
diff --git a/tests/baselines/reference/emitNonStrictModules_commonjs.symbols b/tests/baselines/reference/emitNonStrictModules_commonjs.symbols
new file mode 100644
index 00000000000..36b487f34d1
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_commonjs.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/emitNonStrictModules_commonjs.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(emitNonStrictModules_commonjs.ts, 1, 10))
+
diff --git a/tests/baselines/reference/emitNonStrictModules_commonjs.types b/tests/baselines/reference/emitNonStrictModules_commonjs.types
new file mode 100644
index 00000000000..f8a24d53641
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_commonjs.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/emitNonStrictModules_commonjs.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/emitNonStrictModules_es6.js b/tests/baselines/reference/emitNonStrictModules_es6.js
new file mode 100644
index 00000000000..535afff7730
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_es6.js
@@ -0,0 +1,6 @@
+//// [emitNonStrictModules_es6.ts]
+
+export var x = 0;
+
+//// [emitNonStrictModules_es6.js]
+export var x = 0;
diff --git a/tests/baselines/reference/emitNonStrictModules_es6.symbols b/tests/baselines/reference/emitNonStrictModules_es6.symbols
new file mode 100644
index 00000000000..884189014b0
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_es6.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/emitNonStrictModules_es6.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(emitNonStrictModules_es6.ts, 1, 10))
+
diff --git a/tests/baselines/reference/emitNonStrictModules_es6.types b/tests/baselines/reference/emitNonStrictModules_es6.types
new file mode 100644
index 00000000000..f3208e247da
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_es6.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/emitNonStrictModules_es6.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/emitModulesInLooseMode_system.js b/tests/baselines/reference/emitNonStrictModules_system.js
similarity index 72%
rename from tests/baselines/reference/emitModulesInLooseMode_system.js
rename to tests/baselines/reference/emitNonStrictModules_system.js
index 4cf401a554d..f1ad93f0009 100644
--- a/tests/baselines/reference/emitModulesInLooseMode_system.js
+++ b/tests/baselines/reference/emitNonStrictModules_system.js
@@ -1,8 +1,8 @@
-//// [emitModulesInLooseMode_system.ts]
+//// [emitNonStrictModules_system.ts]
 
 export var x = 0;
 
-//// [emitModulesInLooseMode_system.js]
+//// [emitNonStrictModules_system.js]
 System.register([], function(exports_1, context_1) {
     var __moduleName = context_1 && context_1.id;
     var x;
diff --git a/tests/baselines/reference/emitNonStrictModules_system.symbols b/tests/baselines/reference/emitNonStrictModules_system.symbols
new file mode 100644
index 00000000000..b772eafe447
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_system.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/emitNonStrictModules_system.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(emitNonStrictModules_system.ts, 1, 10))
+
diff --git a/tests/baselines/reference/emitNonStrictModules_system.types b/tests/baselines/reference/emitNonStrictModules_system.types
new file mode 100644
index 00000000000..352381db379
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_system.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/emitNonStrictModules_system.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/emitModulesInLooseMode_umd.js b/tests/baselines/reference/emitNonStrictModules_umd.js
similarity index 81%
rename from tests/baselines/reference/emitModulesInLooseMode_umd.js
rename to tests/baselines/reference/emitNonStrictModules_umd.js
index 327962d18f2..c1ee0c048c5 100644
--- a/tests/baselines/reference/emitModulesInLooseMode_umd.js
+++ b/tests/baselines/reference/emitNonStrictModules_umd.js
@@ -1,8 +1,8 @@
-//// [emitModulesInLooseMode_umd.ts]
+//// [emitNonStrictModules_umd.ts]
 
 export var x = 0;
 
-//// [emitModulesInLooseMode_umd.js]
+//// [emitNonStrictModules_umd.js]
 (function (factory) {
     if (typeof module === 'object' && typeof module.exports === 'object') {
         var v = factory(require, exports); if (v !== undefined) module.exports = v;
diff --git a/tests/baselines/reference/emitNonStrictModules_umd.symbols b/tests/baselines/reference/emitNonStrictModules_umd.symbols
new file mode 100644
index 00000000000..23af4139243
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_umd.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/emitNonStrictModules_umd.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(emitNonStrictModules_umd.ts, 1, 10))
+
diff --git a/tests/baselines/reference/emitNonStrictModules_umd.types b/tests/baselines/reference/emitNonStrictModules_umd.types
new file mode 100644
index 00000000000..83c55b1d4cd
--- /dev/null
+++ b/tests/baselines/reference/emitNonStrictModules_umd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/emitNonStrictModules_umd.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/cases/compiler/emitModulesInLooseMode_amd.ts b/tests/cases/compiler/emitModulesInLooseMode_amd.ts
deleted file mode 100644
index 7c3394bebae..00000000000
--- a/tests/cases/compiler/emitModulesInLooseMode_amd.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// @module: amd
-// @emitModulesInLooseMode: true
-
-export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitModulesInLooseMode_commonjs.ts b/tests/cases/compiler/emitModulesInLooseMode_commonjs.ts
deleted file mode 100644
index 761f1f6ea9f..00000000000
--- a/tests/cases/compiler/emitModulesInLooseMode_commonjs.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// @module: commonjs
-// @emitModulesInLooseMode: true
-
-export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitModulesInLooseMode_es6.ts b/tests/cases/compiler/emitModulesInLooseMode_es6.ts
deleted file mode 100644
index 22c4368629f..00000000000
--- a/tests/cases/compiler/emitModulesInLooseMode_es6.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// @module: es6
-// @target: es6
-// @emitModulesInLooseMode: true
-
-export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitModulesInLooseMode_system.ts b/tests/cases/compiler/emitModulesInLooseMode_system.ts
deleted file mode 100644
index 0face8fabca..00000000000
--- a/tests/cases/compiler/emitModulesInLooseMode_system.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// @module: system
-// @emitModulesInLooseMode: true
-
-export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitModulesInLooseMode_umd.ts b/tests/cases/compiler/emitModulesInLooseMode_umd.ts
deleted file mode 100644
index a6a3559986f..00000000000
--- a/tests/cases/compiler/emitModulesInLooseMode_umd.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// @module: umd
-// @emitModulesInLooseMode: true
-
-export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitNonStrictModules_amd.ts b/tests/cases/compiler/emitNonStrictModules_amd.ts
new file mode 100644
index 00000000000..217e23d91a3
--- /dev/null
+++ b/tests/cases/compiler/emitNonStrictModules_amd.ts
@@ -0,0 +1,4 @@
+// @module: amd
+// @emitNonStrictModules: true
+
+export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitNonStrictModules_commonjs.ts b/tests/cases/compiler/emitNonStrictModules_commonjs.ts
new file mode 100644
index 00000000000..3d29c30176f
--- /dev/null
+++ b/tests/cases/compiler/emitNonStrictModules_commonjs.ts
@@ -0,0 +1,4 @@
+// @module: commonjs
+// @emitNonStrictModules: true
+
+export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitNonStrictModules_es6.ts b/tests/cases/compiler/emitNonStrictModules_es6.ts
new file mode 100644
index 00000000000..426c5aff533
--- /dev/null
+++ b/tests/cases/compiler/emitNonStrictModules_es6.ts
@@ -0,0 +1,5 @@
+// @module: es6
+// @target: es6
+// @emitNonStrictModules: true
+
+export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitNonStrictModules_system.ts b/tests/cases/compiler/emitNonStrictModules_system.ts
new file mode 100644
index 00000000000..23801462b71
--- /dev/null
+++ b/tests/cases/compiler/emitNonStrictModules_system.ts
@@ -0,0 +1,4 @@
+// @module: system
+// @emitNonStrictModules: true
+
+export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitNonStrictModules_umd.ts b/tests/cases/compiler/emitNonStrictModules_umd.ts
new file mode 100644
index 00000000000..1166f512cf2
--- /dev/null
+++ b/tests/cases/compiler/emitNonStrictModules_umd.ts
@@ -0,0 +1,4 @@
+// @module: umd
+// @emitNonStrictModules: true
+
+export var x = 0;
\ No newline at end of file