diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
index 98a8b7ca81b..646a1d8ba38 100644
--- a/src/compiler/builder.ts
+++ b/src/compiler/builder.ts
@@ -62,7 +62,6 @@ import {
     maybeBind,
     noop,
     notImplemented,
-    outFile,
     Path,
     Program,
     ProjectReference,
@@ -310,12 +309,12 @@ function createBuilderProgramState(newProgram: Program, oldState: Readonly<Reusa
     state.program = newProgram;
     const compilerOptions = newProgram.getCompilerOptions();
     state.compilerOptions = compilerOptions;
-    const outFilePath = outFile(compilerOptions);
+    const outFilePath = compilerOptions.outFile;
     // With --out or --outFile, any change affects all semantic diagnostics so no need to cache them
     if (!outFilePath) {
         state.semanticDiagnosticsPerFile = new Map();
     }
-    else if (compilerOptions.composite && oldState?.outSignature && outFilePath === outFile(oldState?.compilerOptions)) {
+    else if (compilerOptions.composite && oldState?.outSignature && outFilePath === oldState.compilerOptions.outFile) {
         state.outSignature = oldState.outSignature && getEmitSignatureFromOldSignature(compilerOptions, oldState.compilerOptions, oldState.outSignature);
     }
     state.changedFilesSet = new Set();
@@ -559,7 +558,7 @@ function releaseCache(state: BuilderProgramState) {
 }
 
 function backupBuilderProgramEmitState(state: Readonly<BuilderProgramState>): SavedBuildProgramEmitState {
-    const outFilePath = outFile(state.compilerOptions);
+    const outFilePath = state.compilerOptions.outFile;
     // Only in --out changeFileSet is kept around till emit
     Debug.assert(!state.changedFilesSet.size || outFilePath);
     return {
@@ -649,7 +648,7 @@ function getNextAffectedFile(
         // so operations are performed directly on program, return program
         const program = Debug.checkDefined(state.program);
         const compilerOptions = program.getCompilerOptions();
-        if (outFile(compilerOptions)) {
+        if (compilerOptions.outFile) {
             Debug.assert(!state.semanticDiagnosticsPerFile);
             return program;
         }
@@ -1051,7 +1050,7 @@ export type ProgramBuildInfo = ProgramMultiFileEmitBuildInfo | ProgramBundleEmit
 
 /** @internal */
 export function isProgramBundleEmitBuildInfo(info: ProgramBuildInfo): info is ProgramBundleEmitBuildInfo {
-    return !!outFile(info.options || {});
+    return !!info.options?.outFile;
 }
 
 /**
@@ -1065,7 +1064,7 @@ function getBuildInfo(state: BuilderProgramState): BuildInfo {
     const fileNames: string[] = [];
     const fileNameToFileId = new Map<string, ProgramBuildInfoFileId>();
     const root: ProgramBuildInfoRoot[] = [];
-    if (outFile(state.compilerOptions)) {
+    if (state.compilerOptions.outFile) {
         // Copy all fileInfo, version and impliedFormat
         // Affects global scope and signature doesnt matter because with --out they arent calculated or needed to determine upto date ness
         const fileInfos = arrayFrom(state.fileInfos.entries(), ([key, value]): ProgramBundleEmitBuildInfoFileInfo => {
@@ -1509,7 +1508,7 @@ export function createBuilderProgram(kind: BuilderProgramKind, { newProgram, hos
         let emitKind: BuilderFileEmit = emitOnlyDtsFiles ?
             programEmitKind & BuilderFileEmit.AllDts : programEmitKind;
         if (!affected) {
-            if (!outFile(state.compilerOptions)) {
+            if (!state.compilerOptions.outFile) {
                 const pendingAffectedFile = getNextAffectedFilePendingEmit(state, emitOnlyDtsFiles);
                 if (!pendingAffectedFile) {
                     const pendingForDiagnostics = getNextPendingEmitDiagnosticsFile(state);
@@ -1586,7 +1585,7 @@ export function createBuilderProgram(kind: BuilderProgramKind, { newProgram, hos
         if (!getEmitDeclarations(state.compilerOptions)) return writeFile || maybeBind(host, host.writeFile);
         return (fileName, text, writeByteOrderMark, onError, sourceFiles, data) => {
             if (isDeclarationFileName(fileName)) {
-                if (!outFile(state.compilerOptions)) {
+                if (!state.compilerOptions.outFile) {
                     Debug.assert(sourceFiles?.length === 1);
                     let emitSignature;
                     if (!customTransformers) {
@@ -1762,7 +1761,7 @@ export function createBuilderProgram(kind: BuilderProgramKind, { newProgram, hos
     function getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): readonly Diagnostic[] {
         assertSourceFileOkWithoutNextAffectedCall(state, sourceFile);
         const compilerOptions = Debug.checkDefined(state.program).getCompilerOptions();
-        if (outFile(compilerOptions)) {
+        if (compilerOptions.outFile) {
             Debug.assert(!state.semanticDiagnosticsPerFile);
             // We dont need to cache the diagnostics just return them from program
             return Debug.checkDefined(state.program).getSemanticDiagnostics(sourceFile, cancellationToken);
@@ -1838,7 +1837,7 @@ export function createBuilderProgramUsingProgramBuildInfo(buildInfo: BuildInfo,
     else {
         filePathsSetList = program.fileIdsList?.map(fileIds => new Set(fileIds.map(toFilePath)));
         const fileInfos = new Map<Path, BuilderState.FileInfo>();
-        const emitSignatures = program.options?.composite && !outFile(program.options) ? new Map<Path, EmitSignature>() : undefined;
+        const emitSignatures = program.options?.composite && !program.options.outFile ? new Map<Path, EmitSignature>() : undefined;
         program.fileInfos.forEach((fileInfo, index) => {
             const path = toFilePath(index + 1 as ProgramBuildInfoFileId);
             const stateFileInfo = toBuilderStateFileInfoForMultiEmit(fileInfo);
diff --git a/src/compiler/builderState.ts b/src/compiler/builderState.ts
index d15d8aca513..aab367dcad7 100644
--- a/src/compiler/builderState.ts
+++ b/src/compiler/builderState.ts
@@ -22,7 +22,6 @@ import {
     mapDefinedIterator,
     ModuleDeclaration,
     ModuleKind,
-    outFile,
     OutputFile,
     Path,
     Program,
@@ -304,7 +303,7 @@ export namespace BuilderState {
     export function create(newProgram: Program, oldState: Readonly<BuilderState> | undefined, disableUseFileVersionAsSignature: boolean): BuilderState {
         const fileInfos = new Map<Path, FileInfo>();
         const options = newProgram.getCompilerOptions();
-        const isOutFile = outFile(options);
+        const isOutFile = options.outFile;
         const referencedMap = options.module !== ModuleKind.None && !isOutFile ?
             createManyToManyPathMap() : undefined;
         const exportedModulesMap = referencedMap ? createManyToManyPathMap() : undefined;
@@ -514,7 +513,7 @@ export namespace BuilderState {
     export function getAllDependencies(state: BuilderState, programOfThisState: Program, sourceFile: SourceFile): readonly string[] {
         const compilerOptions = programOfThisState.getCompilerOptions();
         // With --out or --outFile all outputs go into single file, all files depend on each other
-        if (outFile(compilerOptions)) {
+        if (compilerOptions.outFile) {
             return getAllFileNames(state, programOfThisState);
         }
 
@@ -625,7 +624,7 @@ export namespace BuilderState {
         const compilerOptions = programOfThisState.getCompilerOptions();
         // If `--out` or `--outFile` is specified, any new emit will result in re-emitting the entire project,
         // so returning the file itself is good enough.
-        if (compilerOptions && outFile(compilerOptions)) {
+        if (compilerOptions && compilerOptions.outFile) {
             return [sourceFileWithUpdatedShape];
         }
         return getAllFilesExcludingDefaultLibraryFile(state, programOfThisState, sourceFileWithUpdatedShape);
@@ -646,7 +645,7 @@ export namespace BuilderState {
         }
 
         const compilerOptions = programOfThisState.getCompilerOptions();
-        if (compilerOptions && (getIsolatedModules(compilerOptions) || outFile(compilerOptions))) {
+        if (compilerOptions && (getIsolatedModules(compilerOptions) || compilerOptions.outFile)) {
             return [sourceFileWithUpdatedShape];
         }
 
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 80477543f44..8d144266b8b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -214,7 +214,6 @@ import {
     forEachChildRecursively,
     forEachEnclosingBlockScopeContainer,
     forEachEntry,
-    forEachImportClauseDeclaration,
     forEachKey,
     forEachReturnStatement,
     forEachYieldExpression,
@@ -414,7 +413,6 @@ import {
     ImportDeclaration,
     ImportEqualsDeclaration,
     ImportOrExportSpecifier,
-    ImportsNotUsedAsValues,
     ImportSpecifier,
     ImportTypeNode,
     IndexedAccessType,
@@ -889,7 +887,6 @@ import {
     or,
     orderedRemoveItemAt,
     OuterExpressionKinds,
-    outFile,
     ParameterDeclaration,
     parameterIsThisKeyword,
     ParameterPropertyDeclaration,
@@ -1467,9 +1464,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     var noImplicitAny = getStrictOptionValue(compilerOptions, "noImplicitAny");
     var noImplicitThis = getStrictOptionValue(compilerOptions, "noImplicitThis");
     var useUnknownInCatchVariables = getStrictOptionValue(compilerOptions, "useUnknownInCatchVariables");
-    var keyofStringsOnly = !!compilerOptions.keyofStringsOnly;
-    var defaultIndexFlags = keyofStringsOnly ? IndexFlags.StringsOnly : IndexFlags.None;
-    var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : ObjectFlags.FreshLiteral;
     var exactOptionalPropertyTypes = compilerOptions.exactOptionalPropertyTypes;
 
     var checkBinaryExpression = createCheckBinaryExpression();
@@ -1488,9 +1482,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     var argumentsSymbol = createSymbol(SymbolFlags.Property, "arguments" as __String);
     var requireSymbol = createSymbol(SymbolFlags.Property, "require" as __String);
     var isolatedModulesLikeFlagName = compilerOptions.verbatimModuleSyntax ? "verbatimModuleSyntax" : "isolatedModules";
-    // It is an error to use `importsNotUsedAsValues` alongside `verbatimModuleSyntax`, but we still need to not crash.
-    // Given that, in such a scenario, `verbatimModuleSyntax` is basically disabled, as least as far as alias visibility tracking goes.
-    var canCollectSymbolAliasAccessabilityData = !compilerOptions.verbatimModuleSyntax || !!compilerOptions.importsNotUsedAsValues;
+    var canCollectSymbolAliasAccessabilityData = !compilerOptions.verbatimModuleSyntax;
 
     /** This will be set during calls to `getResolvedSignature` where services determines an apparent number of arguments greater than what is actually provided. */
     var apparentArgumentCount: number | undefined;
@@ -2007,7 +1999,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     var nonPrimitiveType = createIntrinsicType(TypeFlags.NonPrimitive, "object");
     var stringOrNumberType = getUnionType([stringType, numberType]);
     var stringNumberSymbolType = getUnionType([stringType, numberType, esSymbolType]);
-    var keyofConstraintType = keyofStringsOnly ? stringType : stringNumberSymbolType;
     var numberOrBigIntType = getUnionType([numberType, bigintType]);
     var templateConstraintType = getUnionType([stringType, numberType, booleanType, bigintType, nullType, undefinedType]) as UnionType;
     var numericStringType = getTemplateLiteralType(["", ""], [numberType]); // The `${number}` type
@@ -2808,7 +2799,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         if (declarationFile !== useFile) {
             if (
                 (moduleKind && (declarationFile.externalModuleIndicator || useFile.externalModuleIndicator)) ||
-                (!outFile(compilerOptions)) ||
+                (!compilerOptions.outFile) ||
                 isInTypeQuery(usage) ||
                 declaration.flags & NodeFlags.Ambient
             ) {
@@ -8040,7 +8031,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             const links = getSymbolLinks(symbol);
             let specifier = links.specifierCache && links.specifierCache.get(cacheKey);
             if (!specifier) {
-                const isBundle = !!outFile(compilerOptions);
+                const isBundle = !!compilerOptions.outFile;
                 // For declaration bundles, we need to generate absolute paths relative to the common source dir for imports,
                 // just like how the declaration emitter does for the ambient module declarations - we can easily accomplish this
                 // using the `baseUrl` compiler option (which we would otherwise never use in declaration emit) and a non-relative
@@ -13889,10 +13880,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         const templateType = getTemplateTypeFromMappedType(mappedType);
         const modifiersType = getApparentType(getModifiersTypeFromMappedType(type)); // The 'T' in 'keyof T'
         const templateModifiers = getMappedTypeModifiers(type);
-        const include = keyofStringsOnly ? TypeFlags.StringLiteral : TypeFlags.StringOrNumberLiteralOrUnique;
+        const include = TypeFlags.StringOrNumberLiteralOrUnique;
         if (isMappedTypeWithKeyofConstraintDeclaration(type)) {
             // We have a { [P in keyof T]: X }
-            forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(modifiersType, include, keyofStringsOnly, addMemberForKeyType);
+            forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(modifiersType, include, /*stringsOnly*/ false, addMemberForKeyType);
         }
         else {
             forEachType(getLowerBoundOfKeyType(constraintType), addMemberForKeyType);
@@ -14355,7 +14346,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             const constraint = getResolvedBaseConstraint(type as InstantiableType | UnionOrIntersectionType);
             return constraint !== noConstraintType && constraint !== circularConstraintType ? constraint : undefined;
         }
-        return type.flags & TypeFlags.Index ? keyofConstraintType : undefined;
+        return type.flags & TypeFlags.Index ? stringNumberSymbolType : undefined;
     }
 
     /**
@@ -14453,7 +14444,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     undefined;
             }
             if (t.flags & TypeFlags.Index) {
-                return keyofConstraintType;
+                return stringNumberSymbolType;
             }
             if (t.flags & TypeFlags.TemplateLiteral) {
                 const types = (t as TemplateLiteralType).types;
@@ -14589,7 +14580,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             t.flags & TypeFlags.BooleanLike ? globalBooleanType :
             t.flags & TypeFlags.ESSymbolLike ? getGlobalESSymbolType() :
             t.flags & TypeFlags.NonPrimitive ? emptyObjectType :
-            t.flags & TypeFlags.Index ? keyofConstraintType :
+            t.flags & TypeFlags.Index ? stringNumberSymbolType :
             t.flags & TypeFlags.Unknown && !strictNullChecks ? emptyObjectType :
             t;
     }
@@ -15776,7 +15767,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     // When an 'infer T' declaration is in the constraint position of a mapped type, we infer a 'keyof any'
                     // constraint.
                     else if (grandParent.kind === SyntaxKind.TypeParameter && grandParent.parent.kind === SyntaxKind.MappedType) {
-                        inferences = append(inferences, keyofConstraintType);
+                        inferences = append(inferences, stringNumberSymbolType);
                     }
                     // When an 'infer T' declaration is the template of a mapped type, and that mapped type is the extends
                     // clause of a conditional whose check type is also a mapped type, give it a constraint equal to the template
@@ -15789,7 +15780,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     ) {
                         const checkMappedType = (grandParent.parent as ConditionalTypeNode).checkType as MappedTypeNode;
                         const nodeType = getTypeFromTypeNode(checkMappedType.type!);
-                        inferences = append(inferences, instantiateType(nodeType, makeUnaryTypeMapper(getDeclaredTypeOfTypeParameter(getSymbolOfDeclaration(checkMappedType.typeParameter)), checkMappedType.typeParameter.constraint ? getTypeFromTypeNode(checkMappedType.typeParameter.constraint) : keyofConstraintType)));
+                        inferences = append(inferences, instantiateType(nodeType, makeUnaryTypeMapper(getDeclaredTypeOfTypeParameter(getSymbolOfDeclaration(checkMappedType.typeParameter)), checkMappedType.typeParameter.constraint ? getTypeFromTypeNode(checkMappedType.typeParameter.constraint) : stringNumberSymbolType)));
                     }
                 }
             }
@@ -15812,9 +15803,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 else {
                     let type = getTypeFromTypeNode(constraintDeclaration);
                     if (type.flags & TypeFlags.Any && !isErrorType(type)) { // Allow errorType to propegate to keep downstream errors suppressed
-                        // use keyofConstraintType as the base constraint for mapped type key constraints (unknown isn;t assignable to that, but `any` was),
+                        // use stringNumberSymbolType as the base constraint for mapped type key constraints (unknown isn;t assignable to that, but `any` was),
                         // use unknown otherwise
-                        type = constraintDeclaration.parent.parent.kind === SyntaxKind.MappedType ? keyofConstraintType : unknownType;
+                        type = constraintDeclaration.parent.parent.kind === SyntaxKind.MappedType ? stringNumberSymbolType : unknownType;
                     }
                     typeParameter.constraint = type;
                 }
@@ -17897,7 +17888,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             type.flags & TypeFlags.Intersection && maybeTypeOfKind(type, TypeFlags.Instantiable) && some((type as IntersectionType).types, isEmptyAnonymousObjectType));
     }
 
-    function getIndexType(type: Type, indexFlags = defaultIndexFlags): Type {
+    function getIndexType(type: Type, indexFlags = IndexFlags.None): Type {
         type = getReducedType(type);
         return isNoInferType(type) ? getNoInferType(getIndexType((type as SubstitutionType).baseType, indexFlags)) :
             shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type as InstantiableType | UnionOrIntersectionType, indexFlags) :
@@ -17906,14 +17897,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             getObjectFlags(type) & ObjectFlags.Mapped ? getIndexTypeForMappedType(type as MappedType, indexFlags) :
             type === wildcardType ? wildcardType :
             type.flags & TypeFlags.Unknown ? neverType :
-            type.flags & (TypeFlags.Any | TypeFlags.Never) ? keyofConstraintType :
-            getLiteralTypeFromProperties(type, (indexFlags & IndexFlags.NoIndexSignatures ? TypeFlags.StringLiteral : TypeFlags.StringLike) | (indexFlags & IndexFlags.StringsOnly ? 0 : TypeFlags.NumberLike | TypeFlags.ESSymbolLike), indexFlags === defaultIndexFlags);
+            type.flags & (TypeFlags.Any | TypeFlags.Never) ? stringNumberSymbolType :
+            getLiteralTypeFromProperties(type, (indexFlags & IndexFlags.NoIndexSignatures ? TypeFlags.StringLiteral : TypeFlags.StringLike) | (indexFlags & IndexFlags.StringsOnly ? 0 : TypeFlags.NumberLike | TypeFlags.ESSymbolLike), indexFlags === IndexFlags.None);
     }
 
     function getExtractStringType(type: Type) {
-        if (keyofStringsOnly) {
-            return type;
-        }
         const extractTypeAlias = getGlobalExtractSymbol();
         return extractTypeAlias ? getTypeAliasInstantiation(extractTypeAlias, [type, stringType]) : stringType;
     }
@@ -18262,7 +18250,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 if (objectType.symbol === globalThisSymbol && propName !== undefined && globalThisSymbol.exports!.has(propName) && (globalThisSymbol.exports!.get(propName)!.flags & SymbolFlags.BlockScoped)) {
                     error(accessExpression, Diagnostics.Property_0_does_not_exist_on_type_1, unescapeLeadingUnderscores(propName), typeToString(objectType));
                 }
-                else if (noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !(accessFlags & AccessFlags.SuppressNoImplicitAnyError)) {
+                else if (noImplicitAny && !(accessFlags & AccessFlags.SuppressNoImplicitAnyError)) {
                     if (propName !== undefined && typeHasStaticProperty(propName, objectType)) {
                         const typeName = typeToString(objectType);
                         error(accessExpression, Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_to_access_the_static_member_2_instead, propName as string, typeName, typeName + "[" + getTextOfNode(accessExpression.argumentExpression) + "]");
@@ -22698,7 +22686,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             }
             else if (sourceFlags & TypeFlags.Index) {
                 const isDeferredMappedIndex = shouldDeferIndexType((source as IndexType).type, (source as IndexType).indexFlags) && getObjectFlags((source as IndexType).type) & ObjectFlags.Mapped;
-                if (result = isRelatedTo(keyofConstraintType, target, RecursionFlags.Source, reportErrors && !isDeferredMappedIndex)) {
+                if (result = isRelatedTo(stringNumberSymbolType, target, RecursionFlags.Source, reportErrors && !isDeferredMappedIndex)) {
                     return result;
                 }
                 if (isDeferredMappedIndex) {
@@ -23446,7 +23434,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 // in the context of the target signature before checking the relationship. Ideally we'd do
                 // this regardless of the number of signatures, but the potential costs are prohibitive due
                 // to the quadratic nature of the logic below.
-                const eraseGenerics = relation === comparableRelation || !!compilerOptions.noStrictGenericChecks;
+                const eraseGenerics = relation === comparableRelation;
                 const sourceSignature = first(sourceSignatures);
                 const targetSignature = first(targetSignatures);
                 result = signatureRelatedTo(sourceSignature, targetSignature, eraseGenerics, reportErrors, intersectionState, incompatibleReporter(sourceSignature, targetSignature));
@@ -31560,7 +31548,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         const isInJavascript = isInJSFile(node) && !isInJsonFile(node);
         const enumTag = isInJavascript ? getJSDocEnumTag(node) : undefined;
         const isJSObjectLiteral = !contextualType && isInJavascript && !enumTag;
-        let objectFlags: ObjectFlags = freshObjectLiteralFlag;
+        let objectFlags: ObjectFlags = ObjectFlags.FreshLiteral;
         let patternWithComputedProperties = false;
         let hasComputedStringProperty = false;
         let hasComputedNumberProperty = false;
@@ -31626,7 +31614,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     if (impliedProp) {
                         prop.flags |= impliedProp.flags & SymbolFlags.Optional;
                     }
-                    else if (!compilerOptions.suppressExcessPropertyErrors && !getIndexInfoOfType(contextualType, stringType)) {
+                    else if (!getIndexInfoOfType(contextualType, stringType)) {
                         error(memberDecl.name, Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(member), typeToString(contextualType));
                     }
                 }
@@ -31984,7 +31972,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
          * @param attributesTable a symbol table of attributes property
          */
         function createJsxAttributesType() {
-            objectFlags |= freshObjectLiteralFlag;
+            objectFlags |= ObjectFlags.FreshLiteral;
             const result = createAnonymousType(attributes.symbol, attributesTable, emptyArray, emptyArray, emptyArray);
             result.objectFlags |= objectFlags | ObjectFlags.ObjectLiteral | ObjectFlags.ContainsObjectOrArrayLiteral;
             return result;
@@ -40559,11 +40547,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         const type = getTypeFromMappedTypeNode(node) as MappedType;
         const nameType = getNameTypeFromMappedType(type);
         if (nameType) {
-            checkTypeAssignableTo(nameType, keyofConstraintType, node.nameType);
+            checkTypeAssignableTo(nameType, stringNumberSymbolType, node.nameType);
         }
         else {
             const constraintType = getConstraintTypeFromMappedType(type);
-            checkTypeAssignableTo(constraintType, keyofConstraintType, getEffectiveConstraintOfTypeParameter(node.typeParameter));
+            checkTypeAssignableTo(constraintType, stringNumberSymbolType, getEffectiveConstraintOfTypeParameter(node.typeParameter));
         }
     }
 
@@ -45957,17 +45945,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                         case SyntaxKind.ImportClause:
                         case SyntaxKind.ImportSpecifier:
                         case SyntaxKind.ImportEqualsDeclaration: {
-                            if (compilerOptions.preserveValueImports || compilerOptions.verbatimModuleSyntax) {
+                            if (compilerOptions.verbatimModuleSyntax) {
                                 Debug.assertIsDefined(node.name, "An ImportClause with a symbol should have a name");
                                 const message = compilerOptions.verbatimModuleSyntax && isInternalModuleImportEqualsDeclaration(node)
                                     ? Diagnostics.An_import_alias_cannot_resolve_to_a_type_or_type_only_declaration_when_verbatimModuleSyntax_is_enabled
                                     : isType
-                                    ? compilerOptions.verbatimModuleSyntax
-                                        ? Diagnostics._0_is_a_type_and_must_be_imported_using_a_type_only_import_when_verbatimModuleSyntax_is_enabled
-                                        : Diagnostics._0_is_a_type_and_must_be_imported_using_a_type_only_import_when_preserveValueImports_and_isolatedModules_are_both_enabled
-                                    : compilerOptions.verbatimModuleSyntax
-                                    ? Diagnostics._0_resolves_to_a_type_only_declaration_and_must_be_imported_using_a_type_only_import_when_verbatimModuleSyntax_is_enabled
-                                    : Diagnostics._0_resolves_to_a_type_only_declaration_and_must_be_imported_using_a_type_only_import_when_preserveValueImports_and_isolatedModules_are_both_enabled;
+                                    ? Diagnostics._0_is_a_type_and_must_be_imported_using_a_type_only_import_when_verbatimModuleSyntax_is_enabled
+                                    : Diagnostics._0_resolves_to_a_type_only_declaration_and_must_be_imported_using_a_type_only_import_when_verbatimModuleSyntax_is_enabled;
                                 const name = idText(node.kind === SyntaxKind.ImportSpecifier ? node.propertyName || node.name : node.name);
                                 addTypeOnlyDeclarationRelatedInfo(
                                     error(node, message, name),
@@ -46240,50 +46224,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         return !isInAppropriateContext;
     }
 
-    function importClauseContainsReferencedImport(importClause: ImportClause) {
-        return forEachImportClauseDeclaration(importClause, declaration => {
-            return !!getSymbolOfDeclaration(declaration).isReferenced;
-        });
-    }
-
-    function importClauseContainsConstEnumUsedAsValue(importClause: ImportClause) {
-        return forEachImportClauseDeclaration(importClause, declaration => {
-            return !!getSymbolLinks(getSymbolOfDeclaration(declaration)).constEnumReferenced;
-        });
-    }
-
-    function canConvertImportDeclarationToTypeOnly(statement: Statement) {
-        return isImportDeclaration(statement) &&
-            statement.importClause &&
-            !statement.importClause.isTypeOnly &&
-            importClauseContainsReferencedImport(statement.importClause) &&
-            !isReferencedAliasDeclaration(statement.importClause, /*checkChildren*/ true) &&
-            !importClauseContainsConstEnumUsedAsValue(statement.importClause);
-    }
-
-    function canConvertImportEqualsDeclarationToTypeOnly(statement: Statement) {
-        return isImportEqualsDeclaration(statement) &&
-            isExternalModuleReference(statement.moduleReference) &&
-            !statement.isTypeOnly &&
-            getSymbolOfDeclaration(statement).isReferenced &&
-            !isReferencedAliasDeclaration(statement, /*checkChildren*/ false) &&
-            !getSymbolLinks(getSymbolOfDeclaration(statement)).constEnumReferenced;
-    }
-
-    function checkImportsForTypeOnlyConversion(sourceFile: SourceFile) {
-        if (!canCollectSymbolAliasAccessabilityData) {
-            return;
-        }
-        for (const statement of sourceFile.statements) {
-            if (canConvertImportDeclarationToTypeOnly(statement) || canConvertImportEqualsDeclarationToTypeOnly(statement)) {
-                error(
-                    statement,
-                    Diagnostics.This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set_to_error,
-                );
-            }
-        }
-    }
-
     function checkExportSpecifier(node: ExportSpecifier) {
         checkAliasSymbol(node);
         if (getEmitDeclarations(compilerOptions)) {
@@ -46984,14 +46924,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 }
             });
 
-            if (
-                compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Error &&
-                !node.isDeclarationFile &&
-                isExternalModule(node)
-            ) {
-                checkImportsForTypeOnlyConversion(node);
-            }
-
             if (isExternalOrCommonJsModule(node)) {
                 checkExternalModuleExports(node);
             }
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
index 2d2912b69a6..404c2f308b4 100644
--- a/src/compiler/commandLineParser.ts
+++ b/src/compiler/commandLineParser.ts
@@ -789,7 +789,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
         affectsEmit: true,
         affectsSemanticDiagnostics: true,
         affectsBuildInfo: true,
-        category: Diagnostics.Emit,
+        category: Diagnostics.Backwards_Compatibility,
         description: Diagnostics.Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types,
         defaultValueDescription: ImportsNotUsedAsValues.Remove,
     },
@@ -1522,7 +1522,7 @@ const commandOptionsWithoutBuild: CommandLineOption[] = [
         type: "boolean",
         affectsEmit: true,
         affectsBuildInfo: true,
-        category: Diagnostics.Emit,
+        category: Diagnostics.Backwards_Compatibility,
         description: Diagnostics.Preserve_unused_imported_values_in_the_JavaScript_output_that_would_otherwise_be_removed,
         defaultValueDescription: false,
     },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 08051e26c8b..b0a56257a95 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1204,10 +1204,6 @@
         "category": "Message",
         "code": 1369
     },
-    "This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.": {
-        "category": "Error",
-        "code": 1371
-    },
     "'await' expressions are only allowed at the top level of a file when that file is a module, but this file has no imports or exports. Consider adding an empty 'export {}' to make this file a module.": {
         "category": "Error",
         "code": 1375
@@ -1472,14 +1468,6 @@
         "category": "Error",
         "code": 1443
     },
-    "'{0}' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.": {
-        "category": "Error",
-        "code": 1444
-    },
-    "'{0}' resolves to a type-only declaration and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.": {
-        "category": "Error",
-        "code": 1446
-    },
     "'{0}' resolves to a type-only declaration and must be re-exported using a type-only re-export when '{1}' is enabled.": {
         "category": "Error",
         "code": 1448
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 74d066c7ca1..54f407de035 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -323,7 +323,6 @@ import {
     ObjectBindingPattern,
     ObjectLiteralExpression,
     OptionalTypeNode,
-    outFile,
     ParameterDeclaration,
     ParenthesizedExpression,
     ParenthesizedTypeNode,
@@ -450,7 +449,7 @@ export function forEachEmittedFile<T>(
 ) {
     const sourceFiles = isArray(sourceFilesOrTargetSourceFile) ? sourceFilesOrTargetSourceFile : getSourceFilesToEmit(host, sourceFilesOrTargetSourceFile, forceDtsEmit);
     const options = host.getCompilerOptions();
-    if (outFile(options)) {
+    if (options.outFile) {
         if (sourceFiles.length) {
             const bundle = factory.createBundle(sourceFiles);
             const result = action(getOutputPathsFor(bundle, host, forceDtsEmit), bundle);
@@ -479,7 +478,7 @@ export function getTsBuildInfoEmitOutputFilePath(options: CompilerOptions) {
     const configFile = options.configFilePath;
     if (!isIncrementalCompilation(options)) return undefined;
     if (options.tsBuildInfoFile) return options.tsBuildInfoFile;
-    const outPath = outFile(options);
+    const outPath = options.outFile;
     let buildInfoExtensionLess: string;
     if (outPath) {
         buildInfoExtensionLess = removeFileExtension(outPath);
@@ -498,7 +497,7 @@ export function getTsBuildInfoEmitOutputFilePath(options: CompilerOptions) {
 
 /** @internal */
 export function getOutputPathsForBundle(options: CompilerOptions, forceDtsPaths: boolean): EmitFileNames {
-    const outPath = outFile(options)!;
+    const outPath = options.outFile!;
     const jsFilePath = options.emitDeclarationOnly ? undefined : outPath;
     const sourceMapFilePath = jsFilePath && getSourceMapFilePath(jsFilePath, options);
     const declarationFilePath = (forceDtsPaths || getEmitDeclarations(options)) ? removeFileExtension(outPath) + Extension.Dts : undefined;
@@ -668,7 +667,7 @@ export function getCommonSourceDirectoryOfConfig({ options, fileNames }: ParsedC
 /** @internal */
 export function getAllProjectOutputs(configFile: ParsedCommandLine, ignoreCase: boolean): readonly string[] {
     const { addOutput, getOutputs } = createAddOutput();
-    if (outFile(configFile.options)) {
+    if (configFile.options.outFile) {
         getSingleOutputFileNames(configFile, addOutput);
     }
     else {
@@ -685,7 +684,7 @@ export function getOutputFileNames(commandLine: ParsedCommandLine, inputFileName
     inputFileName = normalizePath(inputFileName);
     Debug.assert(contains(commandLine.fileNames, inputFileName), `Expected fileName to be present in command line`);
     const { addOutput, getOutputs } = createAddOutput();
-    if (outFile(commandLine.options)) {
+    if (commandLine.options.outFile) {
         getSingleOutputFileNames(commandLine, addOutput);
     }
     else {
@@ -696,7 +695,7 @@ export function getOutputFileNames(commandLine: ParsedCommandLine, inputFileName
 
 /** @internal */
 export function getFirstProjectOutput(configFile: ParsedCommandLine, ignoreCase: boolean): string {
-    if (outFile(configFile.options)) {
+    if (configFile.options.outFile) {
         const { jsFilePath, declarationFilePath } = getOutputPathsForBundle(configFile.options, /*forceDtsPaths*/ false);
         return Debug.checkDefined(jsFilePath || declarationFilePath, `project ${configFile.options.configFilePath} expected to have at least one output`);
     }
@@ -845,7 +844,7 @@ export function emitFiles(resolver: EmitResolver, host: EmitHost, targetSourceFi
         const sourceFiles = isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles;
         const filesForEmit = forceDtsEmit ? sourceFiles : filter(sourceFiles, isSourceFileNotJson);
         // Setup and perform the transformation to retrieve declarations from the input files
-        const inputListOrBundle = outFile(compilerOptions) ? [factory.createBundle(filesForEmit)] : filesForEmit;
+        const inputListOrBundle = compilerOptions.outFile ? [factory.createBundle(filesForEmit)] : filesForEmit;
         if (emitOnly && !getEmitDeclarations(compilerOptions)) {
             // Checker wont collect the linked aliases since thats only done when declaration is enabled.
             // Do that here when emitting only dts files
diff --git a/src/compiler/factory/utilities.ts b/src/compiler/factory/utilities.ts
index 28c88fe2136..28c8769b401 100644
--- a/src/compiler/factory/utilities.ts
+++ b/src/compiler/factory/utilities.ts
@@ -145,7 +145,6 @@ import {
     ObjectLiteralExpression,
     OuterExpression,
     OuterExpressionKinds,
-    outFile,
     ParenthesizedExpression,
     parseNodeFactory,
     PlusToken,
@@ -860,7 +859,7 @@ export function tryGetModuleNameFromFile(factory: NodeFactory, file: SourceFile
     if (file.moduleName) {
         return factory.createStringLiteral(file.moduleName);
     }
-    if (!file.isDeclarationFile && outFile(options)) {
+    if (!file.isDeclarationFile && options.outFile) {
         return factory.createStringLiteral(getExternalModuleNameFromPath(host, file.fileName));
     }
     return undefined;
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index 5df10bf63dd..98aeccc9cf7 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -240,7 +240,6 @@ import {
     ObjectLiteralExpression,
     OperationCanceledException,
     optionsHaveChanges,
-    outFile,
     PackageId,
     packageIdToPackageName,
     packageIdToString,
@@ -392,14 +391,13 @@ export function createCompilerHost(options: CompilerOptions, setParentNodes?: bo
 /** @internal */
 export function createGetSourceFile(
     readFile: ProgramHost<any>["readFile"],
-    getCompilerOptions: () => CompilerOptions,
     setParentNodes: boolean | undefined,
 ): CompilerHost["getSourceFile"] {
     return (fileName, languageVersionOrOptions, onError) => {
         let text: string | undefined;
         try {
             performance.mark("beforeIORead");
-            text = readFile(fileName, getCompilerOptions().charset);
+            text = readFile(fileName);
             performance.mark("afterIORead");
             performance.measure("I/O Read", "beforeIORead", "afterIORead");
         }
@@ -472,7 +470,7 @@ export function createCompilerHostWorker(
     const newLine = getNewLineCharacter(options);
     const realpath = system.realpath && ((path: string) => system.realpath!(path));
     const compilerHost: CompilerHost = {
-        getSourceFile: createGetSourceFile(fileName => compilerHost.readFile(fileName), () => options, setParentNodes),
+        getSourceFile: createGetSourceFile(fileName => compilerHost.readFile(fileName), setParentNodes),
         getDefaultLibLocation,
         getDefaultLibFileName: options => combinePaths(getDefaultLibLocation(), getDefaultLibFileName(options)),
         writeFile: createWriteFileMeasuringIO(
@@ -1741,7 +1739,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
             if (rootNames.length) {
                 resolvedProjectReferences?.forEach((parsedRef, index) => {
                     if (!parsedRef) return;
-                    const out = outFile(parsedRef.commandLine.options);
+                    const out = parsedRef.commandLine.options.outFile;
                     if (useSourceOfProjectReferenceRedirect) {
                         if (out || getEmitModuleKind(parsedRef.commandLine.options) === ModuleKind.None) {
                             for (const fileName of parsedRef.commandLine.fileNames) {
@@ -2094,7 +2092,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         if (!source) return undefined;
         // Output of .d.ts file so return resolved ref that matches the out file name
         return forEachResolvedProjectReference(resolvedRef => {
-            const out = outFile(resolvedRef.commandLine.options);
+            const out = resolvedRef.commandLine.options.outFile;
             if (!out) return undefined;
             return toPath(out) === filePath ? resolvedRef : undefined;
         });
@@ -2670,7 +2668,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
     }
 
     function emitBuildInfo(writeFileCallback?: WriteFileCallback): EmitResult {
-        Debug.assert(!outFile(options));
+        Debug.assert(!options.outFile);
         tracing?.push(tracing.Phase.Emit, "emitBuildInfo", {}, /*separateBeginAndEnd*/ true);
         performance.mark("beforeEmit");
         const emitResult = emitFiles(
@@ -2753,7 +2751,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         // This is because in the -out scenario all files need to be emitted, and therefore all
         // files need to be type checked. And the way to specify that all files need to be type
         // checked is to not pass the file to getEmitResolver.
-        const emitResolver = getTypeChecker().getEmitResolver(outFile(options) ? undefined : sourceFile, cancellationToken);
+        const emitResolver = getTypeChecker().getEmitResolver(options.outFile ? undefined : sourceFile, cancellationToken);
 
         performance.mark("beforeEmit");
 
@@ -2830,7 +2828,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
     function getDeclarationDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): readonly DiagnosticWithLocation[] {
         const options = program.getCompilerOptions();
         // collect diagnostics from the program only once if either no source file was specified or out/outFile is set (bundled emit)
-        if (!sourceFile || outFile(options)) {
+        if (!sourceFile || options.outFile) {
             return getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
         }
         else {
@@ -3644,7 +3642,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         if (isReferencedFile(reason) && !useSourceOfProjectReferenceRedirect) {
             const redirectProject = getProjectReferenceRedirectProject(fileName);
             if (redirectProject) {
-                if (outFile(redirectProject.commandLine.options)) {
+                if (redirectProject.commandLine.options.outFile) {
                     // Shouldnt create many to 1 mapping file in --out scenario
                     return undefined;
                 }
@@ -3771,7 +3769,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
     }
 
     function getProjectReferenceOutputName(referencedProject: ResolvedProjectReference, fileName: string) {
-        const out = outFile(referencedProject.commandLine.options);
+        const out = referencedProject.commandLine.options.outFile;
         return out ?
             changeExtension(out, Extension.Dts) :
             getOutputDeclarationFileName(fileName, referencedProject.commandLine, !host.useCaseSensitiveFileNames());
@@ -3806,7 +3804,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         if (mapFromToProjectReferenceRedirectSource === undefined) {
             mapFromToProjectReferenceRedirectSource = new Map();
             forEachResolvedProjectReference(resolvedRef => {
-                const out = outFile(resolvedRef.commandLine.options);
+                const out = resolvedRef.commandLine.options.outFile;
                 if (out) {
                     // Dont know which source file it means so return true?
                     const outputDts = changeExtension(out, Extension.Dts);
@@ -4164,10 +4162,6 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         }
 
         if (options.isolatedModules || options.verbatimModuleSyntax) {
-            if (options.out) {
-                createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", options.verbatimModuleSyntax ? "verbatimModuleSyntax" : "isolatedModules");
-            }
-
             if (options.outFile) {
                 createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "outFile", options.verbatimModuleSyntax ? "verbatimModuleSyntax" : "isolatedModules");
             }
@@ -4191,7 +4185,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
             }
         }
 
-        const outputFile = outFile(options);
+        const outputFile = options.outFile;
         if (options.tsBuildInfoFile) {
             if (!isIncrementalCompilation(options)) {
                 createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "tsBuildInfoFile", "incremental", "composite");
@@ -4263,10 +4257,6 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
             }
         }
 
-        if (options.out && options.outFile) {
-            createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "outFile");
-        }
-
         if (options.mapRoot && !(options.sourceMap || options.declarationMap)) {
             // Error to specify --mapRoot without --sourcemap
             createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "mapRoot", "sourceMap", "declarationMap");
@@ -4277,7 +4267,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
                 createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1_or_option_2, "declarationDir", "declaration", "composite");
             }
             if (outputFile) {
-                createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile");
+                createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", "outFile");
             }
         }
 
@@ -4289,10 +4279,6 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
             createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "lib", "noLib");
         }
 
-        if (options.noImplicitUseStrict && getStrictOptionValue(options, "alwaysStrict")) {
-            createDiagnosticForOptionName(Diagnostics.Option_0_cannot_be_specified_with_option_1, "noImplicitUseStrict", "alwaysStrict");
-        }
-
         const languageVersion = getEmitScriptTarget(options);
 
         const firstNonAmbientExternalModuleSourceFile = find(files, f => isExternalModule(f) && !f.isDeclarationFile);
@@ -4314,11 +4300,11 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         // Cannot specify module gen that isn't amd or system with --out
         if (outputFile && !options.emitDeclarationOnly) {
             if (options.module && !(options.module === ModuleKind.AMD || options.module === ModuleKind.System)) {
-                createDiagnosticForOptionName(Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile", "module");
+                createDiagnosticForOptionName(Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, "outFile", "module");
             }
             else if (options.module === undefined && firstNonAmbientExternalModuleSourceFile) {
                 const span = getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, typeof firstNonAmbientExternalModuleSourceFile.externalModuleIndicator === "boolean" ? firstNonAmbientExternalModuleSourceFile : firstNonAmbientExternalModuleSourceFile.externalModuleIndicator!);
-                programDiagnostics.add(createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system, options.out ? "out" : "outFile"));
+                programDiagnostics.add(createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system, "outFile"));
             }
         }
 
@@ -4408,21 +4394,11 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
             }
         }
 
-        if (options.preserveValueImports && getEmitModuleKind(options) < ModuleKind.ES2015) {
-            createDiagnosticForOptionName(Diagnostics.Option_0_can_only_be_used_when_module_is_set_to_preserve_or_to_es2015_or_later, "preserveValueImports");
-        }
-
         const moduleKind = getEmitModuleKind(options);
         if (options.verbatimModuleSyntax) {
             if (moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.UMD || moduleKind === ModuleKind.System) {
                 createDiagnosticForOptionName(Diagnostics.Option_verbatimModuleSyntax_cannot_be_used_when_module_is_set_to_UMD_AMD_or_System, "verbatimModuleSyntax");
             }
-            if (options.preserveValueImports) {
-                createRedundantOptionDiagnostic("preserveValueImports", "verbatimModuleSyntax");
-            }
-            if (options.importsNotUsedAsValues) {
-                createRedundantOptionDiagnostic("importsNotUsedAsValues", "verbatimModuleSyntax");
-            }
         }
 
         if (options.allowImportingTsExtensions && !(options.noEmit || options.emitDeclarationOnly)) {
@@ -4890,26 +4866,6 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         return needsCompilerDiagnostic;
     }
 
-    /**
-     * Only creates a diagnostic on the option key specified by `errorOnOption`.
-     * If both options are specified in the program in separate config files via `extends`,
-     * a diagnostic is only created if `errorOnOption` is specified in the leaf config file.
-     * Useful if `redundantWithOption` represents a superset of the functionality of `errorOnOption`:
-     * if a user inherits `errorOnOption` from a base config file, it's still valid and useful to
-     * override it in the leaf config file.
-     */
-    function createRedundantOptionDiagnostic(errorOnOption: string, redundantWithOption: string) {
-        const compilerOptionsObjectLiteralSyntax = getCompilerOptionsObjectLiteralSyntax();
-        if (compilerOptionsObjectLiteralSyntax) {
-            // This is a no-op if `errorOnOption` isn't present in the leaf config file.
-            createOptionDiagnosticInObjectLiteralSyntax(compilerOptionsObjectLiteralSyntax, /*onKey*/ true, errorOnOption, /*key2*/ undefined, Diagnostics.Option_0_is_redundant_and_cannot_be_specified_with_option_1, errorOnOption, redundantWithOption);
-        }
-        else {
-            // There was no config file, so both options were specified on the command line.
-            createDiagnosticForOptionName(Diagnostics.Option_0_is_redundant_and_cannot_be_specified_with_option_1, errorOnOption, redundantWithOption);
-        }
-    }
-
     function blockEmittingOfFile(emitFileName: string, diag: Diagnostic) {
         hasEmitBlockingDiagnostics.set(toPath(emitFileName), true);
         programDiagnostics.add(diag);
@@ -4927,7 +4883,7 @@ export function createProgram(rootNamesOrOptions: readonly string[] | CreateProg
         }
 
         // If options have --outFile or --out just check that
-        const out = outFile(options);
+        const out = options.outFile;
         if (out) {
             return isSameFile(filePath, out) || isSameFile(filePath, removeFileExtension(out) + Extension.Dts);
         }
@@ -5015,7 +4971,7 @@ function updateHostForUseSourceOfProjectReferenceRedirect(host: HostForUseSource
             if (!setOfDeclarationDirectories) {
                 setOfDeclarationDirectories = new Set();
                 host.forEachResolvedProjectReference(ref => {
-                    const out = outFile(ref.commandLine.options);
+                    const out = ref.commandLine.options.outFile;
                     if (out) {
                         setOfDeclarationDirectories!.add(getDirectoryPath(host.toPath(out)));
                     }
@@ -5166,7 +5122,7 @@ export function handleNoEmitOptions<T extends BuilderProgram>(
     if (options.noEmit) {
         // Cache the semantic diagnostics
         program.getSemanticDiagnostics(sourceFile, cancellationToken);
-        return sourceFile || outFile(options) ?
+        return sourceFile || options.outFile ?
             emitSkippedWithNoDiagnostics :
             program.emitBuildInfo(writeFile, cancellationToken);
     }
@@ -5188,7 +5144,7 @@ export function handleNoEmitOptions<T extends BuilderProgram>(
 
     if (!diagnostics.length) return undefined;
     let emittedFiles: string[] | undefined;
-    if (!sourceFile && !outFile(options)) {
+    if (!sourceFile && !options.outFile) {
         const emitResult = program.emitBuildInfo(writeFile, cancellationToken);
         if (emitResult.diagnostics) diagnostics = [...diagnostics, ...emitResult.diagnostics];
         emittedFiles = emitResult.emittedFiles;
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index 19a3b93249e..ac8af49d3e2 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -125,7 +125,6 @@ import {
     NodeArray,
     NodeFlags,
     ObjectLiteralElementLike,
-    outFile,
     ParameterDeclaration,
     ParenthesizedExpression,
     PartiallyEmittedExpression,
@@ -225,7 +224,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile
             node.isDeclarationFile ||
             !(isEffectiveExternalModule(node, compilerOptions) ||
                 node.transformFlags & TransformFlags.ContainsDynamicImport ||
-                (isJsonSourceFile(node) && hasJsonModuleEmitEnabled(compilerOptions) && outFile(compilerOptions)))
+                (isJsonSourceFile(node) && hasJsonModuleEmitEnabled(compilerOptions) && compilerOptions.outFile))
         ) {
             return node;
         }
@@ -259,7 +258,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile
         startLexicalEnvironment();
 
         const statements: Statement[] = [];
-        const ensureUseStrict = getStrictOptionValue(compilerOptions, "alwaysStrict") || (!compilerOptions.noImplicitUseStrict && isExternalModule(currentSourceFile));
+        const ensureUseStrict = getStrictOptionValue(compilerOptions, "alwaysStrict") || isExternalModule(currentSourceFile);
         const statementOffset = factory.copyPrologue(node.statements, statements, ensureUseStrict && !isJsonSourceFile(node), topLevelVisitor);
 
         if (shouldEmitUnderscoreUnderscoreESModule()) {
@@ -597,7 +596,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile
         startLexicalEnvironment();
 
         const statements: Statement[] = [];
-        const statementOffset = factory.copyPrologue(node.statements, statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, topLevelVisitor);
+        const statementOffset = factory.copyPrologue(node.statements, statements, /*ensureUseStrict*/ true, topLevelVisitor);
 
         if (shouldEmitUnderscoreUnderscoreESModule()) {
             append(statements, createUnderscoreUnderscoreESModule());
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
index 61ff103dac8..7f4f7e07593 100644
--- a/src/compiler/transformers/module/system.ts
+++ b/src/compiler/transformers/module/system.ts
@@ -96,7 +96,6 @@ import {
     Node,
     NodeFlags,
     ObjectLiteralElementLike,
-    outFile,
     ParenthesizedExpression,
     PartiallyEmittedExpression,
     PostfixUnaryExpression,
@@ -251,7 +250,7 @@ export function transformSystemModule(context: TransformationContext): (x: Sourc
             EmitFlags.NoTrailingComments,
         );
 
-        if (!outFile(compilerOptions)) {
+        if (!compilerOptions.outFile) {
             moveEmitHelpers(updated, moduleBodyBlock, helper => !helper.scoped);
         }
 
@@ -355,7 +354,7 @@ export function transformSystemModule(context: TransformationContext): (x: Sourc
         startLexicalEnvironment();
 
         // Add any prologue directives.
-        const ensureUseStrict = getStrictOptionValue(compilerOptions, "alwaysStrict") || (!compilerOptions.noImplicitUseStrict && isExternalModule(currentSourceFile));
+        const ensureUseStrict = getStrictOptionValue(compilerOptions, "alwaysStrict") || isExternalModule(currentSourceFile);
         const statementOffset = factory.copyPrologue(node.statements, statements, ensureUseStrict, topLevelVisitor);
 
         // var __moduleName = context_1 && context_1.id;
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 2e3c2109657..6cc1db76380 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -68,7 +68,6 @@ import {
     ImportClause,
     ImportDeclaration,
     ImportEqualsDeclaration,
-    ImportsNotUsedAsValues,
     ImportSpecifier,
     InitializedVariableDeclaration,
     insertStatementsAfterStandardPrologue,
@@ -2269,9 +2268,7 @@ export function transformTypeScript(context: TransformationContext) {
 
         // Elide the declaration if the import clause was elided.
         const importClause = visitNode(node.importClause, visitImportClause, isImportClause);
-        return importClause ||
-                compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Preserve ||
-                compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Error
+        return importClause
             ? factory.updateImportDeclaration(
                 node,
                 /*modifiers*/ undefined,
@@ -2307,10 +2304,7 @@ export function transformTypeScript(context: TransformationContext) {
         }
         else {
             // Elide named imports if all of its import specifiers are elided and settings allow.
-            const allowEmpty = compilerOptions.verbatimModuleSyntax || compilerOptions.preserveValueImports && (
-                        compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Preserve ||
-                        compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Error
-                    );
+            const allowEmpty = compilerOptions.verbatimModuleSyntax;
             const elements = visitNodes(node.elements, visitImportSpecifier, isImportSpecifier);
             return allowEmpty || some(elements) ? factory.updateNamedImports(node, elements) : undefined;
         }
@@ -2356,10 +2350,7 @@ export function transformTypeScript(context: TransformationContext) {
         }
 
         // Elide the export declaration if all of its named exports are elided.
-        const allowEmpty = compilerOptions.verbatimModuleSyntax || !!node.moduleSpecifier && (
-                    compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Preserve ||
-                    compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Error
-                );
+        const allowEmpty = !!compilerOptions.verbatimModuleSyntax;
         const exportClause = visitNode(
             node.exportClause,
             (bindings: NamedExportBindings) => visitNamedExportBindings(bindings, allowEmpty),
@@ -2435,22 +2426,6 @@ export function transformTypeScript(context: TransformationContext) {
 
         if (isExternalModuleImportEqualsDeclaration(node)) {
             const isReferenced = shouldEmitAliasDeclaration(node);
-            // If the alias is unreferenced but we want to keep the import, replace with 'import "mod"'.
-            if (!isReferenced && compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Preserve) {
-                return setOriginalNode(
-                    setTextRange(
-                        factory.createImportDeclaration(
-                            /*modifiers*/ undefined,
-                            /*importClause*/ undefined,
-                            node.moduleReference.expression,
-                            /*attributes*/ undefined,
-                        ),
-                        node,
-                    ),
-                    node,
-                );
-            }
-
             return isReferenced ? visitEachChild(node, visitor, context) : undefined;
         }
 
@@ -2760,9 +2735,6 @@ export function transformTypeScript(context: TransformationContext) {
     }
 
     function shouldEmitAliasDeclaration(node: Node): boolean {
-        return compilerOptions.verbatimModuleSyntax || isInJSFile(node) ||
-            (compilerOptions.preserveValueImports
-                ? resolver.isValueAliasDeclaration(node)
-                : resolver.isReferencedAliasDeclaration(node));
+        return compilerOptions.verbatimModuleSyntax || isInJSFile(node) || resolver.isReferencedAliasDeclaration(node);
     }
 }
diff --git a/src/compiler/tsbuildPublic.ts b/src/compiler/tsbuildPublic.ts
index c439c3ccda7..a44e6a6bc42 100644
--- a/src/compiler/tsbuildPublic.ts
+++ b/src/compiler/tsbuildPublic.ts
@@ -82,7 +82,6 @@ import {
     mutateMap,
     mutateMapSkippingNewValues,
     noop,
-    outFile,
     OutputFile,
     ParseConfigFileHost,
     parseConfigHostFromCompilerHostLike,
@@ -1462,7 +1461,7 @@ function buildErrors<T extends BuilderProgram>(
     errorType: string,
 ) {
     // Since buildinfo has changeset and diagnostics when doing multi file emit, only --out cannot emit buildinfo if it has errors
-    const canEmitBuildInfo = program && !outFile(program.getCompilerOptions());
+    const canEmitBuildInfo = program && !program.getCompilerOptions().outFile;
 
     reportAndStoreErrors(state, resolvedPath, diagnostics);
     state.projectStatus.set(resolvedPath, { type: UpToDateStatusType.Unbuildable, reason: `${errorType} errors` });
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 9b35247fe2a..ead7edab366 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -7051,6 +7051,7 @@ export interface CompilerOptions {
      * @internal
      */
     build?: boolean;
+    /** @deprecated */
     charset?: string;
     checkJs?: boolean;
     /** @internal */ configFilePath?: string;
@@ -7082,12 +7083,14 @@ export interface CompilerOptions {
     /** @internal */ help?: boolean;
     ignoreDeprecations?: string;
     importHelpers?: boolean;
+    /** @deprecated */
     importsNotUsedAsValues?: ImportsNotUsedAsValues;
     /** @internal */ init?: boolean;
     inlineSourceMap?: boolean;
     inlineSources?: boolean;
     isolatedModules?: boolean;
     jsx?: JsxEmit;
+    /** @deprecated */
     keyofStringsOnly?: boolean;
     lib?: string[];
     /** @internal */ listEmittedFiles?: boolean;
@@ -7111,9 +7114,11 @@ export interface CompilerOptions {
     noImplicitAny?: boolean; // Always combine with strict property
     noImplicitReturns?: boolean;
     noImplicitThis?: boolean; // Always combine with strict property
+    /** @deprecated */
     noStrictGenericChecks?: boolean;
     noUnusedLocals?: boolean;
     noUnusedParameters?: boolean;
+    /** @deprecated */
     noImplicitUseStrict?: boolean;
     noPropertyAccessFromIndexSignature?: boolean;
     assumeChangesOnlyAffectDirectDependencies?: boolean;
@@ -7122,6 +7127,7 @@ export interface CompilerOptions {
     /** @internal */
     noDtsResolution?: boolean;
     noUncheckedIndexedAccess?: boolean;
+    /** @deprecated */
     out?: string;
     outDir?: string;
     outFile?: string;
@@ -7136,6 +7142,7 @@ export interface CompilerOptions {
     preserveConstEnums?: boolean;
     noImplicitOverride?: boolean;
     preserveSymlinks?: boolean;
+    /** @deprecated */
     preserveValueImports?: boolean;
     /** @internal */ preserveWatchOutput?: boolean;
     project?: string;
@@ -7162,7 +7169,9 @@ export interface CompilerOptions {
     strictNullChecks?: boolean; // Always combine with strict property
     strictPropertyInitialization?: boolean; // Always combine with strict property
     stripInternal?: boolean;
+    /** @deprecated */
     suppressExcessPropertyErrors?: boolean;
+    /** @deprecated */
     suppressImplicitAnyIndexErrors?: boolean;
     /** @internal */ suppressOutputPathCheck?: boolean;
     target?: ScriptTarget;
@@ -7233,6 +7242,7 @@ export const enum JsxEmit {
     ReactJSXDev = 5,
 }
 
+/** @deprecated */
 export const enum ImportsNotUsedAsValues {
     Remove,
     Preserve,
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index b5835a2292b..6bbc51a4ad1 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1875,12 +1875,8 @@ export function isEffectiveStrictModeSourceFile(node: SourceFile, compilerOption
         return true;
     }
     if (isExternalModule(node) || getIsolatedModules(compilerOptions)) {
-        // ECMAScript Modules are always strict.
-        if (getEmitModuleKind(compilerOptions) >= ModuleKind.ES2015) {
-            return true;
-        }
-        // Other modules are strict unless otherwise specified.
-        return !compilerOptions.noImplicitUseStrict;
+        // Modules are always strict.
+        return true;
     }
     return false;
 }
@@ -6292,11 +6288,6 @@ export function getPossibleOriginalInputExtensionForExtension(path: string) {
         [Extension.Tsx, Extension.Ts, Extension.Jsx, Extension.Js];
 }
 
-/** @internal */
-export function outFile(options: CompilerOptions) {
-    return options.outFile || options.out;
-}
-
 /**
  * Returns 'undefined' if and only if 'options.paths' is undefined.
  *
@@ -6329,7 +6320,7 @@ export interface EmitFileNames {
  */
 export function getSourceFilesToEmit(host: EmitHost, targetSourceFile?: SourceFile, forceDtsEmit?: boolean): readonly SourceFile[] {
     const options = host.getCompilerOptions();
-    if (outFile(options)) {
+    if (options.outFile) {
         const moduleKind = getEmitModuleKind(options);
         const moduleEmitEnabled = options.emitDeclarationOnly || moduleKind === ModuleKind.AMD || moduleKind === ModuleKind.System;
         // Can emit only sources that are not declaration file and are either non module code or module with --module or --target es6 specified
@@ -6371,7 +6362,7 @@ export function sourceFileMayBeEmitted(sourceFile: SourceFile, host: SourceFileM
     if (!isJsonSourceFile(sourceFile)) return true;
     if (host.getResolvedProjectReferenceToRedirect(sourceFile.fileName)) return false;
     // Emit json file if outFile is specified
-    if (outFile(options)) return true;
+    if (options.outFile) return true;
     // Json file is not emitted if outDir is not specified
     if (!options.outDir) return false;
     // Otherwise if rootDir or composite config file, we know common sourceDir and can check if file would be emitted in same location
@@ -8868,11 +8859,6 @@ export function hasJsonModuleEmitEnabled(options: CompilerOptions) {
     return true;
 }
 
-/** @internal */
-export function importNameElisionDisabled(options: CompilerOptions) {
-    return options.verbatimModuleSyntax || options.isolatedModules && options.preserveValueImports;
-}
-
 /** @internal */
 export function unreachableCodeIsError(options: CompilerOptions): boolean {
     return options.allowUnreachableCode === false;
diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts
index 517a6fab011..8a08fd38731 100644
--- a/src/compiler/watch.ts
+++ b/src/compiler/watch.ts
@@ -77,7 +77,6 @@ import {
     ModuleKind,
     noop,
     normalizePath,
-    outFile,
     packageIdToString,
     ParseConfigFileHost,
     ParsedCommandLine,
@@ -515,7 +514,7 @@ export function fileIncludeReasonToDiagnostics(program: Program, reason: FileInc
             const referencedResolvedRef = Debug.checkDefined(program.getResolvedProjectReferences()?.[reason.index]);
             return chainDiagnosticMessages(
                 /*details*/ undefined,
-                outFile(options) ?
+                options.outFile ?
                     isOutput ?
                         Diagnostics.Output_from_referenced_project_0_included_because_1_specified :
                         Diagnostics.Source_from_referenced_project_0_included_because_1_specified :
@@ -744,7 +743,6 @@ export function createCompilerHostFromProgramHost(host: ProgramHost<any>, getCom
     const compilerHost: CompilerHost = {
         getSourceFile: createGetSourceFile(
             (fileName, encoding) => !encoding ? compilerHost.readFile(fileName) : host.readFile(fileName, encoding),
-            getCompilerOptions,
             /*setParentNodes*/ undefined,
         ),
         getDefaultLibLocation: maybeBind(host, host.getDefaultLibLocation),
diff --git a/src/compiler/watchUtilities.ts b/src/compiler/watchUtilities.ts
index a617a134daf..34794533ace 100644
--- a/src/compiler/watchUtilities.ts
+++ b/src/compiler/watchUtilities.ts
@@ -40,7 +40,6 @@ import {
     mutateMap,
     noop,
     normalizePath,
-    outFile,
     Path,
     PollingInterval,
     Program,
@@ -600,7 +599,7 @@ export function isIgnoredFileFromWildCardWatching({
 
     // We want to ignore emit file check if file is not going to be emitted next to source file
     // In that case we follow config file inclusion rules
-    if (outFile(options) || options.outDir) return false;
+    if (options.outFile || options.outDir) return false;
 
     // File if emitted next to input needs to be ignored
     if (isDeclarationFileName(fileOrDirectoryPath)) {
diff --git a/src/harness/compilerImpl.ts b/src/harness/compilerImpl.ts
index 22bb634b70d..f73e739e8b2 100644
--- a/src/harness/compilerImpl.ts
+++ b/src/harness/compilerImpl.ts
@@ -92,8 +92,8 @@ export class CompilationResult {
         // correlate inputs and outputs
         this._inputsAndOutputs = new collections.SortedMap<string, CompilationOutput>({ comparer: this.vfs.stringComparer, sort: "insertion" });
         if (program) {
-            if (this.options.out || this.options.outFile) {
-                const outFile = vpath.resolve(this.vfs.cwd(), this.options.outFile || this.options.out);
+            if (this.options.outFile) {
+                const outFile = vpath.resolve(this.vfs.cwd(), this.options.outFile);
                 const inputs: documents.TextDocument[] = [];
                 for (const sourceFile of program.getSourceFiles()) {
                     if (sourceFile) {
@@ -166,7 +166,7 @@ export class CompilationResult {
     }
 
     public get singleFile(): boolean {
-        return !!this.options.outFile || !!this.options.out;
+        return !!this.options.outFile;
     }
 
     public get commonSourceDirectory(): string {
@@ -208,8 +208,8 @@ export class CompilationResult {
     }
 
     public getOutputPath(path: string, ext: string): string {
-        if (this.options.outFile || this.options.out) {
-            path = vpath.resolve(this.vfs.cwd(), this.options.outFile || this.options.out);
+        if (this.options.outFile) {
+            path = vpath.resolve(this.vfs.cwd(), this.options.outFile);
         }
         else {
             path = vpath.resolve(this.vfs.cwd(), path);
diff --git a/src/harness/harnessIO.ts b/src/harness/harnessIO.ts
index 9f95c87a82b..525df1099a2 100644
--- a/src/harness/harnessIO.ts
+++ b/src/harness/harnessIO.ts
@@ -488,7 +488,7 @@ export namespace Compiler {
             assert(sourceFile, "Program has no source file with name '" + fileName + "'");
             // Is this file going to be emitted separately
             let sourceFileName: string;
-            const outFile = options.outFile || options.out;
+            const outFile = options.outFile;
             if (!outFile) {
                 if (options.outDir) {
                     let sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, result.vfs.cwd());
diff --git a/src/server/project.ts b/src/server/project.ts
index 109541097f7..8eaa776a5be 100644
--- a/src/server/project.ts
+++ b/src/server/project.ts
@@ -86,7 +86,6 @@ import {
     normalizePath,
     normalizeSlashes,
     orderedRemoveItem,
-    outFile,
     PackageJsonAutoImportPreference,
     PackageJsonInfo,
     ParsedCommandLine,
@@ -1580,7 +1579,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
             );
 
             if (this.generatedFilesMap) {
-                const outPath = outFile(this.compilerOptions);
+                const outPath = this.compilerOptions.outFile;
                 if (isGeneratedFileWatcher(this.generatedFilesMap)) {
                     // --out
                     if (
@@ -1736,7 +1735,7 @@ export abstract class Project implements LanguageServiceHost, ModuleResolutionHo
 
     /** @internal */
     addGeneratedFileWatch(generatedFile: string, sourceFile: string) {
-        if (outFile(this.compilerOptions)) {
+        if (this.compilerOptions.outFile) {
             // Single watcher
             if (!this.generatedFilesMap) {
                 this.generatedFilesMap = this.createGeneratedFileWatcher(generatedFile);
diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index bfba0b572a9..815f7222af6 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -3669,6 +3669,7 @@ export interface CompilerOptions {
     allowUnusedLabels?: boolean;
     alwaysStrict?: boolean;
     baseUrl?: string;
+    /** @deprecated */
     charset?: string;
     checkJs?: boolean;
     declaration?: boolean;
@@ -3701,9 +3702,11 @@ export interface CompilerOptions {
     noImplicitThis?: boolean;
     noUnusedLocals?: boolean;
     noUnusedParameters?: boolean;
+    /** @deprecated */
     noImplicitUseStrict?: boolean;
     noLib?: boolean;
     noResolve?: boolean;
+    /** @deprecated */
     out?: string;
     outDir?: string;
     outFile?: string;
@@ -3723,7 +3726,9 @@ export interface CompilerOptions {
     sourceRoot?: string;
     strict?: boolean;
     strictNullChecks?: boolean;
+    /** @deprecated */
     suppressExcessPropertyErrors?: boolean;
+    /** @deprecated */
     suppressImplicitAnyIndexErrors?: boolean;
     useDefineForClassFields?: boolean;
     target?: ScriptTarget | ts.ScriptTarget;
diff --git a/src/server/session.ts b/src/server/session.ts
index dc2efe45ee4..296a6777698 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -100,7 +100,6 @@ import {
     normalizePath,
     OperationCanceledException,
     OrganizeImportsMode,
-    outFile,
     OutliningSpan,
     Path,
     perfLogger,
@@ -2424,7 +2423,7 @@ export class Session<TMessage = string> implements EventSender {
                 return {
                     projectFileName: project.getProjectName(),
                     fileNames: project.getCompileOnSaveAffectedFileList(info),
-                    projectUsesOutFile: !!outFile(compilationSettings),
+                    projectUsesOutFile: !!compilationSettings.outFile,
                 };
             },
         );
diff --git a/src/services/codefixes/convertToTypeOnlyImport.ts b/src/services/codefixes/convertToTypeOnlyImport.ts
index da71d592b35..6b680e62ba8 100644
--- a/src/services/codefixes/convertToTypeOnlyImport.ts
+++ b/src/services/codefixes/convertToTypeOnlyImport.ts
@@ -26,7 +26,6 @@ import {
 } from "../_namespaces/ts.codefix";
 
 const errorCodes = [
-    Diagnostics.This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set_to_error.code,
     Diagnostics._0_is_a_type_and_must_be_imported_using_a_type_only_import_when_verbatimModuleSyntax_is_enabled.code,
     Diagnostics._0_resolves_to_a_type_only_declaration_and_must_be_imported_using_a_type_only_import_when_verbatimModuleSyntax_is_enabled.code,
 ];
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index f6e192dc4b9..9d67eeece06 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -61,8 +61,6 @@ import {
     ImportEqualsDeclaration,
     importFromModuleSpecifier,
     ImportKind,
-    importNameElisionDisabled,
-    ImportsNotUsedAsValues,
     insertImports,
     InternalSymbolName,
     isExternalModule,
@@ -715,12 +713,8 @@ function getAddAsTypeOnly(
         // Can't use a type-only import if the usage is an emitting position
         return AddAsTypeOnly.NotAllowed;
     }
-    if (isForNewImportDeclaration && compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Error) {
-        // Not writing a (top-level) type-only import here would create an error because the runtime dependency is unnecessary
-        return AddAsTypeOnly.Required;
-    }
     if (
-        importNameElisionDisabled(compilerOptions) &&
+        compilerOptions.verbatimModuleSyntax &&
         (!(targetFlags & SymbolFlags.Value) || !!checker.getTypeOnlyAliasDeclaration(symbol))
     ) {
         // A type-only import is required for this symbol if under these settings if the symbol will
@@ -1396,7 +1390,7 @@ function promoteFromTypeOnly(
 ) {
     const compilerOptions = program.getCompilerOptions();
     // See comment in `doAddExistingFix` on constant with the same name.
-    const convertExistingToTypeOnly = importNameElisionDisabled(compilerOptions);
+    const convertExistingToTypeOnly = compilerOptions.verbatimModuleSyntax;
     switch (aliasDeclaration.kind) {
         case SyntaxKind.ImportSpecifier:
             if (aliasDeclaration.isTypeOnly) {
diff --git a/src/services/sourcemaps.ts b/src/services/sourcemaps.ts
index 27c045646ba..0a58a2cda47 100644
--- a/src/services/sourcemaps.ts
+++ b/src/services/sourcemaps.ts
@@ -18,7 +18,6 @@ import {
     isString,
     LineAndCharacter,
     LineInfo,
-    outFile,
     Program,
     removeFileExtension,
     SourceFileLike,
@@ -114,7 +113,7 @@ export function getSourceMapper(host: SourceMapperHost): SourceMapper {
         }
 
         const options = program.getCompilerOptions();
-        const outPath = outFile(options);
+        const outPath = options.outFile;
 
         const declarationPath = outPath ?
             removeFileExtension(outPath) + Extension.Dts :
diff --git a/src/services/transpile.ts b/src/services/transpile.ts
index a15b48d8d74..084413a701b 100644
--- a/src/services/transpile.ts
+++ b/src/services/transpile.ts
@@ -47,8 +47,6 @@ export interface TranspileOutput {
 
 const optionsRedundantWithVerbatimModuleSyntax = new Set([
     "isolatedModules",
-    "preserveValueImports",
-    "importsNotUsedAsValues",
 ]);
 
 /*
diff --git a/src/testRunner/projectsRunner.ts b/src/testRunner/projectsRunner.ts
index bedb3343e7c..44430453325 100644
--- a/src/testRunner/projectsRunner.ts
+++ b/src/testRunner/projectsRunner.ts
@@ -383,7 +383,7 @@ class ProjectTestCase {
                 }
                 rootFiles.unshift(sourceFile.fileName);
             }
-            else if (!(compilerOptions.outFile || compilerOptions.out)) {
+            else if (!(compilerOptions.outFile)) {
                 let emitOutputFilePathWithoutExtension: string | undefined;
                 if (compilerOptions.outDir) {
                     let sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, compilerResult.program!.getCurrentDirectory());
@@ -402,7 +402,7 @@ class ProjectTestCase {
                 }
             }
             else {
-                const outputDtsFileName = ts.removeFileExtension(compilerOptions.outFile || compilerOptions.out!) + ts.Extension.Dts;
+                const outputDtsFileName = ts.removeFileExtension(compilerOptions.outFile) + ts.Extension.Dts;
                 const outputDtsFile = findOutputDtsFile(outputDtsFileName)!;
                 if (!ts.contains(allInputFiles, outputDtsFile)) {
                     allInputFiles.unshift(outputDtsFile);
diff --git a/src/testRunner/unittests/helpers/baseline.ts b/src/testRunner/unittests/helpers/baseline.ts
index f49e4b59f62..241616967d9 100644
--- a/src/testRunner/unittests/helpers/baseline.ts
+++ b/src/testRunner/unittests/helpers/baseline.ts
@@ -163,7 +163,7 @@ export type ReadableProgramBundleEmitBuildInfo = Omit<ts.ProgramBundleEmitBuildI
 export type ReadableProgramBuildInfo = ReadableProgramMultiFileEmitBuildInfo | ReadableProgramBundleEmitBuildInfo;
 
 export function isReadableProgramBundleEmitBuildInfo(info: ReadableProgramBuildInfo | undefined): info is ReadableProgramBundleEmitBuildInfo {
-    return !!info && !!ts.outFile(info.options || {});
+    return !!info && !!info.options?.outFile;
 }
 export type ReadableBuildInfo = Omit<ts.BuildInfo, "program"> & { program: ReadableProgramBuildInfo | undefined; size: number; };
 function generateBuildInfoProgramBaseline(sys: ts.System, buildInfoPath: string, buildInfo: ts.BuildInfo) {
diff --git a/src/testRunner/unittests/tsserver/compileOnSave.ts b/src/testRunner/unittests/tsserver/compileOnSave.ts
index 65dcbf465e5..ed3a9e23543 100644
--- a/src/testRunner/unittests/tsserver/compileOnSave.ts
+++ b/src/testRunner/unittests/tsserver/compileOnSave.ts
@@ -733,7 +733,6 @@ describe("unittests:: tsserver:: compileOnSave:: affected list", () => {
         }
         test("compileOnSaveAffectedFileList projectUsesOutFile should not be returned if not set", {});
         test("compileOnSaveAffectedFileList projectUsesOutFile should be true if outFile is set", { outFile: "/a/out.js" });
-        test("compileOnSaveAffectedFileList projectUsesOutFile should be true if out is set", { out: "/a/out.js" });
     });
 });
 
diff --git a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.errors.txt b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.errors.txt
index 08d5db9ad26..1ad933c5221 100644
--- a/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.errors.txt
+++ b/tests/baselines/reference/alwaysStrictNoImplicitUseStrict.errors.txt
@@ -1,9 +1,7 @@
-error TS5053: Option 'noImplicitUseStrict' cannot be specified with option 'alwaysStrict'.
 error TS5102: Option 'noImplicitUseStrict' has been removed. Please remove it from your configuration.
 alwaysStrictNoImplicitUseStrict.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode.
 
 
-!!! error TS5053: Option 'noImplicitUseStrict' cannot be specified with option 'alwaysStrict'.
 !!! error TS5102: Option 'noImplicitUseStrict' has been removed. Please remove it from your configuration.
 ==== alwaysStrictNoImplicitUseStrict.ts (1 errors) ====
     module M {
diff --git a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt b/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
deleted file mode 100644
index e2998c1d6b9..00000000000
--- a/tests/baselines/reference/amdDeclarationEmitNoExtraDeclare.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== Class.ts (0 errors) ====
-    import { Configurable } from "./Configurable"
-    
-    export class HiddenClass {}
-    
-    export class ActualClass extends Configurable(HiddenClass) {}
-==== Configurable.ts (0 errors) ====
-    export type Constructor<T> = {
-        new(...args: any[]): T;
-    }
-    export function Configurable<T extends Constructor<{}>>(base: T): T {
-        return class extends base {
-    
-            constructor(...args: any[]) {
-                super(...args);
-            }
-    
-        };
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
index 41b83c13142..3d00867ece8 100644
--- a/tests/baselines/reference/api/typescript.d.ts
+++ b/tests/baselines/reference/api/typescript.d.ts
@@ -2956,6 +2956,7 @@ declare namespace ts {
                 allowUnusedLabels?: boolean;
                 alwaysStrict?: boolean;
                 baseUrl?: string;
+                /** @deprecated */
                 charset?: string;
                 checkJs?: boolean;
                 declaration?: boolean;
@@ -2988,9 +2989,11 @@ declare namespace ts {
                 noImplicitThis?: boolean;
                 noUnusedLocals?: boolean;
                 noUnusedParameters?: boolean;
+                /** @deprecated */
                 noImplicitUseStrict?: boolean;
                 noLib?: boolean;
                 noResolve?: boolean;
+                /** @deprecated */
                 out?: string;
                 outDir?: string;
                 outFile?: string;
@@ -3010,7 +3013,9 @@ declare namespace ts {
                 sourceRoot?: string;
                 strict?: boolean;
                 strictNullChecks?: boolean;
+                /** @deprecated */
                 suppressExcessPropertyErrors?: boolean;
+                /** @deprecated */
                 suppressImplicitAnyIndexErrors?: boolean;
                 useDefineForClassFields?: boolean;
                 target?: ScriptTarget | ts.ScriptTarget;
@@ -7464,6 +7469,7 @@ declare namespace ts {
         allowUnusedLabels?: boolean;
         alwaysStrict?: boolean;
         baseUrl?: string;
+        /** @deprecated */
         charset?: string;
         checkJs?: boolean;
         customConditions?: string[];
@@ -7483,11 +7489,13 @@ declare namespace ts {
         forceConsistentCasingInFileNames?: boolean;
         ignoreDeprecations?: string;
         importHelpers?: boolean;
+        /** @deprecated */
         importsNotUsedAsValues?: ImportsNotUsedAsValues;
         inlineSourceMap?: boolean;
         inlineSources?: boolean;
         isolatedModules?: boolean;
         jsx?: JsxEmit;
+        /** @deprecated */
         keyofStringsOnly?: boolean;
         lib?: string[];
         locale?: string;
@@ -7506,15 +7514,18 @@ declare namespace ts {
         noImplicitAny?: boolean;
         noImplicitReturns?: boolean;
         noImplicitThis?: boolean;
+        /** @deprecated */
         noStrictGenericChecks?: boolean;
         noUnusedLocals?: boolean;
         noUnusedParameters?: boolean;
+        /** @deprecated */
         noImplicitUseStrict?: boolean;
         noPropertyAccessFromIndexSignature?: boolean;
         assumeChangesOnlyAffectDirectDependencies?: boolean;
         noLib?: boolean;
         noResolve?: boolean;
         noUncheckedIndexedAccess?: boolean;
+        /** @deprecated */
         out?: string;
         outDir?: string;
         outFile?: string;
@@ -7522,6 +7533,7 @@ declare namespace ts {
         preserveConstEnums?: boolean;
         noImplicitOverride?: boolean;
         preserveSymlinks?: boolean;
+        /** @deprecated */
         preserveValueImports?: boolean;
         project?: string;
         reactNamespace?: string;
@@ -7546,7 +7558,9 @@ declare namespace ts {
         strictNullChecks?: boolean;
         strictPropertyInitialization?: boolean;
         stripInternal?: boolean;
+        /** @deprecated */
         suppressExcessPropertyErrors?: boolean;
+        /** @deprecated */
         suppressImplicitAnyIndexErrors?: boolean;
         target?: ScriptTarget;
         traceResolution?: boolean;
@@ -7598,6 +7612,7 @@ declare namespace ts {
         ReactJSX = 4,
         ReactJSXDev = 5,
     }
+    /** @deprecated */
     enum ImportsNotUsedAsValues {
         Remove = 0,
         Preserve = 1,
diff --git a/tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.errors.txt b/tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.errors.txt
index b82c15fe008..fa22beceb33 100644
--- a/tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.errors.txt
+++ b/tests/baselines/reference/checkIndexConstraintOfJavascriptClassExpression.errors.txt
@@ -1,12 +1,8 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 weird.js(1,1): error TS2552: Cannot find name 'someFunction'. Did you mean 'Function'?
 weird.js(1,23): error TS7006: Parameter 'BaseClass' implicitly has an 'any' type.
 weird.js(9,17): error TS7006: Parameter 'error' implicitly has an 'any' type.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== weird.js (3 errors) ====
     someFunction(function(BaseClass) {
     ~~~~~~~~~~~~
diff --git a/tests/baselines/reference/checkJsdocReturnTag1.errors.txt b/tests/baselines/reference/checkJsdocReturnTag1.errors.txt
deleted file mode 100644
index 9ad6b7d9b8a..00000000000
--- a/tests/baselines/reference/checkJsdocReturnTag1.errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== returns.js (0 errors) ====
-    // @ts-check
-    /**
-     * @returns {string} This comment is not currently exposed
-     */
-    function f() {
-        return "hello";
-    }
-    
-    /**
-     * @returns {string=} This comment is not currently exposed
-     */
-    function f1() {
-        return "hello world";
-    }
-    
-    /**
-     * @returns {string|number} This comment is not currently exposed
-     */
-    function f2() {
-        return 5 || "hello";
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsdocReturnTag1.js b/tests/baselines/reference/checkJsdocReturnTag1.js
index dfb57637c85..128550bf261 100644
--- a/tests/baselines/reference/checkJsdocReturnTag1.js
+++ b/tests/baselines/reference/checkJsdocReturnTag1.js
@@ -21,7 +21,8 @@ function f1() {
  */
 function f2() {
     return 5 || "hello";
-}
+}
+
 
 //// [dummy.js]
 // @ts-check
diff --git a/tests/baselines/reference/checkJsdocReturnTag1.symbols b/tests/baselines/reference/checkJsdocReturnTag1.symbols
index 950164401c0..787e4f4d61f 100644
--- a/tests/baselines/reference/checkJsdocReturnTag1.symbols
+++ b/tests/baselines/reference/checkJsdocReturnTag1.symbols
@@ -28,3 +28,4 @@ function f2() {
 
     return 5 || "hello";
 }
+
diff --git a/tests/baselines/reference/checkJsdocReturnTag1.types b/tests/baselines/reference/checkJsdocReturnTag1.types
index 5b2f4ce07f6..d02051d2241 100644
--- a/tests/baselines/reference/checkJsdocReturnTag1.types
+++ b/tests/baselines/reference/checkJsdocReturnTag1.types
@@ -33,3 +33,4 @@ function f2() {
 >5 : 5
 >"hello" : "hello"
 }
+
diff --git a/tests/baselines/reference/checkJsdocReturnTag2.errors.txt b/tests/baselines/reference/checkJsdocReturnTag2.errors.txt
index 76905223b7a..1af147cc8fa 100644
--- a/tests/baselines/reference/checkJsdocReturnTag2.errors.txt
+++ b/tests/baselines/reference/checkJsdocReturnTag2.errors.txt
@@ -1,12 +1,8 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 returns.js(6,5): error TS2322: Type 'number' is not assignable to type 'string'.
 returns.js(13,5): error TS2322: Type 'number | boolean' is not assignable to type 'string | number'.
   Type 'boolean' is not assignable to type 'string | number'.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== returns.js (2 errors) ====
     // @ts-check
     /**
@@ -26,4 +22,5 @@ returns.js(13,5): error TS2322: Type 'number | boolean' is not assignable to typ
         ~~~~~~
 !!! error TS2322: Type 'number | boolean' is not assignable to type 'string | number'.
 !!! error TS2322:   Type 'boolean' is not assignable to type 'string | number'.
-    }
\ No newline at end of file
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/checkJsdocReturnTag2.js b/tests/baselines/reference/checkJsdocReturnTag2.js
index beb9fc0179f..fb39bc68dc4 100644
--- a/tests/baselines/reference/checkJsdocReturnTag2.js
+++ b/tests/baselines/reference/checkJsdocReturnTag2.js
@@ -14,7 +14,8 @@ function f() {
  */
 function f1() {
     return 5 || true;
-}
+}
+
 
 //// [dummy.js]
 // @ts-check
diff --git a/tests/baselines/reference/checkJsdocReturnTag2.symbols b/tests/baselines/reference/checkJsdocReturnTag2.symbols
index 0dbb4a6e010..7dcaa09d684 100644
--- a/tests/baselines/reference/checkJsdocReturnTag2.symbols
+++ b/tests/baselines/reference/checkJsdocReturnTag2.symbols
@@ -19,3 +19,4 @@ function f1() {
 
     return 5 || true;
 }
+
diff --git a/tests/baselines/reference/checkJsdocReturnTag2.types b/tests/baselines/reference/checkJsdocReturnTag2.types
index 9f95e8d19c0..b6b9ff9fd01 100644
--- a/tests/baselines/reference/checkJsdocReturnTag2.types
+++ b/tests/baselines/reference/checkJsdocReturnTag2.types
@@ -23,3 +23,4 @@ function f1() {
 >5 : 5
 >true : true
 }
+
diff --git a/tests/baselines/reference/compilerOptionsOutAndNoEmit.errors.txt b/tests/baselines/reference/compilerOptionsOutAndNoEmit.errors.txt
deleted file mode 100644
index 23f8f9d2eb1..00000000000
--- a/tests/baselines/reference/compilerOptionsOutAndNoEmit.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    class c {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames52(target=es2015).errors.txt b/tests/baselines/reference/computedPropertyNames52(target=es2015).errors.txt
deleted file mode 100644
index a23d97abfa0..00000000000
--- a/tests/baselines/reference/computedPropertyNames52(target=es2015).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== computedPropertyNames52.js (0 errors) ====
-    const array = [];
-    for (let i = 0; i < 10; ++i) {
-        array.push(class C {
-            [i] = () => C;
-            static [i] = 100;
-        })
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/computedPropertyNames52(target=es5).errors.txt b/tests/baselines/reference/computedPropertyNames52(target=es5).errors.txt
deleted file mode 100644
index a23d97abfa0..00000000000
--- a/tests/baselines/reference/computedPropertyNames52(target=es5).errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== computedPropertyNames52.js (0 errors) ====
-    const array = [];
-    for (let i = 0; i < 10; ++i) {
-        array.push(class C {
-            [i] = () => C;
-            static [i] = 100;
-        })
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/config/initTSConfig/Default initialized TSConfig/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Default initialized TSConfig/tsconfig.json
index e075f973c4d..81804ba2c2e 100644
--- a/tests/baselines/reference/config/initTSConfig/Default initialized TSConfig/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Default initialized TSConfig/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with --help/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with --help/tsconfig.json
index e075f973c4d..81804ba2c2e 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with --help/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with --help/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with --watch/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with --watch/tsconfig.json
index e075f973c4d..81804ba2c2e 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with --watch/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with --watch/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with advanced options/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with advanced options/tsconfig.json
index 3379ad1a3b5..b5ac6cc2eb0 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with advanced options/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with advanced options/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     "declarationDir": "lib",                             /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json
index e9e873054b7..e8529643dcb 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with boolean value compiler options/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with enum value compiler options/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with enum value compiler options/tsconfig.json
index 178abdeca27..57335d68845 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with enum value compiler options/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with enum value compiler options/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with files options/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with files options/tsconfig.json
index 6136a0e0ce9..491aeff0028 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with files options/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with files options/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json
index 84bdc4354ee..f8c51421595 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with incorrect compiler option value/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json
index e075f973c4d..81804ba2c2e 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with incorrect compiler option/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json
index 8b051d2b3dd..ce7a7c1fd22 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with list compiler options with enum value/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with list compiler options/tsconfig.json b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with list compiler options/tsconfig.json
index c0c664e0d7c..6d0dbd4fb8a 100644
--- a/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with list compiler options/tsconfig.json	
+++ b/tests/baselines/reference/config/initTSConfig/Initialized TSConfig with list compiler options/tsconfig.json	
@@ -59,7 +59,6 @@
     // "removeComments": true,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
     // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
@@ -71,7 +70,6 @@
     // "noEmitOnError": true,                            /* Disable emitting files if any type checking errors are reported. */
     // "preserveConstEnums": true,                       /* Disable erasing 'const enum' declarations in generated code. */
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
     // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
diff --git a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt
index 569d2d4117b..f3d7cc7f4c0 100644
--- a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt
+++ b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 file1.ts(1,1): error TS2448: Block-scoped variable 'c' used before its declaration.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== file1.ts (1 errors) ====
     c;
     ~
@@ -12,4 +8,5 @@ file1.ts(1,1): error TS2448: Block-scoped variable 'c' used before its declarati
 !!! related TS2728 file2.ts:1:7: 'c' is declared here.
     
 ==== file2.ts (0 errors) ====
-    const c = 0;
\ No newline at end of file
+    const c = 0;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.js b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.js
index 022bd25409a..f75ec813d65 100644
--- a/tests/baselines/reference/constDeclarations-useBeforeDefinition2.js
+++ b/tests/baselines/reference/constDeclarations-useBeforeDefinition2.js
@@ -4,7 +4,8 @@
 c;
 
 //// [file2.ts]
-const c = 0;
+const c = 0;
+
 
 //// [out.js]
 c;
diff --git a/tests/baselines/reference/controlFlowJavascript.errors.txt b/tests/baselines/reference/controlFlowJavascript.errors.txt
deleted file mode 100644
index fd16cd69993..00000000000
--- a/tests/baselines/reference/controlFlowJavascript.errors.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== controlFlowJavascript.js (0 errors) ====
-    let cond = true;
-    
-    // CFA for 'let' and no initializer
-    function f1() {
-        let x;
-        if (cond) {
-            x = 1;
-        }
-        if (cond) {
-            x = "hello";
-        }
-        const y = x;  // string | number | undefined
-    }
-    
-    // CFA for 'let' and 'undefined' initializer
-    function f2() {
-        let x = undefined;
-        if (cond) {
-            x = 1;
-        }
-        if (cond) {
-            x = "hello";
-        }
-        const y = x;  // string | number | undefined
-    }
-    
-    // CFA for 'let' and 'null' initializer
-    function f3() {
-        let x = null;
-        if (cond) {
-            x = 1;
-        }
-        if (cond) {
-            x = "hello";
-        }
-        const y = x;  // string | number | null
-    }
-    
-    // CFA for 'var' with no initializer
-    function f5() {
-        var x;
-        if (cond) {
-            x = 1;
-        }
-        if (cond) {
-            x = "hello";
-        }
-        const y = x;  // string | number | undefined
-    }
-    
-    // CFA for 'var' with 'undefined' initializer
-    function f6() {
-        var x = undefined;
-        if (cond) {
-            x = 1;
-        }
-        if (cond) {
-            x = "hello";
-        }
-        const y = x;  // string | number | undefined
-    }
-    
-    // CFA for 'var' with 'null' initializer
-    function f7() {
-        var x = null;
-        if (cond) {
-            x = 1;
-        }
-        if (cond) {
-            x = "hello";
-        }
-        const y = x;  // string | number | null
-    }
-    
-    // No CFA for captured outer variables
-    function f9() {
-        let x;
-        if (cond) {
-            x = 1;
-        }
-        if (cond) {
-            x = "hello";
-        }
-        const y = x;  // string | number | undefined
-        function f() {
-            const z = x;  // any
-        }
-    }
-    
-    // No CFA for captured outer variables
-    function f10() {
-        let x;
-        if (cond) {
-            x = 1;
-        }
-        if (cond) {
-            x = "hello";
-        }
-        const y = x;  // string | number | undefined
-        const f = () => {
-            const z = x;  // any
-        };
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt
index c2a41fa7663..277b882cae8 100644
--- a/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt
+++ b/tests/baselines/reference/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt
@@ -1,13 +1,9 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 declFile.d.ts(2,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
 declFile.d.ts(3,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
 declFile.d.ts(5,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
 declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== client.ts (0 errors) ====
     ///<reference path="declFile.d.ts"/>
     var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file
diff --git a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
index f5c737af1ff..42418f6900c 100644
--- a/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
+++ b/tests/baselines/reference/declarationFileOverwriteErrorWithOut.errors.txt
@@ -1,13 +1,9 @@
 error TS5055: Cannot write file '/out.d.ts' because it would overwrite input file.
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 
 !!! error TS5055: Cannot write file '/out.d.ts' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== /out.d.ts (0 errors) ====
     declare class c {
     }
diff --git a/tests/baselines/reference/deprecatedCompilerOptions1.js b/tests/baselines/reference/deprecatedCompilerOptions1.js
index 463b2a4396e..777f1824373 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions1.js
+++ b/tests/baselines/reference/deprecatedCompilerOptions1.js
@@ -4,5 +4,5 @@
 const a = 1;
 
 
-//// [dist.js]
+//// [a.js]
 var a = 1;
diff --git a/tests/baselines/reference/deprecatedCompilerOptions2.js b/tests/baselines/reference/deprecatedCompilerOptions2.js
index b98235d6193..89286386b80 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions2.js
+++ b/tests/baselines/reference/deprecatedCompilerOptions2.js
@@ -4,5 +4,5 @@
 const a = 1;
 
 
-//// [dist.js]
+//// [a.js]
 var a = 1;
diff --git a/tests/baselines/reference/deprecatedCompilerOptions3.js b/tests/baselines/reference/deprecatedCompilerOptions3.js
index 8b4afffe1ed..3e175cce842 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions3.js
+++ b/tests/baselines/reference/deprecatedCompilerOptions3.js
@@ -4,5 +4,5 @@
 const a = 1;
 
 
-//// [dist.js]
+//// [a.js]
 var a = 1;
diff --git a/tests/baselines/reference/deprecatedCompilerOptions4.js b/tests/baselines/reference/deprecatedCompilerOptions4.js
index 265c50f9843..1557f74b201 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions4.js
+++ b/tests/baselines/reference/deprecatedCompilerOptions4.js
@@ -4,5 +4,5 @@
 const a = 1;
 
 
-//// [dist.js]
+//// [a.js]
 var a = 1;
diff --git a/tests/baselines/reference/deprecatedCompilerOptions5.js b/tests/baselines/reference/deprecatedCompilerOptions5.js
index fa68fd507c5..ed591b33fa6 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions5.js
+++ b/tests/baselines/reference/deprecatedCompilerOptions5.js
@@ -4,5 +4,5 @@
 const a = 1;
 
 
-//// [dist.js]
+//// [a.js]
 var a = 1;
diff --git a/tests/baselines/reference/deprecatedCompilerOptions6.js b/tests/baselines/reference/deprecatedCompilerOptions6.js
index a610fc3216d..2d8cb9f10c3 100644
--- a/tests/baselines/reference/deprecatedCompilerOptions6.js
+++ b/tests/baselines/reference/deprecatedCompilerOptions6.js
@@ -4,5 +4,5 @@
 const a = 1;
 
 
-//// [dist.js]
+//// [a.js]
 var a = 1;
diff --git a/tests/baselines/reference/dynamicRequire.errors.txt b/tests/baselines/reference/dynamicRequire.errors.txt
deleted file mode 100644
index f8d86e38a02..00000000000
--- a/tests/baselines/reference/dynamicRequire.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.js (0 errors) ====
-    function foo(name) {
-        var s = require("t/" + name)
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/dynamicRequire.js b/tests/baselines/reference/dynamicRequire.js
index 1b635bc5c43..d0c82e4abcd 100644
--- a/tests/baselines/reference/dynamicRequire.js
+++ b/tests/baselines/reference/dynamicRequire.js
@@ -3,7 +3,8 @@
 //// [a.js]
 function foo(name) {
     var s = require("t/" + name)
-}
+}
+
 
 //// [a_out.js]
 function foo(name) {
diff --git a/tests/baselines/reference/dynamicRequire.symbols b/tests/baselines/reference/dynamicRequire.symbols
index 2bc30eca5da..d665cff0660 100644
--- a/tests/baselines/reference/dynamicRequire.symbols
+++ b/tests/baselines/reference/dynamicRequire.symbols
@@ -10,3 +10,4 @@ function foo(name) {
 >require : Symbol(require)
 >name : Symbol(name, Decl(a.js, 0, 13))
 }
+
diff --git a/tests/baselines/reference/dynamicRequire.types b/tests/baselines/reference/dynamicRequire.types
index 06bb86ecfe6..605f6da6673 100644
--- a/tests/baselines/reference/dynamicRequire.types
+++ b/tests/baselines/reference/dynamicRequire.types
@@ -13,3 +13,4 @@ function foo(name) {
 >"t/" : "t/"
 >name : any
 }
+
diff --git a/tests/baselines/reference/excessPropertyErrorsSuppressed.errors.txt b/tests/baselines/reference/excessPropertyErrorsSuppressed.errors.txt
index 3d2ecb5a9c5..b421d827c02 100644
--- a/tests/baselines/reference/excessPropertyErrorsSuppressed.errors.txt
+++ b/tests/baselines/reference/excessPropertyErrorsSuppressed.errors.txt
@@ -1,7 +1,10 @@
 error TS5102: Option 'suppressExcessPropertyErrors' has been removed. Please remove it from your configuration.
+excessPropertyErrorsSuppressed.ts(1,38): error TS2353: Object literal may only specify known properties, and 'b' does not exist in type '{ a: string; }'.
 
 
 !!! error TS5102: Option 'suppressExcessPropertyErrors' has been removed. Please remove it from your configuration.
-==== excessPropertyErrorsSuppressed.ts (0 errors) ====
+==== excessPropertyErrorsSuppressed.ts (1 errors) ====
     var x: { a: string } = { a: "hello", b: 42 };  // No error
+                                         ~
+!!! error TS2353: Object literal may only specify known properties, and 'b' does not exist in type '{ a: string; }'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
deleted file mode 100644
index 823d9d0323e..00000000000
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    export class c {
-    }
-    
-==== b.ts (0 errors) ====
-    function foo() {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/genericSetterInClassTypeJsDoc.errors.txt b/tests/baselines/reference/genericSetterInClassTypeJsDoc.errors.txt
deleted file mode 100644
index 6f5cb710cfa..00000000000
--- a/tests/baselines/reference/genericSetterInClassTypeJsDoc.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== genericSetterInClassTypeJsDoc.js (0 errors) ====
-    /**
-     * @template T
-     */
-     class Box {
-        #value;
-    
-        /** @param {T} initialValue */
-        constructor(initialValue) {
-            this.#value = initialValue;
-        }
-        
-        /** @type {T} */
-        get value() {
-            return this.#value;
-        }
-    
-        set value(value) {
-            this.#value = value;
-        }
-    }
-    
-    new Box(3).value = 3;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/globalThisVarDeclaration.errors.txt b/tests/baselines/reference/globalThisVarDeclaration.errors.txt
index 1b4a09e4894..7bbcdac3736 100644
--- a/tests/baselines/reference/globalThisVarDeclaration.errors.txt
+++ b/tests/baselines/reference/globalThisVarDeclaration.errors.txt
@@ -1,13 +1,9 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 actual.ts(12,5): error TS2339: Property 'a' does not exist on type 'Window'.
 actual.ts(13,5): error TS2339: Property 'b' does not exist on type 'Window'.
 b.js(12,5): error TS2339: Property 'a' does not exist on type 'Window'.
 b.js(13,5): error TS2339: Property 'b' does not exist on type 'Window'.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== b.js (2 errors) ====
     var a = 10;
     this.a;
diff --git a/tests/baselines/reference/importsNotUsedAsValues_error.errors.txt b/tests/baselines/reference/importsNotUsedAsValues_error.errors.txt
index 8bd2485056c..39a41bd454c 100644
--- a/tests/baselines/reference/importsNotUsedAsValues_error.errors.txt
+++ b/tests/baselines/reference/importsNotUsedAsValues_error.errors.txt
@@ -1,10 +1,6 @@
 error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-/b.ts(1,1): error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
-/c.ts(1,1): error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
 /e.ts(1,1): error TS6192: All imports in import declaration are unused.
-/g.ts(1,1): error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
-/i.ts(1,1): error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
 
 
 !!! error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
@@ -15,18 +11,14 @@ error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it
     export type B = {};
     export const enum C { One, Two }
     
-==== /b.ts (1 errors) ====
+==== /b.ts (0 errors) ====
     import { A, B } from './a'; // Error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
     let a: A;
     let b: B;
     console.log(a, b);
     
-==== /c.ts (1 errors) ====
+==== /c.ts (0 errors) ====
     import Default, * as named from './a'; // Error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
     let a: Default;
     let b: named.B;
     console.log(a, b);
@@ -50,10 +42,8 @@ error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it
     let d: D.Two = C.Two;
     console.log(c, d);
     
-==== /g.ts (1 errors) ====
+==== /g.ts (0 errors) ====
     import { C } from './a';
-    ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
     let c: C;
     let d: C.Two;
     console.log(c, d);
@@ -62,10 +52,8 @@ error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it
     class H {}
     export = H;
     
-==== /i.ts (1 errors) ====
+==== /i.ts (0 errors) ====
     import H = require('./h'); // Error
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
     let h: H = {};
     console.log(h);
     
diff --git a/tests/baselines/reference/importsNotUsedAsValues_error.js b/tests/baselines/reference/importsNotUsedAsValues_error.js
index 0d3b2faa91f..7d9f1a2be56 100644
--- a/tests/baselines/reference/importsNotUsedAsValues_error.js
+++ b/tests/baselines/reference/importsNotUsedAsValues_error.js
@@ -83,14 +83,12 @@ exports.A = A;
 //// [b.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./a"); // Error
 var a;
 var b;
 console.log(a, b);
 //// [c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./a"); // Error
 var a;
 var b;
 console.log(a, b);
@@ -104,11 +102,9 @@ console.log(a, b);
 //// [e.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./a"); // noUnusedLocals error only
 //// [f.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./a");
 0 /* C.One */;
 var c = 1 /* C.Two */;
 var d = 1 /* C.Two */;
@@ -116,7 +112,6 @@ console.log(c, d);
 //// [g.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./a");
 var c;
 var d;
 console.log(c, d);
diff --git a/tests/baselines/reference/incrementalOut.errors.txt b/tests/baselines/reference/incrementalOut.errors.txt
deleted file mode 100644
index f63729881d5..00000000000
--- a/tests/baselines/reference/incrementalOut.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== incrementalOut.ts (0 errors) ====
-    const x = 10;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/inferringClassMembersFromAssignments.errors.txt b/tests/baselines/reference/inferringClassMembersFromAssignments.errors.txt
index 7c5d24520bd..d0ec3d27953 100644
--- a/tests/baselines/reference/inferringClassMembersFromAssignments.errors.txt
+++ b/tests/baselines/reference/inferringClassMembersFromAssignments.errors.txt
@@ -1,12 +1,8 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 a.js(14,13): error TS7008: Member 'inMethodNullable' implicitly has an 'any' type.
 a.js(20,9): error TS2322: Type 'string' is not assignable to type 'number'.
 a.js(39,9): error TS2322: Type 'boolean' is not assignable to type 'number'.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== a.js (3 errors) ====
     class C {
         constructor() {
diff --git a/tests/baselines/reference/inlineSourceMap2.errors.txt b/tests/baselines/reference/inlineSourceMap2.errors.txt
index 7b08c3a3955..2f9e4253b16 100644
--- a/tests/baselines/reference/inlineSourceMap2.errors.txt
+++ b/tests/baselines/reference/inlineSourceMap2.errors.txt
@@ -1,17 +1,14 @@
 error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
 error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'.
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 error TS5108: Option 'target=ES3' has been removed. Please remove it from your configuration.
 
 
 !!! error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'.
 !!! error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'.
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 !!! error TS5108: Option 'target=ES3' has been removed. Please remove it from your configuration.
 ==== inlineSourceMap2.ts (0 errors) ====
     // configuration errors
     
     var x = 0;
-    console.log(x);
\ No newline at end of file
+    console.log(x);
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineSourceMap2.js b/tests/baselines/reference/inlineSourceMap2.js
index a3ec136a89d..d5e14bac1f7 100644
--- a/tests/baselines/reference/inlineSourceMap2.js
+++ b/tests/baselines/reference/inlineSourceMap2.js
@@ -4,7 +4,8 @@
 // configuration errors
 
 var x = 0;
-console.log(x);
+console.log(x);
+
 
 //// [outfile.js]
 // configuration errors
diff --git a/tests/baselines/reference/inlineSources.errors.txt b/tests/baselines/reference/inlineSources.errors.txt
index 7a86c2dcccd..10a4abb7c07 100644
--- a/tests/baselines/reference/inlineSources.errors.txt
+++ b/tests/baselines/reference/inlineSources.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 error TS5108: Option 'target=ES3' has been removed. Please remove it from your configuration.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 !!! error TS5108: Option 'target=ES3' has been removed. Please remove it from your configuration.
 ==== a.ts (0 errors) ====
     var a = 0;
@@ -12,4 +8,5 @@ error TS5108: Option 'target=ES3' has been removed. Please remove it from your c
     
 ==== b.ts (0 errors) ====
     var b = 0;
-    console.log(b);
\ No newline at end of file
+    console.log(b);
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineSources.js b/tests/baselines/reference/inlineSources.js
index 8ac6bf43bee..5251c994b5c 100644
--- a/tests/baselines/reference/inlineSources.js
+++ b/tests/baselines/reference/inlineSources.js
@@ -6,7 +6,8 @@ console.log(a);
 
 //// [b.ts]
 var b = 0;
-console.log(b);
+console.log(b);
+
 
 //// [out.js]
 var a = 0;
diff --git a/tests/baselines/reference/inlineSources.js.map b/tests/baselines/reference/inlineSources.js.map
index 0131f788103..584d695034f 100644
--- a/tests/baselines/reference/inlineSources.js.map
+++ b/tests/baselines/reference/inlineSources.js.map
@@ -1,3 +1,3 @@
 //// [out.js.map]
-{"version":3,"file":"out.js","sourceRoot":"","sources":["a.ts","b.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,CAAC,CAAC;AACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACDf,IAAI,CAAC,GAAG,CAAC,CAAC;AACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC","sourcesContent":["var a = 0;\nconsole.log(a);\n","var b = 0;\nconsole.log(b);"]}
-//// https://sokra.github.io/source-map-visualization#base64,dmFyIGEgPSAwOw0KY29uc29sZS5sb2coYSk7DQp2YXIgYiA9IDA7DQpjb25zb2xlLmxvZyhiKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPW91dC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQ0RmLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYSA9IDA7XG5jb25zb2xlLmxvZyhhKTtcbiIsInZhciBiID0gMDtcbmNvbnNvbGUubG9nKGIpOyJdfQ==,dmFyIGEgPSAwOwpjb25zb2xlLmxvZyhhKTsK,dmFyIGIgPSAwOwpjb25zb2xlLmxvZyhiKTs=
+{"version":3,"file":"out.js","sourceRoot":"","sources":["a.ts","b.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,CAAC,CAAC;AACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACDf,IAAI,CAAC,GAAG,CAAC,CAAC;AACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC","sourcesContent":["var a = 0;\nconsole.log(a);\n","var b = 0;\nconsole.log(b);\n"]}
+//// https://sokra.github.io/source-map-visualization#base64,dmFyIGEgPSAwOw0KY29uc29sZS5sb2coYSk7DQp2YXIgYiA9IDA7DQpjb25zb2xlLmxvZyhiKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPW91dC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQ0RmLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYSA9IDA7XG5jb25zb2xlLmxvZyhhKTtcbiIsInZhciBiID0gMDtcbmNvbnNvbGUubG9nKGIpO1xuIl19,dmFyIGEgPSAwOwpjb25zb2xlLmxvZyhhKTsK,dmFyIGIgPSAwOwpjb25zb2xlLmxvZyhiKTsK
diff --git a/tests/baselines/reference/inlineSources.sourcemap.txt b/tests/baselines/reference/inlineSources.sourcemap.txt
index f97b1035e53..4325aa8cd87 100644
--- a/tests/baselines/reference/inlineSources.sourcemap.txt
+++ b/tests/baselines/reference/inlineSources.sourcemap.txt
@@ -3,7 +3,7 @@ JsFile: out.js
 mapUrl: out.js.map
 sourceRoot: 
 sources: a.ts,b.ts
-sourcesContent: ["var a = 0;\nconsole.log(a);\n","var b = 0;\nconsole.log(b);"]
+sourcesContent: ["var a = 0;\nconsole.log(a);\n","var b = 0;\nconsole.log(b);\n"]
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:out.js
diff --git a/tests/baselines/reference/inlineSources2.errors.txt b/tests/baselines/reference/inlineSources2.errors.txt
index 7a86c2dcccd..10a4abb7c07 100644
--- a/tests/baselines/reference/inlineSources2.errors.txt
+++ b/tests/baselines/reference/inlineSources2.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 error TS5108: Option 'target=ES3' has been removed. Please remove it from your configuration.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 !!! error TS5108: Option 'target=ES3' has been removed. Please remove it from your configuration.
 ==== a.ts (0 errors) ====
     var a = 0;
@@ -12,4 +8,5 @@ error TS5108: Option 'target=ES3' has been removed. Please remove it from your c
     
 ==== b.ts (0 errors) ====
     var b = 0;
-    console.log(b);
\ No newline at end of file
+    console.log(b);
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineSources2.js b/tests/baselines/reference/inlineSources2.js
index 59bb4e3ac35..14658a64251 100644
--- a/tests/baselines/reference/inlineSources2.js
+++ b/tests/baselines/reference/inlineSources2.js
@@ -6,11 +6,12 @@ console.log(a);
 
 //// [b.ts]
 var b = 0;
-console.log(b);
+console.log(b);
+
 
 //// [out.js]
 var a = 0;
 console.log(a);
 var b = 0;
 console.log(b);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQ0RmLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYSA9IDA7XG5jb25zb2xlLmxvZyhhKTtcbiIsInZhciBiID0gMDtcbmNvbnNvbGUubG9nKGIpOyJdfQ==
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQ0RmLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYSA9IDA7XG5jb25zb2xlLmxvZyhhKTtcbiIsInZhciBiID0gMDtcbmNvbnNvbGUubG9nKGIpO1xuIl19
\ No newline at end of file
diff --git a/tests/baselines/reference/inlineSources2.sourcemap.txt b/tests/baselines/reference/inlineSources2.sourcemap.txt
index 40f4cc80c64..7b807de6076 100644
--- a/tests/baselines/reference/inlineSources2.sourcemap.txt
+++ b/tests/baselines/reference/inlineSources2.sourcemap.txt
@@ -1,9 +1,9 @@
 ===================================================================
 JsFile: out.js
-mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQ0RmLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYSA9IDA7XG5jb25zb2xlLmxvZyhhKTtcbiIsInZhciBiID0gMDtcbmNvbnNvbGUubG9nKGIpOyJdfQ==
+mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQ0RmLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYSA9IDA7XG5jb25zb2xlLmxvZyhhKTtcbiIsInZhciBiID0gMDtcbmNvbnNvbGUubG9nKGIpO1xuIl19
 sourceRoot: 
 sources: a.ts,b.ts
-sourcesContent: ["var a = 0;\nconsole.log(a);\n","var b = 0;\nconsole.log(b);"]
+sourcesContent: ["var a = 0;\nconsole.log(a);\n","var b = 0;\nconsole.log(b);\n"]
 ===================================================================
 -------------------------------------------------------------------
 emittedFile:out.js
@@ -110,4 +110,4 @@ sourceFile:b.ts
 7 >Emitted(4, 15) Source(2, 15) + SourceIndex(1)
 8 >Emitted(4, 16) Source(2, 16) + SourceIndex(1)
 ---
->>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQ0RmLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYSA9IDA7XG5jb25zb2xlLmxvZyhhKTtcbiIsInZhciBiID0gMDtcbmNvbnNvbGUubG9nKGIpOyJdfQ==
\ No newline at end of file
+>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQ0RmLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgYSA9IDA7XG5jb25zb2xlLmxvZyhhKTtcbiIsInZhciBiID0gMDtcbmNvbnNvbGUubG9nKGIpO1xuIl19
\ No newline at end of file
diff --git a/tests/baselines/reference/isolatedModulesOut.errors.txt b/tests/baselines/reference/isolatedModulesOut.errors.txt
index 0a331ba0b6c..9c2d706216e 100644
--- a/tests/baselines/reference/isolatedModulesOut.errors.txt
+++ b/tests/baselines/reference/isolatedModulesOut.errors.txt
@@ -1,15 +1,10 @@
-error TS5053: Option 'out' cannot be specified with option 'isolatedModules'.
 error TS5102: Option 'out' has been removed. Please remove it from your configuration.
   Use 'outFile' instead.
-file1.ts(1,1): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
 
 
-!!! error TS5053: Option 'out' cannot be specified with option 'isolatedModules'.
 !!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'outFile' instead.
-==== file1.ts (1 errors) ====
+==== file1.ts (0 errors) ====
     export var x;
-    ~~~~~~~~~~~~~
-!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
 ==== file2.ts (0 errors) ====
     var y;
\ No newline at end of file
diff --git a/tests/baselines/reference/isolatedModulesOut.js b/tests/baselines/reference/isolatedModulesOut.js
index fe995704a46..df65d3b55a3 100644
--- a/tests/baselines/reference/isolatedModulesOut.js
+++ b/tests/baselines/reference/isolatedModulesOut.js
@@ -5,5 +5,7 @@ export var x;
 //// [file2.ts]
 var y;
 
-//// [all.js]
+//// [file1.js]
+export var x;
+//// [file2.js]
 var y;
diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.errors.txt b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.errors.txt
deleted file mode 100644
index 61703c9b666..00000000000
--- a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.js (0 errors) ====
-    class c {
-        method(a) {
-            let x = a => this.method(a);
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js
index dba1bba5a16..8b833c00693 100644
--- a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js
+++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.js
@@ -5,7 +5,8 @@ class c {
     method(a) {
         let x = a => this.method(a);
     }
-}
+}
+
 
 //// [out.js]
 var c = /** @class */ (function () {
diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols
index e3aff0c85a6..d79e0966e56 100644
--- a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols
+++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.symbols
@@ -17,3 +17,4 @@ class c {
 >a : Symbol(a, Decl(a.js, 2, 15))
     }
 }
+
diff --git a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types
index acaa367b3ff..9e38800cb60 100644
--- a/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types
+++ b/tests/baselines/reference/jsFileCompilationClassMethodContainingArrowFunction.types
@@ -19,3 +19,4 @@ class c {
 >a : any
     }
 }
+
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt
index 4641485b7cd..51e16b7a0ce 100644
--- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementation.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 a.ts(1,10): error TS2393: Duplicate function implementation.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== b.js (0 errors) ====
     function foo() {
         return 10;
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt
index 6c6c2d5ab18..142ed1352d9 100644
--- a/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 a.ts(1,10): error TS2393: Duplicate function implementation.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== a.ts (1 errors) ====
     function foo() {
              ~~~
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt
deleted file mode 100644
index 52ed2fb6c99..00000000000
--- a/tests/baselines/reference/jsFileCompilationDuplicateVariable.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    var x = 10;
-    
-==== b.js (0 errors) ====
-    var x = "hello"; // Error is recorded here, but suppressed because the js file isn't checked
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariable.js b/tests/baselines/reference/jsFileCompilationDuplicateVariable.js
index 6286060cac0..11416c427f7 100644
--- a/tests/baselines/reference/jsFileCompilationDuplicateVariable.js
+++ b/tests/baselines/reference/jsFileCompilationDuplicateVariable.js
@@ -15,3 +15,18 @@ var x = "hello"; // Error is recorded here, but suppressed because the js file i
 //// [out.d.ts]
 declare var x: number;
 declare var x: string;
+
+
+//// [DtsFileErrors]
+
+
+out.d.ts(2,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'number', but here has type 'string'.
+
+
+==== out.d.ts (1 errors) ====
+    declare var x: number;
+    declare var x: string;
+                ~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'number', but here has type 'string'.
+!!! related TS6203 out.d.ts:1:13: 'x' was also declared here.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt
index 7d9d1432235..a44b8c591dd 100644
--- a/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationDuplicateVariableErrorReported.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 a.ts(1,5): error TS2403: Subsequent variable declarations must have the same type.  Variable 'x' must be of type 'string', but here has type 'number'.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== b.js (0 errors) ====
     var x = "hello";
     
diff --git a/tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt b/tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt
deleted file mode 100644
index 342ed01c061..00000000000
--- a/tests/baselines/reference/jsFileCompilationEmitDeclarations.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    class c {
-    }
-    
-==== b.js (0 errors) ====
-    function foo() {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt b/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt
deleted file mode 100644
index bd36dfd3572..00000000000
--- a/tests/baselines/reference/jsFileCompilationEmitTrippleSlashReference.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    class c {
-    }
-    
-==== b.js (0 errors) ====
-    /// <reference path="c.js"/>
-    function foo() {
-    }
-    
-==== c.js (0 errors) ====
-    function bar() {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt b/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt
deleted file mode 100644
index 7589b9a0549..00000000000
--- a/tests/baselines/reference/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    class c {
-    }
-    
-==== b.ts (0 errors) ====
-    /// <reference path="c.js"/>
-    function foo() {
-    }
-    
-==== c.js (0 errors) ====
-    function bar() {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.errors.txt b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.errors.txt
deleted file mode 100644
index 560b8639fe0..00000000000
--- a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.js (0 errors) ====
-    function foo(a) {
-        for (let a = 0; a < 10; a++) {
-            // do something
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
index 7d997291fc7..31ab9d4aa96 100644
--- a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
+++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.js
@@ -5,7 +5,8 @@ function foo(a) {
     for (let a = 0; a < 10; a++) {
         // do something
     }
-}
+}
+
 
 //// [out.js]
 function foo(a) {
diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.symbols b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.symbols
index 4dd3e25dafc..18994a65972 100644
--- a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.symbols
+++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.symbols
@@ -13,3 +13,4 @@ function foo(a) {
         // do something
     }
 }
+
diff --git a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types
index d37297bbc61..0b5c5835612 100644
--- a/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types
+++ b/tests/baselines/reference/jsFileCompilationLetBeingRenamed.types
@@ -17,3 +17,4 @@ function foo(a) {
         // do something
     }
 }
+
diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt
deleted file mode 100644
index fab59e158f8..00000000000
--- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== b.js (0 errors) ====
-    let a = 10;
-    b = 30;
-    
-==== a.ts (0 errors) ====
-    let b = 30;
-    a = 10;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
index 0067d8cc2ee..7085a34f80d 100644
--- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 a.ts(2,1): error TS2448: Block-scoped variable 'a' used before its declaration.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== a.ts (1 errors) ====
     let b = 30;
     a = 10;
diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt
deleted file mode 100644
index e8698c762c6..00000000000
--- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    class c {
-    }
-    
-==== b.ts (0 errors) ====
-    /// <reference path="c.js"/>
-    //no  error on above reference since not emitting declarations
-    function foo() {
-    }
-    
-==== c.js (0 errors) ====
-    function bar() {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js
index 4c56799f55b..2c28c5c5f46 100644
--- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js
+++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.js
@@ -12,7 +12,8 @@ function foo() {
 
 //// [c.js]
 function bar() {
-}
+}
+
 
 //// [out.js]
 var c = /** @class */ (function () {
diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols
index 8fa5157dfa1..f9a7be2474c 100644
--- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols
+++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols
@@ -16,3 +16,4 @@ function foo() {
 function bar() {
 >bar : Symbol(bar, Decl(c.js, 0, 0))
 }
+
diff --git a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types
index d402f442582..6347d6b89bd 100644
--- a/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types
+++ b/tests/baselines/reference/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types
@@ -16,3 +16,4 @@ function foo() {
 function bar() {
 >bar : () => void
 }
+
diff --git a/tests/baselines/reference/jsFileCompilationNonNullAssertion.errors.txt b/tests/baselines/reference/jsFileCompilationNonNullAssertion.errors.txt
index 721805613c4..68250662d89 100644
--- a/tests/baselines/reference/jsFileCompilationNonNullAssertion.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationNonNullAssertion.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 /src/a.js(1,1): error TS8013: Non-null assertions can only be used in TypeScript files.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== /src/a.js (1 errors) ====
     0!
     ~~
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
deleted file mode 100644
index 53e7c639455..00000000000
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== _apply.js (0 errors) ====
-    /**
-     * A faster alternative to `Function#apply`, this function invokes `func`
-     * with the `this` binding of `thisArg` and the arguments of `args`.
-     *
-     * @private
-     * @param {Function} func The function to invoke.
-     * @param {*} thisArg The `this` binding of `func`.
-     * @param {...*} args The arguments to invoke `func` with.
-     * @returns {*} Returns the result of `func`.
-     */
-    function apply(func, thisArg, ...args) {
-        var length = args.length;
-        switch (length) {
-            case 0: return func.call(thisArg);
-            case 1: return func.call(thisArg, args[0]);
-            case 2: return func.call(thisArg, args[0], args[1]);
-            case 3: return func.call(thisArg, args[0], args[1], args[2]);
-        }
-        return func.apply(thisArg, args);
-    }
-    
-    export default apply;
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
index 9904186cc94..a03d26a46c9 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
@@ -22,7 +22,8 @@ function apply(func, thisArg, ...args) {
     return func.apply(thisArg, args);
 }
 
-export default apply;
+export default apply;
+
 
 //// [apply.js]
 define("_apply", ["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/jsFileCompilationRestParameter.errors.txt b/tests/baselines/reference/jsFileCompilationRestParameter.errors.txt
deleted file mode 100644
index 97623628256..00000000000
--- a/tests/baselines/reference/jsFileCompilationRestParameter.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.js (0 errors) ====
-    function foo(...a) { }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationRestParameter.js b/tests/baselines/reference/jsFileCompilationRestParameter.js
index e4953af84f0..84ff150def9 100644
--- a/tests/baselines/reference/jsFileCompilationRestParameter.js
+++ b/tests/baselines/reference/jsFileCompilationRestParameter.js
@@ -1,7 +1,8 @@
 //// [tests/cases/compiler/jsFileCompilationRestParameter.ts] ////
 
 //// [a.js]
-function foo(...a) { }
+function foo(...a) { }
+
 
 //// [b.js]
 function foo(...a) { }
diff --git a/tests/baselines/reference/jsFileCompilationShortHandProperty.errors.txt b/tests/baselines/reference/jsFileCompilationShortHandProperty.errors.txt
deleted file mode 100644
index bbcf5cd1150..00000000000
--- a/tests/baselines/reference/jsFileCompilationShortHandProperty.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.js (0 errors) ====
-    function foo() {
-        var a = 10;
-        var b = "Hello";
-        return {
-            a,
-            b
-        };
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationShortHandProperty.js b/tests/baselines/reference/jsFileCompilationShortHandProperty.js
index 73c47d2a731..5b1df6dccc8 100644
--- a/tests/baselines/reference/jsFileCompilationShortHandProperty.js
+++ b/tests/baselines/reference/jsFileCompilationShortHandProperty.js
@@ -8,7 +8,8 @@ function foo() {
         a,
         b
     };
-}
+}
+
 
 //// [out.js]
 function foo() {
diff --git a/tests/baselines/reference/jsFileCompilationShortHandProperty.symbols b/tests/baselines/reference/jsFileCompilationShortHandProperty.symbols
index 9f7e24bcce4..4cde6bb927a 100644
--- a/tests/baselines/reference/jsFileCompilationShortHandProperty.symbols
+++ b/tests/baselines/reference/jsFileCompilationShortHandProperty.symbols
@@ -19,3 +19,4 @@ function foo() {
 
     };
 }
+
diff --git a/tests/baselines/reference/jsFileCompilationShortHandProperty.types b/tests/baselines/reference/jsFileCompilationShortHandProperty.types
index d3c66ea45c7..163af24a00e 100644
--- a/tests/baselines/reference/jsFileCompilationShortHandProperty.types
+++ b/tests/baselines/reference/jsFileCompilationShortHandProperty.types
@@ -23,3 +23,4 @@ function foo() {
 
     };
 }
+
diff --git a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
index e9892f08307..c120f1de953 100644
--- a/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationTypeAssertions.errors.txt
@@ -1,12 +1,8 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 /src/a.js(1,6): error TS8016: Type assertion expressions can only be used in TypeScript files.
 /src/a.js(2,10): error TS17008: JSX element 'string' has no corresponding closing tag.
 /src/a.js(3,1): error TS1005: '</' expected.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== /src/a.js (3 errors) ====
     0 as number;
          ~~~~~~
diff --git a/tests/baselines/reference/jsFileCompilationWithEnabledCompositeOption.errors.txt b/tests/baselines/reference/jsFileCompilationWithEnabledCompositeOption.errors.txt
deleted file mode 100644
index 342ed01c061..00000000000
--- a/tests/baselines/reference/jsFileCompilationWithEnabledCompositeOption.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    class c {
-    }
-    
-==== b.js (0 errors) ====
-    function foo() {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationWithOut.errors.txt b/tests/baselines/reference/jsFileCompilationWithOut.errors.txt
deleted file mode 100644
index 342ed01c061..00000000000
--- a/tests/baselines/reference/jsFileCompilationWithOut.errors.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    class c {
-    }
-    
-==== b.js (0 errors) ====
-    function foo() {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
index 2b1347d3a59..a13d5723db6 100644
--- a/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt
@@ -1,13 +1,9 @@
 error TS5055: Cannot write file '/b.d.ts' because it would overwrite input file.
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 
 !!! error TS5055: Cannot write file '/b.d.ts' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== /a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt
index a81507d94a4..e546e4dd11e 100644
--- a/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt
+++ b/tests/baselines/reference/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt
@@ -1,13 +1,9 @@
 error TS5055: Cannot write file '/b.js' because it would overwrite input file.
   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 
 !!! error TS5055: Cannot write file '/b.js' because it would overwrite input file.
 !!! error TS5055:   Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig.
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== /a.ts (0 errors) ====
     class c {
     }
diff --git a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.errors.txt b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.errors.txt
deleted file mode 100644
index f9b7c1da41a..00000000000
--- a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.errors.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.js (0 errors) ====
-    var variable = {};
-    variable.a = 0;
-    
-    class C {
-        initializedMember = {};
-        constructor() {
-            this.member = {};
-            this.member.a = 0;
-        }
-    }
-    
-    var obj = {
-        property: {}
-    };
-    
-    obj.property.a = 0;
-    
-    var arr = [{}];
-    
-    function getObj() {
-        return {};
-    }
-    
-    
-==== b.ts (0 errors) ====
-    variable.a = 1;
-    (new C()).member.a = 1;
-    (new C()).initializedMember.a = 1;
-    obj.property.a = 1;
-    arr[0].a = 1;
-    getObj().a = 1;
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types
index 01dc665f9c0..3b880db7f7d 100644
--- a/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types
+++ b/tests/baselines/reference/jsObjectsMarkedAsOpenEnded.types
@@ -29,7 +29,7 @@ class C {
 
         this.member.a = 0;
 >this.member.a = 0 : 0
->this.member.a : any
+>this.member.a : error
 >this.member : {}
 >this : this
 >member : {}
@@ -50,7 +50,7 @@ var obj = {
 
 obj.property.a = 0;
 >obj.property.a = 0 : 0
->obj.property.a : any
+>obj.property.a : error
 >obj.property : {}
 >obj : { property: {}; }
 >property : {}
diff --git a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.errors.txt b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.errors.txt
deleted file mode 100644
index d50eb7aff3b..00000000000
--- a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.errors.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== jsdocAccessibilityTagDeclarations.js (0 errors) ====
-    class Protected {
-        /** @protected */
-        constructor(c) {
-            /** @protected */
-            this.c = c
-        }
-        /** @protected */
-        m() {
-            return this.c
-        }
-        /** @protected */
-        get p() { return this.c }
-        /** @protected */
-        set p(value) { this.c = value }
-    }
-    
-    class Private {
-        /** @private */
-        constructor(c) {
-            /** @private */
-            this.c = c
-        }
-        /** @private */
-        m() {
-            return this.c
-        }
-        /** @private */
-        get p() { return this.c }
-        /** @private */
-        set p(value) { this.c = value }
-    }
-    
-    // https://github.com/microsoft/TypeScript/issues/38401
-    class C {
-        constructor(/** @public */ x, /** @protected */ y, /** @private */ z) {
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.js b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.js
index c24bf1a2376..37eecc45463 100644
--- a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.js
+++ b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.js
@@ -37,7 +37,8 @@ class Private {
 class C {
     constructor(/** @public */ x, /** @protected */ y, /** @private */ z) {
     }
-}
+}
+
 
 //// [foo.js]
 class Protected {
diff --git a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.symbols b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.symbols
index 32bc64604b9..95faf3741d0 100644
--- a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.symbols
+++ b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.symbols
@@ -91,3 +91,4 @@ class C {
 >z : Symbol(z, Decl(jsdocAccessibilityTagDeclarations.js, 34, 54))
     }
 }
+
diff --git a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.types b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.types
index a9c07d7cbc1..d43f0b5de93 100644
--- a/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.types
+++ b/tests/baselines/reference/jsdocAccessibilityTagsDeclarations.types
@@ -95,3 +95,4 @@ class C {
 >z : any
     }
 }
+
diff --git a/tests/baselines/reference/jsdocLiteral.errors.txt b/tests/baselines/reference/jsdocLiteral.errors.txt
deleted file mode 100644
index e95ff9e045b..00000000000
--- a/tests/baselines/reference/jsdocLiteral.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== in.js (0 errors) ====
-    /**
-     * @param {'literal'} p1
-     * @param {"literal"} p2
-     * @param {'literal' | 'other'} p3
-     * @param {'literal' | number} p4
-     * @param {12 | true | 'str'} p5
-     */
-    function f(p1, p2, p3, p4, p5) {
-        return p1 + p2 + p3 + p4 + p5 + '.';
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocNeverUndefinedNull.errors.txt b/tests/baselines/reference/jsdocNeverUndefinedNull.errors.txt
deleted file mode 100644
index 124c606ac34..00000000000
--- a/tests/baselines/reference/jsdocNeverUndefinedNull.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== in.js (0 errors) ====
-    /**
-     * @param {never} p1
-     * @param {undefined} p2
-     * @param {null} p3
-     * @returns {void} nothing
-     */
-    function f(p1, p2, p3) {
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocReadonlyDeclarations.errors.txt b/tests/baselines/reference/jsdocReadonlyDeclarations.errors.txt
deleted file mode 100644
index 27b08710d5f..00000000000
--- a/tests/baselines/reference/jsdocReadonlyDeclarations.errors.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== jsdocReadonlyDeclarations.js (0 errors) ====
-    class C {
-        /** @readonly */
-        x = 6
-        /** @readonly */
-        constructor(n) {
-            this.x = n
-            /**
-             * @readonly
-             * @type {number}
-             */
-            this.y = n
-        }
-    }
-    new C().x
-    
-    function F() {
-        /** @readonly */
-        this.z = 1
-    }
-    
-    // https://github.com/microsoft/TypeScript/issues/38401
-    class D {
-        constructor(/** @readonly */ x) {}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocReadonlyDeclarations.js b/tests/baselines/reference/jsdocReadonlyDeclarations.js
index 068c9f97110..a14f54a4b41 100644
--- a/tests/baselines/reference/jsdocReadonlyDeclarations.js
+++ b/tests/baselines/reference/jsdocReadonlyDeclarations.js
@@ -24,7 +24,8 @@ function F() {
 // https://github.com/microsoft/TypeScript/issues/38401
 class D {
     constructor(/** @readonly */ x) {}
-}
+}
+
 
 //// [foo.js]
 class C {
diff --git a/tests/baselines/reference/jsdocReadonlyDeclarations.symbols b/tests/baselines/reference/jsdocReadonlyDeclarations.symbols
index 0f3df85c23a..32ad42f0860 100644
--- a/tests/baselines/reference/jsdocReadonlyDeclarations.symbols
+++ b/tests/baselines/reference/jsdocReadonlyDeclarations.symbols
@@ -51,3 +51,4 @@ class D {
     constructor(/** @readonly */ x) {}
 >x : Symbol(x, Decl(jsdocReadonlyDeclarations.js, 22, 16))
 }
+
diff --git a/tests/baselines/reference/jsdocReadonlyDeclarations.types b/tests/baselines/reference/jsdocReadonlyDeclarations.types
index 440714ab2b3..0461aa8d327 100644
--- a/tests/baselines/reference/jsdocReadonlyDeclarations.types
+++ b/tests/baselines/reference/jsdocReadonlyDeclarations.types
@@ -57,3 +57,4 @@ class D {
     constructor(/** @readonly */ x) {}
 >x : any
 }
+
diff --git a/tests/baselines/reference/jsdocReturnTag1.errors.txt b/tests/baselines/reference/jsdocReturnTag1.errors.txt
deleted file mode 100644
index 7a17f05ebfd..00000000000
--- a/tests/baselines/reference/jsdocReturnTag1.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== returns.js (0 errors) ====
-    /**
-     * @returns {string} This comment is not currently exposed
-     */
-    function f() {
-        return 5;
-    }
-    
-    /**
-     * @returns {string=} This comment is not currently exposed
-     */
-    function f1() {
-        return 5;
-    }
-    
-    /**
-     * @returns {string|number} This comment is not currently exposed
-     */
-    function f2() {
-        return 5 || "hello";
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/jsdocReturnTag1.js b/tests/baselines/reference/jsdocReturnTag1.js
index ede13b23603..f74196f1efa 100644
--- a/tests/baselines/reference/jsdocReturnTag1.js
+++ b/tests/baselines/reference/jsdocReturnTag1.js
@@ -20,7 +20,8 @@ function f1() {
  */
 function f2() {
     return 5 || "hello";
-}
+}
+
 
 //// [dummy.js]
 /**
diff --git a/tests/baselines/reference/jsdocReturnTag1.symbols b/tests/baselines/reference/jsdocReturnTag1.symbols
index fccaadad9e7..9dd7020ad6f 100644
--- a/tests/baselines/reference/jsdocReturnTag1.symbols
+++ b/tests/baselines/reference/jsdocReturnTag1.symbols
@@ -27,3 +27,4 @@ function f2() {
 
     return 5 || "hello";
 }
+
diff --git a/tests/baselines/reference/jsdocReturnTag1.types b/tests/baselines/reference/jsdocReturnTag1.types
index 2c1a78067c9..bc3bc612cf6 100644
--- a/tests/baselines/reference/jsdocReturnTag1.types
+++ b/tests/baselines/reference/jsdocReturnTag1.types
@@ -32,3 +32,4 @@ function f2() {
 >5 : 5
 >"hello" : "hello"
 }
+
diff --git a/tests/baselines/reference/keepImportsInDts3.errors.txt b/tests/baselines/reference/keepImportsInDts3.errors.txt
deleted file mode 100644
index d8305f3bf0c..00000000000
--- a/tests/baselines/reference/keepImportsInDts3.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== c:/test.ts (0 errors) ====
-    export {};
-==== c:/app/main.ts (0 errors) ====
-    import "test"
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts3.js b/tests/baselines/reference/keepImportsInDts3.js
index f40e1b8c48c..44745d39656 100644
--- a/tests/baselines/reference/keepImportsInDts3.js
+++ b/tests/baselines/reference/keepImportsInDts3.js
@@ -3,7 +3,8 @@
 //// [test.ts]
 export {};
 //// [main.ts]
-import "test"
+import "test"
+
 
 //// [outputfile.js]
 define("test", ["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/keepImportsInDts3.symbols b/tests/baselines/reference/keepImportsInDts3.symbols
index c79d842ddcf..fff64b8db55 100644
--- a/tests/baselines/reference/keepImportsInDts3.symbols
+++ b/tests/baselines/reference/keepImportsInDts3.symbols
@@ -6,3 +6,4 @@ export {};
 === c:/app/main.ts ===
 
 import "test"
+
diff --git a/tests/baselines/reference/keepImportsInDts3.types b/tests/baselines/reference/keepImportsInDts3.types
index c79d842ddcf..fff64b8db55 100644
--- a/tests/baselines/reference/keepImportsInDts3.types
+++ b/tests/baselines/reference/keepImportsInDts3.types
@@ -6,3 +6,4 @@ export {};
 === c:/app/main.ts ===
 
 import "test"
+
diff --git a/tests/baselines/reference/keepImportsInDts4.errors.txt b/tests/baselines/reference/keepImportsInDts4.errors.txt
deleted file mode 100644
index 333b91c1c91..00000000000
--- a/tests/baselines/reference/keepImportsInDts4.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== folder/test.ts (0 errors) ====
-    export {};
-==== main.ts (0 errors) ====
-    import "./folder/test"
\ No newline at end of file
diff --git a/tests/baselines/reference/keepImportsInDts4.js b/tests/baselines/reference/keepImportsInDts4.js
index 058380494d8..21e2e69ffd3 100644
--- a/tests/baselines/reference/keepImportsInDts4.js
+++ b/tests/baselines/reference/keepImportsInDts4.js
@@ -3,7 +3,8 @@
 //// [test.ts]
 export {};
 //// [main.ts]
-import "./folder/test"
+import "./folder/test"
+
 
 //// [outputfile.js]
 define("folder/test", ["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/keepImportsInDts4.symbols b/tests/baselines/reference/keepImportsInDts4.symbols
index ebbe8f0bb07..6409bf469ca 100644
--- a/tests/baselines/reference/keepImportsInDts4.symbols
+++ b/tests/baselines/reference/keepImportsInDts4.symbols
@@ -6,3 +6,4 @@ export {};
 === main.ts ===
 
 import "./folder/test"
+
diff --git a/tests/baselines/reference/keepImportsInDts4.types b/tests/baselines/reference/keepImportsInDts4.types
index ebbe8f0bb07..6409bf469ca 100644
--- a/tests/baselines/reference/keepImportsInDts4.types
+++ b/tests/baselines/reference/keepImportsInDts4.types
@@ -6,3 +6,4 @@ export {};
 === main.ts ===
 
 import "./folder/test"
+
diff --git a/tests/baselines/reference/keyofDoesntContainSymbols.errors.txt b/tests/baselines/reference/keyofDoesntContainSymbols.errors.txt
index f8457a00e90..43b67091085 100644
--- a/tests/baselines/reference/keyofDoesntContainSymbols.errors.txt
+++ b/tests/baselines/reference/keyofDoesntContainSymbols.errors.txt
@@ -1,11 +1,9 @@
 error TS5102: Option 'keyofStringsOnly' has been removed. Please remove it from your configuration.
 keyofDoesntContainSymbols.ts(11,30): error TS2345: Argument of type 'string' is not assignable to parameter of type 'number'.
-keyofDoesntContainSymbols.ts(14,23): error TS2345: Argument of type 'unique symbol' is not assignable to parameter of type '"str" | "num"'.
-keyofDoesntContainSymbols.ts(17,23): error TS2345: Argument of type '0' is not assignable to parameter of type '"str" | "num"'.
 
 
 !!! error TS5102: Option 'keyofStringsOnly' has been removed. Please remove it from your configuration.
-==== keyofDoesntContainSymbols.ts (3 errors) ====
+==== keyofDoesntContainSymbols.ts (1 errors) ====
     const sym = Symbol();
     const num = 0;
     const obj = { num: 0, str: 's', [num]: num as 0, [sym]: sym };
@@ -22,13 +20,9 @@ keyofDoesntContainSymbols.ts(17,23): error TS2345: Argument of type '0' is not a
     // Expect type error
     // Argument of type '""' is not assignable to parameter of type 'number'.
     const valC = set(obj, sym, sym);
-                          ~~~
-!!! error TS2345: Argument of type 'unique symbol' is not assignable to parameter of type '"str" | "num"'.
     // Expect type error
     // Argument of type 'unique symbol' is not assignable to parameter of type "str" | "num"
     const valD = set(obj, num, num);
-                          ~~~
-!!! error TS2345: Argument of type '0' is not assignable to parameter of type '"str" | "num"'.
     // Expect type error
     // Argument of type '0' is not assignable to parameter of type "str" | "num"
     type KeyofObj = keyof typeof obj;
diff --git a/tests/baselines/reference/keyofDoesntContainSymbols.types b/tests/baselines/reference/keyofDoesntContainSymbols.types
index 01472cbc7b1..3604b7cd039 100644
--- a/tests/baselines/reference/keyofDoesntContainSymbols.types
+++ b/tests/baselines/reference/keyofDoesntContainSymbols.types
@@ -59,8 +59,8 @@ const valB = set(obj, 'num', '');
 // Expect type error
 // Argument of type '""' is not assignable to parameter of type 'number'.
 const valC = set(obj, sym, sym);
->valC : string | number
->set(obj, sym, sym) : string | number
+>valC : symbol
+>set(obj, sym, sym) : symbol
 >set : <T extends object, K extends keyof T>(obj: T, key: K, value: T[K]) => T[K]
 >obj : { num: number; str: string; 0: 0; [sym]: symbol; }
 >sym : unique symbol
@@ -69,8 +69,8 @@ const valC = set(obj, sym, sym);
 // Expect type error
 // Argument of type 'unique symbol' is not assignable to parameter of type "str" | "num"
 const valD = set(obj, num, num);
->valD : string | number
->set(obj, num, num) : string | number
+>valD : 0
+>set(obj, num, num) : 0
 >set : <T extends object, K extends keyof T>(obj: T, key: K, value: T[K]) => T[K]
 >obj : { num: number; str: string; 0: 0; [sym]: symbol; }
 >num : 0
@@ -79,7 +79,7 @@ const valD = set(obj, num, num);
 // Expect type error
 // Argument of type '0' is not assignable to parameter of type "str" | "num"
 type KeyofObj = keyof typeof obj;
->KeyofObj : "str" | "num"
+>KeyofObj : unique symbol | 0 | "str" | "num"
 >obj : { num: number; str: string; 0: 0; [sym]: symbol; }
 
 // "str" | "num"
@@ -87,6 +87,6 @@ type Values<T> = T[keyof T];
 >Values : Values<T>
 
 type ValuesOfObj = Values<typeof obj>;
->ValuesOfObj : string | number
+>ValuesOfObj : string | number | symbol
 >obj : { num: number; str: string; 0: 0; [sym]: symbol; }
 
diff --git a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt
index eab5b738b9b..cc9de6e37d8 100644
--- a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt
+++ b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 file1.ts(1,1): error TS2448: Block-scoped variable 'l' used before its declaration.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== file1.ts (1 errors) ====
     l;
     ~
@@ -12,4 +8,5 @@ file1.ts(1,1): error TS2448: Block-scoped variable 'l' used before its declarati
 !!! related TS2728 file2.ts:1:7: 'l' is declared here.
     
 ==== file2.ts (0 errors) ====
-    const l = 0;
\ No newline at end of file
+    const l = 0;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.js b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.js
index 515ef338dda..33db2d5d059 100644
--- a/tests/baselines/reference/letDeclarations-useBeforeDefinition2.js
+++ b/tests/baselines/reference/letDeclarations-useBeforeDefinition2.js
@@ -4,7 +4,8 @@
 l;
 
 //// [file2.ts]
-const l = 0;
+const l = 0;
+
 
 //// [out.js]
 l;
diff --git a/tests/baselines/reference/methodsReturningThis.errors.txt b/tests/baselines/reference/methodsReturningThis.errors.txt
deleted file mode 100644
index 03accab1347..00000000000
--- a/tests/baselines/reference/methodsReturningThis.errors.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== input.js (0 errors) ====
-    function Class()
-    {
-    }
-    
-    // error: 'Class' doesn't have property 'notPresent'
-    Class.prototype.containsError = function () { return this.notPresent; };
-    
-    // lots of methods that return this, which caused out-of-memory in #9527
-    Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; };
-    Class.prototype.m2 = function (x, y) { return this; };
-    Class.prototype.m3 = function (x, y) { return this; };
-    Class.prototype.m4 = function (angle) { return this; };
-    Class.prototype.m5 = function (matrix) { return this; };
-    Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; };
-    Class.prototype.m7 = function(matrix) { return this; };
-    Class.prototype.m8 = function() { return this; };
-    Class.prototype.m9 = function () { return this; };
-    
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/methodsReturningThis.types b/tests/baselines/reference/methodsReturningThis.types
index 56991948dfe..5f4bcd13229 100644
--- a/tests/baselines/reference/methodsReturningThis.types
+++ b/tests/baselines/reference/methodsReturningThis.types
@@ -15,7 +15,7 @@ Class.prototype.containsError = function () { return this.notPresent; };
 >prototype : any
 >containsError : any
 >function () { return this.notPresent; } : () => any
->this.notPresent : any
+>this.notPresent : error
 >this : this
 >notPresent : any
 
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt b/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
deleted file mode 100644
index 8652df4a6cc..00000000000
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.errors.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export class Cls {
-    }
-    
-==== m2.ts (0 errors) ====
-    import {Cls} from "./m1";
-    (<any>Cls.prototype).foo = function() { return 1; };
-    (<any>Cls.prototype).bar = function() { return "1"; };
-    
-    declare module "./m1" {
-        interface Cls {
-            foo(): number;
-        }
-    }
-    
-    declare module "./m1" {
-        interface Cls {
-            bar(): string;
-        }
-    }
-    
-==== m3.ts (0 errors) ====
-    export class C1 { x: number }
-    export class C2 { x: string }
-    
-==== m4.ts (0 errors) ====
-    import {Cls} from "./m1";
-    import {C1, C2} from "./m3";
-    (<any>Cls.prototype).baz1 = function() { return undefined };
-    (<any>Cls.prototype).baz2 = function() { return undefined };
-    
-    declare module "./m1" {
-        interface Cls {
-            baz1(): C1;
-        }
-    }
-    
-    declare module "./m1" {
-        interface Cls {
-            baz2(): C2;
-        }
-    }
-    
-==== test.ts (0 errors) ====
-    import { Cls } from "./m1";
-    import "m2";
-    import "m4";
-    let c: Cls;
-    c.foo().toExponential();
-    c.bar().toLowerCase();
-    c.baz1().x.toExponential();
-    c.baz2().x.toLowerCase();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.errors.txt b/tests/baselines/reference/moduleAugmentationsImports1.errors.txt
deleted file mode 100644
index 5fd1b985d0f..00000000000
--- a/tests/baselines/reference/moduleAugmentationsImports1.errors.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    export class A {}
-    
-==== b.ts (0 errors) ====
-    export class B {x: number;}
-    
-==== c.d.ts (0 errors) ====
-    declare module "C" {
-        class Cls {y: string; }
-    }
-    
-==== d.ts (0 errors) ====
-    /// <reference path="c.d.ts"/>
-    
-    import {A} from "./a";
-    import {B} from "./b";
-    import {Cls} from "C";
-    
-    A.prototype.getB = function () { return undefined; }
-    A.prototype.getCls = function () { return undefined; }
-    
-    declare module "./a" {
-        interface A {
-            getB(): B;
-        }
-    }
-    
-    declare module "./a" {
-        interface A {
-            getCls(): Cls;
-        }
-    }
-    
-==== main.ts (0 errors) ====
-    import {A} from "./a";
-    import "d";
-    
-    let a: A;
-    let b = a.getB().x.toFixed();
-    let c = a.getCls().y.toLowerCase();
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
index aab3667bc2a..36f55f6743f 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.js
+++ b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -39,7 +39,8 @@ import "d";
 
 let a: A;
 let b = a.getB().x.toFixed();
-let c = a.getCls().y.toLowerCase();
+let c = a.getCls().y.toLowerCase();
+
 
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.errors.txt b/tests/baselines/reference/moduleAugmentationsImports2.errors.txt
deleted file mode 100644
index 088ff665686..00000000000
--- a/tests/baselines/reference/moduleAugmentationsImports2.errors.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    export class A {}
-    
-==== b.ts (0 errors) ====
-    export class B {x: number;}
-    
-==== c.d.ts (0 errors) ====
-    declare module "C" {
-        class Cls {y: string; }
-    }
-    
-==== d.ts (0 errors) ====
-    /// <reference path="c.d.ts"/>
-    
-    import {A} from "./a";
-    import {B} from "./b";
-    
-    A.prototype.getB = function () { return undefined; }
-    
-    declare module "./a" {
-        interface A {
-            getB(): B;
-        }
-    }
-    
-==== e.ts (0 errors) ====
-    import {A} from "./a";
-    import {Cls} from "C";
-    
-    A.prototype.getCls = function () { return undefined; }
-    
-    declare module "./a" {
-        interface A {
-            getCls(): Cls;
-        }
-    }
-    
-==== main.ts (0 errors) ====
-    import {A} from "./a";
-    import "d";
-    import "e";
-    
-    let a: A;
-    let b = a.getB().x.toFixed();
-    let c = a.getCls().y.toLowerCase();
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
index e4c49eadf02..d4013a0fdfb 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.js
+++ b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -44,7 +44,8 @@ import "e";
 
 let a: A;
 let b = a.getB().x.toFixed();
-let c = a.getCls().y.toLowerCase();
+let c = a.getCls().y.toLowerCase();
+
 
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.errors.txt b/tests/baselines/reference/moduleAugmentationsImports3.errors.txt
deleted file mode 100644
index 471de3a26b5..00000000000
--- a/tests/baselines/reference/moduleAugmentationsImports3.errors.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== main.ts (0 errors) ====
-    /// <reference path="d.d.ts"/>
-    import {A} from "./a";
-    import "D";
-    import "e";
-    
-    let a: A;
-    let b = a.getB().x.toFixed();
-    let c = a.getCls().y.toLowerCase();
-==== a.ts (0 errors) ====
-    export class A {}
-    
-==== b.ts (0 errors) ====
-    export class B {x: number;}
-    
-==== c.d.ts (0 errors) ====
-    declare module "C" {
-        class Cls {y: string; }
-    }
-    
-==== d.d.ts (0 errors) ====
-    declare module "D" {
-        import {A} from "a";
-        import {B} from "b";
-        module "a" {
-            interface A {
-                getB(): B;
-            }
-        }
-    }
-    
-==== e.ts (0 errors) ====
-    /// <reference path="c.d.ts"/>
-    import {A} from "./a";
-    import {Cls} from "C";
-    
-    A.prototype.getCls = function () { return undefined; }
-    
-    declare module "./a" {
-        interface A {
-            getCls(): Cls;
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 1f80eaba695..788fe3ddbe9 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -43,7 +43,8 @@ import "e";
 
 let a: A;
 let b = a.getB().x.toFixed();
-let c = a.getCls().y.toLowerCase();
+let c = a.getCls().y.toLowerCase();
+
 
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.errors.txt b/tests/baselines/reference/moduleAugmentationsImports4.errors.txt
deleted file mode 100644
index c00b54c5d1f..00000000000
--- a/tests/baselines/reference/moduleAugmentationsImports4.errors.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== main.ts (0 errors) ====
-    /// <reference path="d.d.ts"/>
-    /// <reference path="e.d.ts"/>
-    import {A} from "./a";
-    import "D";
-    import "E";
-    
-    let a: A;
-    let b = a.getB().x.toFixed();
-    let c = a.getCls().y.toLowerCase();
-==== a.ts (0 errors) ====
-    export class A {}
-    
-==== b.ts (0 errors) ====
-    export class B {x: number;}
-    
-==== c.d.ts (0 errors) ====
-    declare module "C" {
-        class Cls {y: string; }
-    }
-    
-==== d.d.ts (0 errors) ====
-    declare module "D" {
-        import {A} from "a";
-        import {B} from "b";
-        module "a" {
-            interface A {
-                getB(): B;
-            }
-        }
-    }
-    
-==== e.d.ts (0 errors) ====
-    /// <reference path="c.d.ts"/>
-    declare module "E" {
-        import {A} from "a";
-        import {Cls} from "C";
-    
-        module "a" {
-            interface A {
-                getCls(): Cls;
-            }
-        }
-    }
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index efb0e153d1c..821c1653602 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -44,7 +44,8 @@ import "E";
 
 let a: A;
 let b = a.getB().x.toFixed();
-let c = a.getCls().y.toLowerCase();
+let c = a.getCls().y.toLowerCase();
+
 
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/multipleDeclarations.errors.txt b/tests/baselines/reference/multipleDeclarations.errors.txt
deleted file mode 100644
index fdb73950391..00000000000
--- a/tests/baselines/reference/multipleDeclarations.errors.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== input.js (0 errors) ====
-    function C() {
-        this.m = null;
-    }
-    C.prototype.m = function() {
-        this.nothing();
-    }
-    class X {
-        constructor() {
-            this.m = this.m.bind(this);
-            this.mistake = 'frankly, complete nonsense';
-        }
-        m() {
-        }
-        mistake() {
-        }
-    }
-    let x = new X();
-    X.prototype.mistake = false;
-    x.m();
-    x.mistake;
-    class Y {
-        mistake() {
-        }
-        m() {
-        }
-        constructor() {
-            this.m = this.m.bind(this);
-            this.mistake = 'even more nonsense';
-        }
-    }
-    Y.prototype.mistake = true;
-    let y = new Y();
-    y.m();
-    y.mistake();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/multipleDeclarations.types b/tests/baselines/reference/multipleDeclarations.types
index 9897abf844c..17f8b3040e6 100644
--- a/tests/baselines/reference/multipleDeclarations.types
+++ b/tests/baselines/reference/multipleDeclarations.types
@@ -20,8 +20,8 @@ C.prototype.m = function() {
 >function() {    this.nothing();} : () => void
 
     this.nothing();
->this.nothing() : any
->this.nothing : any
+>this.nothing() : error
+>this.nothing : error
 >this : this
 >nothing : any
 }
diff --git a/tests/baselines/reference/noCrashWithVerbatimModuleSyntaxAndImportsNotUsedAsValues.errors.txt b/tests/baselines/reference/noCrashWithVerbatimModuleSyntaxAndImportsNotUsedAsValues.errors.txt
index 334991b46fa..0455a747a91 100644
--- a/tests/baselines/reference/noCrashWithVerbatimModuleSyntaxAndImportsNotUsedAsValues.errors.txt
+++ b/tests/baselines/reference/noCrashWithVerbatimModuleSyntaxAndImportsNotUsedAsValues.errors.txt
@@ -1,22 +1,17 @@
 error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
 file.ts(1,1): error TS1287: A top-level 'export' modifier cannot be used on value declarations in a CommonJS module when 'verbatimModuleSyntax' is enabled.
-index.ts(1,1): error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
 index.ts(1,9): error TS1286: ESM syntax is not allowed in a CommonJS module when 'verbatimModuleSyntax' is enabled.
 
 
 !!! error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
-!!! error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
 ==== file.ts (1 errors) ====
     export class A {}
     ~~~~~~
 !!! error TS1287: A top-level 'export' modifier cannot be used on value declarations in a CommonJS module when 'verbatimModuleSyntax' is enabled.
-==== index.ts (2 errors) ====
+==== index.ts (1 errors) ====
     import {A} from "./file";
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1371: This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'.
             ~
 !!! error TS1286: ESM syntax is not allowed in a CommonJS module when 'verbatimModuleSyntax' is enabled.
     
diff --git a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.errors.txt b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.errors.txt
index 0a941ac6477..be7ff25ed45 100644
--- a/tests/baselines/reference/noImplicitAnyIndexingSuppressed.errors.txt
+++ b/tests/baselines/reference/noImplicitAnyIndexingSuppressed.errors.txt
@@ -1,10 +1,12 @@
 error TS5102: Option 'suppressImplicitAnyIndexErrors' has been removed. Please remove it from your configuration.
+noImplicitAnyIndexingSuppressed.ts(12,37): error TS7015: Element implicitly has an 'any' type because index expression is not of type 'number'.
 noImplicitAnyIndexingSuppressed.ts(19,9): error TS2339: Property 'hi' does not exist on type '{}'.
 noImplicitAnyIndexingSuppressed.ts(22,9): error TS2339: Property '10' does not exist on type '{}'.
+noImplicitAnyIndexingSuppressed.ts(29,10): error TS7053: Element implicitly has an 'any' type because expression of type 'any' can't be used to index type '{}'.
 
 
 !!! error TS5102: Option 'suppressImplicitAnyIndexErrors' has been removed. Please remove it from your configuration.
-==== noImplicitAnyIndexingSuppressed.ts (2 errors) ====
+==== noImplicitAnyIndexingSuppressed.ts (4 errors) ====
     enum MyEmusEnum {
         emu
     }
@@ -17,6 +19,8 @@ noImplicitAnyIndexingSuppressed.ts(22,9): error TS2339: Property '10' does not e
     
     // Should be okay, as we suppress implicit 'any' property access checks
     var strRepresentation3 = MyEmusEnum["monehh"];
+                                        ~~~~~~~~
+!!! error TS7015: Element implicitly has an 'any' type because index expression is not of type 'number'.
     
     // Should be okay; should be a MyEmusEnum
     var strRepresentation4 = MyEmusEnum["emu"];
@@ -38,6 +42,8 @@ noImplicitAnyIndexingSuppressed.ts(22,9): error TS2339: Property '10' does not e
     
     // Should be okay, as we suppress implicit 'any' property access checks
     var z1 = emptyObj[hi];
+             ~~~~~~~~~~~~
+!!! error TS7053: Element implicitly has an 'any' type because expression of type 'any' can't be used to index type '{}'.
     var z2 = (<any>emptyObj)[hi];
     
     interface MyMap<T> {
diff --git a/tests/baselines/reference/noImplicitUseStrict_amd.js b/tests/baselines/reference/noImplicitUseStrict_amd.js
index 81b9bba6e27..34e3fa0c420 100644
--- a/tests/baselines/reference/noImplicitUseStrict_amd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_amd.js
@@ -5,6 +5,7 @@ export var x = 0;
 
 //// [noImplicitUseStrict_amd.js]
 define(["require", "exports"], function (require, exports) {
+    "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
     exports.x = 0;
diff --git a/tests/baselines/reference/noImplicitUseStrict_commonjs.js b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
index 54785192aca..3df24235f5b 100644
--- a/tests/baselines/reference/noImplicitUseStrict_commonjs.js
+++ b/tests/baselines/reference/noImplicitUseStrict_commonjs.js
@@ -4,6 +4,7 @@
 export var x = 0;
 
 //// [noImplicitUseStrict_commonjs.js]
+"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = void 0;
 exports.x = 0;
diff --git a/tests/baselines/reference/noImplicitUseStrict_system.js b/tests/baselines/reference/noImplicitUseStrict_system.js
index bf49b58b6d8..0fc5e8267a8 100644
--- a/tests/baselines/reference/noImplicitUseStrict_system.js
+++ b/tests/baselines/reference/noImplicitUseStrict_system.js
@@ -5,6 +5,7 @@ export var x = 0;
 
 //// [noImplicitUseStrict_system.js]
 System.register([], function (exports_1, context_1) {
+    "use strict";
     var x;
     var __moduleName = context_1 && context_1.id;
     return {
diff --git a/tests/baselines/reference/noImplicitUseStrict_umd.js b/tests/baselines/reference/noImplicitUseStrict_umd.js
index 30de9f2e3fe..7ff99fd9096 100644
--- a/tests/baselines/reference/noImplicitUseStrict_umd.js
+++ b/tests/baselines/reference/noImplicitUseStrict_umd.js
@@ -13,6 +13,7 @@ export var x = 0;
         define(["require", "exports"], factory);
     }
 })(function (require, exports) {
+    "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = void 0;
     exports.x = 0;
diff --git a/tests/baselines/reference/noStrictGenericChecks.errors.txt b/tests/baselines/reference/noStrictGenericChecks.errors.txt
index a743f001ffa..8dec27be24e 100644
--- a/tests/baselines/reference/noStrictGenericChecks.errors.txt
+++ b/tests/baselines/reference/noStrictGenericChecks.errors.txt
@@ -1,13 +1,23 @@
 error TS5102: Option 'noStrictGenericChecks' has been removed. Please remove it from your configuration.
+noStrictGenericChecks.ts(5,5): error TS2322: Type 'B' is not assignable to type 'A'.
+  Types of parameters 'y' and 'y' are incompatible.
+    Type 'U' is not assignable to type 'T'.
+      'T' could be instantiated with an arbitrary type which could be unrelated to 'U'.
 
 
 !!! error TS5102: Option 'noStrictGenericChecks' has been removed. Please remove it from your configuration.
-==== noStrictGenericChecks.ts (0 errors) ====
+==== noStrictGenericChecks.ts (1 errors) ====
     type A = <T, U>(x: T, y: U) => [T, U];
     type B = <S>(x: S, y: S) => [S, S];
     
     function f(a: A, b: B) {
         a = b;  // Error disabled here
+        ~
+!!! error TS2322: Type 'B' is not assignable to type 'A'.
+!!! error TS2322:   Types of parameters 'y' and 'y' are incompatible.
+!!! error TS2322:     Type 'U' is not assignable to type 'T'.
+!!! error TS2322:       'T' could be instantiated with an arbitrary type which could be unrelated to 'U'.
+!!! related TS2208 noStrictGenericChecks.ts:1:14: This type parameter might need an `extends T` constraint.
         b = a;  // Ok
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.errors.txt b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.errors.txt
index 3b37c42cac6..6f1c4126231 100644
--- a/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.errors.txt
+++ b/tests/baselines/reference/nonPrimitiveIndexingWithForInSupressError.errors.txt
@@ -1,11 +1,16 @@
 error TS5102: Option 'suppressImplicitAnyIndexErrors' has been removed. Please remove it from your configuration.
+nonPrimitiveIndexingWithForInSupressError.ts(4,17): error TS7053: Element implicitly has an 'any' type because expression of type 'string' can't be used to index type '{}'.
+  No index signature with a parameter of type 'string' was found on type '{}'.
 
 
 !!! error TS5102: Option 'suppressImplicitAnyIndexErrors' has been removed. Please remove it from your configuration.
-==== nonPrimitiveIndexingWithForInSupressError.ts (0 errors) ====
+==== nonPrimitiveIndexingWithForInSupressError.ts (1 errors) ====
     var a: object;
     
     for (var key in a) {
         var value = a[key];
+                    ~~~~~~
+!!! error TS7053: Element implicitly has an 'any' type because expression of type 'string' can't be used to index type '{}'.
+!!! error TS7053:   No index signature with a parameter of type 'string' was found on type '{}'.
     }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt b/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
index 055fe91bbb0..29cc0ba1804 100644
--- a/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
+++ b/tests/baselines/reference/optionsOutAndNoModuleGen.errors.txt
@@ -1,11 +1,8 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-optionsOutAndNoModuleGen.ts(1,1): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+optionsOutAndNoModuleGen.ts(1,1): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== optionsOutAndNoModuleGen.ts (1 errors) ====
     export var x = 10;
     ~~~~~~~~~~~~~~~~~~
-!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
\ No newline at end of file
+!!! error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/out-flag.js b/tests/baselines/reference/out-flag.js
index 4211fb868bd..e6daa0c6ba1 100644
--- a/tests/baselines/reference/out-flag.js
+++ b/tests/baselines/reference/out-flag.js
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/out-flag.ts] ////
 
 //// [out-flag.ts]
-//// @out: bin\
+//// @outFile: bin\
 
 // my class comments
 class MyClass
@@ -16,10 +16,11 @@ class MyClass
     {
         //
     }
-}
+}
+
 
 //// [out-flag.js]
-//// @out: bin\
+//// @outFile: bin\
 // my class comments
 var MyClass = /** @class */ (function () {
     function MyClass() {
diff --git a/tests/baselines/reference/out-flag.js.map b/tests/baselines/reference/out-flag.js.map
index 534fa4150e2..4cddc69d40e 100644
--- a/tests/baselines/reference/out-flag.js.map
+++ b/tests/baselines/reference/out-flag.js.map
@@ -1,3 +1,3 @@
 //// [out-flag.js.map]
-{"version":3,"file":"out-flag.js","sourceRoot":"","sources":["out-flag.ts"],"names":[],"mappings":"AAAA,eAAe;AAEf,oBAAoB;AACpB;IAAA;IAYA,CAAC;IAVG,uBAAuB;IAChB,uBAAK,GAAZ;QAEI,OAAO,EAAE,CAAC;IACd,CAAC;IAEM,0BAAQ,GAAf,UAAgB,KAAa;QAEzB,EAAE;IACN,CAAC;IACL,cAAC;AAAD,CAAC,AAZD,IAYC"}
-//// https://sokra.github.io/source-map-visualization#base64,Ly8vLyBAb3V0OiBiaW5cDQovLyBteSBjbGFzcyBjb21tZW50cw0KdmFyIE15Q2xhc3MgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gTXlDbGFzcygpIHsNCiAgICB9DQogICAgLy8gbXkgZnVuY3Rpb24gY29tbWVudHMNCiAgICBNeUNsYXNzLnByb3RvdHlwZS5Db3VudCA9IGZ1bmN0aW9uICgpIHsNCiAgICAgICAgcmV0dXJuIDQyOw0KICAgIH07DQogICAgTXlDbGFzcy5wcm90b3R5cGUuU2V0Q291bnQgPSBmdW5jdGlvbiAodmFsdWUpIHsNCiAgICAgICAgLy8NCiAgICB9Ow0KICAgIHJldHVybiBNeUNsYXNzOw0KfSgpKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPW91dC1mbGFnLmpzLm1hcA==,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LWZsYWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJvdXQtZmxhZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxlQUFlO0FBRWYsb0JBQW9CO0FBQ3BCO0lBQUE7SUFZQSxDQUFDO0lBVkcsdUJBQXVCO0lBQ2hCLHVCQUFLLEdBQVo7UUFFSSxPQUFPLEVBQUUsQ0FBQztJQUNkLENBQUM7SUFFTSwwQkFBUSxHQUFmLFVBQWdCLEtBQWE7UUFFekIsRUFBRTtJQUNOLENBQUM7SUFDTCxjQUFDO0FBQUQsQ0FBQyxBQVpELElBWUMifQ==,Ly8vLyBAb3V0OiBiaW5cCgovLyBteSBjbGFzcyBjb21tZW50cwpjbGFzcyBNeUNsYXNzCnsKICAgIC8vIG15IGZ1bmN0aW9uIGNvbW1lbnRzCiAgICBwdWJsaWMgQ291bnQoKTogbnVtYmVyCiAgICB7CiAgICAgICAgcmV0dXJuIDQyOwogICAgfQoKICAgIHB1YmxpYyBTZXRDb3VudCh2YWx1ZTogbnVtYmVyKQogICAgewogICAgICAgIC8vCiAgICB9Cn0=
+{"version":3,"file":"out-flag.js","sourceRoot":"","sources":["out-flag.ts"],"names":[],"mappings":"AAAA,mBAAmB;AAEnB,oBAAoB;AACpB;IAAA;IAYA,CAAC;IAVG,uBAAuB;IAChB,uBAAK,GAAZ;QAEI,OAAO,EAAE,CAAC;IACd,CAAC;IAEM,0BAAQ,GAAf,UAAgB,KAAa;QAEzB,EAAE;IACN,CAAC;IACL,cAAC;AAAD,CAAC,AAZD,IAYC"}
+//// https://sokra.github.io/source-map-visualization#base64,Ly8vLyBAb3V0RmlsZTogYmluXA0KLy8gbXkgY2xhc3MgY29tbWVudHMNCnZhciBNeUNsYXNzID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIE15Q2xhc3MoKSB7DQogICAgfQ0KICAgIC8vIG15IGZ1bmN0aW9uIGNvbW1lbnRzDQogICAgTXlDbGFzcy5wcm90b3R5cGUuQ291bnQgPSBmdW5jdGlvbiAoKSB7DQogICAgICAgIHJldHVybiA0MjsNCiAgICB9Ow0KICAgIE15Q2xhc3MucHJvdG90eXBlLlNldENvdW50ID0gZnVuY3Rpb24gKHZhbHVlKSB7DQogICAgICAgIC8vDQogICAgfTsNCiAgICByZXR1cm4gTXlDbGFzczsNCn0oKSk7DQovLyMgc291cmNlTWFwcGluZ1VSTD1vdXQtZmxhZy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3V0LWZsYWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJvdXQtZmxhZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxtQkFBbUI7QUFFbkIsb0JBQW9CO0FBQ3BCO0lBQUE7SUFZQSxDQUFDO0lBVkcsdUJBQXVCO0lBQ2hCLHVCQUFLLEdBQVo7UUFFSSxPQUFPLEVBQUUsQ0FBQztJQUNkLENBQUM7SUFFTSwwQkFBUSxHQUFmLFVBQWdCLEtBQWE7UUFFekIsRUFBRTtJQUNOLENBQUM7SUFDTCxjQUFDO0FBQUQsQ0FBQyxBQVpELElBWUMifQ==,Ly8vLyBAb3V0RmlsZTogYmluXAoKLy8gbXkgY2xhc3MgY29tbWVudHMKY2xhc3MgTXlDbGFzcwp7CiAgICAvLyBteSBmdW5jdGlvbiBjb21tZW50cwogICAgcHVibGljIENvdW50KCk6IG51bWJlcgogICAgewogICAgICAgIHJldHVybiA0MjsKICAgIH0KCiAgICBwdWJsaWMgU2V0Q291bnQodmFsdWU6IG51bWJlcikKICAgIHsKICAgICAgICAvLwogICAgfQp9Cg==
diff --git a/tests/baselines/reference/out-flag.sourcemap.txt b/tests/baselines/reference/out-flag.sourcemap.txt
index 5ee4c935c46..37dfd03de63 100644
--- a/tests/baselines/reference/out-flag.sourcemap.txt
+++ b/tests/baselines/reference/out-flag.sourcemap.txt
@@ -8,14 +8,14 @@ sources: out-flag.ts
 emittedFile:out-flag.js
 sourceFile:out-flag.ts
 -------------------------------------------------------------------
->>>//// @out: bin\
+>>>//// @outFile: bin\
 1 >
-2 >^^^^^^^^^^^^^^^
-3 >               ^^^^^^->
+2 >^^^^^^^^^^^^^^^^^^^
+3 >                   ^^->
 1 >
-2 >//// @out: bin\
+2 >//// @outFile: bin\
 1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(1, 16) Source(1, 16) + SourceIndex(0)
+2 >Emitted(1, 20) Source(1, 20) + SourceIndex(0)
 ---
 >>>// my class comments
 1->
diff --git a/tests/baselines/reference/out-flag.symbols b/tests/baselines/reference/out-flag.symbols
index 7fd22243b20..0cfcee5e5e9 100644
--- a/tests/baselines/reference/out-flag.symbols
+++ b/tests/baselines/reference/out-flag.symbols
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/out-flag.ts] ////
 
 === out-flag.ts ===
-//// @out: bin\
+//// @outFile: bin\
 
 // my class comments
 class MyClass
@@ -21,3 +21,4 @@ class MyClass
         //
     }
 }
+
diff --git a/tests/baselines/reference/out-flag.types b/tests/baselines/reference/out-flag.types
index 00bef0bdb47..c2c9c05cbf0 100644
--- a/tests/baselines/reference/out-flag.types
+++ b/tests/baselines/reference/out-flag.types
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/out-flag.ts] ////
 
 === out-flag.ts ===
-//// @out: bin\
+//// @outFile: bin\
 
 // my class comments
 class MyClass
@@ -22,3 +22,4 @@ class MyClass
         //
     }
 }
+
diff --git a/tests/baselines/reference/out-flag3.errors.txt b/tests/baselines/reference/out-flag3.errors.txt
index 987ce4246cb..8460347a217 100644
--- a/tests/baselines/reference/out-flag3.errors.txt
+++ b/tests/baselines/reference/out-flag3.errors.txt
@@ -1,13 +1,7 @@
-error TS5053: Option 'out' cannot be specified with option 'outFile'.
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5053: Option 'out' cannot be specified with option 'outFile'.
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== a.ts (0 errors) ====
     class A { }
     
diff --git a/tests/baselines/reference/out-flag3.js b/tests/baselines/reference/out-flag3.js
index eaafbcb399b..176625d7ebf 100644
--- a/tests/baselines/reference/out-flag3.js
+++ b/tests/baselines/reference/out-flag3.js
@@ -7,7 +7,7 @@ class A { }
 class B { }
 
 
-//// [c.js]
+//// [d.js]
 var A = /** @class */ (function () {
     function A() {
     }
@@ -18,9 +18,9 @@ var B = /** @class */ (function () {
     }
     return B;
 }());
-//# sourceMappingURL=c.js.map
+//# sourceMappingURL=d.js.map
 
-//// [c.d.ts]
+//// [d.d.ts]
 declare class A {
 }
 declare class B {
diff --git a/tests/baselines/reference/out-flag3.js.map b/tests/baselines/reference/out-flag3.js.map
index d984f1d5fbe..7281b0e9210 100644
--- a/tests/baselines/reference/out-flag3.js.map
+++ b/tests/baselines/reference/out-flag3.js.map
@@ -1,3 +1,3 @@
-//// [c.js.map]
-{"version":3,"file":"c.js","sourceRoot":"","sources":["a.ts","b.ts"],"names":[],"mappings":"AAAA;IAAA;IAAU,CAAC;IAAD,QAAC;AAAD,CAAC,AAAX,IAAW;ACAX;IAAA;IAAU,CAAC;IAAD,QAAC;AAAD,CAAC,AAAX,IAAW"}
-//// https://sokra.github.io/source-map-visualization#base64,dmFyIEEgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gQSgpIHsNCiAgICB9DQogICAgcmV0dXJuIEE7DQp9KCkpOw0KdmFyIEIgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gQigpIHsNCiAgICB9DQogICAgcmV0dXJuIEI7DQp9KCkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9Yy5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiLCJiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0lBQUE7SUFBVSxDQUFDO0lBQUQsUUFBQztBQUFELENBQUMsQUFBWCxJQUFXO0FDQVg7SUFBQTtJQUFVLENBQUM7SUFBRCxRQUFDO0FBQUQsQ0FBQyxBQUFYLElBQVcifQ==,Y2xhc3MgQSB7IH0K,Y2xhc3MgQiB7IH0K
+//// [d.js.map]
+{"version":3,"file":"d.js","sourceRoot":"","sources":["a.ts","b.ts"],"names":[],"mappings":"AAAA;IAAA;IAAU,CAAC;IAAD,QAAC;AAAD,CAAC,AAAX,IAAW;ACAX;IAAA;IAAU,CAAC;IAAD,QAAC;AAAD,CAAC,AAAX,IAAW"}
+//// https://sokra.github.io/source-map-visualization#base64,dmFyIEEgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gQSgpIHsNCiAgICB9DQogICAgcmV0dXJuIEE7DQp9KCkpOw0KdmFyIEIgPSAvKiogQGNsYXNzICovIChmdW5jdGlvbiAoKSB7DQogICAgZnVuY3Rpb24gQigpIHsNCiAgICB9DQogICAgcmV0dXJuIEI7DQp9KCkpOw0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9ZC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiLCJiLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0lBQUE7SUFBVSxDQUFDO0lBQUQsUUFBQztBQUFELENBQUMsQUFBWCxJQUFXO0FDQVg7SUFBQTtJQUFVLENBQUM7SUFBRCxRQUFDO0FBQUQsQ0FBQyxBQUFYLElBQVcifQ==,Y2xhc3MgQSB7IH0K,Y2xhc3MgQiB7IH0K
diff --git a/tests/baselines/reference/out-flag3.sourcemap.txt b/tests/baselines/reference/out-flag3.sourcemap.txt
index 9786d844acd..c083ae5401e 100644
--- a/tests/baselines/reference/out-flag3.sourcemap.txt
+++ b/tests/baselines/reference/out-flag3.sourcemap.txt
@@ -1,11 +1,11 @@
 ===================================================================
-JsFile: c.js
-mapUrl: c.js.map
+JsFile: d.js
+mapUrl: d.js.map
 sourceRoot: 
 sources: a.ts,b.ts
 ===================================================================
 -------------------------------------------------------------------
-emittedFile:c.js
+emittedFile:d.js
 sourceFile:a.ts
 -------------------------------------------------------------------
 >>>var A = /** @class */ (function () {
@@ -53,7 +53,7 @@ sourceFile:a.ts
 4 >Emitted(5, 6) Source(1, 12) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
-emittedFile:c.js
+emittedFile:d.js
 sourceFile:b.ts
 -------------------------------------------------------------------
 >>>var B = /** @class */ (function () {
@@ -100,4 +100,4 @@ sourceFile:b.ts
 3 >Emitted(10, 2) Source(1, 1) + SourceIndex(1)
 4 >Emitted(10, 6) Source(1, 12) + SourceIndex(1)
 ---
->>>//# sourceMappingURL=c.js.map
\ No newline at end of file
+>>>//# sourceMappingURL=d.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/preserveUnusedImports.js b/tests/baselines/reference/preserveUnusedImports.js
index 8eafbbfd385..162e48aeb68 100644
--- a/tests/baselines/reference/preserveUnusedImports.js
+++ b/tests/baselines/reference/preserveUnusedImports.js
@@ -29,6 +29,4 @@ exports.B = B;
 //// [c.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./a");
-require("./b");
 var b;
diff --git a/tests/baselines/reference/preserveValueImports(isolatedmodules=false).js b/tests/baselines/reference/preserveValueImports(isolatedmodules=false).js
index 9b26f77b331..12d63c918f4 100644
--- a/tests/baselines/reference/preserveValueImports(isolatedmodules=false).js
+++ b/tests/baselines/reference/preserveValueImports(isolatedmodules=false).js
@@ -31,14 +31,14 @@ export default {};
 export var b = 0;
 export var c = 1;
 //// [b.js]
-import a, { b, c } from "./a";
+export {};
 //// [c.js]
-import * as a from "./a";
+export {};
 //// [d.js]
 export {};
 //// [e.js]
 DD;
 export {};
 //// [f.js]
-import { b, c } from "./a";
+import { b } from "./a";
 b;
diff --git a/tests/baselines/reference/preserveValueImports(isolatedmodules=true).errors.txt b/tests/baselines/reference/preserveValueImports(isolatedmodules=true).errors.txt
index cece8441d83..a2fb07e18c5 100644
--- a/tests/baselines/reference/preserveValueImports(isolatedmodules=true).errors.txt
+++ b/tests/baselines/reference/preserveValueImports(isolatedmodules=true).errors.txt
@@ -1,6 +1,5 @@
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-b.ts(1,19): error TS1444: 'D' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
 d.ts(1,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead.
 e.ts(1,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead.
 e.ts(2,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead.
@@ -14,10 +13,8 @@ e.ts(2,1): error TS1202: Import assignment cannot be used when targeting ECMAScr
     export const c = 1;
     export interface D {}
     
-==== b.ts (1 errors) ====
+==== b.ts (0 errors) ====
     import a, { b, c, D } from "./a";
-                      ~
-!!! error TS1444: 'D' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
     
 ==== c.ts (0 errors) ====
     import * as a from "./a";
diff --git a/tests/baselines/reference/preserveValueImports(isolatedmodules=true).js b/tests/baselines/reference/preserveValueImports(isolatedmodules=true).js
index 9b26f77b331..12d63c918f4 100644
--- a/tests/baselines/reference/preserveValueImports(isolatedmodules=true).js
+++ b/tests/baselines/reference/preserveValueImports(isolatedmodules=true).js
@@ -31,14 +31,14 @@ export default {};
 export var b = 0;
 export var c = 1;
 //// [b.js]
-import a, { b, c } from "./a";
+export {};
 //// [c.js]
-import * as a from "./a";
+export {};
 //// [d.js]
 export {};
 //// [e.js]
 DD;
 export {};
 //// [f.js]
-import { b, c } from "./a";
+import { b } from "./a";
 b;
diff --git a/tests/baselines/reference/preserveValueImports_errors(isolatedmodules=true).errors.txt b/tests/baselines/reference/preserveValueImports_errors(isolatedmodules=true).errors.txt
index 857a8b36b3f..fcf4c08e69e 100644
--- a/tests/baselines/reference/preserveValueImports_errors(isolatedmodules=true).errors.txt
+++ b/tests/baselines/reference/preserveValueImports_errors(isolatedmodules=true).errors.txt
@@ -1,13 +1,7 @@
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-c.ts(1,8): error TS1444: 'DefaultA' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
-c.ts(2,10): error TS1444: 'A' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
-c.ts(3,8): error TS1446: 'DefaultB' resolves to a type-only declaration and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
-c.ts(4,10): error TS1446: 'B' resolves to a type-only declaration and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
 d.ts(1,10): error TS1205: Re-exporting a type when 'isolatedModules' is enabled requires using 'export type'.
 d.ts(2,10): error TS1448: 'B' resolves to a type-only declaration and must be re-exported using a type-only re-export when 'isolatedModules' is enabled.
-e.ts(1,10): error TS1444: 'AA' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
-e.ts(1,14): error TS1446: 'BB' resolves to a type-only declaration and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
 
 
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
@@ -20,21 +14,11 @@ e.ts(1,14): error TS1446: 'BB' resolves to a type-only declaration and must be i
     class B {};
     export type { B, B as default };
     
-==== c.ts (4 errors) ====
+==== c.ts (0 errors) ====
     import DefaultA from "./a";
-           ~~~~~~~~
-!!! error TS1444: 'DefaultA' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
     import { A } from "./a";
-             ~
-!!! error TS1444: 'A' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
     import DefaultB from "./b";
-           ~~~~~~~~
-!!! error TS1446: 'DefaultB' resolves to a type-only declaration and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
-!!! related TS1377 b.ts:2:18: 'DefaultB' was exported here.
     import { B } from "./b";
-             ~
-!!! error TS1446: 'B' resolves to a type-only declaration and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
-!!! related TS1377 b.ts:2:15: 'B' was exported here.
     
 ==== c.fixed.ts (0 errors) ====
     import type DefaultA from "./a";
@@ -55,13 +39,8 @@ e.ts(1,14): error TS1446: 'BB' resolves to a type-only declaration and must be i
     export type { A as AA } from "./a";
     export type { B as BB } from "./b";
     
-==== e.ts (2 errors) ====
+==== e.ts (0 errors) ====
     import { AA, BB } from "./d";
-             ~~
-!!! error TS1444: 'AA' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
-                 ~~
-!!! error TS1446: 'BB' resolves to a type-only declaration and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
-!!! related TS1377 b.ts:2:15: 'BB' was exported here.
     
 ==== e.fixed.ts (0 errors) ====
     import type { AA, BB } from "./d";
diff --git a/tests/baselines/reference/preserveValueImports_importsNotUsedAsValues.js b/tests/baselines/reference/preserveValueImports_importsNotUsedAsValues.js
index 2c77dc75b2b..491fdbd2e70 100644
--- a/tests/baselines/reference/preserveValueImports_importsNotUsedAsValues.js
+++ b/tests/baselines/reference/preserveValueImports_importsNotUsedAsValues.js
@@ -15,6 +15,6 @@ export { type A, type B, type C } from "./mod.js";
 //// [mod.js]
 export {};
 //// [index.js]
-import {} from "./mod.js";
+export {};
 //// [reexport.js]
-export {} from "./mod.js";
+export {};
diff --git a/tests/baselines/reference/preserveValueImports_mixedImports.errors.txt b/tests/baselines/reference/preserveValueImports_mixedImports.errors.txt
index 64413364cd2..a51d3eceedd 100644
--- a/tests/baselines/reference/preserveValueImports_mixedImports.errors.txt
+++ b/tests/baselines/reference/preserveValueImports_mixedImports.errors.txt
@@ -1,6 +1,5 @@
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-/index.ts(1,21): error TS1444: 'ComponentProps' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
 
 
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
@@ -9,10 +8,8 @@ error TS5102: Option 'preserveValueImports' has been removed. Please remove it f
     export function Component() {}
     export interface ComponentProps {}
     
-==== /index.ts (1 errors) ====
+==== /index.ts (0 errors) ====
     import { Component, ComponentProps } from "./exports.js";
-                        ~~~~~~~~~~~~~~
-!!! error TS1444: 'ComponentProps' is a type and must be imported using a type-only import when 'preserveValueImports' and 'isolatedModules' are both enabled.
     
 ==== /index.fixed.ts (0 errors) ====
     import { Component, type ComponentProps } from "./exports.js";
diff --git a/tests/baselines/reference/preserveValueImports_mixedImports.js b/tests/baselines/reference/preserveValueImports_mixedImports.js
index 889ab0f80f2..2dedf00b6a4 100644
--- a/tests/baselines/reference/preserveValueImports_mixedImports.js
+++ b/tests/baselines/reference/preserveValueImports_mixedImports.js
@@ -14,6 +14,6 @@ import { Component, type ComponentProps } from "./exports.js";
 //// [exports.js]
 export function Component() { }
 //// [index.js]
-import { Component } from "./exports.js";
+export {};
 //// [index.fixed.js]
-import { Component } from "./exports.js";
+export {};
diff --git a/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt b/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt
index 979d04db2a9..6421fbec305 100644
--- a/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt
+++ b/tests/baselines/reference/preserveValueImports_module(module=amd).errors.txt
@@ -1,9 +1,7 @@
-error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
 
 
-!!! error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
 ==== preserveValueImports_module.ts (0 errors) ====
diff --git a/tests/baselines/reference/preserveValueImports_module(module=commonjs).errors.txt b/tests/baselines/reference/preserveValueImports_module(module=commonjs).errors.txt
index 979d04db2a9..6421fbec305 100644
--- a/tests/baselines/reference/preserveValueImports_module(module=commonjs).errors.txt
+++ b/tests/baselines/reference/preserveValueImports_module(module=commonjs).errors.txt
@@ -1,9 +1,7 @@
-error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
 
 
-!!! error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
 ==== preserveValueImports_module.ts (0 errors) ====
diff --git a/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt b/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt
index 979d04db2a9..6421fbec305 100644
--- a/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt
+++ b/tests/baselines/reference/preserveValueImports_module(module=system).errors.txt
@@ -1,9 +1,7 @@
-error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
 
 
-!!! error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
 ==== preserveValueImports_module.ts (0 errors) ====
diff --git a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
index 88730d22afb..4dfbd076cc9 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
+++ b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.errors.txt
@@ -1,11 +1,7 @@
-error TS5053: Option 'declarationDir' cannot be specified with option 'out'.
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
+error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
 
 
-!!! error TS5053: Option 'declarationDir' cannot be specified with option 'out'.
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
+!!! error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
 ==== b.ts (0 errors) ====
     export class B {
         
diff --git a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json
index 9ff661cf194..1fed8344ac8 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json
+++ b/tests/baselines/reference/project/declarationDir3/amd/declarationDir3.json
@@ -6,7 +6,7 @@
         "subfolder/b.ts",
         "subfolder/c.ts"
     ],
-    "out": "out.js",
+    "outFile": "out.js",
     "declaration": true,
     "declarationDir": "declarations",
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
index 4a582e47971..c877782f389 100644
--- a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
+++ b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.errors.txt
@@ -1,13 +1,9 @@
-error TS5053: Option 'declarationDir' cannot be specified with option 'out'.
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5053: Option 'declarationDir' cannot be specified with option 'out'.
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS5053: Option 'declarationDir' cannot be specified with option 'outFile'.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== b.ts (0 errors) ====
     export class B {
         
diff --git a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json
index eec7e0d434d..77974750c2e 100644
--- a/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json
+++ b/tests/baselines/reference/project/declarationDir3/node/declarationDir3.json
@@ -6,7 +6,7 @@
         "subfolder/b.ts",
         "subfolder/c.ts"
     ],
-    "out": "out.js",
+    "outFile": "out.js",
     "declaration": true,
     "declarationDir": "declarations",
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/DifferentNamesNotSpecified/test.d.ts
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.d.ts
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/DifferentNamesNotSpecified/test.d.ts
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/DifferentNamesNotSpecified/test.js
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/test.js
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/DifferentNamesNotSpecified/test.js
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
deleted file mode 100644
index 8c60acfa6f1..00000000000
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-DifferentNamesNotSpecified/tsconfig.json(2,24): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-==== DifferentNamesNotSpecified/tsconfig.json (1 errors) ====
-    {
-      "compilerOptions": { "out": "test.js" }
-                           ~~~~~
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-    }
-==== DifferentNamesNotSpecified/a.ts (0 errors) ====
-    var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json
index 2a08e8c8281..e4cb8e11ef7 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/amd/jsFileCompilationDifferentNamesNotSpecified.json
@@ -11,7 +11,7 @@
         "DifferentNamesNotSpecified/a.ts"
     ],
     "emittedFiles": [
-        "test.js",
-        "test.d.ts"
+        "DifferentNamesNotSpecified/test.js",
+        "DifferentNamesNotSpecified/test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/DifferentNamesNotSpecified/test.d.ts
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.d.ts
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/DifferentNamesNotSpecified/test.d.ts
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/DifferentNamesNotSpecified/test.js
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/test.js
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/DifferentNamesNotSpecified/test.js
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
index c5bd67af08d..94920694c07 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.errors.txt
@@ -1,16 +1,12 @@
-DifferentNamesNotSpecified/tsconfig.json(2,24): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-DifferentNamesNotSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+DifferentNamesNotSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-==== DifferentNamesNotSpecified/tsconfig.json (2 errors) ====
+==== DifferentNamesNotSpecified/tsconfig.json (1 errors) ====
     {
-      "compilerOptions": { "out": "test.js" }
-                           ~~~~~
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-                           ~~~~~
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+      "compilerOptions": { "outFile": "test.js" }
+                           ~~~~~~~~~
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
     }
+    
 ==== DifferentNamesNotSpecified/a.ts (0 errors) ====
     var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json
index 2a08e8c8281..e4cb8e11ef7 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecified/node/jsFileCompilationDifferentNamesNotSpecified.json
@@ -11,7 +11,7 @@
         "DifferentNamesNotSpecified/a.ts"
     ],
     "emittedFiles": [
-        "test.js",
-        "test.d.ts"
+        "DifferentNamesNotSpecified/test.js",
+        "DifferentNamesNotSpecified/test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/DifferentNamesNotSpecifiedWithAllowJs/test.d.ts
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.d.ts
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/DifferentNamesNotSpecifiedWithAllowJs/test.d.ts
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/DifferentNamesNotSpecifiedWithAllowJs/test.js
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/test.js
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/DifferentNamesNotSpecifiedWithAllowJs/test.js
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index c6a5f4cc054..00000000000
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(3,5): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
-    {
-      "compilerOptions": {
-        "out": "test.js",
-        ~~~~~
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-        "allowJs": true
-      }
-    }
-==== DifferentNamesNotSpecifiedWithAllowJs/a.ts (0 errors) ====
-    var test = 10;
-==== DifferentNamesNotSpecifiedWithAllowJs/b.js (0 errors) ====
-    var test2 = 10; // Should get compiled
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json
index 07a76b67d5f..8408c1370fc 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json
@@ -12,7 +12,7 @@
         "DifferentNamesNotSpecifiedWithAllowJs/b.js"
     ],
     "emittedFiles": [
-        "test.js",
-        "test.d.ts"
+        "DifferentNamesNotSpecifiedWithAllowJs/test.js",
+        "DifferentNamesNotSpecifiedWithAllowJs/test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/DifferentNamesNotSpecifiedWithAllowJs/test.d.ts
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.d.ts
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/DifferentNamesNotSpecifiedWithAllowJs/test.d.ts
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/DifferentNamesNotSpecifiedWithAllowJs/test.js
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/test.js
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/DifferentNamesNotSpecifiedWithAllowJs/test.js
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
index f0b63f2a3d2..f6601905979 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.errors.txt
@@ -1,20 +1,16 @@
-DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(3,5): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(3,5): error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json(3,5): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
+==== DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
     {
       "compilerOptions": {
-        "out": "test.js",
-        ~~~~~
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-        ~~~~~
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+        "outFile": "test.js",
+        ~~~~~~~~~
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
         "allowJs": true
       }
     }
+    
 ==== DifferentNamesNotSpecifiedWithAllowJs/a.ts (0 errors) ====
     var test = 10;
 ==== DifferentNamesNotSpecifiedWithAllowJs/b.js (0 errors) ====
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json
index 07a76b67d5f..8408c1370fc 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesNotSpecifiedWithAllowJs.json
@@ -12,7 +12,7 @@
         "DifferentNamesNotSpecifiedWithAllowJs/b.js"
     ],
     "emittedFiles": [
-        "test.js",
-        "test.d.ts"
+        "DifferentNamesNotSpecifiedWithAllowJs/test.js",
+        "DifferentNamesNotSpecifiedWithAllowJs/test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/DifferentNamesSpecified/test.d.ts
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.d.ts
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/DifferentNamesSpecified/test.d.ts
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/DifferentNamesSpecified/test.js
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/test.js
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/DifferentNamesSpecified/test.js
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
index 0fbf7c7c033..bc59a1a6546 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.errors.txt
@@ -1,21 +1,17 @@
 error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
   The file is in the program because:
     Part of 'files' list in tsconfig.json
-DifferentNamesSpecified/tsconfig.json(2,24): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 
 
 !!! error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 !!! error TS6504:   The file is in the program because:
 !!! error TS6504:     Part of 'files' list in tsconfig.json
 !!! related TS1410 DifferentNamesSpecified/tsconfig.json:3:22: File is matched by 'files' list specified here.
-==== DifferentNamesSpecified/tsconfig.json (1 errors) ====
+==== DifferentNamesSpecified/tsconfig.json (0 errors) ====
     {
-      "compilerOptions": { "out": "test.js" },
-                           ~~~~~
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
+      "compilerOptions": { "outFile": "test.js" },
       "files": [ "a.ts", "b.js" ]
     }
+    
 ==== DifferentNamesSpecified/a.ts (0 errors) ====
     var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json
index 95d8a687b97..c8971a240fa 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/amd/jsFileCompilationDifferentNamesSpecified.json
@@ -11,7 +11,7 @@
         "DifferentNamesSpecified/a.ts"
     ],
     "emittedFiles": [
-        "test.js",
-        "test.d.ts"
+        "DifferentNamesSpecified/test.js",
+        "DifferentNamesSpecified/test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/DifferentNamesSpecified/test.d.ts
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.d.ts
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/DifferentNamesSpecified/test.d.ts
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/DifferentNamesSpecified/test.js
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/test.js
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/DifferentNamesSpecified/test.js
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
index c3296635839..2a527c77f34 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.errors.txt
@@ -1,24 +1,20 @@
 error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
   The file is in the program because:
     Part of 'files' list in tsconfig.json
-DifferentNamesSpecified/tsconfig.json(2,24): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-DifferentNamesSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+DifferentNamesSpecified/tsconfig.json(2,24): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
 !!! error TS6504: File 'DifferentNamesSpecified/b.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
 !!! error TS6504:   The file is in the program because:
 !!! error TS6504:     Part of 'files' list in tsconfig.json
 !!! related TS1410 DifferentNamesSpecified/tsconfig.json:3:22: File is matched by 'files' list specified here.
-==== DifferentNamesSpecified/tsconfig.json (2 errors) ====
+==== DifferentNamesSpecified/tsconfig.json (1 errors) ====
     {
-      "compilerOptions": { "out": "test.js" },
-                           ~~~~~
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-                           ~~~~~
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+      "compilerOptions": { "outFile": "test.js" },
+                           ~~~~~~~~~
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
       "files": [ "a.ts", "b.js" ]
     }
+    
 ==== DifferentNamesSpecified/a.ts (0 errors) ====
     var test = 10;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json
index 95d8a687b97..c8971a240fa 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecified/node/jsFileCompilationDifferentNamesSpecified.json
@@ -11,7 +11,7 @@
         "DifferentNamesSpecified/a.ts"
     ],
     "emittedFiles": [
-        "test.js",
-        "test.d.ts"
+        "DifferentNamesSpecified/test.js",
+        "DifferentNamesSpecified/test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/DifferentNamesSpecifiedWithAllowJs/test.d.ts
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.d.ts
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/DifferentNamesSpecifiedWithAllowJs/test.d.ts
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/DifferentNamesSpecifiedWithAllowJs/test.js
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/test.js
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/DifferentNamesSpecifiedWithAllowJs/test.js
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
deleted file mode 100644
index d21ae4a0627..00000000000
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-DifferentNamesSpecifiedWithAllowJs/tsconfig.json(3,5): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
-    {
-      "compilerOptions": {
-        "out": "test.js",
-        ~~~~~
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-        "allowJs": true
-      },
-      "files": [ "a.ts", "b.js" ]
-    }
-==== DifferentNamesSpecifiedWithAllowJs/a.ts (0 errors) ====
-    var test = 10;
-==== DifferentNamesSpecifiedWithAllowJs/b.js (0 errors) ====
-    var test2 = 10; // Should get compiled
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json
index 09066720002..24874dc6db1 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/amd/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json
@@ -12,7 +12,7 @@
         "DifferentNamesSpecifiedWithAllowJs/b.js"
     ],
     "emittedFiles": [
-        "test.js",
-        "test.d.ts"
+        "DifferentNamesSpecifiedWithAllowJs/test.js",
+        "DifferentNamesSpecifiedWithAllowJs/test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.d.ts b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/DifferentNamesSpecifiedWithAllowJs/test.d.ts
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.d.ts
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/DifferentNamesSpecifiedWithAllowJs/test.d.ts
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.js b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/DifferentNamesSpecifiedWithAllowJs/test.js
similarity index 100%
rename from tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/test.js
rename to tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/DifferentNamesSpecifiedWithAllowJs/test.js
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
index d39730567a1..5e9b61c196d 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.errors.txt
@@ -1,21 +1,17 @@
-DifferentNamesSpecifiedWithAllowJs/tsconfig.json(3,5): error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-DifferentNamesSpecifiedWithAllowJs/tsconfig.json(3,5): error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+DifferentNamesSpecifiedWithAllowJs/tsconfig.json(3,5): error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (2 errors) ====
+==== DifferentNamesSpecifiedWithAllowJs/tsconfig.json (1 errors) ====
     {
       "compilerOptions": {
-        "out": "test.js",
-        ~~~~~
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-        ~~~~~
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+        "outFile": "test.js",
+        ~~~~~~~~~
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
         "allowJs": true
       },
       "files": [ "a.ts", "b.js" ]
     }
+    
 ==== DifferentNamesSpecifiedWithAllowJs/a.ts (0 errors) ====
     var test = 10;
 ==== DifferentNamesSpecifiedWithAllowJs/b.js (0 errors) ====
diff --git a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json
index 09066720002..24874dc6db1 100644
--- a/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json
+++ b/tests/baselines/reference/project/jsFileCompilationDifferentNamesSpecifiedWithAllowJs/node/jsFileCompilationDifferentNamesSpecifiedWithAllowJs.json
@@ -12,7 +12,7 @@
         "DifferentNamesSpecifiedWithAllowJs/b.js"
     ],
     "emittedFiles": [
-        "test.js",
-        "test.d.ts"
+        "DifferentNamesSpecifiedWithAllowJs/test.js",
+        "DifferentNamesSpecifiedWithAllowJs/test.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index c6b34436561..567c70e898d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index c6b34436561..567c70e898d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 5e94306523f..8249ddc0104 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 5e94306523f..8249ddc0104 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 6ae1bc3544d..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index cd4835bbf7f..c0c64622038 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index 70119d48e13..247f9e4f2f2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 9a0e4f12172..69993b52b2c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 26d9ee3effd..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 60f07373d31..71bdb92b4c3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index b1251e65c48..12592331fb5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 450277c7af2..c359770ee5f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 64a69acb2af..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index a54ef733040..b8129796d7c 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index 76a5b2b384a..42154149020 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index 928272566aa..0f2fff84982 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a644c1c6d29..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json
index bc11e112cf4..4e4f3b687d8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index ec74fc9a4ee..664beb97bc2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json
index bc11e112cf4..4e4f3b687d8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMultifolderSpecifyOutputFile/node/mapRootAbsolutePathMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 44fdc1b3398..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json
index 33c73ff1feb..5d0059a6a5e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/amd/mapRootAbsolutePathSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index a9a9b2cc4a3..53fc18f86c7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json
index 33c73ff1feb..5d0059a6a5e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSimpleSpecifyOutputFile/node/mapRootAbsolutePathSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7542dd5a80b..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json
index 818e5df89fd..7f053304c82 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/amd/mapRootAbsolutePathSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 4cb8eea6a1c..eb358c3b79d 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json
index 818e5df89fd..7f053304c82 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSingleFileSpecifyOutputFile/node/mapRootAbsolutePathSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 9d44caf5878..00000000000
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json
index 701d236d0c9..73e1064e622 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index 5b48bc2c2c1..110e3849820 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json
index 701d236d0c9..73e1064e622 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootAbsolutePathSubfolderSpecifyOutputFile/node/mapRootAbsolutePathSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
index 963ddc6cf78..c69a4b99151 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
index 963ddc6cf78..c69a4b99151 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/node/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 8160e95c62e..e9a5bfb6f6b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 8160e95c62e..e9a5bfb6f6b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 6ae1bc3544d..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 8663fb676df..defc6e1f513 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index 70119d48e13..247f9e4f2f2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 5ae718014ef..9cf596bb2ab 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 26d9ee3effd..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index 76eeb95324c..f67a962fe3a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index b1251e65c48..12592331fb5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index 30faceeb43d..dec2a63151a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 64a69acb2af..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index eaaf066b605..b10fa592472 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index 76a5b2b384a..42154149020 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 3f9c7b37c90..6880d91a722 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a644c1c6d29..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json
index f51c8f0a912..7dc14c2bcdb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/amd/mapRootRelativePathMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index ec74fc9a4ee..664beb97bc2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json
index f51c8f0a912..7dc14c2bcdb 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathMultifolderSpecifyOutputFile/node/mapRootRelativePathMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 44fdc1b3398..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json
index 5ca065cdf0e..c9aa92b1665 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/amd/mapRootRelativePathSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
index a9a9b2cc4a3..53fc18f86c7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json
index 5ca065cdf0e..c9aa92b1665 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathSimpleSpecifyOutputFile/node/mapRootRelativePathSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7542dd5a80b..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json
index eabd30d4b7a..343a1ed90f6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/amd/mapRootRelativePathSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 4cb8eea6a1c..eb358c3b79d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json
index eabd30d4b7a..343a1ed90f6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathSingleFileSpecifyOutputFile/node/mapRootRelativePathSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 9d44caf5878..00000000000
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json
index 43907c826b3..0d4a304a91a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/amd/mapRootRelativePathSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index 5b48bc2c2c1..110e3849820 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json
index 43907c826b3..0d4a304a91a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/mapRootRelativePathSubfolderSpecifyOutputFile/node/mapRootRelativePathSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json
index edb5ba80851..555f14219e7 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json
index edb5ba80851..555f14219e7 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 7b967675abf..96652a0db01 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 7b967675abf..96652a0db01 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 6ae1bc3544d..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
index 2b1eadcbd1b..00606be4e8f 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 70119d48e13..247f9e4f2f2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
index 999415d5dee..85c13833e74 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 26d9ee3effd..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
index 070128f11b5..3a0253543f6 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
index b1251e65c48..12592331fb5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
index 087d1c667bb..b48f55c96f1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 64a69acb2af..00000000000
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
index 24f628f187d..62022a2a153 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index 76a5b2b384a..42154149020 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
index bc6aa594d38..85f9744e785 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a644c1c6d29..00000000000
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json
index 917456b3ca0..8a4866e166e 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/amd/maprootUrlMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
index ec74fc9a4ee..664beb97bc2 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json
index 917456b3ca0..8a4866e166e 100644
--- a/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlMultifolderSpecifyOutputFile/node/maprootUrlMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 44fdc1b3398..00000000000
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json
index 5c96ab2dc0b..2c4743185e8 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/amd/maprootUrlSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
index a9a9b2cc4a3..53fc18f86c7 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json
index 5c96ab2dc0b..2c4743185e8 100644
--- a/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlSimpleSpecifyOutputFile/node/maprootUrlSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7542dd5a80b..00000000000
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json
index 448ead4532f..ebabe9513f4 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/amd/maprootUrlSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
index 4cb8eea6a1c..eb358c3b79d 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json
index 448ead4532f..ebabe9513f4 100644
--- a/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlSingleFileSpecifyOutputFile/node/maprootUrlSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 9d44caf5878..00000000000
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json
index 70776c85805..687222d46a8 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/amd/maprootUrlSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
index 5b48bc2c2c1..110e3849820 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json
index 70776c85805..687222d46a8 100644
--- a/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlSubfolderSpecifyOutputFile/node/maprootUrlSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
index 71b1238bba5..1c079b250d5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
index 71b1238bba5..1c079b250d5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 9aeb2b6c767..173db119740 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 9aeb2b6c767..173db119740 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 6ae1bc3544d..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index b074aae66cc..bde947b83f9 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 70119d48e13..247f9e4f2f2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 500277e1680..26c67e97360 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 26d9ee3effd..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index a4a700b6f76..fa233c59d3a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index b1251e65c48..12592331fb5 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index a1478f4c6f0..1bc6bae5911 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 64a69acb2af..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index cd461d9385f..58b76d6f050 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index 76a5b2b384a..42154149020 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 5b2dceeded3..a1489a487ca 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a644c1c6d29..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json
index fc3a6893bc4..df871756767 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index ec74fc9a4ee..664beb97bc2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json
index fc3a6893bc4..df871756767 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile/node/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 44fdc1b3398..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json
index 9c64212b2d2..2666250b16d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
index a9a9b2cc4a3..53fc18f86c7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json
index 9c64212b2d2..2666250b16d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile/node/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7542dd5a80b..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json
index 35ea35d2b5c..18ac619ec46 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/amd/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 4cb8eea6a1c..eb358c3b79d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json
index 35ea35d2b5c..18ac619ec46 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile/node/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 9d44caf5878..00000000000
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json
index 3882ed95cef..54c67310d87 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index 5b48bc2c2c1..110e3849820 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json
index 3882ed95cef..54c67310d87 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile/node/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json
index f5449179393..608da90fecf 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/outMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json
index f5449179393..608da90fecf 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/node/outMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 1d651c8adbf..00d09c00523 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 1d651c8adbf..00d09c00523 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 6ae1bc3544d..00000000000
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
index bc5db5e3f5f..64960cadbd9 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/outModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
index 70119d48e13..247f9e4f2f2 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
index 469166f9483..45de87d52c9 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/outModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 26d9ee3effd..00000000000
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
index e7861f1a36d..b664b24ac28 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/outModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
index b1251e65c48..12592331fb5 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
index 4598de4d205..3e391a0e3ad 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/outModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 64a69acb2af..00000000000
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
index cc00d955e4c..d220bf9f619 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/outModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
index 76a5b2b384a..42154149020 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
index 525e66e396a..612b0844772 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/outModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a644c1c6d29..00000000000
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.json
index ad7df0e44cd..a24164af539 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/amd/outMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
index ec74fc9a4ee..664beb97bc2 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.json
index ad7df0e44cd..a24164af539 100644
--- a/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outMultifolderSpecifyOutputFile/node/outMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 44fdc1b3398..00000000000
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.json
index 73b40fdf5bc..78d29bc1a00 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/amd/outSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
index a9a9b2cc4a3..53fc18f86c7 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.json
index 73b40fdf5bc..78d29bc1a00 100644
--- a/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outSimpleSpecifyOutputFile/node/outSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7542dd5a80b..00000000000
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.json
index 93882b8f8b3..38b182ee727 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/amd/outSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
index 4cb8eea6a1c..eb358c3b79d 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.json
index 93882b8f8b3..38b182ee727 100644
--- a/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outSingleFileSpecifyOutputFile/node/outSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 9d44caf5878..00000000000
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.json
index 1a51de4c1df..9444fdbc973 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/amd/outSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
index 5b48bc2c2c1..110e3849820 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.json
index 1a51de4c1df..9444fdbc973 100644
--- a/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/outSubfolderSpecifyOutputFile/node/outSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true,
     "resolvedInputFiles": [
diff --git a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
deleted file mode 100644
index 6222fbb7426..00000000000
--- a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== globalThisCapture.ts (0 errors) ====
-    // Add a lambda to ensure global 'this' capture is triggered
-    (()=>this.window);
-    
-==== __extends.ts (0 errors) ====
-    // class inheritance to ensure __extends is emitted
-    module m {
-        export class base {}
-        export class child extends base {}
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.json b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.json
index 4bd84ede2e9..b464866d68f 100644
--- a/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.json
+++ b/tests/baselines/reference/project/prologueEmit/amd/prologueEmit.json
@@ -5,7 +5,7 @@
         "globalThisCapture.ts",
         "__extends.ts"
     ],
-    "out": "out.js",
+    "outFile": "out.js",
     "baselineCheck": true,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
diff --git a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
index e78becdaae4..ef77af7372e 100644
--- a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
+++ b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== globalThisCapture.ts (0 errors) ====
     // Add a lambda to ensure global 'this' capture is triggered
     (()=>this.window);
diff --git a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.json b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.json
index 4bd84ede2e9..b464866d68f 100644
--- a/tests/baselines/reference/project/prologueEmit/node/prologueEmit.json
+++ b/tests/baselines/reference/project/prologueEmit/node/prologueEmit.json
@@ -5,7 +5,7 @@
         "globalThisCapture.ts",
         "__extends.ts"
     ],
-    "out": "out.js",
+    "outFile": "out.js",
     "baselineCheck": true,
     "resolvedInputFiles": [
         "lib.es5.d.ts",
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index 499f2f3b1d9..3fd52c14a67 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index 499f2f3b1d9..3fd52c14a67 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 70892931007..755e67d25e3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 70892931007..755e67d25e3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 6ae1bc3544d..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index c5e8b375fe3..45316284f41 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
index 70119d48e13..247f9e4f2f2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index f9228f2e9d3..51f70eb209e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 26d9ee3effd..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index e92c71f42b1..5fdcedd76ed 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
index b1251e65c48..12592331fb5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 1c41f04f7a6..86ca4936100 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 64a69acb2af..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index 3b9d70d28c8..e213d6c327a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
index 76a5b2b384a..42154149020 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index b1e2eb2d31b..b8e4423ade9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a644c1c6d29..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json
index 2ec1c0876bf..e14490694a1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
index ec74fc9a4ee..664beb97bc2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json
index 2ec1c0876bf..e14490694a1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile/node/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 44fdc1b3398..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json
index 6cbe6a53091..f2d9e216fc9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
index a9a9b2cc4a3..53fc18f86c7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json
index 6cbe6a53091..f2d9e216fc9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSimpleSpecifyOutputFile/node/sourceRootAbsolutePathSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7542dd5a80b..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json
index 3942383f683..6a127d21c6a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/amd/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
index 4cb8eea6a1c..eb358c3b79d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json
index 3942383f683..6a127d21c6a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile/node/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 9d44caf5878..00000000000
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json
index d3ac3a495d2..8e542cca39e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
index 5b48bc2c2c1..110e3849820 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json
index d3ac3a495d2..8e542cca39e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile/node/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
index fb08ca4bafa..a9863e32b99 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
index fb08ca4bafa..a9863e32b99 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index e8ae9e150f0..2cfd94ec715 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index e8ae9e150f0..2cfd94ec715 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 6ae1bc3544d..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index b23978bbacb..fd197880aa9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
index 70119d48e13..247f9e4f2f2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 8073c8445a7..af9087b1fdc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 26d9ee3effd..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index 403c703dc31..c18aaa793b6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
index b1251e65c48..12592331fb5 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index 5db69ae6833..44c9dec0c5e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 64a69acb2af..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index d7fa4c8247c..7c600e86593 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
index 76a5b2b384a..42154149020 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index e6049e27de1..6563d66606a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a644c1c6d29..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json
index 9c57960eb74..717d3e1fdfd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/amd/sourceRootRelativePathMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
index ec74fc9a4ee..664beb97bc2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json
index 9c57960eb74..717d3e1fdfd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathMultifolderSpecifyOutputFile/node/sourceRootRelativePathMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 44fdc1b3398..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json
index 97c1eae9376..a6b1c978c9d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/amd/sourceRootRelativePathSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
index a9a9b2cc4a3..53fc18f86c7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json
index 97c1eae9376..a6b1c978c9d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathSimpleSpecifyOutputFile/node/sourceRootRelativePathSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7542dd5a80b..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json
index 75bfb879271..15643252eed 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/amd/sourceRootRelativePathSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
index 4cb8eea6a1c..eb358c3b79d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json
index 75bfb879271..15643252eed 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathSingleFileSpecifyOutputFile/node/sourceRootRelativePathSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 9d44caf5878..00000000000
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json
index 603cc6ee949..66e86029f60 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/amd/sourceRootRelativePathSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
index 5b48bc2c2c1..110e3849820 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json
index 603cc6ee949..66e86029f60 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourceRootRelativePathSubfolderSpecifyOutputFile/node/sourceRootRelativePathSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json
index ca15bdbd039..38ec6350861 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/sourcemapMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json
index ca15bdbd039..38ec6350861 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/node/sourcemapMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 0e12348e4a8..3c50c40cd41 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 0e12348e4a8..3c50c40cd41 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 6ae1bc3544d..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
index 5ef45d7a2bf..c4bc520017c 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
index 70119d48e13..247f9e4f2f2 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
index 3f397d21470..30a40201b6e 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 26d9ee3effd..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
index 968443c40f8..926ee8e90c2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
index b1251e65c48..12592331fb5 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
index 4287a57f845..7588606f606 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 64a69acb2af..00000000000
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
index 2e77077c1a9..1925480ffc8 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
index 76a5b2b384a..42154149020 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
index 51f7e64041b..b014e6bff34 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a644c1c6d29..00000000000
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.json
index 2be183ff658..3cd1b6109b1 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/amd/sourcemapMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
index ec74fc9a4ee..664beb97bc2 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.json
index 2be183ff658..3cd1b6109b1 100644
--- a/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapMultifolderSpecifyOutputFile/node/sourcemapMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 44fdc1b3398..00000000000
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.json
index 171c6b3fa89..c7cfcf104a0 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/amd/sourcemapSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
index a9a9b2cc4a3..53fc18f86c7 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.json
index 171c6b3fa89..c7cfcf104a0 100644
--- a/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapSimpleSpecifyOutputFile/node/sourcemapSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7542dd5a80b..00000000000
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.json
index 632cbb94850..8d14a6ac73f 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/amd/sourcemapSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
index 4cb8eea6a1c..eb358c3b79d 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.json
index 632cbb94850..8d14a6ac73f 100644
--- a/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapSingleFileSpecifyOutputFile/node/sourcemapSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 9d44caf5878..00000000000
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.json
index 55e340576c4..9a0056afadc 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/amd/sourcemapSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
index 5b48bc2c2c1..110e3849820 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.json
index 55e340576c4..9a0056afadc 100644
--- a/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcemapSubfolderSpecifyOutputFile/node/sourcemapSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
index 52cda4cda4c..7e27dcb3c5b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
index 52cda4cda4c..7e27dcb3c5b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/node/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
deleted file mode 100644
index 30fd9f0cf95..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ref/m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 664d2fbc795..ff1b266c9f8 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
index 3658c2a02d5..51edf2991ad 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 664d2fbc795..ff1b266c9f8 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 6ae1bc3544d..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== m2.ts (0 errors) ====
-    export var m2_a1 = 10;
-    export class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    export var m2_instance1 = new m2_c1();
-    export function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    import m2 = require("../outputdir_module_multifolder_ref/m2");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
-    export var a3 = m2.m2_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index d52687f18ee..3d4fe4f2d59 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
index 70119d48e13..247f9e4f2f2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index aa275509db3..a1a7cd857fa 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 26d9ee3effd..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index 8deb90ce856..98820967ad2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
index b1251e65c48..12592331fb5 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index b8606f5e8f2..7bd6c455998 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 64a69acb2af..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    export var m1_a1 = 10;
-    export class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    export var m1_instance1 = new m1_c1();
-    export function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    import m1 = require("ref/m1");
-    export var a1 = 10;
-    export class c1 {
-        public p1: number;
-    }
-    
-    export var instance1 = new c1();
-    export function f1() {
-        return instance1;
-    }
-    
-    export var a2 = m1.m1_c1;
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index e12d642b8a7..6a3e7ecd4a2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
index 76a5b2b384a..42154149020 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     export var m1_a1 = 10;
     export class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 4af06269858..f0d4c07c48a 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index a644c1c6d29..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== ../outputdir_multifolder_ref/m2.ts (0 errors) ====
-    var m2_a1 = 10;
-    class m2_c1 {
-        public m2_c1_p1: number;
-    }
-    
-    var m2_instance1 = new m2_c1();
-    function m2_f1() {
-        return m2_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    /// <reference path='../outputdir_multifolder_ref/m2.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json
index b61ec6967e0..d52d1adf453 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/amd/sourcerootUrlMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
index ec74fc9a4ee..664beb97bc2 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json
index b61ec6967e0..d52d1adf453 100644
--- a/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlMultifolderSpecifyOutputFile/node/sourcerootUrlMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
deleted file mode 100644
index 44fdc1b3398..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json
index ccef6f8bc0e..35aa5757db6 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/amd/sourcerootUrlSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
index a9a9b2cc4a3..53fc18f86c7 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json
index ccef6f8bc0e..35aa5757db6 100644
--- a/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlSimpleSpecifyOutputFile/node/sourcerootUrlSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
deleted file mode 100644
index 7542dd5a80b..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== test.ts (0 errors) ====
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json
index 7ee95507027..1e714415401 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/amd/sourcerootUrlSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
index 4cb8eea6a1c..eb358c3b79d 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== test.ts (0 errors) ====
     var a1 = 10;
     class c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json
index 7ee95507027..1e714415401 100644
--- a/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlSingleFileSpecifyOutputFile/node/sourcerootUrlSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
deleted file mode 100644
index 9d44caf5878..00000000000
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== ref/m1.ts (0 errors) ====
-    var m1_a1 = 10;
-    class m1_c1 {
-        public m1_c1_p1: number;
-    }
-    
-    var m1_instance1 = new m1_c1();
-    function m1_f1() {
-        return m1_instance1;
-    }
-==== test.ts (0 errors) ====
-    /// <reference path='ref/m1.ts'/>
-    var a1 = 10;
-    class c1 {
-        public p1: number;
-    }
-    
-    var instance1 = new c1();
-    function f1() {
-        return instance1;
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json
index c3a146b56e7..99837509def 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/amd/sourcerootUrlSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
index 5b48bc2c2c1..110e3849820 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --out.
+!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile.
 ==== ref/m1.ts (0 errors) ====
     var m1_a1 = 10;
     class m1_c1 {
diff --git a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json
index c3a146b56e7..99837509def 100644
--- a/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json
+++ b/tests/baselines/reference/project/sourcerootUrlSubfolderSpecifyOutputFile/node/sourcerootUrlSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
diff --git a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.errors.txt b/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.errors.txt
deleted file mode 100644
index 4488938b75c..00000000000
--- a/tests/baselines/reference/signaturesUseJSDocForOptionalParameters.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== jsDocOptionality.js (0 errors) ====
-    function MyClass() {
-      this.prop = null;
-    }
-    /**
-     * @param  {string} required
-     * @param  {string} [notRequired]
-     * @returns {MyClass}
-     */
-    MyClass.prototype.optionalParam = function(required, notRequired) {
-        return this;
-    };
-    let pInst = new MyClass();
-    let c1 = pInst.optionalParam('hello')
-    let c2 = pInst.optionalParam('hello', null)
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.errors.txt b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.errors.txt
deleted file mode 100644
index e274395b5ef..00000000000
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== testFiles/app.ts (0 errors) ====
-    // Note in the out result we are using same folder name only different in casing
-    // Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts
-    class c {
-    }
-    
-==== testFiles/app2.ts (0 errors) ====
-    class d {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js
index 7f7d513a166..db4ab232a95 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.js
@@ -8,7 +8,8 @@ class c {
 
 //// [app2.ts]
 class d {
-}
+}
+
 
 //// [fooResult.js]
 // Note in the out result we are using same folder name only different in casing
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.symbols b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.symbols
index e699f3bdc4d..8a0d31eee92 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.symbols
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.symbols
@@ -11,3 +11,4 @@ class c {
 class d {
 >d : Symbol(d, Decl(app2.ts, 0, 0))
 }
+
diff --git a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.types b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.types
index ee29cd0f616..4e8a4465719 100644
--- a/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.types
+++ b/tests/baselines/reference/sourceMapWithCaseSensitiveFileNames.types
@@ -11,3 +11,4 @@ class c {
 class d {
 >d : d
 }
+
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.errors.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.errors.txt
deleted file mode 100644
index 76f8b9c73fc..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithCopyright.errors.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== b.ts (0 errors) ====
-    /*--------------------------------------------------------------------------
-    Copyright 
-    ---------------------------------------------------------------------------*/
-    
-    ///<reference path="a.ts"/>
-    var y = x;
-    
-==== a.ts (0 errors) ====
-    /*--------------------------------------------------------------------------
-    Copyright 
-    ---------------------------------------------------------------------------*/
-    
-    var x = {
-        a: 10,
-        b: 20
-    };
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt
deleted file mode 100644
index a34be0883c7..00000000000
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.ts (0 errors) ====
-    module M {
-        export var X = 1;
-    }
-    interface Navigator {
-        getGamepads(func?: any): any;
-        webkitGetGamepads(func?: any): any
-        msGetGamepads(func?: any): any;
-        webkitGamepads(func?: any): any;
-    }
-    
-==== b.ts (0 errors) ====
-    module m1 {
-        export class c1 {
-        }
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
index 4b9816a6259..eef3e883409 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js
@@ -15,7 +15,8 @@ interface Navigator {
 module m1 {
     export class c1 {
     }
-}
+}
+
 
 //// [fooResult.js]
 var M;
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
index c0466e09ac6..3f26d66bb10 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.js.map
@@ -1,3 +1,3 @@
 //// [fooResult.js.map]
 {"version":3,"file":"fooResult.js","sourceRoot":"","sources":["a.ts","b.ts"],"names":[],"mappings":"AAAA,IAAO,CAAC,CAEP;AAFD,WAAO,CAAC;IACO,GAAC,GAAG,CAAC,CAAC;AACrB,CAAC,EAFM,CAAC,KAAD,CAAC,QAEP;ACFD,IAAO,EAAE,CAGR;AAHD,WAAO,EAAE;IACL;QAAA;QACA,CAAC;QAAD,SAAC;IAAD,CAAC,AADD,IACC;IADY,KAAE,KACd,CAAA;AACL,CAAC,EAHM,EAAE,KAAF,EAAE,QAGR"}
-//// https://sokra.github.io/source-map-visualization#base64,dmFyIE07DQooZnVuY3Rpb24gKE0pIHsNCiAgICBNLlggPSAxOw0KfSkoTSB8fCAoTSA9IHt9KSk7DQp2YXIgbTE7DQooZnVuY3Rpb24gKG0xKSB7DQogICAgdmFyIGMxID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICBmdW5jdGlvbiBjMSgpIHsNCiAgICAgICAgfQ0KICAgICAgICByZXR1cm4gYzE7DQogICAgfSgpKTsNCiAgICBtMS5jMSA9IGMxOw0KfSkobTEgfHwgKG0xID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWZvb1Jlc3VsdC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9vUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBTyxDQUFDLENBRVA7QUFGRCxXQUFPLENBQUM7SUFDTyxHQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ3JCLENBQUMsRUFGTSxDQUFDLEtBQUQsQ0FBQyxRQUVQO0FDRkQsSUFBTyxFQUFFLENBR1I7QUFIRCxXQUFPLEVBQUU7SUFDTDtRQUFBO1FBQ0EsQ0FBQztRQUFELFNBQUM7SUFBRCxDQUFDLEFBREQsSUFDQztJQURZLEtBQUUsS0FDZCxDQUFBO0FBQ0wsQ0FBQyxFQUhNLEVBQUUsS0FBRixFQUFFLFFBR1IifQ==,bW9kdWxlIE0gewogICAgZXhwb3J0IHZhciBYID0gMTsKfQppbnRlcmZhY2UgTmF2aWdhdG9yIHsKICAgIGdldEdhbWVwYWRzKGZ1bmM/OiBhbnkpOiBhbnk7CiAgICB3ZWJraXRHZXRHYW1lcGFkcyhmdW5jPzogYW55KTogYW55CiAgICBtc0dldEdhbWVwYWRzKGZ1bmM/OiBhbnkpOiBhbnk7CiAgICB3ZWJraXRHYW1lcGFkcyhmdW5jPzogYW55KTogYW55Owp9Cg==,bW9kdWxlIG0xIHsKICAgIGV4cG9ydCBjbGFzcyBjMSB7CiAgICB9Cn0=
+//// https://sokra.github.io/source-map-visualization#base64,dmFyIE07DQooZnVuY3Rpb24gKE0pIHsNCiAgICBNLlggPSAxOw0KfSkoTSB8fCAoTSA9IHt9KSk7DQp2YXIgbTE7DQooZnVuY3Rpb24gKG0xKSB7DQogICAgdmFyIGMxID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgICAgICBmdW5jdGlvbiBjMSgpIHsNCiAgICAgICAgfQ0KICAgICAgICByZXR1cm4gYzE7DQogICAgfSgpKTsNCiAgICBtMS5jMSA9IGMxOw0KfSkobTEgfHwgKG0xID0ge30pKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWZvb1Jlc3VsdC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9vUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYS50cyIsImIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBTyxDQUFDLENBRVA7QUFGRCxXQUFPLENBQUM7SUFDTyxHQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ3JCLENBQUMsRUFGTSxDQUFDLEtBQUQsQ0FBQyxRQUVQO0FDRkQsSUFBTyxFQUFFLENBR1I7QUFIRCxXQUFPLEVBQUU7SUFDTDtRQUFBO1FBQ0EsQ0FBQztRQUFELFNBQUM7SUFBRCxDQUFDLEFBREQsSUFDQztJQURZLEtBQUUsS0FDZCxDQUFBO0FBQ0wsQ0FBQyxFQUhNLEVBQUUsS0FBRixFQUFFLFFBR1IifQ==,bW9kdWxlIE0gewogICAgZXhwb3J0IHZhciBYID0gMTsKfQppbnRlcmZhY2UgTmF2aWdhdG9yIHsKICAgIGdldEdhbWVwYWRzKGZ1bmM/OiBhbnkpOiBhbnk7CiAgICB3ZWJraXRHZXRHYW1lcGFkcyhmdW5jPzogYW55KTogYW55CiAgICBtc0dldEdhbWVwYWRzKGZ1bmM/OiBhbnkpOiBhbnk7CiAgICB3ZWJraXRHYW1lcGFkcyhmdW5jPzogYW55KTogYW55Owp9Cg==,bW9kdWxlIG0xIHsKICAgIGV4cG9ydCBjbGFzcyBjMSB7CiAgICB9Cn0K
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols
index 73598169754..b98896057b0 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols
@@ -35,3 +35,4 @@ module m1 {
 >c1 : Symbol(c1, Decl(b.ts, 0, 11))
     }
 }
+
diff --git a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
index 4252e2b4998..ab77620e97e 100644
--- a/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
+++ b/tests/baselines/reference/sourceMapWithMultipleFilesWithFileEndingWithInterface.types
@@ -34,3 +34,4 @@ module m1 {
 >c1 : c1
     }
 }
+
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.errors.txt b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.errors.txt
deleted file mode 100644
index 1277a2e7132..00000000000
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== testFiles/app.ts (0 errors) ====
-    // Note in the out result we are using same folder name only different in casing
-    // Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap
-    class c {
-    }
-    
-==== testFiles/app2.ts (0 errors) ====
-    class d {
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js
index 76fd5061d05..950c697a590 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js
@@ -8,7 +8,8 @@ class c {
 
 //// [app2.ts]
 class d {
-}
+}
+
 
 //// [fooResult.js]
 // Note in the out result we are using same folder name only different in casing
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map
index 7a56ccbd998..0ad733be0bd 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.js.map
@@ -1,3 +1,3 @@
 //// [fooResult.js.map]
 {"version":3,"file":"fooResult.js","sourceRoot":"","sources":["app.ts","app2.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0GAA0G;AAC1G;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC;ACHD;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"}
-//// https://sokra.github.io/source-map-visualization#base64,Ly8gTm90ZSBpbiB0aGUgb3V0IHJlc3VsdCB3ZSBhcmUgdXNpbmcgc2FtZSBmb2xkZXIgbmFtZSBvbmx5IGRpZmZlcmVudCBpbiBjYXNpbmcNCi8vIFNpbmNlIHRoaXMgaXMgbm9uIGNhc2Ugc2Vuc2l0aXZlLCB0aGUgcmVsYXRpdmUgcGF0aHMgc2hvdWxkIGJlIGp1c3QgYXBwLnRzIGFuZCBhcHAyLnRzIGluIHRoZSBzb3VyY2VtYXANCnZhciBjID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIGMoKSB7DQogICAgfQ0KICAgIHJldHVybiBjOw0KfSgpKTsNCnZhciBkID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIGQoKSB7DQogICAgfQ0KICAgIHJldHVybiBkOw0KfSgpKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWZvb1Jlc3VsdC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9vUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIiwiYXBwMi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxnRkFBZ0Y7QUFDaEYsMEdBQTBHO0FBQzFHO0lBQUE7SUFDQSxDQUFDO0lBQUQsUUFBQztBQUFELENBQUMsQUFERCxJQUNDO0FDSEQ7SUFBQTtJQUNBLENBQUM7SUFBRCxRQUFDO0FBQUQsQ0FBQyxBQURELElBQ0MifQ==,Ly8gTm90ZSBpbiB0aGUgb3V0IHJlc3VsdCB3ZSBhcmUgdXNpbmcgc2FtZSBmb2xkZXIgbmFtZSBvbmx5IGRpZmZlcmVudCBpbiBjYXNpbmcKLy8gU2luY2UgdGhpcyBpcyBub24gY2FzZSBzZW5zaXRpdmUsIHRoZSByZWxhdGl2ZSBwYXRocyBzaG91bGQgYmUganVzdCBhcHAudHMgYW5kIGFwcDIudHMgaW4gdGhlIHNvdXJjZW1hcApjbGFzcyBjIHsKfQo=,Y2xhc3MgZCB7Cn0=
+//// https://sokra.github.io/source-map-visualization#base64,Ly8gTm90ZSBpbiB0aGUgb3V0IHJlc3VsdCB3ZSBhcmUgdXNpbmcgc2FtZSBmb2xkZXIgbmFtZSBvbmx5IGRpZmZlcmVudCBpbiBjYXNpbmcNCi8vIFNpbmNlIHRoaXMgaXMgbm9uIGNhc2Ugc2Vuc2l0aXZlLCB0aGUgcmVsYXRpdmUgcGF0aHMgc2hvdWxkIGJlIGp1c3QgYXBwLnRzIGFuZCBhcHAyLnRzIGluIHRoZSBzb3VyY2VtYXANCnZhciBjID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIGMoKSB7DQogICAgfQ0KICAgIHJldHVybiBjOw0KfSgpKTsNCnZhciBkID0gLyoqIEBjbGFzcyAqLyAoZnVuY3Rpb24gKCkgew0KICAgIGZ1bmN0aW9uIGQoKSB7DQogICAgfQ0KICAgIHJldHVybiBkOw0KfSgpKTsNCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWZvb1Jlc3VsdC5qcy5tYXA=,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9vUmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIiwiYXBwMi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxnRkFBZ0Y7QUFDaEYsMEdBQTBHO0FBQzFHO0lBQUE7SUFDQSxDQUFDO0lBQUQsUUFBQztBQUFELENBQUMsQUFERCxJQUNDO0FDSEQ7SUFBQTtJQUNBLENBQUM7SUFBRCxRQUFDO0FBQUQsQ0FBQyxBQURELElBQ0MifQ==,Ly8gTm90ZSBpbiB0aGUgb3V0IHJlc3VsdCB3ZSBhcmUgdXNpbmcgc2FtZSBmb2xkZXIgbmFtZSBvbmx5IGRpZmZlcmVudCBpbiBjYXNpbmcKLy8gU2luY2UgdGhpcyBpcyBub24gY2FzZSBzZW5zaXRpdmUsIHRoZSByZWxhdGl2ZSBwYXRocyBzaG91bGQgYmUganVzdCBhcHAudHMgYW5kIGFwcDIudHMgaW4gdGhlIHNvdXJjZW1hcApjbGFzcyBjIHsKfQo=,Y2xhc3MgZCB7Cn0K
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.symbols b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.symbols
index 51b6395815c..2b391319081 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.symbols
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.symbols
@@ -11,3 +11,4 @@ class c {
 class d {
 >d : Symbol(d, Decl(app2.ts, 0, 0))
 }
+
diff --git a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.types b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.types
index 73bf52a1edd..5cd56b3263f 100644
--- a/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.types
+++ b/tests/baselines/reference/sourceMapWithNonCaseSensitiveFileNames.types
@@ -11,3 +11,4 @@ class c {
 class d {
 >d : d
 }
+
diff --git a/tests/baselines/reference/topLevelThisAssignment.errors.txt b/tests/baselines/reference/topLevelThisAssignment.errors.txt
deleted file mode 100644
index 227933a462d..00000000000
--- a/tests/baselines/reference/topLevelThisAssignment.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== a.js (0 errors) ====
-    this.a = 10;
-    this.a;
-    a;
-    
-==== b.js (0 errors) ====
-    this.a;
-    a;
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
index 5b89d73d4b3..4fa0a44c345 100644
--- a/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
+++ b/tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
@@ -38,12 +38,15 @@ Output::
 3     "out": "/a/out.js"
       ~~~~~
 
-[12:00:18 AM] Found 1 error. Watching for file changes.
+[12:00:20 AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/a/out.js]
+//// [/a/a.js]
 var x = 1;
+
+
+//// [/a/b.js]
 var y = 1;
 
 
@@ -81,7 +84,10 @@ Program files::
 
 No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
+Shape signatures in builder refreshed for::
+/a/a.ts (used version)
+/a/b.ts (used version)
+/a/lib/lib.d.ts (used version)
 
 exitCode:: ExitStatus.undefined
 
@@ -101,7 +107,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:22 AM] File change detected. Starting incremental compilation...
+[12:00:24 AM] File change detected. Starting incremental compilation...
 
 a/tsconfig.json:3:5 - error TS5102: Option 'out' has been removed. Please remove it from your configuration.
   Use 'outFile' instead.
@@ -109,15 +115,15 @@ Output::
 3     "out": "/a/out.js"
       ~~~~~
 
-[12:00:26 AM] Found 1 error. Watching for file changes.
+[12:00:31 AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/a/out.js]
+//// [/a/a.js]
 var x = 11;
-var y = 1;
 
 
+//// [/a/b.js] file written with same contents
 
 
 Program root files: [
@@ -139,7 +145,9 @@ Program files::
 
 No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
+Shape signatures in builder refreshed for::
+/a/a.ts (computed .d.ts)
+/a/b.ts (computed .d.ts)
 
 exitCode:: ExitStatus.undefined
 
@@ -159,7 +167,7 @@ Before running Timeout callback:: count: 1
 After running Timeout callback:: count: 0
 Output::
 >> Screen clear
-[12:00:30 AM] File change detected. Starting incremental compilation...
+[12:00:35 AM] File change detected. Starting incremental compilation...
 
 a/tsconfig.json:3:5 - error TS5102: Option 'out' has been removed. Please remove it from your configuration.
   Use 'outFile' instead.
@@ -167,15 +175,15 @@ Output::
 3     "out": "/a/out.js"
       ~~~~~
 
-[12:00:34 AM] Found 1 error. Watching for file changes.
+[12:00:42 AM] Found 1 error. Watching for file changes.
 
 
 
-//// [/a/out.js]
+//// [/a/a.js]
 var xy = 11;
-var y = 1;
 
 
+//// [/a/b.js] file written with same contents
 
 
 Program root files: [
@@ -197,6 +205,8 @@ Program files::
 
 No cached semantic diagnostics in the builder::
 
-No shapes updated in the builder::
+Shape signatures in builder refreshed for::
+/a/a.ts (computed .d.ts)
+/a/b.ts (computed .d.ts)
 
 exitCode:: ExitStatus.undefined
diff --git a/tests/baselines/reference/tsserver/compileOnSave/compileOnSaveAffectedFileList-projectUsesOutFile-should-be-true-if-out-is-set.js b/tests/baselines/reference/tsserver/compileOnSave/compileOnSaveAffectedFileList-projectUsesOutFile-should-be-true-if-out-is-set.js
deleted file mode 100644
index 9c756287215..00000000000
--- a/tests/baselines/reference/tsserver/compileOnSave/compileOnSaveAffectedFileList-projectUsesOutFile-should-be-true-if-out-is-set.js
+++ /dev/null
@@ -1,275 +0,0 @@
-currentDirectory:: / useCaseSensitiveFileNames: false
-Info seq  [hh:mm:ss:mss] Provided types map file "/typesMap.json" doesn't exist
-Before request
-//// [/a/a.ts]
-let x = 1
-
-//// [/a/b.ts]
-let y = 1
-
-//// [/a/tsconfig.json]
-{
-  "compilerOptions": {
-    "out": "/a/out.js"
-  },
-  "compileOnSave": true
-}
-
-
-Info seq  [hh:mm:ss:mss] request:
-    {
-      "command": "open",
-      "arguments": {
-        "file": "/a/a.ts"
-      },
-      "seq": 1,
-      "type": "request"
-    }
-Info seq  [hh:mm:ss:mss] Search path: /a
-Info seq  [hh:mm:ss:mss] For info: /a/a.ts :: Config file name: /a/tsconfig.json
-Info seq  [hh:mm:ss:mss] Creating configuration project /a/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/tsconfig.json 2000 undefined Project: /a/tsconfig.json WatchType: Config file
-Info seq  [hh:mm:ss:mss] event:
-    {
-      "seq": 0,
-      "type": "event",
-      "event": "projectLoadingStart",
-      "body": {
-        "projectName": "/a/tsconfig.json",
-        "reason": "Creating possible configured project for /a/a.ts to open"
-      }
-    }
-Info seq  [hh:mm:ss:mss] Config: /a/tsconfig.json : {
- "rootNames": [
-  "/a/a.ts",
-  "/a/b.ts"
- ],
- "options": {
-  "out": "/a/out.js",
-  "configFilePath": "/a/tsconfig.json"
- }
-}
-Info seq  [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Info seq  [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /a 1 undefined Config: /a/tsconfig.json WatchType: Wild card directory
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/b.ts 500 undefined WatchType: Closed Script info
-Info seq  [hh:mm:ss:mss] Starting updateGraphWorker: Project: /a/tsconfig.json
-Info seq  [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /a/lib/lib.d.ts 500 undefined Project: /a/tsconfig.json WatchType: Missing file
-Info seq  [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /a/tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
-Info seq  [hh:mm:ss:mss] Project '/a/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
-	/a/a.ts SVC-1-0 "let x = 1"
-	/a/b.ts Text-1 "let y = 1"
-
-
-	a.ts
-	  Matched by default include pattern '**/*'
-	b.ts
-	  Matched by default include pattern '**/*'
-
-Info seq  [hh:mm:ss:mss] -----------------------------------------------
-Info seq  [hh:mm:ss:mss] event:
-    {
-      "seq": 0,
-      "type": "event",
-      "event": "projectLoadingFinish",
-      "body": {
-        "projectName": "/a/tsconfig.json"
-      }
-    }
-Info seq  [hh:mm:ss:mss] event:
-    {
-      "seq": 0,
-      "type": "event",
-      "event": "telemetry",
-      "body": {
-        "telemetryEventName": "projectInfo",
-        "payload": {
-          "projectId": "bcbb3eb9a7f46ab3b8f574ad3733f3e5a7ce50557c14c0c6192f1203aedcacca",
-          "fileStats": {
-            "js": 0,
-            "jsSize": 0,
-            "jsx": 0,
-            "jsxSize": 0,
-            "ts": 2,
-            "tsSize": 18,
-            "tsx": 0,
-            "tsxSize": 0,
-            "dts": 0,
-            "dtsSize": 0,
-            "deferred": 0,
-            "deferredSize": 0
-          },
-          "compilerOptions": {
-            "out": ""
-          },
-          "typeAcquisition": {
-            "enable": false,
-            "include": false,
-            "exclude": false
-          },
-          "extends": false,
-          "files": false,
-          "include": false,
-          "exclude": false,
-          "compileOnSave": true,
-          "configFileName": "tsconfig.json",
-          "projectType": "configured",
-          "languageServiceEnabled": true,
-          "version": "FakeVersion"
-        }
-      }
-    }
-Info seq  [hh:mm:ss:mss] event:
-    {
-      "seq": 0,
-      "type": "event",
-      "event": "configFileDiag",
-      "body": {
-        "triggerFile": "/a/a.ts",
-        "configFile": "/a/tsconfig.json",
-        "diagnostics": [
-          {
-            "text": "File '/a/lib/lib.d.ts' not found.\n  The file is in the program because:\n    Default library for target 'es5'",
-            "code": 6053,
-            "category": "error"
-          },
-          {
-            "start": {
-              "line": 3,
-              "offset": 5
-            },
-            "end": {
-              "line": 3,
-              "offset": 10
-            },
-            "text": "Option 'out' has been removed. Please remove it from your configuration.\n  Use 'outFile' instead.",
-            "code": 5102,
-            "category": "error",
-            "fileName": "/a/tsconfig.json"
-          },
-          {
-            "text": "Cannot find global type 'Array'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Boolean'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Function'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'IArguments'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Number'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'Object'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'RegExp'.",
-            "code": 2318,
-            "category": "error"
-          },
-          {
-            "text": "Cannot find global type 'String'.",
-            "code": 2318,
-            "category": "error"
-          }
-        ]
-      }
-    }
-Info seq  [hh:mm:ss:mss] Project '/a/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
-
-Info seq  [hh:mm:ss:mss] -----------------------------------------------
-Info seq  [hh:mm:ss:mss] Open files: 
-Info seq  [hh:mm:ss:mss] 	FileName: /a/a.ts ProjectRootPath: undefined
-Info seq  [hh:mm:ss:mss] 		Projects: /a/tsconfig.json
-Info seq  [hh:mm:ss:mss] response:
-    {
-      "responseRequired": false
-    }
-After request
-
-PolledWatches::
-/a/lib/lib.d.ts: *new*
-  {"pollingInterval":500}
-
-FsWatches::
-/a/b.ts: *new*
-  {}
-/a/tsconfig.json: *new*
-  {}
-
-FsWatchesRecursive::
-/a: *new*
-  {}
-
-Projects::
-/a/tsconfig.json (Configured) *new*
-    projectStateVersion: 1
-    projectProgramVersion: 1
-
-ScriptInfos::
-/a/a.ts (Open) *new*
-    version: SVC-1-0
-    containingProjects: 1
-        /a/tsconfig.json *default*
-/a/b.ts *new*
-    version: Text-1
-    containingProjects: 1
-        /a/tsconfig.json
-
-Before request
-
-Info seq  [hh:mm:ss:mss] request:
-    {
-      "command": "compileOnSaveAffectedFileList",
-      "arguments": {
-        "file": "/a/a.ts"
-      },
-      "seq": 2,
-      "type": "request"
-    }
-Info seq  [hh:mm:ss:mss] Before ensureProjectForOpenFiles:
-Info seq  [hh:mm:ss:mss] Project '/a/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
-
-Info seq  [hh:mm:ss:mss] -----------------------------------------------
-Info seq  [hh:mm:ss:mss] Open files: 
-Info seq  [hh:mm:ss:mss] 	FileName: /a/a.ts ProjectRootPath: undefined
-Info seq  [hh:mm:ss:mss] 		Projects: /a/tsconfig.json
-Info seq  [hh:mm:ss:mss] After ensureProjectForOpenFiles:
-Info seq  [hh:mm:ss:mss] Project '/a/tsconfig.json' (Configured)
-Info seq  [hh:mm:ss:mss] 	Files (2)
-
-Info seq  [hh:mm:ss:mss] -----------------------------------------------
-Info seq  [hh:mm:ss:mss] Open files: 
-Info seq  [hh:mm:ss:mss] 	FileName: /a/a.ts ProjectRootPath: undefined
-Info seq  [hh:mm:ss:mss] 		Projects: /a/tsconfig.json
-Info seq  [hh:mm:ss:mss] response:
-    {
-      "response": [
-        {
-          "projectFileName": "/a/tsconfig.json",
-          "fileNames": [
-            "/a/a.ts"
-          ],
-          "projectUsesOutFile": true
-        }
-      ],
-      "responseRequired": true
-    }
-After request
diff --git a/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js b/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js
index 708eb5ab307..84136dbefa0 100644
--- a/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js
+++ b/tests/baselines/reference/tsserver/telemetry/does-not-expose-paths.js
@@ -277,7 +277,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 4,
               "offset": 14
             },
-            "text": "Option 'out' cannot be specified with option 'outFile'.",
+            "text": "Option 'declarationDir' cannot be specified with option 'outFile'.",
             "code": 5053,
             "category": "error",
             "fileName": "/tsconfig.json"
@@ -324,34 +324,6 @@ Info seq  [hh:mm:ss:mss] event:
             "category": "error",
             "fileName": "/tsconfig.json"
           },
-          {
-            "start": {
-              "line": 20,
-              "offset": 5
-            },
-            "end": {
-              "line": 20,
-              "offset": 10
-            },
-            "text": "Option 'declarationDir' cannot be specified with option 'out'.",
-            "code": 5053,
-            "category": "error",
-            "fileName": "/tsconfig.json"
-          },
-          {
-            "start": {
-              "line": 20,
-              "offset": 5
-            },
-            "end": {
-              "line": 20,
-              "offset": 10
-            },
-            "text": "Option 'out' cannot be specified with option 'outFile'.",
-            "code": 5053,
-            "category": "error",
-            "fileName": "/tsconfig.json"
-          },
           {
             "start": {
               "line": 20,
@@ -403,7 +375,7 @@ Info seq  [hh:mm:ss:mss] event:
               "line": 24,
               "offset": 21
             },
-            "text": "Option 'declarationDir' cannot be specified with option 'out'.",
+            "text": "Option 'declarationDir' cannot be specified with option 'outFile'.",
             "code": 5053,
             "category": "error",
             "fileName": "/tsconfig.json"
diff --git a/tests/baselines/reference/typeReferenceDirectives11.errors.txt b/tests/baselines/reference/typeReferenceDirectives11.errors.txt
index b28f67c0695..fa3bba15ee2 100644
--- a/tests/baselines/reference/typeReferenceDirectives11.errors.txt
+++ b/tests/baselines/reference/typeReferenceDirectives11.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-/mod1.ts(1,17): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+/mod1.ts(1,17): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== /mod2.ts (0 errors) ====
     import {foo} from "./mod1";
     export const bar = foo();
@@ -15,5 +11,5 @@ error TS5102: Option 'out' has been removed. Please remove it from your configur
 ==== /mod1.ts (1 errors) ====
     export function foo(): Lib { return {x: 1} }
                     ~~~
-!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+!!! error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/typeReferenceDirectives12.errors.txt b/tests/baselines/reference/typeReferenceDirectives12.errors.txt
index e2917374c95..dce188dc25c 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.errors.txt
+++ b/tests/baselines/reference/typeReferenceDirectives12.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-/main.ts(1,14): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+/main.ts(1,14): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== /mod2.ts (0 errors) ====
     import { Cls } from "./main";
     import "./mod1";
@@ -12,13 +8,14 @@ error TS5102: Option 'out' has been removed. Please remove it from your configur
     export const cls = Cls;
     export const foo = new Cls().foo();
     export const bar = Cls.bar();
+    
 ==== /types/lib/index.d.ts (0 errors) ====
     interface Lib { x }
     
 ==== /main.ts (1 errors) ====
     export class Cls {
                  ~~~
-!!! error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'.
+!!! error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'.
         x
     }
     
diff --git a/tests/baselines/reference/typeSatisfaction_js.errors.txt b/tests/baselines/reference/typeSatisfaction_js.errors.txt
index 63b7f1d3fc2..0858b35c7e4 100644
--- a/tests/baselines/reference/typeSatisfaction_js.errors.txt
+++ b/tests/baselines/reference/typeSatisfaction_js.errors.txt
@@ -1,10 +1,6 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 /src/a.js(1,29): error TS8037: Type satisfaction expressions can only be used in TypeScript files.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== /src/a.js (1 errors) ====
     var v = undefined satisfies 1;
                                 ~
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsInJs.errors.txt b/tests/baselines/reference/uniqueSymbolsDeclarationsInJs.errors.txt
deleted file mode 100644
index 670528078dd..00000000000
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsInJs.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
-
-
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
-==== uniqueSymbolsDeclarationsInJs.js (0 errors) ====
-    // classes
-    class C {
-        /**
-         * @readonly
-         */
-        static readonlyStaticCall = Symbol();
-        /**
-         * @type {unique symbol}
-         * @readonly
-         */
-        static readonlyStaticType;
-        /**
-         * @type {unique symbol}
-         * @readonly
-         */
-        static readonlyStaticTypeAndCall = Symbol();
-        static readwriteStaticCall = Symbol();
-    
-        /**
-         * @readonly
-         */
-        readonlyCall = Symbol();
-        readwriteCall = Symbol();
-    }
-    
-    /** @type {unique symbol} */
-    const a = Symbol();
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.errors.txt b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.errors.txt
index 4e07c791774..681f7c5f3e7 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.errors.txt
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.errors.txt
@@ -1,11 +1,7 @@
-error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-  Use 'outFile' instead.
 uniqueSymbolsDeclarationsInJsErrors.js(5,12): error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'.
 uniqueSymbolsDeclarationsInJsErrors.js(14,12): error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'.
 
 
-!!! error TS5102: Option 'out' has been removed. Please remove it from your configuration.
-!!! error TS5102:   Use 'outFile' instead.
 ==== uniqueSymbolsDeclarationsInJsErrors.js (2 errors) ====
     class C {
         /**
@@ -25,4 +21,5 @@ uniqueSymbolsDeclarationsInJsErrors.js(14,12): error TS1331: A property of a cla
         static readwriteType;
                ~~~~~~~~~~~~~
 !!! error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'.
-    }
\ No newline at end of file
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.js b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.js
index d17f9855e5f..cbd0aa57514 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.js
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.js
@@ -15,7 +15,8 @@ class C {
      * @type {unique symbol}
      */
     static readwriteType;
-}
+}
+
 
 //// [uniqueSymbolsDeclarationsInJsErrors-out.js]
 class C {
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.symbols b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.symbols
index 8aa87256149..44e440f38be 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.symbols
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.symbols
@@ -23,3 +23,4 @@ class C {
     static readwriteType;
 >readwriteType : Symbol(C.readwriteType, Decl(uniqueSymbolsDeclarationsInJsErrors.js, 9, 24))
 }
+
diff --git a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.types b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.types
index 94045cdeb1d..8efd009a30c 100644
--- a/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.types
+++ b/tests/baselines/reference/uniqueSymbolsDeclarationsInJsErrors.types
@@ -23,3 +23,4 @@ class C {
     static readwriteType;
 >readwriteType : symbol
 }
+
diff --git a/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt b/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt
index 89eba872398..8c173b0d85e 100644
--- a/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt
+++ b/tests/baselines/reference/verbatimModuleSyntaxCompat.errors.txt
@@ -1,20 +1,14 @@
-error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
-error TS5104: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
 error TS5105: Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.
 
 
-!!! error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 !!! error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
-!!! error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
-!!! error TS5104: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
 !!! error TS5105: Option 'verbatimModuleSyntax' cannot be used when 'module' is set to 'UMD', 'AMD', or 'System'.
 ==== verbatimModuleSyntaxCompat.ts (0 errors) ====
     export {};
\ No newline at end of file
diff --git a/tests/baselines/reference/verbatimModuleSyntaxCompat2.errors.txt b/tests/baselines/reference/verbatimModuleSyntaxCompat2.errors.txt
index 051374a90a1..63a4d327419 100644
--- a/tests/baselines/reference/verbatimModuleSyntaxCompat2.errors.txt
+++ b/tests/baselines/reference/verbatimModuleSyntaxCompat2.errors.txt
@@ -1,31 +1,22 @@
-/tsconfig.json(5,9): error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 /tsconfig.json(5,9): error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-/tsconfig.json(5,9): error TS5104: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
 /tsconfig.json(6,9): error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-/tsconfig.json(6,9): error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
 
 
-==== /tsconfig.json (5 errors) ====
+==== /tsconfig.json (2 errors) ====
     {
         "compilerOptions": {
             "verbatimModuleSyntax": true,
             "isolatedModules": true,
             "preserveValueImports": true,
             ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
-            ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
-            ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS5104: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
             "importsNotUsedAsValues": "error",
             ~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
-            ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
         }
     }
 ==== /index.ts (0 errors) ====
diff --git a/tests/baselines/reference/verbatimModuleSyntaxCompat3.errors.txt b/tests/baselines/reference/verbatimModuleSyntaxCompat3.errors.txt
index e1e4c5c7ab2..8cb0dac888c 100644
--- a/tests/baselines/reference/verbatimModuleSyntaxCompat3.errors.txt
+++ b/tests/baselines/reference/verbatimModuleSyntaxCompat3.errors.txt
@@ -1,11 +1,9 @@
-error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
 error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
 
 
-!!! error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 !!! error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
diff --git a/tests/baselines/reference/verbatimModuleSyntaxCompat4.errors.txt b/tests/baselines/reference/verbatimModuleSyntaxCompat4.errors.txt
index 4daeafb9f6e..838a4b88420 100644
--- a/tests/baselines/reference/verbatimModuleSyntaxCompat4.errors.txt
+++ b/tests/baselines/reference/verbatimModuleSyntaxCompat4.errors.txt
@@ -1,31 +1,22 @@
-/tsconfig.json(5,9): error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
 /tsconfig.json(5,9): error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-/tsconfig.json(5,9): error TS5104: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
 /tsconfig.json(6,9): error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
   Use 'verbatimModuleSyntax' instead.
-/tsconfig.json(6,9): error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
 
 
-==== /tsconfig.json (5 errors) ====
+==== /tsconfig.json (2 errors) ====
     {
         "extends": "./tsconfig.base.json",
         "compilerOptions": {
             "isolatedModules": true,
             "preserveValueImports": true,
             ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS5095: Option 'preserveValueImports' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.
-            ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS5102: Option 'preserveValueImports' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
-            ~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS5104: Option 'preserveValueImports' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
             "importsNotUsedAsValues": "error",
             ~~~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS5102: Option 'importsNotUsedAsValues' has been removed. Please remove it from your configuration.
 !!! error TS5102:   Use 'verbatimModuleSyntax' instead.
-            ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS5104: Option 'importsNotUsedAsValues' is redundant and cannot be specified with option 'verbatimModuleSyntax'.
         }
     }
 ==== /index.ts (0 errors) ====
diff --git a/tests/cases/compiler/amdDeclarationEmitNoExtraDeclare.ts b/tests/cases/compiler/amdDeclarationEmitNoExtraDeclare.ts
index fb70a40df94..9d073e95b18 100644
--- a/tests/cases/compiler/amdDeclarationEmitNoExtraDeclare.ts
+++ b/tests/cases/compiler/amdDeclarationEmitNoExtraDeclare.ts
@@ -1,6 +1,6 @@
 // @declaration: true
 // @module: amd
-// @out: dist.js
+// @outFile: dist.js
 // @filename: Class.ts
 import { Configurable } from "./Configurable"
 
diff --git a/tests/cases/compiler/checkIndexConstraintOfJavascriptClassExpression.ts b/tests/cases/compiler/checkIndexConstraintOfJavascriptClassExpression.ts
index 58844d98fd8..859e8a4e12d 100644
--- a/tests/cases/compiler/checkIndexConstraintOfJavascriptClassExpression.ts
+++ b/tests/cases/compiler/checkIndexConstraintOfJavascriptClassExpression.ts
@@ -3,7 +3,7 @@
 // @checkJs: true
 // @strict: true
 // @noEmit: true
-// @out: foo.js
+// @outFile: foo.js
 someFunction(function(BaseClass) {
     'use strict';
     const DEFAULT_MESSAGE = "nop!";
diff --git a/tests/cases/compiler/compilerOptionsOutAndNoEmit.ts b/tests/cases/compiler/compilerOptionsOutAndNoEmit.ts
index 126043826bd..6a913fda355 100644
--- a/tests/cases/compiler/compilerOptionsOutAndNoEmit.ts
+++ b/tests/cases/compiler/compilerOptionsOutAndNoEmit.ts
@@ -1,4 +1,4 @@
-// @out: outDir
+// @outFile: outDir
 // @noEmit: true
 // @fileName: a.ts
 
diff --git a/tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts b/tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts
index c34bb4012bf..2f9def647d0 100644
--- a/tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts
+++ b/tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts
@@ -1,8 +1,8 @@
 // @target: ES6
-// @out: out.js
+// @outFile: out.js
 
 // @Filename: file1.ts
 c;
 
 // @Filename: file2.ts
-const c = 0;
\ No newline at end of file
+const c = 0;
diff --git a/tests/cases/compiler/controlFlowJavascript.ts b/tests/cases/compiler/controlFlowJavascript.ts
index b2886a2233a..73fc2a7b89b 100644
--- a/tests/cases/compiler/controlFlowJavascript.ts
+++ b/tests/cases/compiler/controlFlowJavascript.ts
@@ -1,6 +1,6 @@
 // @allowJs: true
 // @Filename: controlFlowJavascript.js
-// @out: out.js
+// @outFile: out.js
 
 let cond = true;
 
diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts
index 005b52d5bc9..1217abd0624 100644
--- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts
+++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts
@@ -1,5 +1,5 @@
 // @declaration: true
-// @out: out.js
+// @outFile: out.js
 
 // @Filename: declFile.d.ts
 declare module M {
diff --git a/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts b/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts
index dfe78d76929..c2b0c78a6a1 100644
--- a/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts
+++ b/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts
@@ -1,6 +1,6 @@
 // @declaration: true
 
-// @out: /out.js
+// @outFile: /out.js
 
 // @Filename: /out.d.ts
 declare class c {
diff --git a/tests/cases/compiler/dynamicRequire.ts b/tests/cases/compiler/dynamicRequire.ts
index 8d72a37dceb..f0408ef9571 100644
--- a/tests/cases/compiler/dynamicRequire.ts
+++ b/tests/cases/compiler/dynamicRequire.ts
@@ -1,8 +1,8 @@
 // @allowJs: true
 // @module: amd
-// @out: a_out.js
+// @outFile: a_out.js
 
 // @filename: a.js
 function foo(name) {
     var s = require("t/" + name)
-}
\ No newline at end of file
+}
diff --git a/tests/cases/compiler/filesEmittingIntoSameOutputWithOutOption.ts b/tests/cases/compiler/filesEmittingIntoSameOutputWithOutOption.ts
index dfb226844d1..e4575936b5c 100644
--- a/tests/cases/compiler/filesEmittingIntoSameOutputWithOutOption.ts
+++ b/tests/cases/compiler/filesEmittingIntoSameOutputWithOutOption.ts
@@ -1,4 +1,4 @@
-// @out: a.js
+// @outFile: a.js
 // @module: amd
 // @filename: a.ts
 export class c {
diff --git a/tests/cases/compiler/incrementalOut.ts b/tests/cases/compiler/incrementalOut.ts
index 4cd49dbba11..36585c69986 100644
--- a/tests/cases/compiler/incrementalOut.ts
+++ b/tests/cases/compiler/incrementalOut.ts
@@ -1,5 +1,5 @@
 // @incremental: true
-// @out: output.js
+// @outFile: output.js
 
 const x = 10;
 
diff --git a/tests/cases/compiler/inlineSourceMap2.ts b/tests/cases/compiler/inlineSourceMap2.ts
index 1d426f17736..18ec5b46bac 100644
--- a/tests/cases/compiler/inlineSourceMap2.ts
+++ b/tests/cases/compiler/inlineSourceMap2.ts
@@ -2,10 +2,10 @@
 // @sourcemap: true
 // @maproot: file:///folder
 // @sourceroot: file:///folder
-// @out: outfile.js
+// @outFile: outfile.js
 // @inlinesourcemap: true
 
 // configuration errors
 
 var x = 0;
-console.log(x);
\ No newline at end of file
+console.log(x);
diff --git a/tests/cases/compiler/inlineSources.ts b/tests/cases/compiler/inlineSources.ts
index f46eacdb57c..1153db4d85b 100644
--- a/tests/cases/compiler/inlineSources.ts
+++ b/tests/cases/compiler/inlineSources.ts
@@ -1,7 +1,7 @@
 // @target: ES3
 // @sourcemap: true
 // @inlinesources: true
-// @out: out.js
+// @outFile: out.js
 
 // @filename: a.ts
 var a = 0;
@@ -9,4 +9,4 @@ console.log(a);
 
 // @filename: b.ts
 var b = 0;
-console.log(b);
\ No newline at end of file
+console.log(b);
diff --git a/tests/cases/compiler/inlineSources2.ts b/tests/cases/compiler/inlineSources2.ts
index 6fa567dc521..69cd338cf38 100644
--- a/tests/cases/compiler/inlineSources2.ts
+++ b/tests/cases/compiler/inlineSources2.ts
@@ -1,7 +1,7 @@
 // @target: ES3
 // @inlinesourcemap: true
 // @inlinesources: true
-// @out: out.js
+// @outFile: out.js
 
 // @filename: a.ts
 var a = 0;
@@ -9,4 +9,4 @@ console.log(a);
 
 // @filename: b.ts
 var b = 0;
-console.log(b);
\ No newline at end of file
+console.log(b);
diff --git a/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts b/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts
index 50adc50388d..e8b04bbfbd0 100644
--- a/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts
+++ b/tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts
@@ -1,9 +1,9 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 
 // @FileName: a.js
 class c {
     method(a) {
         let x = a => this.method(a);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts
index 8517c9dbf8e..95a05084ed6 100644
--- a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts
+++ b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @declaration: true
 // @filename: b.js
 function foo() {
diff --git a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts
index a02b7d9d88a..8f482791fc8 100644
--- a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts
+++ b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @declaration: true
 // @filename: a.ts
 function foo() {
diff --git a/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts b/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts
index 4bcd69563f1..c766c6e780f 100644
--- a/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts
+++ b/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @declaration: true
 // @filename: a.ts
 var x = 10;
diff --git a/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts b/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts
index 93a05c3ba11..c7e08abdbfa 100644
--- a/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts
+++ b/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @declaration: true
 // @filename: b.js
 var x = "hello";
diff --git a/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts
index 9d6daeac6fa..327d6e5d08b 100644
--- a/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts
+++ b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @declaration: true
 // @filename: a.ts
 class c {
diff --git a/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts
index 5dd123a4670..948c341cc09 100644
--- a/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts
+++ b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @declaration: true
 // @filename: a.ts
 class c {
diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts
index 5bb44333d36..187a9f53e7a 100644
--- a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts
+++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @declaration: true
 // @filename: a.ts
 class c {
diff --git a/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts b/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts
index 177b0f55e27..26818bee5a9 100644
--- a/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts
+++ b/tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts
@@ -1,9 +1,9 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 
 // @FileName: a.js
 function foo(a) {
     for (let a = 0; a < 10; a++) {
         // do something
     }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts
index 962267c5cab..c55ee080a95 100644
--- a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts
+++ b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @declaration: true
 // @filename: b.js
 let a = 10;
diff --git a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts
index 8f89c57ade2..0c170e2f105 100644
--- a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts
+++ b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @declaration: true
 // @filename: a.ts
 let b = 30;
diff --git a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts
index 8783b722f2a..b11ca7e9f53 100644
--- a/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts
+++ b/tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @filename: a.ts
 class c {
 }
@@ -12,4 +12,4 @@ function foo() {
 
 // @filename: c.js
 function bar() {
-}
\ No newline at end of file
+}
diff --git a/tests/cases/compiler/jsFileCompilationNonNullAssertion.ts b/tests/cases/compiler/jsFileCompilationNonNullAssertion.ts
index 5f34b132ed5..fc7145f01e0 100644
--- a/tests/cases/compiler/jsFileCompilationNonNullAssertion.ts
+++ b/tests/cases/compiler/jsFileCompilationNonNullAssertion.ts
@@ -1,4 +1,4 @@
 // @allowJs: true
 // @filename: /src/a.js
-// @out: /bin/a.js
+// @outFile: /bin/a.js
 0!
diff --git a/tests/cases/compiler/jsFileCompilationRestParamJsDocFunction.ts b/tests/cases/compiler/jsFileCompilationRestParamJsDocFunction.ts
index 3588a739948..fcbca067cf5 100644
--- a/tests/cases/compiler/jsFileCompilationRestParamJsDocFunction.ts
+++ b/tests/cases/compiler/jsFileCompilationRestParamJsDocFunction.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: apply.js
+// @outFile: apply.js
 // @module: amd
 
 // @filename: _apply.js
@@ -24,4 +24,4 @@ function apply(func, thisArg, ...args) {
     return func.apply(thisArg, args);
 }
 
-export default apply;
\ No newline at end of file
+export default apply;
diff --git a/tests/cases/compiler/jsFileCompilationRestParameter.ts b/tests/cases/compiler/jsFileCompilationRestParameter.ts
index 560fc1ebd1a..12013bb76bd 100644
--- a/tests/cases/compiler/jsFileCompilationRestParameter.ts
+++ b/tests/cases/compiler/jsFileCompilationRestParameter.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
 // @filename: a.js
 // @target: es6
-// @out: b.js
-function foo(...a) { }
\ No newline at end of file
+// @outFile: b.js
+function foo(...a) { }
diff --git a/tests/cases/compiler/jsFileCompilationShortHandProperty.ts b/tests/cases/compiler/jsFileCompilationShortHandProperty.ts
index 476658e0fa1..67764577e55 100644
--- a/tests/cases/compiler/jsFileCompilationShortHandProperty.ts
+++ b/tests/cases/compiler/jsFileCompilationShortHandProperty.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 
 // @FileName: a.js
 function foo() {
@@ -9,4 +9,4 @@ function foo() {
         a,
         b
     };
-}
\ No newline at end of file
+}
diff --git a/tests/cases/compiler/jsFileCompilationTypeAssertions.ts b/tests/cases/compiler/jsFileCompilationTypeAssertions.ts
index 6eebf93ca77..aa025e60623 100644
--- a/tests/cases/compiler/jsFileCompilationTypeAssertions.ts
+++ b/tests/cases/compiler/jsFileCompilationTypeAssertions.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
 // @filename: /src/a.js
-// @out: /lib/a.js
+// @outFile: /lib/a.js
 0 as number;
 var v = <string>undefined;
diff --git a/tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts b/tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts
index 90340ef5d3a..eae66cb24cc 100644
--- a/tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts
+++ b/tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @composite: true
 // @filename: a.ts
 class c {
diff --git a/tests/cases/compiler/jsFileCompilationWithOut.ts b/tests/cases/compiler/jsFileCompilationWithOut.ts
index f76605b7fe6..d2000f7c75e 100644
--- a/tests/cases/compiler/jsFileCompilationWithOut.ts
+++ b/tests/cases/compiler/jsFileCompilationWithOut.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out.js
+// @outFile: out.js
 // @filename: a.ts
 class c {
 }
diff --git a/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts b/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts
index 5d796e856c2..509d86d4c30 100644
--- a/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts
+++ b/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts
@@ -1,5 +1,5 @@
 // @declaration: true
-// @out: /b.js
+// @outFile: /b.js
 // @filename: /a.ts
 class c {
 }
diff --git a/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts b/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts
index 4bcfb132e00..734578f5ad4 100644
--- a/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts
+++ b/tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: /b.js
+// @outFile: /b.js
 // @filename: /a.ts
 class c {
 }
diff --git a/tests/cases/compiler/keepImportsInDts3.ts b/tests/cases/compiler/keepImportsInDts3.ts
index cdd83dce132..267d7a28578 100644
--- a/tests/cases/compiler/keepImportsInDts3.ts
+++ b/tests/cases/compiler/keepImportsInDts3.ts
@@ -1,8 +1,8 @@
 // @module: amd
 // @declaration: true
-// @out: outputfile.js
+// @outFile: outputfile.js
 
 // @filename: c:/test.ts
 export {};
 // @filename: c:/app/main.ts
-import "test"
\ No newline at end of file
+import "test"
diff --git a/tests/cases/compiler/keepImportsInDts4.ts b/tests/cases/compiler/keepImportsInDts4.ts
index 272932be488..623184d8e74 100644
--- a/tests/cases/compiler/keepImportsInDts4.ts
+++ b/tests/cases/compiler/keepImportsInDts4.ts
@@ -1,8 +1,8 @@
 // @module: amd
 // @declaration: true
-// @out: outputfile.js
+// @outFile: outputfile.js
 
 // @filename: folder/test.ts
 export {};
 // @filename: main.ts
-import "./folder/test"
\ No newline at end of file
+import "./folder/test"
diff --git a/tests/cases/compiler/letDeclarations-useBeforeDefinition2.ts b/tests/cases/compiler/letDeclarations-useBeforeDefinition2.ts
index a6cbc729b94..e908f5ec8fc 100644
--- a/tests/cases/compiler/letDeclarations-useBeforeDefinition2.ts
+++ b/tests/cases/compiler/letDeclarations-useBeforeDefinition2.ts
@@ -1,8 +1,8 @@
 // @target: ES6
-// @out: out.js
+// @outFile: out.js
 
 // @Filename: file1.ts
 l;
 
 // @Filename: file2.ts
-const l = 0;
\ No newline at end of file
+const l = 0;
diff --git a/tests/cases/compiler/moduleAugmentationsBundledOutput1.ts b/tests/cases/compiler/moduleAugmentationsBundledOutput1.ts
index e633e355d80..3792cc821e0 100644
--- a/tests/cases/compiler/moduleAugmentationsBundledOutput1.ts
+++ b/tests/cases/compiler/moduleAugmentationsBundledOutput1.ts
@@ -1,7 +1,7 @@
 // @target: es5
 // @module: amd
 // @declaration: true
-// @out: out.js
+// @outFile: out.js
 
 // @filename: m1.ts
 export class Cls {
diff --git a/tests/cases/compiler/moduleAugmentationsImports1.ts b/tests/cases/compiler/moduleAugmentationsImports1.ts
index ad029bdfc4a..68e005bae68 100644
--- a/tests/cases/compiler/moduleAugmentationsImports1.ts
+++ b/tests/cases/compiler/moduleAugmentationsImports1.ts
@@ -1,6 +1,6 @@
 // @module: amd
 // @declaration: true
-// @out: f.js
+// @outFile: f.js
 
 // @filename: a.ts
 export class A {}
@@ -41,4 +41,4 @@ import "d";
 
 let a: A;
 let b = a.getB().x.toFixed();
-let c = a.getCls().y.toLowerCase();
\ No newline at end of file
+let c = a.getCls().y.toLowerCase();
diff --git a/tests/cases/compiler/moduleAugmentationsImports2.ts b/tests/cases/compiler/moduleAugmentationsImports2.ts
index bf5b4b1cd17..dfbb196bd3c 100644
--- a/tests/cases/compiler/moduleAugmentationsImports2.ts
+++ b/tests/cases/compiler/moduleAugmentationsImports2.ts
@@ -1,6 +1,6 @@
 // @module: amd
 // @declaration: true
-// @out: f.js
+// @outFile: f.js
 
 // @filename: a.ts
 export class A {}
@@ -46,4 +46,4 @@ import "e";
 
 let a: A;
 let b = a.getB().x.toFixed();
-let c = a.getCls().y.toLowerCase();
\ No newline at end of file
+let c = a.getCls().y.toLowerCase();
diff --git a/tests/cases/compiler/moduleAugmentationsImports3.ts b/tests/cases/compiler/moduleAugmentationsImports3.ts
index 92cc6c73a3c..f9c49c79f59 100644
--- a/tests/cases/compiler/moduleAugmentationsImports3.ts
+++ b/tests/cases/compiler/moduleAugmentationsImports3.ts
@@ -1,6 +1,6 @@
 // @module: amd
 // @declaration: true
-// @out: f.js
+// @outFile: f.js
 
 // @filename: a.ts
 export class A {}
@@ -45,4 +45,4 @@ import "e";
 
 let a: A;
 let b = a.getB().x.toFixed();
-let c = a.getCls().y.toLowerCase();
\ No newline at end of file
+let c = a.getCls().y.toLowerCase();
diff --git a/tests/cases/compiler/moduleAugmentationsImports4.ts b/tests/cases/compiler/moduleAugmentationsImports4.ts
index 5e48954c092..20137e1d5bb 100644
--- a/tests/cases/compiler/moduleAugmentationsImports4.ts
+++ b/tests/cases/compiler/moduleAugmentationsImports4.ts
@@ -1,6 +1,6 @@
 // @module: amd
 // @declaration: true
-// @out: f.js
+// @outFile: f.js
 
 // @filename: a.ts
 export class A {}
@@ -46,4 +46,4 @@ import "E";
 
 let a: A;
 let b = a.getB().x.toFixed();
-let c = a.getCls().y.toLowerCase();
\ No newline at end of file
+let c = a.getCls().y.toLowerCase();
diff --git a/tests/cases/compiler/optionsOutAndNoModuleGen.ts b/tests/cases/compiler/optionsOutAndNoModuleGen.ts
index b0a7cf22d21..93f47b6b1ea 100644
--- a/tests/cases/compiler/optionsOutAndNoModuleGen.ts
+++ b/tests/cases/compiler/optionsOutAndNoModuleGen.ts
@@ -1,3 +1,3 @@
-// @out: output.js
+// @outFile: output.js
 
-export var x = 10;
\ No newline at end of file
+export var x = 10;
diff --git a/tests/cases/compiler/out-flag.ts b/tests/cases/compiler/out-flag.ts
index 07cd55224a5..0e63b80725f 100644
--- a/tests/cases/compiler/out-flag.ts
+++ b/tests/cases/compiler/out-flag.ts
@@ -2,7 +2,7 @@
 // @sourcemap: true
 // @declaration: true
 // @module: commonjs
-//// @out: bin\
+//// @outFile: bin\
 // @removeComments: false
 
 // my class comments
@@ -18,4 +18,4 @@ class MyClass
     {
         //
     }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/compiler/out-flag3.ts b/tests/cases/compiler/out-flag3.ts
index 82ef99c42de..a0b05ed9aab 100644
--- a/tests/cases/compiler/out-flag3.ts
+++ b/tests/cases/compiler/out-flag3.ts
@@ -3,7 +3,7 @@
 // @declaration: true
 // @module: commonjs
 // @outFile: c.js
-// @out: d.js
+// @outFile: d.js
 
 // --out and --outFile error
 
diff --git a/tests/cases/compiler/signaturesUseJSDocForOptionalParameters.ts b/tests/cases/compiler/signaturesUseJSDocForOptionalParameters.ts
index a6f9c9fb394..cb10de5868a 100644
--- a/tests/cases/compiler/signaturesUseJSDocForOptionalParameters.ts
+++ b/tests/cases/compiler/signaturesUseJSDocForOptionalParameters.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: out_1.js
+// @outFile: out_1.js
 // @filename: jsDocOptionality.js
 function MyClass() {
   this.prop = null;
diff --git a/tests/cases/compiler/sourceMapWithCaseSensitiveFileNames.ts b/tests/cases/compiler/sourceMapWithCaseSensitiveFileNames.ts
index ebb8cf13a8a..0b074ec3f1a 100644
--- a/tests/cases/compiler/sourceMapWithCaseSensitiveFileNames.ts
+++ b/tests/cases/compiler/sourceMapWithCaseSensitiveFileNames.ts
@@ -1,4 +1,4 @@
-// @out: testfiles/fooResult.js
+// @outFile: testfiles/fooResult.js
 // @sourcemap: true
 // @useCaseSensitiveFileNames: true
 // @Filename: testFiles/app.ts
@@ -9,4 +9,4 @@ class c {
 
 // @Filename: testFiles/app2.ts
 class d {
-}
\ No newline at end of file
+}
diff --git a/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts b/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts
index 54a767d3df2..1b299cbc2ad 100644
--- a/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts
+++ b/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts
@@ -1,4 +1,4 @@
-// @out: a.js
+// @outFile: a.js
 // @sourcemap: true
 // @declaration: true
 // @Filename: a.ts
diff --git a/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts b/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts
index e7634a22b6a..3705ade75c7 100644
--- a/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts
+++ b/tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts
@@ -1,4 +1,4 @@
-// @out: fooResult.js
+// @outFile: fooResult.js
 // @sourcemap: true
 // @Filename: a.ts
 module M {
@@ -15,4 +15,4 @@ interface Navigator {
 module m1 {
     export class c1 {
     }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/compiler/sourceMapWithNonCaseSensitiveFileNames.ts b/tests/cases/compiler/sourceMapWithNonCaseSensitiveFileNames.ts
index 3528b204688..27ab35d4195 100644
--- a/tests/cases/compiler/sourceMapWithNonCaseSensitiveFileNames.ts
+++ b/tests/cases/compiler/sourceMapWithNonCaseSensitiveFileNames.ts
@@ -1,4 +1,4 @@
-// @out: testfiles/fooResult.js
+// @outFile: testfiles/fooResult.js
 // @sourcemap: true
 // @useCaseSensitiveFileNames: false
 // @Filename: testFiles/app.ts
@@ -9,4 +9,4 @@ class c {
 
 // @Filename: testFiles/app2.ts
 class d {
-}
\ No newline at end of file
+}
diff --git a/tests/cases/compiler/typeReferenceDirectives11.ts b/tests/cases/compiler/typeReferenceDirectives11.ts
index 696fdd56987..645e1da279c 100644
--- a/tests/cases/compiler/typeReferenceDirectives11.ts
+++ b/tests/cases/compiler/typeReferenceDirectives11.ts
@@ -3,7 +3,7 @@
 // @typeRoots: /types
 // @traceResolution: true
 // @types: lib
-// @out: output.js
+// @outFile: output.js
 
 // @currentDirectory: /
 
diff --git a/tests/cases/compiler/typeReferenceDirectives12.ts b/tests/cases/compiler/typeReferenceDirectives12.ts
index 3273c9b7276..e7b0bda3151 100644
--- a/tests/cases/compiler/typeReferenceDirectives12.ts
+++ b/tests/cases/compiler/typeReferenceDirectives12.ts
@@ -2,7 +2,7 @@
 // @declaration: true
 // @typeRoots: /types
 // @traceResolution: true
-// @out: output.js
+// @outFile: output.js
 
 // @currentDirectory: /
 
@@ -36,4 +36,4 @@ import "./mod1";
 
 export const cls = Cls;
 export const foo = new Cls().foo();
-export const bar = Cls.bar();
\ No newline at end of file
+export const bar = Cls.bar();
diff --git a/tests/cases/conformance/classes/members/classTypes/genericSetterInClassTypeJsDoc.ts b/tests/cases/conformance/classes/members/classTypes/genericSetterInClassTypeJsDoc.ts
index e035eddc448..c59754868eb 100644
--- a/tests/cases/conformance/classes/members/classTypes/genericSetterInClassTypeJsDoc.ts
+++ b/tests/cases/conformance/classes/members/classTypes/genericSetterInClassTypeJsDoc.ts
@@ -4,7 +4,7 @@
 // @allowJs: true
 // @checkJs: true
 // @filename: genericSetterInClassTypeJsDoc.js
-// @out: genericSetterInClassTypeJsDoc-out.js
+// @outFile: genericSetterInClassTypeJsDoc-out.js
 
 /**
  * @template T
diff --git a/tests/cases/conformance/es2019/globalThisVarDeclaration.ts b/tests/cases/conformance/es2019/globalThisVarDeclaration.ts
index 5b75d1095a6..1c743590278 100644
--- a/tests/cases/conformance/es2019/globalThisVarDeclaration.ts
+++ b/tests/cases/conformance/es2019/globalThisVarDeclaration.ts
@@ -1,4 +1,4 @@
-// @out: output.js
+// @outFile: output.js
 // @target: esnext
 // @lib: esnext, dom
 // @Filename: b.js
diff --git a/tests/cases/conformance/es6/computedProperties/computedPropertyNames52.ts b/tests/cases/conformance/es6/computedProperties/computedPropertyNames52.ts
index f6afef7fec3..507537e235a 100644
--- a/tests/cases/conformance/es6/computedProperties/computedPropertyNames52.ts
+++ b/tests/cases/conformance/es6/computedProperties/computedPropertyNames52.ts
@@ -1,5 +1,5 @@
 // @filename: computedPropertyNames52.js
-// @out: computedPropertyNames52-emit.js
+// @outFile: computedPropertyNames52-emit.js
 // @allowJs: true
 // @target: es5, es2015
 const array = [];
diff --git a/tests/cases/conformance/expressions/typeSatisfaction/typeSatisfaction_js.ts b/tests/cases/conformance/expressions/typeSatisfaction/typeSatisfaction_js.ts
index 5826e4a2097..af47eeff3c3 100644
--- a/tests/cases/conformance/expressions/typeSatisfaction/typeSatisfaction_js.ts
+++ b/tests/cases/conformance/expressions/typeSatisfaction/typeSatisfaction_js.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
 // @filename: /src/a.js
-// @out: /lib/a.js
+// @outFile: /lib/a.js
 
 var v = undefined satisfies 1;
diff --git a/tests/cases/conformance/jsdoc/checkJsdocReturnTag1.ts b/tests/cases/conformance/jsdoc/checkJsdocReturnTag1.ts
index fde7c3fa0f4..791f169b462 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocReturnTag1.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocReturnTag1.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: dummy.js
+// @outFile: dummy.js
 
 // @filename: returns.js
 // @ts-check
@@ -22,4 +22,4 @@ function f1() {
  */
 function f2() {
     return 5 || "hello";
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/jsdoc/checkJsdocReturnTag2.ts b/tests/cases/conformance/jsdoc/checkJsdocReturnTag2.ts
index 02b7fbeacef..761924a4448 100644
--- a/tests/cases/conformance/jsdoc/checkJsdocReturnTag2.ts
+++ b/tests/cases/conformance/jsdoc/checkJsdocReturnTag2.ts
@@ -1,5 +1,5 @@
 // @allowJs: true
-// @out: dummy.js
+// @outFile: dummy.js
 
 // @filename: returns.js
 // @ts-check
@@ -15,4 +15,4 @@ function f() {
  */
 function f1() {
     return 5 || true;
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts b/tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts
index 8890dbf9247..b49f732c1bb 100644
--- a/tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts
+++ b/tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts
@@ -1,7 +1,7 @@
 // @allowJs: true
 // @checkJs: true
 // @target: esnext
-// @out: foo.js
+// @outFile: foo.js
 // @declaration: true
 // @Filename: jsdocAccessibilityTagDeclarations.js
 class Protected {
@@ -40,4 +40,4 @@ class Private {
 class C {
     constructor(/** @public */ x, /** @protected */ y, /** @private */ z) {
     }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/jsdoc/jsdocLiteral.ts b/tests/cases/conformance/jsdoc/jsdocLiteral.ts
index bd0d2d562f9..ff7b1e24b3e 100644
--- a/tests/cases/conformance/jsdoc/jsdocLiteral.ts
+++ b/tests/cases/conformance/jsdoc/jsdocLiteral.ts
@@ -1,6 +1,6 @@
 // @allowJs: true
 // @filename: in.js
-// @out: out.js
+// @outFile: out.js
 /**
  * @param {'literal'} p1
  * @param {"literal"} p2
diff --git a/tests/cases/conformance/jsdoc/jsdocNeverUndefinedNull.ts b/tests/cases/conformance/jsdoc/jsdocNeverUndefinedNull.ts
index c095bc1c920..40ccd5e7f69 100644
--- a/tests/cases/conformance/jsdoc/jsdocNeverUndefinedNull.ts
+++ b/tests/cases/conformance/jsdoc/jsdocNeverUndefinedNull.ts
@@ -1,6 +1,6 @@
 // @allowJs: true
 // @filename: in.js
-// @out: out.js
+// @outFile: out.js
 /**
  * @param {never} p1
  * @param {undefined} p2
diff --git a/tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts b/tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts
index b70e0d75b99..1036c2eb7a8 100644
--- a/tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts
+++ b/tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts
@@ -1,7 +1,7 @@
 // @allowJs: true
 // @checkJs: true
 // @target: esnext
-// @out: foo.js
+// @outFile: foo.js
 // @declaration: true
 // @Filename: jsdocReadonlyDeclarations.js
 // @useDefineForClassFields: false
@@ -28,4 +28,4 @@ function F() {
 // https://github.com/microsoft/TypeScript/issues/38401
 class D {
     constructor(/** @readonly */ x) {}
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/jsdoc/jsdocReturnTag1.ts b/tests/cases/conformance/jsdoc/jsdocReturnTag1.ts
index a425322a749..ae24f22ee02 100644
--- a/tests/cases/conformance/jsdoc/jsdocReturnTag1.ts
+++ b/tests/cases/conformance/jsdoc/jsdocReturnTag1.ts
@@ -1,6 +1,6 @@
 // @allowJs: true
 // @filename: returns.js
-// @out: dummy.js
+// @outFile: dummy.js
 /**
  * @returns {string} This comment is not currently exposed
  */
@@ -20,4 +20,4 @@ function f1() {
  */
 function f2() {
     return 5 || "hello";
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/salsa/inferringClassMembersFromAssignments.ts b/tests/cases/conformance/salsa/inferringClassMembersFromAssignments.ts
index b6c12be6407..69c3f789be9 100644
--- a/tests/cases/conformance/salsa/inferringClassMembersFromAssignments.ts
+++ b/tests/cases/conformance/salsa/inferringClassMembersFromAssignments.ts
@@ -1,4 +1,4 @@
-// @out: output.js
+// @outFile: output.js
 // @allowJs: true
 // @checkJs: true
 // @noImplicitAny: true
diff --git a/tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts b/tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts
index 52b27641f0d..4991d674d5e 100644
--- a/tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts
+++ b/tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts
@@ -1,4 +1,4 @@
-// @out: output.js
+// @outFile: output.js
 // @allowJs: true
 
 // @filename: a.js
diff --git a/tests/cases/conformance/salsa/methodsReturningThis.ts b/tests/cases/conformance/salsa/methodsReturningThis.ts
index 4c9f0d5cd0b..521613d9e98 100644
--- a/tests/cases/conformance/salsa/methodsReturningThis.ts
+++ b/tests/cases/conformance/salsa/methodsReturningThis.ts
@@ -1,5 +1,5 @@
 // @filename: input.js
-// @out: output.js
+// @outFile: output.js
 // @allowJs: true
 function Class()
 {
diff --git a/tests/cases/conformance/salsa/multipleDeclarations.ts b/tests/cases/conformance/salsa/multipleDeclarations.ts
index ba2e14e11e9..89f1308eadd 100644
--- a/tests/cases/conformance/salsa/multipleDeclarations.ts
+++ b/tests/cases/conformance/salsa/multipleDeclarations.ts
@@ -1,5 +1,5 @@
 // @filename: input.js
-// @out: output.js
+// @outFile: output.js
 // @allowJs: true
 function C() {
     this.m = null;
diff --git a/tests/cases/conformance/salsa/topLevelThisAssignment.ts b/tests/cases/conformance/salsa/topLevelThisAssignment.ts
index aed2f867108..7cf806450a0 100644
--- a/tests/cases/conformance/salsa/topLevelThisAssignment.ts
+++ b/tests/cases/conformance/salsa/topLevelThisAssignment.ts
@@ -1,4 +1,4 @@
-// @out: output.js
+// @outFile: output.js
 // @allowJs: true
 // @checkJs: true
 // @Filename: a.js
diff --git a/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs.ts b/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs.ts
index 77570833143..c7ff74691ec 100644
--- a/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs.ts
+++ b/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs.ts
@@ -4,7 +4,7 @@
 // @allowJs: true
 // @checkJs: true
 // @filename: uniqueSymbolsDeclarationsInJs.js
-// @out: uniqueSymbolsDeclarationsInJs-out.js
+// @outFile: uniqueSymbolsDeclarationsInJs-out.js
 // @useDefineForClassFields: false
 
 // classes
diff --git a/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors.ts b/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors.ts
index 231778d2628..240aef7acc1 100644
--- a/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors.ts
+++ b/tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors.ts
@@ -4,7 +4,7 @@
 // @allowJs: true
 // @checkJs: true
 // @filename: uniqueSymbolsDeclarationsInJsErrors.js
-// @out: uniqueSymbolsDeclarationsInJsErrors-out.js
+// @outFile: uniqueSymbolsDeclarationsInJsErrors-out.js
 // @useDefineForClassFields: false
 
 class C {
@@ -21,4 +21,4 @@ class C {
      * @type {unique symbol}
      */
     static readwriteType;
-}
\ No newline at end of file
+}
diff --git a/tests/cases/fourslash/codeFixClassImplementInterfaceAutoImports_typeOnly.ts b/tests/cases/fourslash/codeFixClassImplementInterfaceAutoImports_typeOnly.ts
index 55103d11486..b7c67c7d59d 100644
--- a/tests/cases/fourslash/codeFixClassImplementInterfaceAutoImports_typeOnly.ts
+++ b/tests/cases/fourslash/codeFixClassImplementInterfaceAutoImports_typeOnly.ts
@@ -1,6 +1,7 @@
 /// <reference path='fourslash.ts' />
 
-// @importsNotUsedAsValues: error
+// @module: esnext
+// @verbatimModuleSyntax: true
 
 // @Filename: types1.ts
 ////type A = {};
diff --git a/tests/cases/fourslash/codeFixConvertToTypeOnlyImport1.ts b/tests/cases/fourslash/codeFixConvertToTypeOnlyImport1.ts
index d8556c97e59..28670a3340d 100644
--- a/tests/cases/fourslash/codeFixConvertToTypeOnlyImport1.ts
+++ b/tests/cases/fourslash/codeFixConvertToTypeOnlyImport1.ts
@@ -1,6 +1,7 @@
 /// <reference path="fourslash.ts" />
 
-// @importsNotUsedAsValues: error
+// @module: esnext
+// @verbatimModuleSyntax: true
 
 // @Filename: exports.ts
 ////export default class A {}
@@ -18,15 +19,13 @@
 ////console.log(b, c);
 
 goTo.file("imports.ts");
-verify.codeFix({
-    index: 0,
-    description: ts.Diagnostics.Use_import_type.message,
-    newFileContent: `import type {
-    B,
-    C,
-} from './exports';
-
-declare const b: B;
-declare const c: C;
-console.log(b, c);`
-});
+// This test previously showed that a codefix could be applied to turn
+// these imports, only used in type positions, into type-only imports.
+// The code fix was triggered by the error issued by
+// `--importsNotUsedAsValues error`, for which there is no analog in
+// the compiler after its removal. `verbatimModuleSyntax` does not
+// error here since the imported names are values, and so will not
+// crash at runtime. Users have replaced this error and codefix with
+// an eslint rule. We could consider bringing it back as a suggestion
+// diagnostic, a refactor, or an organizeImports feature.
+verify.not.codeFixAvailable();
diff --git a/tests/cases/fourslash/codeFixConvertToTypeOnlyImport2.ts b/tests/cases/fourslash/codeFixConvertToTypeOnlyImport2.ts
index 145998d9854..5156e2e0d89 100644
--- a/tests/cases/fourslash/codeFixConvertToTypeOnlyImport2.ts
+++ b/tests/cases/fourslash/codeFixConvertToTypeOnlyImport2.ts
@@ -1,6 +1,7 @@
 /// <reference path="fourslash.ts" />
 
-// @importsNotUsedAsValues: error
+// @module: esnext
+// @verbatimModuleSyntax: true
 
 // @Filename: exports.ts
 ////export default class A {}
@@ -16,14 +17,13 @@
 ////console.log(a, b, c);
 
 goTo.file("imports.ts");
-verify.codeFix({
-    index: 0,
-    description: ts.Diagnostics.Use_import_type.message,
-    newFileContent: `import type A from './exports';
-import type { B, C } from './exports';
-
-declare const a: A;
-declare const b: B;
-declare const c: C;
-console.log(a, b, c);`
-});
+// This test previously showed that a codefix could be applied to turn
+// these imports, only used in type positions, into type-only imports.
+// The code fix was triggered by the error issued by
+// `--importsNotUsedAsValues error`, for which there is no analog in
+// the compiler after its removal. `verbatimModuleSyntax` does not
+// error here since the imported names are values, and so will not
+// crash at runtime. Users have replaced this error and codefix with
+// an eslint rule. We could consider bringing it back as a suggestion
+// diagnostic, a refactor, or an organizeImports feature.
+verify.not.codeFixAvailable();
diff --git a/tests/cases/fourslash/codeFixConvertToTypeOnlyImport3.ts b/tests/cases/fourslash/codeFixConvertToTypeOnlyImport3.ts
index e021992ddd9..b0bc7fb80db 100644
--- a/tests/cases/fourslash/codeFixConvertToTypeOnlyImport3.ts
+++ b/tests/cases/fourslash/codeFixConvertToTypeOnlyImport3.ts
@@ -1,6 +1,7 @@
 /// <reference path="fourslash.ts" />
 
-// @importsNotUsedAsValues: error
+// @module: esnext
+// @verbatimModuleSyntax: true
 
 // @Filename: exports1.ts
 ////export default class A {}
@@ -24,18 +25,13 @@
 ////console.log(a, b, c, d, o);
 
 goTo.file("imports.ts");
-verify.codeFixAll({
-    fixId: "convertToTypeOnlyImport",
-    fixAllDescription: ts.Diagnostics.Fix_all_with_type_only_imports.message,
-    newFileContent: `import type A from './exports1';
-import type { B, C } from './exports1';
-import type D from "./exports2";
-import type * as others from "./exports2";
-
-declare const a: A;
-declare const b: B;
-declare const c: C;
-declare const d: D;
-declare const o: typeof others;
-console.log(a, b, c, d, o);`
-});
+// This test previously showed that a codefix could be applied to turn
+// these imports, only used in type positions, into type-only imports.
+// The code fix was triggered by the error issued by
+// `--importsNotUsedAsValues error`, for which there is no analog in
+// the compiler after its removal. `verbatimModuleSyntax` does not
+// error here since the imported names are values, and so will not
+// crash at runtime. Users have replaced this error and codefix with
+// an eslint rule. We could consider bringing it back as a suggestion
+// diagnostic, a refactor, or an organizeImports feature.
+verify.not.codeFixAvailable();
diff --git a/tests/cases/fourslash/completionsImport_promoteTypeOnly4.ts b/tests/cases/fourslash/completionsImport_promoteTypeOnly4.ts
index 3a8ec856402..df033219e6e 100644
--- a/tests/cases/fourslash/completionsImport_promoteTypeOnly4.ts
+++ b/tests/cases/fourslash/completionsImport_promoteTypeOnly4.ts
@@ -1,7 +1,6 @@
 /// <reference path="fourslash.ts" />
 // @module: es2015
-// @isolatedModules: true
-// @preserveValueImports: true
+// @verbatimModuleSyntax: true
 
 // @Filename: /exports.ts
 //// export interface SomeInterface {}
diff --git a/tests/cases/fourslash/diagnosticsJsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/fourslash/diagnosticsJsFileCompilationDuplicateFunctionImplementation.ts
index 3a89a7a0b36..268944e010a 100644
--- a/tests/cases/fourslash/diagnosticsJsFileCompilationDuplicateFunctionImplementation.ts
+++ b/tests/cases/fourslash/diagnosticsJsFileCompilationDuplicateFunctionImplementation.ts
@@ -2,7 +2,7 @@
 
 // @declaration: true
 // @newLine: lf
-// @out: out.js
+// @outFile: out.js
 // @allowJs: true
 // @Filename: b.js
 // @emitThisFile: true
diff --git a/tests/cases/fourslash/getDeclarationDiagnostics.ts b/tests/cases/fourslash/getDeclarationDiagnostics.ts
index c4610af6289..d4372611f43 100644
--- a/tests/cases/fourslash/getDeclarationDiagnostics.ts
+++ b/tests/cases/fourslash/getDeclarationDiagnostics.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @declaration: true
-// @out: true
+// @outFile: true
 
 // @Filename: inputFile1.ts
 //// module m {
diff --git a/tests/cases/fourslash/getEmitOutputDeclarationSingleFile.ts b/tests/cases/fourslash/getEmitOutputDeclarationSingleFile.ts
index 502e3903d75..c416c81c615 100644
--- a/tests/cases/fourslash/getEmitOutputDeclarationSingleFile.ts
+++ b/tests/cases/fourslash/getEmitOutputDeclarationSingleFile.ts
@@ -2,7 +2,7 @@
 
 // @BaselineFile: getEmitOutputDeclarationSingleFile.baseline
 // @declaration: true
-// @out: declSingleFile.js
+// @outFile: declSingleFile.js
 
 // @Filename: inputFile1.ts
 // @emitThisFile: true
@@ -19,4 +19,4 @@
 ////    y : number;
 //// }
 
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/getEmitOutputExternalModule.ts b/tests/cases/fourslash/getEmitOutputExternalModule.ts
index 080cd56e976..ccb5b1d32ef 100644
--- a/tests/cases/fourslash/getEmitOutputExternalModule.ts
+++ b/tests/cases/fourslash/getEmitOutputExternalModule.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @BaselineFile: getEmitOutputExternalModule.baseline
-// @out: declSingleFile.js
+// @outFile: declSingleFile.js
 
 // @Filename: inputFile1.ts
 // @emitThisFile: true
@@ -16,4 +16,4 @@
 //// 	class C {c}
 //// }
 
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/getEmitOutputExternalModule2.ts b/tests/cases/fourslash/getEmitOutputExternalModule2.ts
index f4b55abc2ea..cc11ca36c68 100644
--- a/tests/cases/fourslash/getEmitOutputExternalModule2.ts
+++ b/tests/cases/fourslash/getEmitOutputExternalModule2.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @BaselineFile: getEmitOutputExternalModule2.baseline
-// @out: declSingleFile.js
+// @outFile: declSingleFile.js
 
 // @Filename: inputFile1.ts
 //// var x: number = 5;
@@ -23,4 +23,4 @@
 //// 	class C {c}
 //// }
 
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/getEmitOutputMapRoot.ts b/tests/cases/fourslash/getEmitOutputMapRoot.ts
index 7cbaf5d60b1..2dfc2b32778 100644
--- a/tests/cases/fourslash/getEmitOutputMapRoot.ts
+++ b/tests/cases/fourslash/getEmitOutputMapRoot.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @BaselineFile: getEmitOutputMapRoots.baseline
-// @out: declSingleFile.js
+// @outFile: declSingleFile.js
 // @sourceMap: true
 // @mapRoot: mapRootDir/
 
@@ -14,4 +14,4 @@
 ////   y: string;
 //// }
 
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/getEmitOutputOut.ts b/tests/cases/fourslash/getEmitOutputOut.ts
index 077b257e4de..0960739b2ba 100644
--- a/tests/cases/fourslash/getEmitOutputOut.ts
+++ b/tests/cases/fourslash/getEmitOutputOut.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @BaselineFile: getEmitOutputOut.baseline
-// @out: out.js
+// @outFile: out.js
 
 // @Filename: my.d.ts
 // @emitThisFile: false
@@ -20,4 +20,4 @@
 // @emitThisFile: true
 ////var x;
 
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/getEmitOutputSingleFile.ts b/tests/cases/fourslash/getEmitOutputSingleFile.ts
index babeb8dee14..64a0d097db7 100644
--- a/tests/cases/fourslash/getEmitOutputSingleFile.ts
+++ b/tests/cases/fourslash/getEmitOutputSingleFile.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @BaselineFile: getEmitOutputSingleFile.baseline
-// @out: outputDir/singleFile.js
+// @outFile: outputDir/singleFile.js
 
 // @Filename: inputFile1.ts
 //// var x: any;
@@ -18,4 +18,4 @@
 ////    y : number
 //// }
 
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/getEmitOutputSingleFile2.ts b/tests/cases/fourslash/getEmitOutputSingleFile2.ts
index 5d616b19e13..19d86a5747c 100644
--- a/tests/cases/fourslash/getEmitOutputSingleFile2.ts
+++ b/tests/cases/fourslash/getEmitOutputSingleFile2.ts
@@ -3,7 +3,7 @@
 // @BaselineFile: getEmitOutputSingleFile2.baseline
 // @module: CommonJS
 // @declaration: true
-// @out: declSingleFile.js
+// @outFile: declSingleFile.js
 // @outDir: /tests/cases/fourslash/
 
 // @Filename: inputFile1.ts
@@ -25,4 +25,4 @@
 ////export var foo = 10;
 ////export var bar = "hello world"
 
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/getEmitOutputWithDeclarationFile3.ts b/tests/cases/fourslash/getEmitOutputWithDeclarationFile3.ts
index dfcf49c0e1f..5a5e057ade4 100644
--- a/tests/cases/fourslash/getEmitOutputWithDeclarationFile3.ts
+++ b/tests/cases/fourslash/getEmitOutputWithDeclarationFile3.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @BaselineFile: getEmitOutputWithDeclarationFile3.baseline
-// @out: declSingle.js
+// @outFile: declSingle.js
 
 // @Filename: decl.d.ts
 //// interface I { a: string; }
@@ -18,4 +18,4 @@
 
 // @Filename: inputFile5.js
 //// var x2 = 1000;
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/getEmitOutputWithSemanticErrorsForMultipleFiles2.ts b/tests/cases/fourslash/getEmitOutputWithSemanticErrorsForMultipleFiles2.ts
index 95a4ac78a88..f01f4c3b194 100644
--- a/tests/cases/fourslash/getEmitOutputWithSemanticErrorsForMultipleFiles2.ts
+++ b/tests/cases/fourslash/getEmitOutputWithSemanticErrorsForMultipleFiles2.ts
@@ -2,7 +2,7 @@
 
 // @BaselineFile: getEmitOutputWithSemanticErrorsForMultipleFiles2.baseline
 // @declaration: true
-// @out: out.js
+// @outFile: out.js
 
 // @Filename: inputFile1.ts
 // @emitThisFile: true
@@ -14,4 +14,4 @@
 //// // File not emitted, and contains semantic errors
 //// var semanticError: boolean = "string";
 
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/getEmitOutputWithSyntacticErrorsForMultipleFiles2.ts b/tests/cases/fourslash/getEmitOutputWithSyntacticErrorsForMultipleFiles2.ts
index f66e6563c81..72e866692ca 100644
--- a/tests/cases/fourslash/getEmitOutputWithSyntacticErrorsForMultipleFiles2.ts
+++ b/tests/cases/fourslash/getEmitOutputWithSyntacticErrorsForMultipleFiles2.ts
@@ -1,7 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @BaselineFile: getEmitOutputWithSyntacticErrorsForMultipleFiles2.baseline
-// @out: out.js
+// @outFile: out.js
 
 // @Filename: inputFile1.ts
 // @emitThisFile: true
@@ -13,4 +13,4 @@
 //// // File not emitted, and contains syntactic errors
 //// var syntactic Error;
 
-verify.baselineGetEmitOutput();
\ No newline at end of file
+verify.baselineGetEmitOutput();
diff --git a/tests/cases/fourslash/importNameCodeFix_importType1.ts b/tests/cases/fourslash/importNameCodeFix_importType1.ts
index cd9dbfd3199..6e5da0f1485 100644
--- a/tests/cases/fourslash/importNameCodeFix_importType1.ts
+++ b/tests/cases/fourslash/importNameCodeFix_importType1.ts
@@ -1,7 +1,6 @@
 /// <reference path="fourslash.ts" />
 
-// @preserveValueImports: true
-// @isolatedModules: true
+// @verbatimModuleSyntax: true
 // @module: es2015
 
 // @Filename: /exports.ts
diff --git a/tests/cases/fourslash/importNameCodeFix_importType2.ts b/tests/cases/fourslash/importNameCodeFix_importType2.ts
index f336b3e5076..44fd81bb70a 100644
--- a/tests/cases/fourslash/importNameCodeFix_importType2.ts
+++ b/tests/cases/fourslash/importNameCodeFix_importType2.ts
@@ -1,8 +1,6 @@
 /// <reference path="fourslash.ts" />
 
-// @importsNotUsedAsValues: error
-// @preserveValueImports: true
-// @isolatedModules: true
+// @verbatimModuleSyntax: true
 // @module: es2015
 
 // @Filename: /exports1.ts
diff --git a/tests/cases/fourslash/importNameCodeFix_importType3.ts b/tests/cases/fourslash/importNameCodeFix_importType3.ts
index 6c530b3475c..a44d5728a87 100644
--- a/tests/cases/fourslash/importNameCodeFix_importType3.ts
+++ b/tests/cases/fourslash/importNameCodeFix_importType3.ts
@@ -1,7 +1,6 @@
 /// <reference path="fourslash.ts" />
 
-// @preserveValueImports: true
-// @isolatedModules: true
+// @verbatimModuleSyntax: true
 // @module: es2015
 
 // @Filename: /exports.ts
diff --git a/tests/cases/fourslash/importNameCodeFix_importType8.ts b/tests/cases/fourslash/importNameCodeFix_importType8.ts
index 5cd2a583e99..ae91a7327bd 100644
--- a/tests/cases/fourslash/importNameCodeFix_importType8.ts
+++ b/tests/cases/fourslash/importNameCodeFix_importType8.ts
@@ -1,8 +1,7 @@
 /// <reference path="fourslash.ts" />
 
 // @module: es2015
-// @isolatedModules: true
-// @preserveValueImports: true
+// @verbatimModuleSyntax: true
 
 // @Filename: /exports.ts
 //// export interface SomeInterface {}
diff --git a/tests/cases/fourslash/importNameCodeFix_typeOnly.ts b/tests/cases/fourslash/importNameCodeFix_typeOnly.ts
index ad16ea42032..4e7bfebb4b4 100644
--- a/tests/cases/fourslash/importNameCodeFix_typeOnly.ts
+++ b/tests/cases/fourslash/importNameCodeFix_typeOnly.ts
@@ -1,6 +1,7 @@
 /// <reference path="fourslash.ts" />
 
-// @importsNotUsedAsValues: error
+// @module: esnext
+// @verbatimModuleSyntax: true
 
 // @Filename: types.ts
 ////export class A {}
diff --git a/tests/cases/fourslash/importNameCodeFix_typeOnly3.ts b/tests/cases/fourslash/importNameCodeFix_typeOnly3.ts
index fdc7189200a..f8a4ef962f7 100644
--- a/tests/cases/fourslash/importNameCodeFix_typeOnly3.ts
+++ b/tests/cases/fourslash/importNameCodeFix_typeOnly3.ts
@@ -1,6 +1,7 @@
 /// <reference path="fourslash.ts" />
 
-// @importsNotUsedAsValues: error
+// @module: esnext
+// @verbatimModuleSyntax: true
 
 // @Filename: Presenter.ts
 //// export type DisplayStyle = "normal" | "compact";
diff --git a/tests/cases/project/declarationDir3.json b/tests/cases/project/declarationDir3.json
index b86e454c69d..a55c1e44ed7 100644
--- a/tests/cases/project/declarationDir3.json
+++ b/tests/cases/project/declarationDir3.json
@@ -6,8 +6,8 @@
         "subfolder/b.ts",
         "subfolder/c.ts"
     ],
-    "out": "out.js",
+    "outFile": "out.js",
     "declaration": true,
     "declarationDir": "declarations",
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index 6fff7fa991a..32f943d9ac8 100644
--- a/tests/cases/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles",
     "resolveMapRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/cases/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 3389460d2d3..5a1e3175fd6 100644
--- a/tests/cases/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/cases/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,11 +4,11 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_mixed_subfolder/mapFiles",
     "resolveMapRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index f428a4298fe..9e1f3b86536 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_multifolder/mapFiles",
     "resolveMapRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 4be7fe381a0..0e46c7f6555 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_simple/mapFiles",
     "resolveMapRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index 5f69842eca7..da34468ad2c 100644
--- a/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_module_subfolder/mapFiles",
     "resolveMapRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathMultifolderSpecifyOutputFile.json
index 036121d2503..40ddfc18ad6 100644
--- a/tests/cases/project/mapRootAbsolutePathMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathMultifolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_multifolder/mapFiles",
     "resolveMapRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathSimpleSpecifyOutputFile.json
index 2fb6ad4be65..65179974deb 100644
--- a/tests/cases/project/mapRootAbsolutePathSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathSimpleSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_simple/mapFiles",
     "resolveMapRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathSingleFileSpecifyOutputFile.json
index 5e6ca91ed87..ebe768f0bf9 100644
--- a/tests/cases/project/mapRootAbsolutePathSingleFileSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathSingleFileSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_singleFile/mapFiles",
     "resolveMapRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/cases/project/mapRootAbsolutePathSubfolderSpecifyOutputFile.json
index c389817079c..9c6c89eaa5a 100644
--- a/tests/cases/project/mapRootAbsolutePathSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootAbsolutePathSubfolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "tests/cases/projects/outputdir_subfolder/mapFiles",
     "resolveMapRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
index d02ef6f54d5..d78a11e777c 100644
--- a/tests/cases/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/cases/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index c46485b6e5e..a24612777e7 100644
--- a/tests/cases/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/cases/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 00e249c11c5..b1124122faa 100644
--- a/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
index c5d15721889..01528e90545 100644
--- a/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
index abf95b99184..75396128b8a 100644
--- a/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootRelativePathMultifolderSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathMultifolderSpecifyOutputFile.json
index 7f00a4013d3..f1c43e56ca3 100644
--- a/tests/cases/project/mapRootRelativePathMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathMultifolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootRelativePathSimpleSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathSimpleSpecifyOutputFile.json
index 59fd30cb555..6cdd7bd1cca 100644
--- a/tests/cases/project/mapRootRelativePathSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathSimpleSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootRelativePathSingleFileSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathSingleFileSpecifyOutputFile.json
index 18aa8ea67d7..1dd57d09489 100644
--- a/tests/cases/project/mapRootRelativePathSingleFileSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathSingleFileSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/mapRootRelativePathSubfolderSpecifyOutputFile.json b/tests/cases/project/mapRootRelativePathSubfolderSpecifyOutputFile.json
index 855874cf810..6b53467cab0 100644
--- a/tests/cases/project/mapRootRelativePathSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/mapRootRelativePathSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "../mapFiles"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlMixedSubfolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlMixedSubfolderSpecifyOutputFile.json
index e7dd9c05ef7..4aa95144afb 100644
--- a/tests/cases/project/maprootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlMixedSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/cases/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 81ec4c19c39..7dfa0251ab6 100644
--- a/tests/cases/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/cases/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputFile.json
index ceef314150e..c96ede8705f 100644
--- a/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlModuleMultifolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputFile.json b/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputFile.json
index ac67a010557..6e47b94dbf7 100644
--- a/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlModuleSimpleSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputFile.json
index 8135fdce942..b05befb815e 100644
--- a/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlModuleSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlMultifolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlMultifolderSpecifyOutputFile.json
index 12a7e93bd2f..4c1a68fef43 100644
--- a/tests/cases/project/maprootUrlMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlMultifolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlSimpleSpecifyOutputFile.json b/tests/cases/project/maprootUrlSimpleSpecifyOutputFile.json
index bcaae8031c3..dd2034531a2 100644
--- a/tests/cases/project/maprootUrlSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlSimpleSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlSingleFileSpecifyOutputFile.json b/tests/cases/project/maprootUrlSingleFileSpecifyOutputFile.json
index 0e273df1cb6..9ce2bdaf118 100644
--- a/tests/cases/project/maprootUrlSingleFileSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlSingleFileSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlSubfolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlSubfolderSpecifyOutputFile.json
index 57ea7acf35f..ee4e7bbfa9e 100644
--- a/tests/cases/project/maprootUrlSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
index c11c6153d52..aa572b19fbc 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/cases/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index da1337d72de..4f8736988dc 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,11 +4,11 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
index 42cd9d0bc7d..2426f75c45f 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
index 0b687bb0863..03d5a55a9c2 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 05c4aa19a19..36f32dccf78 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json
index ee5a063cafb..82b88bbb891 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlMultifolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json
index c2106230dc9..53b72c94c0c 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlSimpleSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json
index 5bc38c6221d..174416aca43 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlSingleFileSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json b/tests/cases/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json
index 95783ff3b80..72407f1483d 100644
--- a/tests/cases/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/maprootUrlsourcerootUrlSubfolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "mapRoot": "http://www.typescriptlang.org/",
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/outMixedSubfolderSpecifyOutputFile.json b/tests/cases/project/outMixedSubfolderSpecifyOutputFile.json
index 989661799cf..968fa217c80 100644
--- a/tests/cases/project/outMixedSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/outMixedSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/cases/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 62248dce612..b6abc619f86 100644
--- a/tests/cases/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/cases/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,8 +4,8 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/outModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/outModuleMultifolderSpecifyOutputFile.json
index 4393e574422..69f028cabca 100644
--- a/tests/cases/project/outModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/outModuleMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/outModuleSimpleSpecifyOutputFile.json b/tests/cases/project/outModuleSimpleSpecifyOutputFile.json
index 579464c73fc..b8b573d84ed 100644
--- a/tests/cases/project/outModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/outModuleSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/outModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/outModuleSubfolderSpecifyOutputFile.json
index c866f4d92d1..4e7dc934f93 100644
--- a/tests/cases/project/outModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/outModuleSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/outMultifolderSpecifyOutputFile.json b/tests/cases/project/outMultifolderSpecifyOutputFile.json
index d2e50860be8..085d33b3b88 100644
--- a/tests/cases/project/outMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/outMultifolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/outSimpleSpecifyOutputFile.json b/tests/cases/project/outSimpleSpecifyOutputFile.json
index 5ac5ce20f9a..793f60dea26 100644
--- a/tests/cases/project/outSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/outSimpleSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/outSingleFileSpecifyOutputFile.json b/tests/cases/project/outSingleFileSpecifyOutputFile.json
index 87adea93ec5..5a9e8492b9a 100644
--- a/tests/cases/project/outSingleFileSpecifyOutputFile.json
+++ b/tests/cases/project/outSingleFileSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/outSubfolderSpecifyOutputFile.json b/tests/cases/project/outSubfolderSpecifyOutputFile.json
index 90ee6cb4314..8124e2eb0fc 100644
--- a/tests/cases/project/outSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/outSubfolderSpecifyOutputFile.json
@@ -4,7 +4,7 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/prologueEmit.json b/tests/cases/project/prologueEmit.json
index 547607ff547..90c6daa7e7e 100644
--- a/tests/cases/project/prologueEmit.json
+++ b/tests/cases/project/prologueEmit.json
@@ -5,6 +5,6 @@
         "globalThisCapture.ts",
         "__extends.ts"
     ],
-    "out": "out.js",
+    "outFile": "out.js",
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
index 7f4e5443c9b..7aec4452d12 100644
--- a/tests/cases/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src",
     "resolveSourceRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/cases/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 1b484a0880e..f1a89903329 100644
--- a/tests/cases/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/cases/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,11 +4,11 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_mixed_subfolder/src",
     "resolveSourceRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
index 90898e7c103..c6af4fe75a7 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_multifolder/src",
     "resolveSourceRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
index 60cbd5bcefd..9648defa582 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_simple/src",
     "resolveSourceRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
index e4d746bfdcb..8426036bd71 100644
--- a/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_module_subfolder/src",
     "resolveSourceRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json
index ad5b47232f8..ad3816e7591 100644
--- a/tests/cases/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathMultifolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_multifolder/src",
     "resolveSourceRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootAbsolutePathSimpleSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathSimpleSpecifyOutputFile.json
index 3d58ab7ae4e..91ea5bd5490 100644
--- a/tests/cases/project/sourceRootAbsolutePathSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathSimpleSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_simple/src",
     "resolveSourceRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json
index 65a804d7829..719a21ee4d7 100644
--- a/tests/cases/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathSingleFileSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_singleFile/src",
     "resolveSourceRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json b/tests/cases/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json
index e64252398b5..14c14d47caa 100644
--- a/tests/cases/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootAbsolutePathSubfolderSpecifyOutputFile.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "tests/cases/projects/outputdir_subfolder/src",
     "resolveSourceRoot": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
index c8a4259b742..33bf2255d16 100644
--- a/tests/cases/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/cases/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 6c9ec87df5b..7055cc42560 100644
--- a/tests/cases/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/cases/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
index 76dcb88db29..68663e87725 100644
--- a/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
index 0f13eb471eb..34286657938 100644
--- a/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
index 4d4a21bd018..8836464991c 100644
--- a/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootRelativePathMultifolderSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathMultifolderSpecifyOutputFile.json
index cc1a90e9c54..d55d647c6de 100644
--- a/tests/cases/project/sourceRootRelativePathMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathMultifolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootRelativePathSimpleSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathSimpleSpecifyOutputFile.json
index 0415f7e06ae..9972912637f 100644
--- a/tests/cases/project/sourceRootRelativePathSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathSimpleSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootRelativePathSingleFileSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathSingleFileSpecifyOutputFile.json
index e4a6dc60073..1e28d71edc4 100644
--- a/tests/cases/project/sourceRootRelativePathSingleFileSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathSingleFileSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourceRootRelativePathSubfolderSpecifyOutputFile.json b/tests/cases/project/sourceRootRelativePathSubfolderSpecifyOutputFile.json
index a4c9ed54b17..7447365ea29 100644
--- a/tests/cases/project/sourceRootRelativePathSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourceRootRelativePathSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "../src"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcemapMixedSubfolderSpecifyOutputFile.json b/tests/cases/project/sourcemapMixedSubfolderSpecifyOutputFile.json
index 449e780e60d..39b61d25b89 100644
--- a/tests/cases/project/sourcemapMixedSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapMixedSubfolderSpecifyOutputFile.json
@@ -4,8 +4,8 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/cases/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index d611eb5c828..b5641ff99e4 100644
--- a/tests/cases/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/cases/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputFile.json
index 5c1afbbba1e..c2b1ca6cf1e 100644
--- a/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapModuleMultifolderSpecifyOutputFile.json
@@ -4,8 +4,8 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcemapModuleSimpleSpecifyOutputFile.json b/tests/cases/project/sourcemapModuleSimpleSpecifyOutputFile.json
index 392b4d484e6..82a0221663f 100644
--- a/tests/cases/project/sourcemapModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapModuleSimpleSpecifyOutputFile.json
@@ -4,8 +4,8 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputFile.json
index 770c223453f..a29ec4429bd 100644
--- a/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapModuleSubfolderSpecifyOutputFile.json
@@ -4,8 +4,8 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcemapMultifolderSpecifyOutputFile.json b/tests/cases/project/sourcemapMultifolderSpecifyOutputFile.json
index 6b23d06b8c6..6f26d35647c 100644
--- a/tests/cases/project/sourcemapMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapMultifolderSpecifyOutputFile.json
@@ -4,8 +4,8 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcemapSimpleSpecifyOutputFile.json b/tests/cases/project/sourcemapSimpleSpecifyOutputFile.json
index b99e9adb9ea..0196e9cd940 100644
--- a/tests/cases/project/sourcemapSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapSimpleSpecifyOutputFile.json
@@ -4,8 +4,8 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcemapSingleFileSpecifyOutputFile.json b/tests/cases/project/sourcemapSingleFileSpecifyOutputFile.json
index a99eb02b04a..30e8726cd4e 100644
--- a/tests/cases/project/sourcemapSingleFileSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapSingleFileSpecifyOutputFile.json
@@ -4,8 +4,8 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcemapSubfolderSpecifyOutputFile.json b/tests/cases/project/sourcemapSubfolderSpecifyOutputFile.json
index 54e8bc42d36..2de9307cd75 100644
--- a/tests/cases/project/sourcemapSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcemapSubfolderSpecifyOutputFile.json
@@ -4,8 +4,8 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcerootUrlMixedSubfolderSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
index 6c0ee842fa9..56b2ea0e029 100644
--- a/tests/cases/project/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlMixedSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json b/tests/cases/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
index 83d7b5ab69c..5957dcb33e9 100644
--- a/tests/cases/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
+++ b/tests/cases/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory.json
@@ -4,10 +4,10 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/outAndOutDirFile.js",
+    "outFile": "bin/outAndOutDirFile.js",
     "outDir": "outdir/outAndOutDirFolder",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
index e1efb2eba66..dd6be1a7920 100644
--- a/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlModuleMultifolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputFile.json
index 9d67f8af21d..a3b2de48d02 100644
--- a/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlModuleSimpleSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
index 08a6268c462..4f8404137f8 100644
--- a/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlModuleSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcerootUrlMultifolderSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlMultifolderSpecifyOutputFile.json
index 8e2d80ec02b..45061e40ff1 100644
--- a/tests/cases/project/sourcerootUrlMultifolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlMultifolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcerootUrlSimpleSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlSimpleSpecifyOutputFile.json
index 16e88b9c76e..45bb02c3514 100644
--- a/tests/cases/project/sourcerootUrlSimpleSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlSimpleSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcerootUrlSingleFileSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlSingleFileSpecifyOutputFile.json
index 38f2b98b1e6..869edced14d 100644
--- a/tests/cases/project/sourcerootUrlSingleFileSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlSingleFileSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/project/sourcerootUrlSubfolderSpecifyOutputFile.json b/tests/cases/project/sourcerootUrlSubfolderSpecifyOutputFile.json
index ab61b02c5fc..3def41c27c2 100644
--- a/tests/cases/project/sourcerootUrlSubfolderSpecifyOutputFile.json
+++ b/tests/cases/project/sourcerootUrlSubfolderSpecifyOutputFile.json
@@ -4,9 +4,9 @@
     "inputFiles": [
         "test.ts"
     ],
-    "out": "bin/test.js",
+    "outFile": "bin/test.js",
     "sourceMap": true,
     "declaration": true,
     "baselineCheck": true,
     "sourceRoot": "http://typescript.codeplex.com/"
-}
\ No newline at end of file
+}
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/tsconfig.json
index 1b726957fdd..7ff119cc70e 100644
--- a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/tsconfig.json
+++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecified/tsconfig.json
@@ -1,3 +1,3 @@
 {
-  "compilerOptions": { "out": "test.js" }
-}
\ No newline at end of file
+  "compilerOptions": { "outFile": "test.js" }
+}
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json
index 167eaebec3a..da26d0152f3 100644
--- a/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json
+++ b/tests/cases/projects/jsFileCompilation/DifferentNamesNotSpecifiedWithAllowJs/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "out": "test.js",
+    "outFile": "test.js",
     "allowJs": true
   }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json
index 582826bdceb..9194aeb8b5b 100644
--- a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json
+++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecified/tsconfig.json
@@ -1,4 +1,4 @@
 {
-  "compilerOptions": { "out": "test.js" },
+  "compilerOptions": { "outFile": "test.js" },
   "files": [ "a.ts", "b.js" ]
-}
\ No newline at end of file
+}
diff --git a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/tsconfig.json b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/tsconfig.json
index 1a5a6f6189f..e71eadba579 100644
--- a/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/tsconfig.json
+++ b/tests/cases/projects/jsFileCompilation/DifferentNamesSpecifiedWithAllowJs/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "out": "test.js",
+    "outFile": "test.js",
     "allowJs": true
   },
   "files": [ "a.ts", "b.js" ]
-}
\ No newline at end of file
+}