From 10522f9eee43f9515f2ced6f7a46ddd5180eb162 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 3 Feb 2016 14:16:09 -0800
Subject: [PATCH 1/3] Add flag to emit modules in loose mode

---
 src/compiler/commandLineParser.ts             |  5 +++
 src/compiler/diagnosticMessages.json          | 38 +++++++++++--------
 src/compiler/emitter.ts                       |  8 ++--
 src/compiler/types.ts                         |  1 +
 .../reference/emitModulesInLooseMode_amd.js   |  8 ++++
 .../emitModulesInLooseMode_amd.symbols        |  5 +++
 .../emitModulesInLooseMode_amd.types          |  6 +++
 .../emitModulesInLooseMode_commonjs.js        |  6 +++
 .../emitModulesInLooseMode_commonjs.symbols   |  5 +++
 .../emitModulesInLooseMode_commonjs.types     |  6 +++
 .../reference/emitModulesInLooseMode_es6.js   |  6 +++
 .../emitModulesInLooseMode_es6.symbols        |  5 +++
 .../emitModulesInLooseMode_es6.types          |  6 +++
 .../emitModulesInLooseMode_system.js          | 15 ++++++++
 .../emitModulesInLooseMode_system.symbols     |  5 +++
 .../emitModulesInLooseMode_system.types       |  6 +++
 .../reference/emitModulesInLooseMode_umd.js   | 15 ++++++++
 .../emitModulesInLooseMode_umd.symbols        |  5 +++
 .../emitModulesInLooseMode_umd.types          |  6 +++
 .../compiler/emitModulesInLooseMode_amd.ts    |  4 ++
 .../emitModulesInLooseMode_commonjs.ts        |  4 ++
 .../compiler/emitModulesInLooseMode_es6.ts    |  5 +++
 .../compiler/emitModulesInLooseMode_system.ts |  4 ++
 .../compiler/emitModulesInLooseMode_umd.ts    |  4 ++
 24 files changed, 158 insertions(+), 20 deletions(-)
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_amd.js
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_amd.symbols
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_amd.types
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_commonjs.js
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_commonjs.symbols
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_commonjs.types
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_es6.js
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_es6.symbols
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_es6.types
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_system.js
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_system.symbols
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_system.types
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_umd.js
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_umd.symbols
 create mode 100644 tests/baselines/reference/emitModulesInLooseMode_umd.types
 create mode 100644 tests/cases/compiler/emitModulesInLooseMode_amd.ts
 create mode 100644 tests/cases/compiler/emitModulesInLooseMode_commonjs.ts
 create mode 100644 tests/cases/compiler/emitModulesInLooseMode_es6.ts
 create mode 100644 tests/cases/compiler/emitModulesInLooseMode_system.ts
 create mode 100644 tests/cases/compiler/emitModulesInLooseMode_umd.ts

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index d5bf95a64058a..7d635c2aaf50a 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -320,6 +320,11 @@ namespace ts {
             name: "allowSyntheticDefaultImports",
             type: "boolean",
             description: Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
+        },
+        {
+            name: "emitModulesInLooseMode",
+            type: "boolean",
+            description: Diagnostics.Do_not_emit_use_strict_directives_in_module_output
         }
     ];
 
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index b8ae833e5ab2f..5b93f61bb9042 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1,4 +1,4 @@
- {
+{
     "Unterminated string literal.": {
         "category": "Error",
         "code": 1002
@@ -2187,6 +2187,7 @@
         "category": "Error",
         "code": 5062
     },
+
     "Concatenate and emit output to single file.": {
         "category": "Message",
         "code": 6001
@@ -2231,10 +2232,10 @@
         "category": "Message",
         "code": 6011
     },
-  "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)": {
-    "category": "Message",
-    "code": 6015
-  },
+    "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015' (experimental)": {
+        "category": "Message",
+        "code": 6015
+    },
     "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'": {
         "category": "Message",
         "code": 6016
@@ -2571,6 +2572,11 @@
         "category": "Message",
         "code": 6111
     },
+    "Do not emit 'use strict' directives in module output.": {
+        "category": "Message",
+        "code": 6112
+    },
+
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
         "code": 7005
@@ -2757,23 +2763,23 @@
         "code": 17004
     },
     "A constructor cannot contain a 'super' call when its class extends 'null'": {
-      "category": "Error",
-      "code": 17005
+        "category": "Error",
+        "code": 17005
     },
     "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses.": {
-      "category": "Error",
-      "code": 17006
+        "category": "Error",
+        "code": 17006
     },
     "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses.": {
-      "category": "Error",
-      "code": 17007
+        "category": "Error",
+        "code": 17007
     },
     "JSX element '{0}' has no corresponding closing tag.": {
-      "category": "Error",
-      "code": 17008
+        "category": "Error",
+        "code": 17008
     },
     "'super' must be called before accessing 'this' in the constructor of a derived class.": {
-      "category": "Error",
-      "code": 17009
+        "category": "Error",
+        "code": 17009
     }
-}
+}
\ No newline at end of file
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index e86d86603b46a..92cb3334f632d 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*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.emitModulesInLooseMode);
                 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*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/!compilerOptions.emitModulesInLooseMode);
                 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*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ !compilerOptions.emitModulesInLooseMode);
                 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*/ true);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.emitModulesInLooseMode);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 5545fbd162e73..97cf2fff3b5d3 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2422,6 +2422,7 @@ namespace ts {
         traceModuleResolution?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowJs?: boolean;
+        emitModulesInLooseMode?: boolean;
         /* @internal */ stripInternal?: boolean;
 
         // Skip checking lib.d.ts to help speed up tests.
diff --git a/tests/baselines/reference/emitModulesInLooseMode_amd.js b/tests/baselines/reference/emitModulesInLooseMode_amd.js
new file mode 100644
index 0000000000000..a93ca62de0e84
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_amd.js
@@ -0,0 +1,8 @@
+//// [emitModulesInLooseMode_amd.ts]
+
+export var x = 0;
+
+//// [emitModulesInLooseMode_amd.js]
+define(["require", "exports"], function (require, exports) {
+    exports.x = 0;
+});
diff --git a/tests/baselines/reference/emitModulesInLooseMode_amd.symbols b/tests/baselines/reference/emitModulesInLooseMode_amd.symbols
new file mode 100644
index 0000000000000..d76fea8b7b878
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_amd.symbols
@@ -0,0 +1,5 @@
+=== 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
new file mode 100644
index 0000000000000..1c070cc95faf9
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_amd.types
@@ -0,0 +1,6 @@
+=== 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
new file mode 100644
index 0000000000000..be24cdf6b91ee
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_commonjs.js
@@ -0,0 +1,6 @@
+//// [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
new file mode 100644
index 0000000000000..225286c74de1c
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_commonjs.symbols
@@ -0,0 +1,5 @@
+=== 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
new file mode 100644
index 0000000000000..b37bb9667ab17
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_commonjs.types
@@ -0,0 +1,6 @@
+=== 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
new file mode 100644
index 0000000000000..95cc14ff60908
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_es6.js
@@ -0,0 +1,6 @@
+//// [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
new file mode 100644
index 0000000000000..4f3c073f7eeac
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_es6.symbols
@@ -0,0 +1,5 @@
+=== 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
new file mode 100644
index 0000000000000..84631ede00f32
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_es6.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/emitModulesInLooseMode_es6.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/emitModulesInLooseMode_system.js b/tests/baselines/reference/emitModulesInLooseMode_system.js
new file mode 100644
index 0000000000000..4cf401a554d36
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_system.js
@@ -0,0 +1,15 @@
+//// [emitModulesInLooseMode_system.ts]
+
+export var x = 0;
+
+//// [emitModulesInLooseMode_system.js]
+System.register([], function(exports_1, context_1) {
+    var __moduleName = context_1 && context_1.id;
+    var x;
+    return {
+        setters:[],
+        execute: function() {
+            exports_1("x", x = 0);
+        }
+    }
+});
diff --git a/tests/baselines/reference/emitModulesInLooseMode_system.symbols b/tests/baselines/reference/emitModulesInLooseMode_system.symbols
new file mode 100644
index 0000000000000..0682b2b648f9e
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_system.symbols
@@ -0,0 +1,5 @@
+=== 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
new file mode 100644
index 0000000000000..429908c1de45f
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_system.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/emitModulesInLooseMode_system.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/emitModulesInLooseMode_umd.js b/tests/baselines/reference/emitModulesInLooseMode_umd.js
new file mode 100644
index 0000000000000..327962d18f267
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_umd.js
@@ -0,0 +1,15 @@
+//// [emitModulesInLooseMode_umd.ts]
+
+export var x = 0;
+
+//// [emitModulesInLooseMode_umd.js]
+(function (factory) {
+    if (typeof module === 'object' && typeof module.exports === 'object') {
+        var v = factory(require, exports); if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === 'function' && define.amd) {
+        define(["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    exports.x = 0;
+});
diff --git a/tests/baselines/reference/emitModulesInLooseMode_umd.symbols b/tests/baselines/reference/emitModulesInLooseMode_umd.symbols
new file mode 100644
index 0000000000000..86c9e9b200c09
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_umd.symbols
@@ -0,0 +1,5 @@
+=== 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
new file mode 100644
index 0000000000000..98a32838eb62b
--- /dev/null
+++ b/tests/baselines/reference/emitModulesInLooseMode_umd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/emitModulesInLooseMode_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
new file mode 100644
index 0000000000000..7c3394bebae6b
--- /dev/null
+++ b/tests/cases/compiler/emitModulesInLooseMode_amd.ts
@@ -0,0 +1,4 @@
+// @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
new file mode 100644
index 0000000000000..761f1f6ea9f4f
--- /dev/null
+++ b/tests/cases/compiler/emitModulesInLooseMode_commonjs.ts
@@ -0,0 +1,4 @@
+// @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
new file mode 100644
index 0000000000000..22c4368629fab
--- /dev/null
+++ b/tests/cases/compiler/emitModulesInLooseMode_es6.ts
@@ -0,0 +1,5 @@
+// @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
new file mode 100644
index 0000000000000..0face8fabca70
--- /dev/null
+++ b/tests/cases/compiler/emitModulesInLooseMode_system.ts
@@ -0,0 +1,4 @@
+// @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
new file mode 100644
index 0000000000000..a6a3559986fad
--- /dev/null
+++ b/tests/cases/compiler/emitModulesInLooseMode_umd.ts
@@ -0,0 +1,4 @@
+// @module: umd
+// @emitModulesInLooseMode: true
+
+export var x = 0;
\ No newline at end of file

From 1611f5648146ff5f90bf0e11556e1fa5fdbe9398 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 4 Feb 2016 12:44:03 -0800
Subject: [PATCH 2/3] Rename flag

---
 src/compiler/commandLineParser.ts                         | 2 +-
 src/compiler/emitter.ts                                   | 8 ++++----
 src/compiler/types.ts                                     | 2 +-
 .../reference/emitModulesInLooseMode_amd.symbols          | 5 -----
 .../baselines/reference/emitModulesInLooseMode_amd.types  | 6 ------
 .../reference/emitModulesInLooseMode_commonjs.js          | 6 ------
 .../reference/emitModulesInLooseMode_commonjs.symbols     | 5 -----
 .../reference/emitModulesInLooseMode_commonjs.types       | 6 ------
 tests/baselines/reference/emitModulesInLooseMode_es6.js   | 6 ------
 .../reference/emitModulesInLooseMode_es6.symbols          | 5 -----
 .../baselines/reference/emitModulesInLooseMode_es6.types  | 6 ------
 .../reference/emitModulesInLooseMode_system.symbols       | 5 -----
 .../reference/emitModulesInLooseMode_system.types         | 6 ------
 .../reference/emitModulesInLooseMode_umd.symbols          | 5 -----
 .../baselines/reference/emitModulesInLooseMode_umd.types  | 6 ------
 ...ulesInLooseMode_amd.js => emitNonStrictModules_amd.js} | 4 ++--
 .../baselines/reference/emitNonStrictModules_amd.symbols  | 5 +++++
 tests/baselines/reference/emitNonStrictModules_amd.types  | 6 ++++++
 .../baselines/reference/emitNonStrictModules_commonjs.js  | 6 ++++++
 .../reference/emitNonStrictModules_commonjs.symbols       | 5 +++++
 .../reference/emitNonStrictModules_commonjs.types         | 6 ++++++
 tests/baselines/reference/emitNonStrictModules_es6.js     | 6 ++++++
 .../baselines/reference/emitNonStrictModules_es6.symbols  | 5 +++++
 tests/baselines/reference/emitNonStrictModules_es6.types  | 6 ++++++
 ...LooseMode_system.js => emitNonStrictModules_system.js} | 4 ++--
 .../reference/emitNonStrictModules_system.symbols         | 5 +++++
 .../baselines/reference/emitNonStrictModules_system.types | 6 ++++++
 ...ulesInLooseMode_umd.js => emitNonStrictModules_umd.js} | 4 ++--
 .../baselines/reference/emitNonStrictModules_umd.symbols  | 5 +++++
 tests/baselines/reference/emitNonStrictModules_umd.types  | 6 ++++++
 tests/cases/compiler/emitModulesInLooseMode_amd.ts        | 4 ----
 tests/cases/compiler/emitModulesInLooseMode_umd.ts        | 4 ----
 tests/cases/compiler/emitNonStrictModules_amd.ts          | 4 ++++
 ...eMode_commonjs.ts => emitNonStrictModules_commonjs.ts} | 2 +-
 ...ulesInLooseMode_es6.ts => emitNonStrictModules_es6.ts} | 2 +-
 ...LooseMode_system.ts => emitNonStrictModules_system.ts} | 2 +-
 tests/cases/compiler/emitNonStrictModules_umd.ts          | 4 ++++
 37 files changed, 90 insertions(+), 90 deletions(-)
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_amd.symbols
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_amd.types
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_commonjs.js
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_commonjs.symbols
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_commonjs.types
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_es6.js
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_es6.symbols
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_es6.types
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_system.symbols
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_system.types
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_umd.symbols
 delete mode 100644 tests/baselines/reference/emitModulesInLooseMode_umd.types
 rename tests/baselines/reference/{emitModulesInLooseMode_amd.js => emitNonStrictModules_amd.js} (56%)
 create mode 100644 tests/baselines/reference/emitNonStrictModules_amd.symbols
 create mode 100644 tests/baselines/reference/emitNonStrictModules_amd.types
 create mode 100644 tests/baselines/reference/emitNonStrictModules_commonjs.js
 create mode 100644 tests/baselines/reference/emitNonStrictModules_commonjs.symbols
 create mode 100644 tests/baselines/reference/emitNonStrictModules_commonjs.types
 create mode 100644 tests/baselines/reference/emitNonStrictModules_es6.js
 create mode 100644 tests/baselines/reference/emitNonStrictModules_es6.symbols
 create mode 100644 tests/baselines/reference/emitNonStrictModules_es6.types
 rename tests/baselines/reference/{emitModulesInLooseMode_system.js => emitNonStrictModules_system.js} (72%)
 create mode 100644 tests/baselines/reference/emitNonStrictModules_system.symbols
 create mode 100644 tests/baselines/reference/emitNonStrictModules_system.types
 rename tests/baselines/reference/{emitModulesInLooseMode_umd.js => emitNonStrictModules_umd.js} (81%)
 create mode 100644 tests/baselines/reference/emitNonStrictModules_umd.symbols
 create mode 100644 tests/baselines/reference/emitNonStrictModules_umd.types
 delete mode 100644 tests/cases/compiler/emitModulesInLooseMode_amd.ts
 delete mode 100644 tests/cases/compiler/emitModulesInLooseMode_umd.ts
 create mode 100644 tests/cases/compiler/emitNonStrictModules_amd.ts
 rename tests/cases/compiler/{emitModulesInLooseMode_commonjs.ts => emitNonStrictModules_commonjs.ts} (52%)
 rename tests/cases/compiler/{emitModulesInLooseMode_es6.ts => emitNonStrictModules_es6.ts} (57%)
 rename tests/cases/compiler/{emitModulesInLooseMode_system.ts => emitNonStrictModules_system.ts} (50%)
 create mode 100644 tests/cases/compiler/emitNonStrictModules_umd.ts

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 7d635c2aaf50a..957b38c67dea1 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 92cb3334f632d..15edb022b113c 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 97cf2fff3b5d3..90a6a9a6752ad 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 d76fea8b7b878..0000000000000
--- 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 1c070cc95faf9..0000000000000
--- 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 be24cdf6b91ee..0000000000000
--- 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 225286c74de1c..0000000000000
--- 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 b37bb9667ab17..0000000000000
--- 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 95cc14ff60908..0000000000000
--- 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 4f3c073f7eeac..0000000000000
--- 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 84631ede00f32..0000000000000
--- 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 0682b2b648f9e..0000000000000
--- 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 429908c1de45f..0000000000000
--- 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 86c9e9b200c09..0000000000000
--- 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 98a32838eb62b..0000000000000
--- 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 a93ca62de0e84..f2a746280ac64 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 0000000000000..1590ea05ad4f1
--- /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 0000000000000..650df648d8d5a
--- /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 0000000000000..7a2d072001519
--- /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 0000000000000..36b487f34d1bb
--- /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 0000000000000..f8a24d53641a6
--- /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 0000000000000..535afff773043
--- /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 0000000000000..884189014b0fb
--- /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 0000000000000..f3208e247da27
--- /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 4cf401a554d36..f1ad93f0009b5 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 0000000000000..b772eafe44722
--- /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 0000000000000..352381db379ad
--- /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 327962d18f267..c1ee0c048c5dd 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 0000000000000..23af4139243cc
--- /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 0000000000000..83c55b1d4cd0b
--- /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 7c3394bebae6b..0000000000000
--- 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_umd.ts b/tests/cases/compiler/emitModulesInLooseMode_umd.ts
deleted file mode 100644
index a6a3559986fad..0000000000000
--- 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 0000000000000..217e23d91a37a
--- /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/emitModulesInLooseMode_commonjs.ts b/tests/cases/compiler/emitNonStrictModules_commonjs.ts
similarity index 52%
rename from tests/cases/compiler/emitModulesInLooseMode_commonjs.ts
rename to tests/cases/compiler/emitNonStrictModules_commonjs.ts
index 761f1f6ea9f4f..3d29c30176f80 100644
--- a/tests/cases/compiler/emitModulesInLooseMode_commonjs.ts
+++ b/tests/cases/compiler/emitNonStrictModules_commonjs.ts
@@ -1,4 +1,4 @@
 // @module: commonjs
