diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index b718c72c009b9..bba2143612fc8 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -31437,7 +31437,7 @@ namespace ts {
          */
         function checkClassNameCollisionWithObject(name: Identifier): void {
             if (languageVersion === ScriptTarget.ES5 && name.escapedText === "Object"
-                && moduleKind !== ModuleKind.ES2015 && moduleKind !== ModuleKind.ESNext) {
+                && moduleKind < ModuleKind.ES2015) {
                 error(name, Diagnostics.Class_name_cannot_be_Object_when_targeting_ES5_with_module_0, ModuleKind[moduleKind]); // https://github.com/Microsoft/TypeScript/issues/17494
             }
         }
@@ -32597,7 +32597,7 @@ namespace ts {
                         error(node.moduleSpecifier, Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
                     }
 
-                    if (moduleKind !== ModuleKind.System && moduleKind !== ModuleKind.ES2015 && moduleKind !== ModuleKind.ESNext) {
+                    if (moduleKind !== ModuleKind.System && moduleKind < ModuleKind.ES2015) {
                         checkExternalEmitHelpers(node, ExternalEmitHelpers.ExportStar);
                     }
                 }
@@ -35805,7 +35805,9 @@ namespace ts {
                 return grammarErrorOnNode(node.exclamationToken, Diagnostics.Definite_assignment_assertions_can_only_be_used_along_with_a_type_annotation);
             }
 
-            if (compilerOptions.module !== ModuleKind.ES2015 && compilerOptions.module !== ModuleKind.ESNext && compilerOptions.module !== ModuleKind.System && !compilerOptions.noEmit &&
+            const moduleKind = getEmitModuleKind(compilerOptions);
+
+            if (moduleKind < ModuleKind.ES2015 && moduleKind !== ModuleKind.System && !compilerOptions.noEmit &&
                 !(node.parent.parent.flags & NodeFlags.Ambient) && hasModifier(node.parent.parent, ModifierFlags.Export)) {
                 checkESModuleMarker(node.name);
             }
@@ -36151,7 +36153,7 @@ namespace ts {
 
         function checkGrammarImportCallExpression(node: ImportCall): boolean {
             if (moduleKind === ModuleKind.ES2015) {
-                return grammarErrorOnNode(node, Diagnostics.Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_esnext_commonjs_amd_system_or_umd);
+                return grammarErrorOnNode(node, Diagnostics.Dynamic_imports_are_only_supported_when_the_module_flag_is_set_to_es2020_esnext_commonjs_amd_system_or_umd);
             }
 
             if (node.typeArguments) {
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 4bcc1e48c8f19..86557767870cd 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -261,6 +261,7 @@ namespace ts {
                 umd: ModuleKind.UMD,
                 es6: ModuleKind.ES2015,
                 es2015: ModuleKind.ES2015,
+                es2020: ModuleKind.ES2020,
                 esnext: ModuleKind.ESNext
             }),
             affectsModuleResolution: true,
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index d93b725c01b19..63d8d5eee26e3 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -903,7 +903,7 @@
         "category": "Error",
         "code": 1322
     },
-    "Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.": {
+    "Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.": {
         "category": "Error",
         "code": 1323
     },
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
index d54244c083260..ac8986d229e84 100644
--- a/src/compiler/factory.ts
+++ b/src/compiler/factory.ts
@@ -5157,8 +5157,7 @@ namespace ts {
             const moduleKind = getEmitModuleKind(compilerOptions);
             let create = (hasExportStarsToExportValues || (compilerOptions.esModuleInterop && hasImportStarOrImportDefault))
                 && moduleKind !== ModuleKind.System
-                && moduleKind !== ModuleKind.ES2015
-                && moduleKind !== ModuleKind.ESNext;
+                && moduleKind < ModuleKind.ES2015;
             if (!create) {
                 const helpers = getEmitHelpers(node);
                 if (helpers) {
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
index bd8f34ee128c6..1b56e3faac7b5 100644
--- a/src/compiler/transformer.ts
+++ b/src/compiler/transformer.ts
@@ -3,6 +3,7 @@ namespace ts {
     function getModuleTransformer(moduleKind: ModuleKind): TransformerFactory<SourceFile | Bundle> {
         switch (moduleKind) {
             case ModuleKind.ESNext:
+            case ModuleKind.ES2020:
             case ModuleKind.ES2015:
                 return transformES2015Module;
             case ModuleKind.System:
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index d413a835d0d86..af94108993f0a 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -2469,6 +2469,7 @@ namespace ts {
             return isExportOfNamespace(node)
                 || (isExternalModuleExport(node)
                     && moduleKind !== ModuleKind.ES2015
+                    && moduleKind !== ModuleKind.ES2020
                     && moduleKind !== ModuleKind.ESNext
                     && moduleKind !== ModuleKind.System);
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 78f62f3013e8a..bfb4a65c25d32 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -5054,6 +5054,7 @@ namespace ts {
         //       Non-ES module kinds should not come between ES2015 (the earliest ES module kind) and ESNext (the last ES
         //       module kind).
         ES2015 = 5,
+        ES2020 = 6,
         ESNext = 99
     }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 935c528ebe296..e142cc91f5001 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -7634,6 +7634,7 @@ namespace ts {
             case ModuleKind.CommonJS:
             case ModuleKind.AMD:
             case ModuleKind.ES2015:
+            case ModuleKind.ES2020:
             case ModuleKind.ESNext:
                 return true;
             default:
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index a43aa7f6f9d3c..3f5c138238ab2 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -378,6 +378,7 @@ namespace ts.codefix {
                 return ImportKind.Equals;
             case ModuleKind.System:
             case ModuleKind.ES2015:
+            case ModuleKind.ES2020:
             case ModuleKind.ESNext:
             case ModuleKind.None:
                 // Fall back to the `import * as ns` style import.
diff --git a/src/testRunner/unittests/config/commandLineParsing.ts b/src/testRunner/unittests/config/commandLineParsing.ts
index 6ad786fbfc4fd..0709802eaab72 100644
--- a/src/testRunner/unittests/config/commandLineParsing.ts
+++ b/src/testRunner/unittests/config/commandLineParsing.ts
@@ -136,7 +136,7 @@ namespace ts {
                         start: undefined,
                         length: undefined,
                     }, {
-                        messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.",
+                        messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.",
                         category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category,
                         code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code,
 
diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
index 94c856cfd0401..0eca21f543218 100644
--- a/tests/baselines/reference/api/tsserverlibrary.d.ts
+++ b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -2680,6 +2680,7 @@ declare namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
+        ES2020 = 6,
         ESNext = 99
     }
     export enum JsxEmit {
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 433217ee422c7..00767cb155e77 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -2680,6 +2680,7 @@ declare namespace ts {
         UMD = 3,
         System = 4,
         ES2015 = 5,
+        ES2020 = 6,
         ESNext = 99
     }
     export enum JsxEmit {
diff --git a/tests/baselines/reference/importCallExpression1ESNext.js b/tests/baselines/reference/importCallExpression1ES2020.js
similarity index 93%
rename from tests/baselines/reference/importCallExpression1ESNext.js
rename to tests/baselines/reference/importCallExpression1ES2020.js
index 32d45aaf628d0..4431a65217724 100644
--- a/tests/baselines/reference/importCallExpression1ESNext.js
+++ b/tests/baselines/reference/importCallExpression1ES2020.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/dynamicImport/importCallExpression1ESNext.ts] ////
+//// [tests/cases/conformance/dynamicImport/importCallExpression1ES2020.ts] ////
 
 //// [0.ts]
 export function foo() { return "foo"; }
@@ -14,7 +14,8 @@ export var p2 = import("./0");
 
 function foo() {
     const p2 = import("./0");
-}
+}
+
 
 //// [0.js]
 export function foo() { return "foo"; }
diff --git a/tests/baselines/reference/importCallExpression1ESNext.symbols b/tests/baselines/reference/importCallExpression1ES2020.symbols
similarity index 96%
rename from tests/baselines/reference/importCallExpression1ESNext.symbols
rename to tests/baselines/reference/importCallExpression1ES2020.symbols
index 33cf3c234206e..1b96322c25df6 100644
--- a/tests/baselines/reference/importCallExpression1ESNext.symbols
+++ b/tests/baselines/reference/importCallExpression1ES2020.symbols
@@ -34,3 +34,4 @@ function foo() {
 >p2 : Symbol(p2, Decl(1.ts, 9, 9))
 >"./0" : Symbol("tests/cases/conformance/dynamicImport/0", Decl(0.ts, 0, 0))
 }
+
diff --git a/tests/baselines/reference/importCallExpression1ESNext.types b/tests/baselines/reference/importCallExpression1ES2020.types
similarity index 97%
rename from tests/baselines/reference/importCallExpression1ESNext.types
rename to tests/baselines/reference/importCallExpression1ES2020.types
index 30fe9acd605ea..fd3564b2c147c 100644
--- a/tests/baselines/reference/importCallExpression1ESNext.types
+++ b/tests/baselines/reference/importCallExpression1ES2020.types
@@ -42,3 +42,4 @@ function foo() {
 >import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
+
diff --git a/tests/baselines/reference/importCallExpression2ESNext.js b/tests/baselines/reference/importCallExpression2ES2020.js
similarity index 92%
rename from tests/baselines/reference/importCallExpression2ESNext.js
rename to tests/baselines/reference/importCallExpression2ES2020.js
index 662f57f07ff5f..12ca057cf4a8e 100644
--- a/tests/baselines/reference/importCallExpression2ESNext.js
+++ b/tests/baselines/reference/importCallExpression2ES2020.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/dynamicImport/importCallExpression2ESNext.ts] ////
+//// [tests/cases/conformance/dynamicImport/importCallExpression2ES2020.ts] ////
 
 //// [0.ts]
 export class B {
@@ -13,7 +13,8 @@ function foo(x: Promise<any>) {
     })
 }
 
-foo(import("./0"));
+foo(import("./0"));
+
 
 //// [0.js]
 export class B {
diff --git a/tests/baselines/reference/importCallExpression2ESNext.symbols b/tests/baselines/reference/importCallExpression2ES2020.symbols
similarity index 100%
rename from tests/baselines/reference/importCallExpression2ESNext.symbols
rename to tests/baselines/reference/importCallExpression2ES2020.symbols
diff --git a/tests/baselines/reference/importCallExpression2ESNext.types b/tests/baselines/reference/importCallExpression2ES2020.types
similarity index 100%
rename from tests/baselines/reference/importCallExpression2ESNext.types
rename to tests/baselines/reference/importCallExpression2ES2020.types
diff --git a/tests/baselines/reference/importCallExpression3ESNext.js b/tests/baselines/reference/importCallExpression3ES2020.js
similarity index 92%
rename from tests/baselines/reference/importCallExpression3ESNext.js
rename to tests/baselines/reference/importCallExpression3ES2020.js
index 0cd41388616b9..82aac400c74d6 100644
--- a/tests/baselines/reference/importCallExpression3ESNext.js
+++ b/tests/baselines/reference/importCallExpression3ES2020.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/dynamicImport/importCallExpression3ESNext.ts] ////
+//// [tests/cases/conformance/dynamicImport/importCallExpression3ES2020.ts] ////
 
 //// [0.ts]
 export class B {
@@ -11,7 +11,8 @@ async function foo() {
     var c = new C();
     c.print();
 }
-foo();
+foo();
+
 
 //// [0.js]
 export class B {
diff --git a/tests/baselines/reference/importCallExpression3ESNext.symbols b/tests/baselines/reference/importCallExpression3ES2020.symbols
similarity index 100%
rename from tests/baselines/reference/importCallExpression3ESNext.symbols
rename to tests/baselines/reference/importCallExpression3ES2020.symbols
diff --git a/tests/baselines/reference/importCallExpression3ESNext.types b/tests/baselines/reference/importCallExpression3ES2020.types
similarity index 100%
rename from tests/baselines/reference/importCallExpression3ESNext.types
rename to tests/baselines/reference/importCallExpression3ES2020.types
diff --git a/tests/baselines/reference/importCallExpression4ESNext.js b/tests/baselines/reference/importCallExpression4ES2020.js
similarity index 95%
rename from tests/baselines/reference/importCallExpression4ESNext.js
rename to tests/baselines/reference/importCallExpression4ES2020.js
index d5d4a51d69f0b..842593277598c 100644
--- a/tests/baselines/reference/importCallExpression4ESNext.js
+++ b/tests/baselines/reference/importCallExpression4ES2020.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/dynamicImport/importCallExpression4ESNext.ts] ////
+//// [tests/cases/conformance/dynamicImport/importCallExpression4ES2020.ts] ////
 
 //// [0.ts]
 export class B {
@@ -24,7 +24,8 @@ class C {
             console.log(one.backup());
         });
     }
-}
+}
+
 
 //// [0.js]
 export class B {
diff --git a/tests/baselines/reference/importCallExpression4ESNext.symbols b/tests/baselines/reference/importCallExpression4ES2020.symbols
similarity index 96%
rename from tests/baselines/reference/importCallExpression4ESNext.symbols
rename to tests/baselines/reference/importCallExpression4ES2020.symbols
index ef8d6e9c50905..5c5a5b682eaaa 100644
--- a/tests/baselines/reference/importCallExpression4ESNext.symbols
+++ b/tests/baselines/reference/importCallExpression4ES2020.symbols
@@ -65,3 +65,4 @@ class C {
         });
     }
 }
+
diff --git a/tests/baselines/reference/importCallExpression4ESNext.types b/tests/baselines/reference/importCallExpression4ES2020.types
similarity index 97%
rename from tests/baselines/reference/importCallExpression4ESNext.types
rename to tests/baselines/reference/importCallExpression4ES2020.types
index 82ddbf1db6571..e7f75126c1494 100644
--- a/tests/baselines/reference/importCallExpression4ESNext.types
+++ b/tests/baselines/reference/importCallExpression4ES2020.types
@@ -86,3 +86,4 @@ class C {
         });
     }
 }
+
diff --git a/tests/baselines/reference/importCallExpression5ESNext.errors.txt b/tests/baselines/reference/importCallExpression5ES2020.errors.txt
similarity index 96%
rename from tests/baselines/reference/importCallExpression5ESNext.errors.txt
rename to tests/baselines/reference/importCallExpression5ES2020.errors.txt
index ed5900c2a0395..fdd8ad313ecfe 100644
--- a/tests/baselines/reference/importCallExpression5ESNext.errors.txt
+++ b/tests/baselines/reference/importCallExpression5ES2020.errors.txt
@@ -28,4 +28,5 @@ tests/cases/conformance/dynamicImport/2.ts(6,24): error TS7036: Dynamic import's
 !!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type '"./1" | null'.
     let myModule3 = import(null);
                            ~~~~
-!!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'null'.
\ No newline at end of file
+!!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'null'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpression5ESNext.js b/tests/baselines/reference/importCallExpression5ES2020.js
similarity index 95%
rename from tests/baselines/reference/importCallExpression5ESNext.js
rename to tests/baselines/reference/importCallExpression5ES2020.js
index 1f4c789120b8a..40a4578d4d40e 100644
--- a/tests/baselines/reference/importCallExpression5ESNext.js
+++ b/tests/baselines/reference/importCallExpression5ES2020.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/dynamicImport/importCallExpression5ESNext.ts] ////
+//// [tests/cases/conformance/dynamicImport/importCallExpression5ES2020.ts] ////
 
 //// [0.ts]
 export class B {
@@ -16,7 +16,8 @@ const specify = bar() ? "./0" : undefined;
 let myModule = import(specify);
 let myModule1 = import(undefined);
 let myModule2 = import(bar() ? "./1" : null);
-let myModule3 = import(null);
+let myModule3 = import(null);
+
 
 //// [0.js]
 export class B {
diff --git a/tests/baselines/reference/importCallExpression5ESNext.symbols b/tests/baselines/reference/importCallExpression5ES2020.symbols
similarity index 100%
rename from tests/baselines/reference/importCallExpression5ESNext.symbols
rename to tests/baselines/reference/importCallExpression5ES2020.symbols
diff --git a/tests/baselines/reference/importCallExpression5ESNext.types b/tests/baselines/reference/importCallExpression5ES2020.types
similarity index 100%
rename from tests/baselines/reference/importCallExpression5ESNext.types
rename to tests/baselines/reference/importCallExpression5ES2020.types
diff --git a/tests/baselines/reference/importCallExpression6ESNext.errors.txt b/tests/baselines/reference/importCallExpression6ES2020.errors.txt
similarity index 94%
rename from tests/baselines/reference/importCallExpression6ESNext.errors.txt
rename to tests/baselines/reference/importCallExpression6ES2020.errors.txt
index 1703e0913d128..21683ddcd2b9f 100644
--- a/tests/baselines/reference/importCallExpression6ESNext.errors.txt
+++ b/tests/baselines/reference/importCallExpression6ES2020.errors.txt
@@ -22,4 +22,5 @@ tests/cases/conformance/dynamicImport/2.ts(6,24): error TS7036: Dynamic import's
     let myModule2 = import(bar() ? "./1" : null);
     let myModule3 = import(null);
                            ~~~~
-!!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'null'.
\ No newline at end of file
+!!! error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'null'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpression6ESNext.js b/tests/baselines/reference/importCallExpression6ES2020.js
similarity index 95%
rename from tests/baselines/reference/importCallExpression6ESNext.js
rename to tests/baselines/reference/importCallExpression6ES2020.js
index bdac7328f69ff..17169c1e722fb 100644
--- a/tests/baselines/reference/importCallExpression6ESNext.js
+++ b/tests/baselines/reference/importCallExpression6ES2020.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/dynamicImport/importCallExpression6ESNext.ts] ////
+//// [tests/cases/conformance/dynamicImport/importCallExpression6ES2020.ts] ////
 
 //// [0.ts]
 export class B {
@@ -16,7 +16,8 @@ const specify = bar() ? "./0" : undefined;
 let myModule = import(specify);
 let myModule1 = import(undefined);
 let myModule2 = import(bar() ? "./1" : null);
-let myModule3 = import(null);
+let myModule3 = import(null);
+
 
 //// [0.js]
 export class B {
diff --git a/tests/baselines/reference/importCallExpression6ESNext.symbols b/tests/baselines/reference/importCallExpression6ES2020.symbols
similarity index 100%
rename from tests/baselines/reference/importCallExpression6ESNext.symbols
rename to tests/baselines/reference/importCallExpression6ES2020.symbols
diff --git a/tests/baselines/reference/importCallExpression6ESNext.types b/tests/baselines/reference/importCallExpression6ES2020.types
similarity index 100%
rename from tests/baselines/reference/importCallExpression6ESNext.types
rename to tests/baselines/reference/importCallExpression6ES2020.types
diff --git a/tests/baselines/reference/importCallExpressionAsyncESNext.js b/tests/baselines/reference/importCallExpressionAsyncES2020.js
similarity index 100%
rename from tests/baselines/reference/importCallExpressionAsyncESNext.js
rename to tests/baselines/reference/importCallExpressionAsyncES2020.js
diff --git a/tests/baselines/reference/importCallExpressionAsyncESNext.symbols b/tests/baselines/reference/importCallExpressionAsyncES2020.symbols
similarity index 100%
rename from tests/baselines/reference/importCallExpressionAsyncESNext.symbols
rename to tests/baselines/reference/importCallExpressionAsyncES2020.symbols
diff --git a/tests/baselines/reference/importCallExpressionAsyncESNext.types b/tests/baselines/reference/importCallExpressionAsyncES2020.types
similarity index 100%
rename from tests/baselines/reference/importCallExpressionAsyncESNext.types
rename to tests/baselines/reference/importCallExpressionAsyncES2020.types
diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit2.js b/tests/baselines/reference/importCallExpressionDeclarationEmit2.js
index a83aa5b84c9dd..12eea213a751c 100644
--- a/tests/baselines/reference/importCallExpressionDeclarationEmit2.js
+++ b/tests/baselines/reference/importCallExpressionDeclarationEmit2.js
@@ -4,7 +4,8 @@
 export function foo() { return "foo"; }
 
 //// [1.ts]
-var p1 = import("./0");
+var p1 = import("./0");
+
 
 //// [0.js]
 export function foo() { return "foo"; }
diff --git a/tests/baselines/reference/importCallExpressionErrorInES2015.errors.txt b/tests/baselines/reference/importCallExpressionErrorInES2015.errors.txt
index b071d82ccb1d6..d55a470765854 100644
--- a/tests/baselines/reference/importCallExpressionErrorInES2015.errors.txt
+++ b/tests/baselines/reference/importCallExpressionErrorInES2015.errors.txt
@@ -1,6 +1,6 @@
-tests/cases/conformance/dynamicImport/1.ts(1,1): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
-tests/cases/conformance/dynamicImport/1.ts(2,10): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
-tests/cases/conformance/dynamicImport/1.ts(8,16): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+tests/cases/conformance/dynamicImport/1.ts(1,1): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
+tests/cases/conformance/dynamicImport/1.ts(2,10): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
+tests/cases/conformance/dynamicImport/1.ts(8,16): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
 
 
 ==== tests/cases/conformance/dynamicImport/0.ts (0 errors) ====
@@ -9,10 +9,10 @@ tests/cases/conformance/dynamicImport/1.ts(8,16): error TS1323: Dynamic imports
 ==== tests/cases/conformance/dynamicImport/1.ts (3 errors) ====
     import("./0");
     ~~~~~~~~~~~~~
-!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
     var p1 = import("./0");
              ~~~~~~~~~~~~~
-!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
     p1.then(zero => {
         return zero.foo();
     })
@@ -20,5 +20,5 @@ tests/cases/conformance/dynamicImport/1.ts(8,16): error TS1323: Dynamic imports
     function foo() {
         const p2 = import("./0");
                    ~~~~~~~~~~~~~
-!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionIncorrect1.errors.txt b/tests/baselines/reference/importCallExpressionIncorrect1.errors.txt
index 4b22567454e18..8159b6398acc4 100644
--- a/tests/baselines/reference/importCallExpressionIncorrect1.errors.txt
+++ b/tests/baselines/reference/importCallExpressionIncorrect1.errors.txt
@@ -8,4 +8,5 @@ tests/cases/conformance/dynamicImport/1.ts(2,1): error TS1109: Expression expect
     import
     import { foo } from './0';
     ~~~~~~
-!!! error TS1109: Expression expected.
\ No newline at end of file
+!!! error TS1109: Expression expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionIncorrect1.js b/tests/baselines/reference/importCallExpressionIncorrect1.js
index c007d1c8c6fe8..0742fd5524511 100644
--- a/tests/baselines/reference/importCallExpressionIncorrect1.js
+++ b/tests/baselines/reference/importCallExpressionIncorrect1.js
@@ -5,7 +5,8 @@ export function foo() { return "foo"; }
 
 //// [1.ts]
 import
-import { foo } from './0';
+import { foo } from './0';
+
 
 //// [0.js]
 export function foo() { return "foo"; }
diff --git a/tests/baselines/reference/importCallExpressionIncorrect2.errors.txt b/tests/baselines/reference/importCallExpressionIncorrect2.errors.txt
index a83f6f9a1f9c1..8c70d3d08f665 100644
--- a/tests/baselines/reference/importCallExpressionIncorrect2.errors.txt
+++ b/tests/baselines/reference/importCallExpressionIncorrect2.errors.txt
@@ -7,4 +7,5 @@ tests/cases/conformance/dynamicImport/1.ts(1,9): error TS1109: Expression expect
 ==== tests/cases/conformance/dynamicImport/1.ts (1 errors) ====
     var x = import { foo } from './0';
             ~~~~~~
-!!! error TS1109: Expression expected.
\ No newline at end of file
+!!! error TS1109: Expression expected.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionIncorrect2.js b/tests/baselines/reference/importCallExpressionIncorrect2.js
index 718bef9b9a8e3..4f0fa0314870b 100644
--- a/tests/baselines/reference/importCallExpressionIncorrect2.js
+++ b/tests/baselines/reference/importCallExpressionIncorrect2.js
@@ -4,7 +4,8 @@
 export function foo() { return "foo"; }
 
 //// [1.ts]
-var x = import { foo } from './0';
+var x = import { foo } from './0';
+
 
 //// [0.js]
 export function foo() { return "foo"; }
diff --git a/tests/baselines/reference/importCallExpressionNestedES2015.errors.txt b/tests/baselines/reference/importCallExpressionNestedES2015.errors.txt
index abb7002439344..6a0efe8747b20 100644
--- a/tests/baselines/reference/importCallExpressionNestedES2015.errors.txt
+++ b/tests/baselines/reference/importCallExpressionNestedES2015.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/dynamicImport/index.ts(2,18): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
-tests/cases/conformance/dynamicImport/index.ts(2,32): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+tests/cases/conformance/dynamicImport/index.ts(2,18): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
+tests/cases/conformance/dynamicImport/index.ts(2,32): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
 
 
 ==== tests/cases/conformance/dynamicImport/foo.ts (0 errors) ====
@@ -9,7 +9,7 @@ tests/cases/conformance/dynamicImport/index.ts(2,32): error TS1323: Dynamic impo
     async function foo() {
         return await import((await import("./foo")).default);
                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
                                    ~~~~~~~~~~~~~~~
-!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionNestedES20152.errors.txt b/tests/baselines/reference/importCallExpressionNestedES20152.errors.txt
index abb7002439344..6a0efe8747b20 100644
--- a/tests/baselines/reference/importCallExpressionNestedES20152.errors.txt
+++ b/tests/baselines/reference/importCallExpressionNestedES20152.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/dynamicImport/index.ts(2,18): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
-tests/cases/conformance/dynamicImport/index.ts(2,32): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+tests/cases/conformance/dynamicImport/index.ts(2,18): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
+tests/cases/conformance/dynamicImport/index.ts(2,32): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
 
 
 ==== tests/cases/conformance/dynamicImport/foo.ts (0 errors) ====
@@ -9,7 +9,7 @@ tests/cases/conformance/dynamicImport/index.ts(2,32): error TS1323: Dynamic impo
     async function foo() {
         return await import((await import("./foo")).default);
                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
                                    ~~~~~~~~~~~~~~~
-!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'esnext', 'commonjs',  'amd', 'system', or 'umd'.
+!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'esnext', 'commonjs', 'amd', 'system', or 'umd'.
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext.js b/tests/baselines/reference/importCallExpressionNestedES2020.js
similarity index 95%
rename from tests/baselines/reference/importCallExpressionNestedESNext.js
rename to tests/baselines/reference/importCallExpressionNestedES2020.js
index 77ade8e892884..8fdc57118d259 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext.js
+++ b/tests/baselines/reference/importCallExpressionNestedES2020.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/dynamicImport/importCallExpressionNestedESNext.ts] ////
+//// [tests/cases/conformance/dynamicImport/importCallExpressionNestedES2020.ts] ////
 
 //// [foo.ts]
 export default "./foo";
@@ -6,7 +6,8 @@ export default "./foo";
 //// [index.ts]
 async function foo() {
     return await import((await import("./foo")).default);
-}
+}
+
 
 //// [foo.js]
 export default "./foo";
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext.symbols b/tests/baselines/reference/importCallExpressionNestedES2020.symbols
similarity index 97%
rename from tests/baselines/reference/importCallExpressionNestedESNext.symbols
rename to tests/baselines/reference/importCallExpressionNestedES2020.symbols
index 67e2eabd6fd5e..ca63503edfecf 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext.symbols
+++ b/tests/baselines/reference/importCallExpressionNestedES2020.symbols
@@ -10,3 +10,4 @@ async function foo() {
 >"./foo" : Symbol("tests/cases/conformance/dynamicImport/foo", Decl(foo.ts, 0, 0))
 >default : Symbol(default, Decl(foo.ts, 0, 0))
 }
+
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext2.types b/tests/baselines/reference/importCallExpressionNestedES2020.types
similarity index 97%
rename from tests/baselines/reference/importCallExpressionNestedESNext2.types
rename to tests/baselines/reference/importCallExpressionNestedES2020.types
index 1e23832e30522..379522a845db9 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext2.types
+++ b/tests/baselines/reference/importCallExpressionNestedES2020.types
@@ -15,3 +15,4 @@ async function foo() {
 >"./foo" : "./foo"
 >default : "./foo"
 }
+
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext2.js b/tests/baselines/reference/importCallExpressionNestedES20202.js
similarity index 97%
rename from tests/baselines/reference/importCallExpressionNestedESNext2.js
rename to tests/baselines/reference/importCallExpressionNestedES20202.js
index cfe3fca6aeb90..3c47766522ae2 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext2.js
+++ b/tests/baselines/reference/importCallExpressionNestedES20202.js
@@ -1,4 +1,4 @@
-//// [tests/cases/conformance/dynamicImport/importCallExpressionNestedESNext2.ts] ////
+//// [tests/cases/conformance/dynamicImport/importCallExpressionNestedES20202.ts] ////
 
 //// [foo.ts]
 export default "./foo";
@@ -6,7 +6,8 @@ export default "./foo";
 //// [index.ts]
 async function foo() {
     return await import((await import("./foo")).default);
-}
+}
+
 
 //// [foo.js]
 export default "./foo";
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext2.symbols b/tests/baselines/reference/importCallExpressionNestedES20202.symbols
similarity index 97%
rename from tests/baselines/reference/importCallExpressionNestedESNext2.symbols
rename to tests/baselines/reference/importCallExpressionNestedES20202.symbols
index 67e2eabd6fd5e..ca63503edfecf 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext2.symbols
+++ b/tests/baselines/reference/importCallExpressionNestedES20202.symbols
@@ -10,3 +10,4 @@ async function foo() {
 >"./foo" : Symbol("tests/cases/conformance/dynamicImport/foo", Decl(foo.ts, 0, 0))
 >default : Symbol(default, Decl(foo.ts, 0, 0))
 }
+
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext.types b/tests/baselines/reference/importCallExpressionNestedES20202.types
similarity index 97%
rename from tests/baselines/reference/importCallExpressionNestedESNext.types
rename to tests/baselines/reference/importCallExpressionNestedES20202.types
index 1e23832e30522..379522a845db9 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext.types
+++ b/tests/baselines/reference/importCallExpressionNestedES20202.types
@@ -15,3 +15,4 @@ async function foo() {
 >"./foo" : "./foo"
 >default : "./foo"
 }
+
diff --git a/tests/baselines/reference/importCallExpressionShouldNotGetParen.js b/tests/baselines/reference/importCallExpressionShouldNotGetParen.js
index 07539664aa3b7..4e6ea064b351d 100644
--- a/tests/baselines/reference/importCallExpressionShouldNotGetParen.js
+++ b/tests/baselines/reference/importCallExpressionShouldNotGetParen.js
@@ -6,7 +6,8 @@ import(`./locales/${localeName}.js`).then(bar => {
 
 import("./locales/" + localeName + ".js").then(bar => {
     let x = bar;
-});
+});
+
 
 //// [importCallExpressionShouldNotGetParen.js]
 const localeName = "zh-CN";
diff --git a/tests/baselines/reference/importCallExpressionShouldNotGetParen.symbols b/tests/baselines/reference/importCallExpressionShouldNotGetParen.symbols
index ace34efcf0d80..8eb6ef9d670c0 100644
--- a/tests/baselines/reference/importCallExpressionShouldNotGetParen.symbols
+++ b/tests/baselines/reference/importCallExpressionShouldNotGetParen.symbols
@@ -25,3 +25,4 @@ import("./locales/" + localeName + ".js").then(bar => {
 >bar : Symbol(bar, Decl(importCallExpressionShouldNotGetParen.ts, 5, 47))
 
 });
+
diff --git a/tests/baselines/reference/importCallExpressionShouldNotGetParen.types b/tests/baselines/reference/importCallExpressionShouldNotGetParen.types
index 3e4001dc5b710..6c45228344687 100644
--- a/tests/baselines/reference/importCallExpressionShouldNotGetParen.types
+++ b/tests/baselines/reference/importCallExpressionShouldNotGetParen.types
@@ -37,3 +37,4 @@ import("./locales/" + localeName + ".js").then(bar => {
 >bar : any
 
 });
+
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt
index f746915da7d5a..812f55c9be313 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt	
@@ -1,6 +1,6 @@
-error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.
 
 
-!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.
+!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.
 ==== file.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.oldTranspile.errors.txt
index f746915da7d5a..812f55c9be313 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.oldTranspile.errors.txt	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.oldTranspile.errors.txt	
@@ -1,6 +1,6 @@
-error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.
 
 
-!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.
+!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.
 ==== file.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt
index f746915da7d5a..812f55c9be313 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt	
@@ -1,6 +1,6 @@
-error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.
 
 
-!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.
+!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.
 ==== file.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.oldTranspile.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.oldTranspile.errors.txt
index f746915da7d5a..812f55c9be313 100644
--- a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.oldTranspile.errors.txt	
+++ b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.oldTranspile.errors.txt	
@@ -1,6 +1,6 @@
-error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.
+error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.
 
 
-!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.
+!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2020', 'esnext'.
 ==== file.ts (0 errors) ====
     
\ No newline at end of file
diff --git a/tests/cases/conformance/dynamicImport/importCallExpression1ESNext.ts b/tests/cases/conformance/dynamicImport/importCallExpression1ES2020.ts
similarity index 80%
rename from tests/cases/conformance/dynamicImport/importCallExpression1ESNext.ts
rename to tests/cases/conformance/dynamicImport/importCallExpression1ES2020.ts
index a499360f5dd51..f703a7bb7dc96 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpression1ESNext.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpression1ES2020.ts
@@ -1,5 +1,5 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @filename: 0.ts
 export function foo() { return "foo"; }
 
@@ -14,4 +14,4 @@ export var p2 = import("./0");
 
 function foo() {
     const p2 = import("./0");
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/dynamicImport/importCallExpression2ESNext.ts b/tests/cases/conformance/dynamicImport/importCallExpression2ES2020.ts
similarity index 72%
rename from tests/cases/conformance/dynamicImport/importCallExpression2ESNext.ts
rename to tests/cases/conformance/dynamicImport/importCallExpression2ES2020.ts
index f0e9b358854cb..ca3a10f537f3a 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpression2ESNext.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpression2ES2020.ts
@@ -1,5 +1,5 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @filename: 0.ts
 export class B {
     print() { return "I am B"}
@@ -13,4 +13,4 @@ function foo(x: Promise<any>) {
     })
 }
 
-foo(import("./0"));
\ No newline at end of file
+foo(import("./0"));
diff --git a/tests/cases/conformance/dynamicImport/importCallExpression3ESNext.ts b/tests/cases/conformance/dynamicImport/importCallExpression3ES2020.ts
similarity index 76%
rename from tests/cases/conformance/dynamicImport/importCallExpression3ESNext.ts
rename to tests/cases/conformance/dynamicImport/importCallExpression3ES2020.ts
index ee7264b8c7ebf..2c183d472f322 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpression3ESNext.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpression3ES2020.ts
@@ -1,5 +1,5 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @filename: 0.ts
 export class B {
     print() { return "I am B"}
@@ -11,4 +11,4 @@ async function foo() {
     var c = new C();
     c.print();
 }
-foo();
\ No newline at end of file
+foo();
diff --git a/tests/cases/conformance/dynamicImport/importCallExpression4ESNext.ts b/tests/cases/conformance/dynamicImport/importCallExpression4ES2020.ts
similarity index 86%
rename from tests/cases/conformance/dynamicImport/importCallExpression4ESNext.ts
rename to tests/cases/conformance/dynamicImport/importCallExpression4ES2020.ts
index 3fa222e10890f..d518f2934c9cb 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpression4ESNext.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpression4ES2020.ts
@@ -1,6 +1,6 @@
-// @lib: esnext
-// @module: esnext
-// @target: esnext
+// @lib: es2020
+// @module: es2020
+// @target: es2020
 // @filename: 0.ts
 export class B {
     print() { return "I am B"}
@@ -25,4 +25,4 @@ class C {
             console.log(one.backup());
         });
     }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/dynamicImport/importCallExpression5ESNext.ts b/tests/cases/conformance/dynamicImport/importCallExpression5ES2020.ts
similarity index 81%
rename from tests/cases/conformance/dynamicImport/importCallExpression5ESNext.ts
rename to tests/cases/conformance/dynamicImport/importCallExpression5ES2020.ts
index 173b606a50c39..913b302818f1a 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpression5ESNext.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpression5ES2020.ts
@@ -1,5 +1,5 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @strictNullChecks: true
 // @filename: 0.ts
 export class B {
@@ -17,4 +17,4 @@ const specify = bar() ? "./0" : undefined;
 let myModule = import(specify);
 let myModule1 = import(undefined);
 let myModule2 = import(bar() ? "./1" : null);
-let myModule3 = import(null);
\ No newline at end of file
+let myModule3 = import(null);
diff --git a/tests/cases/conformance/dynamicImport/importCallExpression6ESNext.ts b/tests/cases/conformance/dynamicImport/importCallExpression6ES2020.ts
similarity index 81%
rename from tests/cases/conformance/dynamicImport/importCallExpression6ESNext.ts
rename to tests/cases/conformance/dynamicImport/importCallExpression6ES2020.ts
index f09521186e816..7a693f8be8ae0 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpression6ESNext.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpression6ES2020.ts
@@ -1,5 +1,5 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @filename: 0.ts
 export class B {
     print() { return "I am B"}
@@ -16,4 +16,4 @@ const specify = bar() ? "./0" : undefined;
 let myModule = import(specify);
 let myModule1 = import(undefined);
 let myModule2 = import(bar() ? "./1" : null);
-let myModule3 = import(null);
\ No newline at end of file
+let myModule3 = import(null);
diff --git a/tests/cases/conformance/dynamicImport/importCallExpressionAsyncESNext.ts b/tests/cases/conformance/dynamicImport/importCallExpressionAsyncES2020.ts
similarity index 88%
rename from tests/cases/conformance/dynamicImport/importCallExpressionAsyncESNext.ts
rename to tests/cases/conformance/dynamicImport/importCallExpressionAsyncES2020.ts
index 8e56b2aa640b0..1ff60b517d240 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpressionAsyncESNext.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpressionAsyncES2020.ts
@@ -1,5 +1,5 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @filename: test.ts
 export async function fn() {
     const req = await import('./test') // ONE
diff --git a/tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit2.ts b/tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit2.ts
index 4b9196dea2019..125666b2bd132 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit2.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit2.ts
@@ -1,9 +1,9 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @declaration: true
 
 // @filename: 0.ts
 export function foo() { return "foo"; }
 
 // @filename: 1.ts
-var p1 = import("./0");
\ No newline at end of file
+var p1 = import("./0");
diff --git a/tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit3.ts b/tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit3.ts
index 6d17d624190fd..7ee194e81a47f 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit3.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit3.ts
@@ -1,5 +1,5 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @declaration: true
 
 // @filename: 0.ts
diff --git a/tests/cases/conformance/dynamicImport/importCallExpressionIncorrect1.ts b/tests/cases/conformance/dynamicImport/importCallExpressionIncorrect1.ts
index 25a96ef30c6d7..d07e7ecce1ddd 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpressionIncorrect1.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpressionIncorrect1.ts
@@ -1,8 +1,8 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @filename: 0.ts
 export function foo() { return "foo"; }
 
 // @filename: 1.ts
 import
-import { foo } from './0';
\ No newline at end of file
+import { foo } from './0';
diff --git a/tests/cases/conformance/dynamicImport/importCallExpressionIncorrect2.ts b/tests/cases/conformance/dynamicImport/importCallExpressionIncorrect2.ts
index 01309b71ba2e5..e9bd8f7ae87d8 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpressionIncorrect2.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpressionIncorrect2.ts
@@ -1,7 +1,7 @@
-// @module: esnext
-// @target: esnext
+// @module: es2020
+// @target: es2020
 // @filename: 0.ts
 export function foo() { return "foo"; }
 
 // @filename: 1.ts
-var x = import { foo } from './0';
\ No newline at end of file
+var x = import { foo } from './0';
diff --git a/tests/cases/conformance/dynamicImport/importCallExpressionNestedESNext.ts b/tests/cases/conformance/dynamicImport/importCallExpressionNestedES2020.ts
similarity index 86%
rename from tests/cases/conformance/dynamicImport/importCallExpressionNestedESNext.ts
rename to tests/cases/conformance/dynamicImport/importCallExpressionNestedES2020.ts
index fffc12a77260a..9fb48e7ebead6 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpressionNestedESNext.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpressionNestedES2020.ts
@@ -1,4 +1,4 @@
-// @module: esnext
+// @module: es2020
 // @target: es6
 // @skipLibCheck: true
 // @lib: es6
@@ -8,4 +8,4 @@ export default "./foo";
 // @filename: index.ts
 async function foo() {
     return await import((await import("./foo")).default);
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/dynamicImport/importCallExpressionNestedESNext2.ts b/tests/cases/conformance/dynamicImport/importCallExpressionNestedES20202.ts
similarity index 86%
rename from tests/cases/conformance/dynamicImport/importCallExpressionNestedESNext2.ts
rename to tests/cases/conformance/dynamicImport/importCallExpressionNestedES20202.ts
index 246e9d931f024..13cd890b544e2 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpressionNestedESNext2.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpressionNestedES20202.ts
@@ -1,4 +1,4 @@
-// @module: esnext
+// @module: es2020
 // @target: es5
 // @skipLibCheck: true
 // @lib: es6
@@ -8,4 +8,4 @@ export default "./foo";
 // @filename: index.ts
 async function foo() {
     return await import((await import("./foo")).default);
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/dynamicImport/importCallExpressionShouldNotGetParen.ts b/tests/cases/conformance/dynamicImport/importCallExpressionShouldNotGetParen.ts
index 6734e888a5e2a..2306f1dd0fc93 100644
--- a/tests/cases/conformance/dynamicImport/importCallExpressionShouldNotGetParen.ts
+++ b/tests/cases/conformance/dynamicImport/importCallExpressionShouldNotGetParen.ts
@@ -1,4 +1,4 @@
-// @module: esnext
+// @module: es2020
 // @target: es6
 // @noImplicitAny: true
 const localeName = "zh-CN";
@@ -8,4 +8,4 @@ import(`./locales/${localeName}.js`).then(bar => {
 
 import("./locales/" + localeName + ".js").then(bar => {
     let x = bar;
-});
\ No newline at end of file
+});