diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 935e82c5bd0..a9b42e31090 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -10817,7 +10817,13 @@ module ts {
 
         function getExportNameSubstitution(symbol: Symbol, location: Node): string {
             if (isExternalModuleSymbol(symbol.parent)) {
-                return "exports." + unescapeIdentifier(symbol.name);
+                var symbolName = unescapeIdentifier(symbol.name);
+                if (languageVersion >= ScriptTarget.ES6) {
+                    return symbolName;
+                }
+                else {
+                    return "exports." + symbolName;
+                }
             }
             var node = location;
             var containerSymbol = getParentOfSymbol(symbol);
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 84312ef3be3..ffdea4c71fb 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -3810,8 +3810,14 @@ module ts {
             function emitModuleMemberName(node: Declaration) {
                 emitStart(node.name);
                 if (getCombinedNodeFlags(node) & NodeFlags.Export) {
-                    emitContainingModuleName(node);
-                    write(".");
+                    var container = getContainingModule(node);
+                    if (container) {
+                        write(resolver.getGeneratedNameForNode(container));
+                        write(".");
+                    }
+                    else if (languageVersion < ScriptTarget.ES6) {
+                        write("exports.");
+                    }
                 }
                 emitNodeWithoutSourceMap(node.name);
                 emitEnd(node.name);
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 0d70eb86000..6934658920c 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/tests/baselines/reference/constDeclarations-access5.js
@@ -49,7 +49,7 @@ m.x.toString();
 
 
 //// [constDeclarations_access_1.js]
-exports.x = 0;
+x = 0;
 //// [constDeclarations_access_2.js]
 // Errors
 m.x = 1;
diff --git a/tests/baselines/reference/es6ImportDefaultBinding.js b/tests/baselines/reference/es6ImportDefaultBinding.js
index 630f601fbae..53b122a12ca 100644
--- a/tests/baselines/reference/es6ImportDefaultBinding.js
+++ b/tests/baselines/reference/es6ImportDefaultBinding.js
@@ -9,7 +9,7 @@ import defaultBinding from "es6ImportDefaultBinding_0";
 
 
 //// [es6ImportDefaultBinding_0.js]
-exports.a = 10;
+a = 10;
 //// [es6ImportDefaultBinding_1.js]
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
index a79a6665067..12f64528164 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
@@ -16,9 +16,9 @@ import defaultBinding, { m,  } from "es6ImportDefaultBindingFollowedWithNamedImp
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_0.js]
-exports.a = 10;
-exports.x = exports.a;
-exports.m = exports.a;
+a = 10;
+x = a;
+m = a;
 //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
index 3f11e5076ef..425fc0bd778 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js
@@ -9,7 +9,7 @@ import defaultBinding, * as nameSpaceBinding  from "es6ImportDefaultBindingFollo
 var x: number = nameSpaceBinding.a;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.js]
-exports.a = 10;
+a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.js]
 import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
 var x = nameSpaceBinding.a;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 87c9b9fa90f..86ac02be37a 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -9,7 +9,7 @@ import * as nameSpaceBinding from "es6ImportNameSpaceImport_0";
 
 
 //// [es6ImportNameSpaceImport_0.js]
-exports.a = 10;
+a = 10;
 //// [es6ImportNameSpaceImport_1.js]
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index 05ab441a690..76627d4aaff 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -20,11 +20,11 @@ import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
 
 
 //// [es6ImportNamedImport_0.js]
-exports.a = 10;
-exports.x = exports.a;
-exports.m = exports.a;
-exports.a1 = 10;
-exports.x1 = 10;
+a = 10;
+x = a;
+m = a;
+a1 = 10;
+x1 = 10;
 //// [es6ImportNamedImport_1.js]
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportParsingError.js b/tests/baselines/reference/es6ImportNamedImportParsingError.js
index 5d80a3d7a8c..010e84ed8a4 100644
--- a/tests/baselines/reference/es6ImportNamedImportParsingError.js
+++ b/tests/baselines/reference/es6ImportNamedImportParsingError.js
@@ -13,9 +13,9 @@ import , { a } from "es6ImportNamedImportParsingError_0";
 import { a }, from "es6ImportNamedImportParsingError_0";
 
 //// [es6ImportNamedImportParsingError_0.js]
-exports.a = 10;
-exports.x = exports.a;
-exports.m = exports.a;
+a = 10;
+x = a;
+m = a;
 //// [es6ImportNamedImportParsingError_1.js]
 from;
 "es6ImportNamedImportParsingError_0";
diff --git a/tests/baselines/reference/es6ImportWithoutFromClause.js b/tests/baselines/reference/es6ImportWithoutFromClause.js
index cf0713d4ec5..194ce8f9715 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClause.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClause.js
@@ -9,7 +9,7 @@ import "es6ImportWithoutFromClause_0";
 
 
 //// [es6ImportWithoutFromClause_0.js]
-exports.a = 10;
+a = 10;
 //// [es6ImportWithoutFromClause_1.js]
 import "es6ImportWithoutFromClause_0";
 
diff --git a/tests/baselines/reference/es6Module.js b/tests/baselines/reference/es6Module.js
index 111d8fe2030..56c5264c053 100644
--- a/tests/baselines/reference/es6Module.js
+++ b/tests/baselines/reference/es6Module.js
@@ -20,4 +20,4 @@ var A = (function () {
     };
     return A;
 })();
-exports.A = A;
+A = A;
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
index fd0c07ecdc4..36df01dc237 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
@@ -20,4 +20,4 @@ var A = (function () {
     };
     return A;
 })();
-exports.A = A;
+A = A;
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
index 06cf44b4d50..fbcebbd9d0d 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
@@ -20,4 +20,4 @@ var A = (function () {
     };
     return A;
 })();
-exports.A = A;
+A = A;