diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1d9da0a78..865ae4d17b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,11 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 4.4.2
+
+ * **New Feature**
+  * Add `moduleId` option for specifying a custom module id.
+
 ## 4.4.0
 
  * **New Feature**
diff --git a/lib/babel/transformation/file.js b/lib/babel/transformation/file.js
index 9713fe1f6d..37b5e4e1e3 100644
--- a/lib/babel/transformation/file.js
+++ b/lib/babel/transformation/file.js
@@ -89,7 +89,7 @@ File.validOptions = [
   "compact",
 
   "resolveModuleSource",
-  "getModuleName",
+  "moduleId",
 
   // legacy
   "format",
@@ -138,6 +138,10 @@ File.prototype.normalizeOptions = function (opts) {
     opts.sourceRoot = slash(opts.sourceRoot);
   }
 
+  if (opts.moduleId) {
+    opts.moduleIds = true;
+  }
+
   opts.basename = path.basename(opts.filename, path.extname(opts.filename));
 
   opts.blacklist = util.arrayify(opts.blacklist);
diff --git a/lib/babel/transformation/modules/_default.js b/lib/babel/transformation/modules/_default.js
index 0e80537bdf..5fdd180199 100644
--- a/lib/babel/transformation/modules/_default.js
+++ b/lib/babel/transformation/modules/_default.js
@@ -146,7 +146,7 @@ DefaultFormatter.prototype.isLocalReference = function (node, scope) {
 
 DefaultFormatter.prototype.getModuleName = function () {
   var opts = this.file.opts;
-  if (opts.getModuleName) return opts.getModuleName(opts.filename);
+  if (opts.moduleId) return opts.moduleId;
 
   var filenameRelative = opts.filenameRelative;
   var moduleName = "";
diff --git a/test/fixtures/transformation/es6-modules-amd/get-module-name-option/options.js b/test/fixtures/transformation/es6-modules-amd/get-module-name-option/options.js
deleted file mode 100644
index e9f2b038d2..0000000000
--- a/test/fixtures/transformation/es6-modules-amd/get-module-name-option/options.js
+++ /dev/null
@@ -1,5 +0,0 @@
-exports.getModuleName = function () {
-  return "my custom module name";
-};
-
-exports.moduleIds = true;
diff --git a/test/fixtures/transformation/es6-modules-amd/get-module-name-option/options.json b/test/fixtures/transformation/es6-modules-amd/get-module-name-option/options.json
new file mode 100644
index 0000000000..6d0cdb5a6f
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-amd/get-module-name-option/options.json
@@ -0,0 +1,4 @@
+{
+  "moduleIds": true,
+  "moduleId": "my custom module name"
+}
diff --git a/test/fixtures/transformation/es6-modules-system/get-module-name-option/options.js b/test/fixtures/transformation/es6-modules-system/get-module-name-option/options.js
deleted file mode 100644
index e9f2b038d2..0000000000
--- a/test/fixtures/transformation/es6-modules-system/get-module-name-option/options.js
+++ /dev/null
@@ -1,5 +0,0 @@
-exports.getModuleName = function () {
-  return "my custom module name";
-};
-
-exports.moduleIds = true;
diff --git a/test/fixtures/transformation/es6-modules-system/get-module-name-option/options.json b/test/fixtures/transformation/es6-modules-system/get-module-name-option/options.json
new file mode 100644
index 0000000000..6d0cdb5a6f
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-system/get-module-name-option/options.json
@@ -0,0 +1,4 @@
+{
+  "moduleIds": true,
+  "moduleId": "my custom module name"
+}
diff --git a/test/fixtures/transformation/es6-modules-umd/get-module-name-option/options.js b/test/fixtures/transformation/es6-modules-umd/get-module-name-option/options.js
deleted file mode 100644
index e9f2b038d2..0000000000
--- a/test/fixtures/transformation/es6-modules-umd/get-module-name-option/options.js
+++ /dev/null
@@ -1,5 +0,0 @@
-exports.getModuleName = function () {
-  return "my custom module name";
-};
-
-exports.moduleIds = true;
diff --git a/test/fixtures/transformation/es6-modules-umd/get-module-name-option/options.json b/test/fixtures/transformation/es6-modules-umd/get-module-name-option/options.json
new file mode 100644
index 0000000000..6d0cdb5a6f
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-umd/get-module-name-option/options.json
@@ -0,0 +1,4 @@
+{
+  "moduleIds": true,
+  "moduleId": "my custom module name"
+}