-// @emitModulesInLooseMode: true
+// @emitNonStrictModules: true
 
 export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitModulesInLooseMode_es6.ts b/tests/cases/compiler/emitNonStrictModules_es6.ts
similarity index 57%
rename from tests/cases/compiler/emitModulesInLooseMode_es6.ts
rename to tests/cases/compiler/emitNonStrictModules_es6.ts
index 22c4368629fab..426c5aff53322 100644
--- a/tests/cases/compiler/emitModulesInLooseMode_es6.ts
+++ b/tests/cases/compiler/emitNonStrictModules_es6.ts
@@ -1,5 +1,5 @@
 // @module: es6
 // @target: es6
-// @emitModulesInLooseMode: true
+// @emitNonStrictModules: true
 
 export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitModulesInLooseMode_system.ts b/tests/cases/compiler/emitNonStrictModules_system.ts
similarity index 50%
rename from tests/cases/compiler/emitModulesInLooseMode_system.ts
rename to tests/cases/compiler/emitNonStrictModules_system.ts
index 0face8fabca70..23801462b71d2 100644
--- a/tests/cases/compiler/emitModulesInLooseMode_system.ts
+++ b/tests/cases/compiler/emitNonStrictModules_system.ts
@@ -1,4 +1,4 @@
 // @module: system
