diff --git a/packages/babel-cli/bin/babel/dir.js b/packages/babel-cli/bin/babel/dir.js
index 43c401046d..5f232ad99c 100644
--- a/packages/babel-cli/bin/babel/dir.js
+++ b/packages/babel-cli/bin/babel/dir.js
@@ -15,7 +15,7 @@ module.exports = function (commander, filenames, opts) {
 
     var data = util.compile(src, {
       sourceFileName: slash(path.relative(dest + "/..", src)),
-      sourceMapName: path.basename(relative)
+      sourceMapTarget: path.basename(relative)
     });
     if (data.ignored) return;
 
diff --git a/src/babel/generation/source-map.js b/src/babel/generation/source-map.js
index 2f6407ca41..f6e760a36f 100644
--- a/src/babel/generation/source-map.js
+++ b/src/babel/generation/source-map.js
@@ -8,7 +8,7 @@ export default class SourceMap {
 
     if (opts.sourceMaps) {
       this.map = new sourceMap.SourceMapGenerator({
-        file: opts.sourceMapName,
+        file: opts.sourceMapTarget,
         sourceRoot: opts.sourceRoot
       });
 
diff --git a/src/babel/transformation/file/index.js b/src/babel/transformation/file/index.js
index 958a2cac43..b457a328af 100644
--- a/src/babel/transformation/file/index.js
+++ b/src/babel/transformation/file/index.js
@@ -168,7 +168,7 @@ export default class File {
 
     defaults(opts, {
       sourceFileName: opts.filenameRelative,
-      sourceMapName:  opts.filenameRelative
+      sourceMapTarget:  opts.filenameRelative
     });
 
     //
diff --git a/src/babel/transformation/file/options.json b/src/babel/transformation/file/options.json
index 0fcd36f82e..3bd7456bc3 100644
--- a/src/babel/transformation/file/options.json
+++ b/src/babel/transformation/file/options.json
@@ -197,6 +197,11 @@
   },
 
   "sourceMapName": {
+    "alias": "sourceMapTarget",
+    "description": "DEPRECATED - Please use sourceMapTarget"
+  },
+
+  "sourceMapTarget": {
     "type": "string",
     "description": "set `file` on returned source map"
   },