diff --git a/src/babel/transformation/transformers/index.js b/src/babel/transformation/transformers/index.js
index f392707339..903bd084b1 100644
--- a/src/babel/transformation/transformers/index.js
+++ b/src/babel/transformation/transformers/index.js
@@ -2,7 +2,7 @@ export default {
   //- builtin-prepass
   "minification.constantFolding":          require("./minification/constant-folding"),
 
-  //- builtin-setup
+  //- builtin-pre
   strict:                                  require("./other/strict"),
   eval:                                    require("./other/eval"),
   _explode:                                require("./internal/explode"),
diff --git a/src/babel/transformation/transformers/internal/explode.js b/src/babel/transformation/transformers/internal/explode.js
index 9f11c013d8..10a8091fdc 100644
--- a/src/babel/transformation/transformers/internal/explode.js
+++ b/src/babel/transformation/transformers/internal/explode.js
@@ -2,7 +2,7 @@ import clone from "lodash/lang/clone";
 import * as t from "../../../types";
 
 export var metadata = {
-  group: "builtin-setup"
+  group: "builtin-pre"
 };
 
 function buildClone(bindingKey, refKey, check?) {
diff --git a/src/babel/transformation/transformers/internal/hoist-directives.js b/src/babel/transformation/transformers/internal/hoist-directives.js
index a3dbe27811..939b23c00c 100644
--- a/src/babel/transformation/transformers/internal/hoist-directives.js
+++ b/src/babel/transformation/transformers/internal/hoist-directives.js
@@ -1,7 +1,7 @@
 import * as t from "../../../types";
 
 export var metadata = {
-  group: "builtin-setup"
+  group: "builtin-pre"
 };
 
 export var BlockStatement = {
diff --git a/src/babel/transformation/transformers/internal/modules.js b/src/babel/transformation/transformers/internal/modules.js
index bb14c9980a..c1c2317b17 100644
--- a/src/babel/transformation/transformers/internal/modules.js
+++ b/src/babel/transformation/transformers/internal/modules.js
@@ -16,7 +16,7 @@ function getDeclar(node) {
 }
 
 export var metadata = {
-  group: "builtin-setup"
+  group: "builtin-pre"
 };
 
 export function ExportDefaultDeclaration(node, parent, scope) {
diff --git a/src/babel/transformation/transformers/internal/validation.js b/src/babel/transformation/transformers/internal/validation.js
index 626c236fee..0d974fe952 100644
--- a/src/babel/transformation/transformers/internal/validation.js
+++ b/src/babel/transformation/transformers/internal/validation.js
@@ -2,7 +2,7 @@ import * as messages from "../../../messages";
 import * as t from "../../../types";
 
 export var metadata = {
-  group: "builtin-setup"
+  group: "builtin-pre"
 };
 
 export function ForOfStatement(node, parent, scope, file) {
diff --git a/src/babel/transformation/transformers/minification/dead-code-elimination.js b/src/babel/transformation/transformers/minification/dead-code-elimination.js
index c8a2355f51..8b8407144f 100644
--- a/src/babel/transformation/transformers/minification/dead-code-elimination.js
+++ b/src/babel/transformation/transformers/minification/dead-code-elimination.js
@@ -19,7 +19,7 @@ function toStatements(node) {
 
 export var metadata = {
   optional: true,
-  group: "builtin-setup"
+  group: "builtin-pre"
 };
 
 export function ReferencedIdentifier(node, parent, scope) {
diff --git a/src/babel/transformation/transformers/minification/remove-console.js b/src/babel/transformation/transformers/minification/remove-console.js
index 9c97208cc9..d5d3ca3ec3 100644
--- a/src/babel/transformation/transformers/minification/remove-console.js
+++ b/src/babel/transformation/transformers/minification/remove-console.js
@@ -2,7 +2,7 @@ import * as t from "../../../types";
 
 export var metadata = {
   optional: true,
-  group: "builtin-setup"
+  group: "builtin-pre"
 };
 
 export function CallExpression(node, parent) {
diff --git a/src/babel/transformation/transformers/minification/remove-debugger.js b/src/babel/transformation/transformers/minification/remove-debugger.js
index c3ab38f5af..8735b18015 100644
--- a/src/babel/transformation/transformers/minification/remove-debugger.js
+++ b/src/babel/transformation/transformers/minification/remove-debugger.js
@@ -1,6 +1,6 @@
 export var metadata = {
   optional: true,
-  group: "builtin-setup"
+  group: "builtin-pre"
 };
 
 export function DebuggerStatement(node) {