-// @emitModulesInLooseMode: true
+// @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 0000000000000..1166f512cf2a6
--- /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

From 6f804e40efc6cdc153f9aee594382df74aa8db0c Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Fri, 5 Feb 2016 16:30:01 -0800
Subject: [PATCH 3/3] change flag name

---
 src/compiler/commandLineParser.ts                         | 2 +-
 src/compiler/emitter.ts                                   | 8 ++++----
 src/compiler/types.ts                                     | 2 +-
 .../baselines/reference/emitNonStrictModules_amd.symbols  | 5 -----
 tests/baselines/reference/emitNonStrictModules_amd.types  | 6 ------
 .../baselines/reference/emitNonStrictModules_commonjs.js  | 6 ------
 .../reference/emitNonStrictModules_commonjs.symbols       | 5 -----
 .../reference/emitNonStrictModules_commonjs.types         | 6 ------
 tests/baselines/reference/emitNonStrictModules_es6.js     | 6 ------
 .../baselines/reference/emitNonStrictModules_es6.symbols  | 5 -----
 tests/baselines/reference/emitNonStrictModules_es6.types  | 6 ------
 .../reference/emitNonStrictModules_system.symbols         | 5 -----
 .../baselines/reference/emitNonStrictModules_system.types | 6 ------
 .../baselines/reference/emitNonStrictModules_umd.symbols  | 5 -----
 tests/baselines/reference/emitNonStrictModules_umd.types  | 6 ------
 ...NonStrictModules_amd.js => noImplicitUseStrict_amd.js} | 4 ++--
 tests/baselines/reference/noImplicitUseStrict_amd.symbols | 5 +++++
 tests/baselines/reference/noImplicitUseStrict_amd.types   | 6 ++++++
 tests/baselines/reference/noImplicitUseStrict_commonjs.js | 6 ++++++
 .../reference/noImplicitUseStrict_commonjs.symbols        | 5 +++++
 .../reference/noImplicitUseStrict_commonjs.types          | 6 ++++++
 tests/baselines/reference/noImplicitUseStrict_es6.js      | 6 ++++++
 tests/baselines/reference/noImplicitUseStrict_es6.symbols | 5 +++++
 tests/baselines/reference/noImplicitUseStrict_es6.types   | 6 ++++++
 ...ictModules_system.js => noImplicitUseStrict_system.js} | 4 ++--
 .../reference/noImplicitUseStrict_system.symbols          | 5 +++++
 .../baselines/reference/noImplicitUseStrict_system.types  | 6 ++++++
 ...NonStrictModules_umd.js => noImplicitUseStrict_umd.js} | 4 ++--
 tests/baselines/reference/noImplicitUseStrict_umd.symbols | 5 +++++
 tests/baselines/reference/noImplicitUseStrict_umd.types   | 6 ++++++
 ...NonStrictModules_amd.ts => noImplicitUseStrict_amd.ts} | 2 +-
 ...odules_commonjs.ts => noImplicitUseStrict_commonjs.ts} | 2 +-
 ...NonStrictModules_es6.ts => noImplicitUseStrict_es6.ts} | 2 +-
 ...ictModules_system.ts => noImplicitUseStrict_system.ts} | 2 +-
 ...NonStrictModules_umd.ts => noImplicitUseStrict_umd.ts} | 2 +-
 35 files changed, 84 insertions(+), 84 deletions(-)
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_amd.symbols
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_amd.types
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_commonjs.js
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_commonjs.symbols
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_commonjs.types
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_es6.js
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_es6.symbols
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_es6.types
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_system.symbols
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_system.types
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_umd.symbols
 delete mode 100644 tests/baselines/reference/emitNonStrictModules_umd.types
 rename tests/baselines/reference/{emitNonStrictModules_amd.js => noImplicitUseStrict_amd.js} (57%)
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_amd.symbols
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_amd.types
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_commonjs.js
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_commonjs.symbols
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_commonjs.types
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_es6.js
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_es6.symbols
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_es6.types
 rename tests/baselines/reference/{emitNonStrictModules_system.js => noImplicitUseStrict_system.js} (73%)
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_system.symbols
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_system.types
 rename tests/baselines/reference/{emitNonStrictModules_umd.js => noImplicitUseStrict_umd.js} (81%)
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_umd.symbols
 create mode 100644 tests/baselines/reference/noImplicitUseStrict_umd.types
 rename tests/cases/compiler/{emitNonStrictModules_amd.ts => noImplicitUseStrict_amd.ts} (50%)
 rename tests/cases/compiler/{emitNonStrictModules_commonjs.ts => noImplicitUseStrict_commonjs.ts} (53%)
 rename tests/cases/compiler/{emitNonStrictModules_es6.ts => noImplicitUseStrict_es6.ts} (58%)
 rename tests/cases/compiler/{emitNonStrictModules_system.ts => noImplicitUseStrict_system.ts} (52%)
 rename tests/cases/compiler/{emitNonStrictModules_umd.ts => noImplicitUseStrict_umd.ts} (50%)

diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 957b38c67dea1..065fb3a973792 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: "emitNonStrictModules",
+            name: "noImplicitUseStrict",
             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 15edb022b113c..7d602c584007e 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.emitNonStrictModules);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 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.emitNonStrictModules);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/!compilerOptions.noImplicitUseStrict);
                 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.emitNonStrictModules);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 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.emitNonStrictModules);
+                const startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
                 emitExportStarHelper();
                 emitCaptureThisForNodeIfNecessary(node);
                 emitLinesStartingAt(node.statements, startIndex);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 90a6a9a6752ad..1b992bb11ef8c 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -2422,7 +2422,7 @@ namespace ts {
         traceModuleResolution?: boolean;
         allowSyntheticDefaultImports?: boolean;
         allowJs?: boolean;
-        emitNonStrictModules?: boolean;
+        noImplicitUseStrict?: boolean;
         /* @internal */ stripInternal?: boolean;
 
         // Skip checking lib.d.ts to help speed up tests.
diff --git a/tests/baselines/reference/emitNonStrictModules_amd.symbols b/tests/baselines/reference/emitNonStrictModules_amd.symbols
deleted file mode 100644
index 1590ea05ad4f1..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_amd.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== 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
deleted file mode 100644
index 650df648d8d5a..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_amd.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== 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
deleted file mode 100644
index 7a2d072001519..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_commonjs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [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
deleted file mode 100644
index 36b487f34d1bb..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_commonjs.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== 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
deleted file mode 100644
index f8a24d53641a6..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_commonjs.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== 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
deleted file mode 100644
index 535afff773043..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_es6.js
+++ /dev/null
@@ -1,6 +0,0 @@
-//// [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
deleted file mode 100644
index 884189014b0fb..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_es6.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== 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
deleted file mode 100644
index f3208e247da27..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_es6.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/compiler/emitNonStrictModules_es6.ts ===
-
-export var x = 0;
->x : number
->0 : number
-
diff --git a/tests/baselines/reference/emitNonStrictModules_system.symbols b/tests/baselines/reference/emitNonStrictModules_system.symbols
deleted file mode 100644
index b772eafe44722..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_system.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== 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
deleted file mode 100644
index 352381db379ad..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_system.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/compiler/emitNonStrictModules_system.ts ===
-
-export var x = 0;
->x : number
->0 : number
-
diff --git a/tests/baselines/reference/emitNonStrictModules_umd.symbols b/tests/baselines/reference/emitNonStrictModules_umd.symbols
deleted file mode 100644
index 23af4139243cc..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_umd.symbols
+++ /dev/null
@@ -1,5 +0,0 @@
-=== 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
deleted file mode 100644
index 83c55b1d4cd0b..0000000000000
--- a/tests/baselines/reference/emitNonStrictModules_umd.types
+++ /dev/null
@@ -1,6 +0,0 @@
-=== tests/cases/compiler/emitNonStrictModules_umd.ts ===
-
-export var x = 0;
->x : number
->0 : number
-
diff --git a/tests/baselines/reference/emitNonStrictModules_amd.js b/tests/baselines/reference/noImplicitUseStrict_amd.js
similarity index 57%
rename from tests/baselines/reference/emitNonStrictModules_amd.js
rename to tests/baselines/reference/noImplicitUseStrict_amd.js
index f2a746280ac64..ac15f548c4741 100644
--- a/tests/baselines/reference/emitNonStrictModules_amd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.js
@@ -1,8 +1,8 @@
-//// [emitNonStrictModules_amd.ts]
+//// [noImplicitUseStrict_amd.ts]
 
 export var x = 0;
 
-//// [emitNonStrictModules_amd.js]
+//// [noImplicitUseStrict_amd.js]
 define(["require", "exports"], function (require, exports) {
     exports.x = 0;
 });
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.symbols b/tests/baselines/reference/noImplicitUseStrict_amd.symbols
new file mode 100644
index 0000000000000..de1faa2213c0d
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_amd.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_amd.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.types b/tests/baselines/reference/noImplicitUseStrict_amd.types
new file mode 100644
index 0000000000000..c9e1b5749dc0c
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_amd.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.js b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
new file mode 100644
index 0000000000000..9c726938f043a
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
@@ -0,0 +1,6 @@
+//// [noImplicitUseStrict_commonjs.ts]
+
+export var x = 0;
+
+//// [noImplicitUseStrict_commonjs.js]
+exports.x = 0;
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.symbols b/tests/baselines/reference/noImplicitUseStrict_commonjs.symbols
new file mode 100644
index 0000000000000..af53dc272d255
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_commonjs.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_commonjs.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.types b/tests/baselines/reference/noImplicitUseStrict_commonjs.types
new file mode 100644
index 0000000000000..9999d3b94ba01
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_commonjs.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_es6.js b/tests/baselines/reference/noImplicitUseStrict_es6.js
new file mode 100644
index 0000000000000..27dbbc7ea7957
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_es6.js
@@ -0,0 +1,6 @@
+//// [noImplicitUseStrict_es6.ts]
+
+export var x = 0;
+
+//// [noImplicitUseStrict_es6.js]
+export var x = 0;
diff --git a/tests/baselines/reference/noImplicitUseStrict_es6.symbols b/tests/baselines/reference/noImplicitUseStrict_es6.symbols
new file mode 100644
index 0000000000000..31bc1904ff987
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_es6.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_es6.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_es6.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_es6.types b/tests/baselines/reference/noImplicitUseStrict_es6.types
new file mode 100644
index 0000000000000..838c7316be059
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_es6.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_es6.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/emitNonStrictModules_system.js b/tests/baselines/reference/noImplicitUseStrict_system.js
similarity index 73%
rename from tests/baselines/reference/emitNonStrictModules_system.js
rename to tests/baselines/reference/noImplicitUseStrict_system.js
index f1ad93f0009b5..cf5a7e1b26173 100644
--- a/tests/baselines/reference/emitNonStrictModules_system.js
+++ b/tests/baselines/reference/noImplicitUseStrict_system.js
@@ -1,8 +1,8 @@
-//// [emitNonStrictModules_system.ts]
+//// [noImplicitUseStrict_system.ts]
 
 export var x = 0;
 
-//// [emitNonStrictModules_system.js]
+//// [noImplicitUseStrict_system.js]
 System.register([], function(exports_1, context_1) {
     var __moduleName = context_1 && context_1.id;
     var x;
diff --git a/tests/baselines/reference/noImplicitUseStrict_system.symbols b/tests/baselines/reference/noImplicitUseStrict_system.symbols
new file mode 100644
index 0000000000000..62b89a6593da1
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_system.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_system.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_system.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_system.types b/tests/baselines/reference/noImplicitUseStrict_system.types
new file mode 100644
index 0000000000000..1da563f938b28
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_system.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_system.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/baselines/reference/emitNonStrictModules_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js
similarity index 81%
rename from tests/baselines/reference/emitNonStrictModules_umd.js
rename to tests/baselines/reference/noImplicitUseStrict_umd.js
index c1ee0c048c5dd..ca252daeb9d4c 100644
--- a/tests/baselines/reference/emitNonStrictModules_umd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.js
@@ -1,8 +1,8 @@
-//// [emitNonStrictModules_umd.ts]
+//// [noImplicitUseStrict_umd.ts]
 
 export var x = 0;
 
-//// [emitNonStrictModules_umd.js]
+//// [noImplicitUseStrict_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/noImplicitUseStrict_umd.symbols b/tests/baselines/reference/noImplicitUseStrict_umd.symbols
new file mode 100644
index 0000000000000..a72a251ad09a5
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/noImplicitUseStrict_umd.ts ===
+
+export var x = 0;
+>x : Symbol(x, Decl(noImplicitUseStrict_umd.ts, 1, 10))
+
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.types b/tests/baselines/reference/noImplicitUseStrict_umd.types
new file mode 100644
index 0000000000000..6a3fd6ece773a
--- /dev/null
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/noImplicitUseStrict_umd.ts ===
+
+export var x = 0;
+>x : number
+>0 : number
+
diff --git a/tests/cases/compiler/emitNonStrictModules_amd.ts b/tests/cases/compiler/noImplicitUseStrict_amd.ts
similarity index 50%
rename from tests/cases/compiler/emitNonStrictModules_amd.ts
rename to tests/cases/compiler/noImplicitUseStrict_amd.ts
index 217e23d91a37a..3a2a4760221c6 100644
--- a/tests/cases/compiler/emitNonStrictModules_amd.ts
+++ b/tests/cases/compiler/noImplicitUseStrict_amd.ts
@@ -1,4 +1,4 @@
 // @module: amd
-// @emitNonStrictModules: true
+// @noImplicitUseStrict: true
 
 export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitNonStrictModules_commonjs.ts b/tests/cases/compiler/noImplicitUseStrict_commonjs.ts
similarity index 53%
rename from tests/cases/compiler/emitNonStrictModules_commonjs.ts
rename to tests/cases/compiler/noImplicitUseStrict_commonjs.ts
index 3d29c30176f80..f8377dba07abe 100644
--- a/tests/cases/compiler/emitNonStrictModules_commonjs.ts
+++ b/tests/cases/compiler/noImplicitUseStrict_commonjs.ts
@@ -1,4 +1,4 @@
 // @module: commonjs
-// @emitNonStrictModules: true
+// @noImplicitUseStrict: true
 
 export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitNonStrictModules_es6.ts b/tests/cases/compiler/noImplicitUseStrict_es6.ts
similarity index 58%
rename from tests/cases/compiler/emitNonStrictModules_es6.ts
rename to tests/cases/compiler/noImplicitUseStrict_es6.ts
index 426c5aff53322..f56b0fd902146 100644
--- a/tests/cases/compiler/emitNonStrictModules_es6.ts
+++ b/tests/cases/compiler/noImplicitUseStrict_es6.ts
@@ -1,5 +1,5 @@
 // @module: es6
 // @target: es6
-// @emitNonStrictModules: true
+// @noImplicitUseStrict: true
 
 export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitNonStrictModules_system.ts b/tests/cases/compiler/noImplicitUseStrict_system.ts
similarity index 52%
rename from tests/cases/compiler/emitNonStrictModules_system.ts
rename to tests/cases/compiler/noImplicitUseStrict_system.ts
index 23801462b71d2..37ff5de469d1d 100644
--- a/tests/cases/compiler/emitNonStrictModules_system.ts
+++ b/tests/cases/compiler/noImplicitUseStrict_system.ts
@@ -1,4 +1,4 @@
 // @module: system
-// @emitNonStrictModules: true
+// @noImplicitUseStrict: true
 
 export var x = 0;
\ No newline at end of file
diff --git a/tests/cases/compiler/emitNonStrictModules_umd.ts b/tests/cases/compiler/noImplicitUseStrict_umd.ts
similarity index 50%
rename from tests/cases/compiler/emitNonStrictModules_umd.ts
rename to tests/cases/compiler/noImplicitUseStrict_umd.ts
index 1166f512cf2a6..f26f2ee2aff6f 100644
--- a/tests/cases/compiler/emitNonStrictModules_umd.ts
+++ b/tests/cases/compiler/noImplicitUseStrict_umd.ts
@@ -1,4 +1,4 @@
 // @module: umd
-// @emitNonStrictModules: true
+// @noImplicitUseStrict: true
 
 export var x = 0;
\ No newline at end of file