diff --git a/src/babel/transformation/transformers/index.js b/src/babel/transformation/transformers/index.js
index 1cf1b7e953..b90d40d342 100644
--- a/src/babel/transformation/transformers/index.js
+++ b/src/babel/transformation/transformers/index.js
@@ -14,7 +14,6 @@ export default {
   "minification.deadCodeElimination":      require("babel-plugin-dead-code-elimination"),
   _modules:                                require("./internal/modules"),
   "react.displayName":                     require("babel-plugin-react-display-name"),
-  "spec.functionName":                     require("./spec/function-name"),
   "es6.spec.templateLiterals":             require("./es6/spec.template-literals"),
   "es6.templateLiterals":                  require("./es6/template-literals"),
   "validation.undeclaredVariableCheck":    require("babel-plugin-undeclared-variables-check"),
@@ -22,6 +21,7 @@ export default {
   //- builtin-basic
   // this is where the bulk of the ES6 transformations take place, none of them require traversal state
   // so they can all be concatenated together for performance
+  "spec.functionName":                     require("./spec/function-name"),
   "es7.classProperties":                   require("./es7/class-properties"),
   "es7.trailingFunctionCommas":            require("./es7/trailing-function-commas"),
   "es7.asyncFunctions":                    require("./es7/async-functions"),
diff --git a/src/babel/transformation/transformers/spec/function-name.js b/src/babel/transformation/transformers/spec/function-name.js
index 190d3db868..9cd2e6ef5b 100644
--- a/src/babel/transformation/transformers/spec/function-name.js
+++ b/src/babel/transformation/transformers/spec/function-name.js
@@ -1,7 +1,7 @@
 import { bare } from "../../helpers/name-method";
 
 export var metadata = {
-  group: "builtin-pre"
+  group: "builtin-basic"
 };
 
 export var visitor = {
diff --git a/test/core/fixtures/transformation/es5.properties.mutators/getter-and-setter/expected.js b/test/core/fixtures/transformation/es5.properties.mutators/getter-and-setter/expected.js
index 45c66960b2..9d6ca2feff 100644
--- a/test/core/fixtures/transformation/es5.properties.mutators/getter-and-setter/expected.js
+++ b/test/core/fixtures/transformation/es5.properties.mutators/getter-and-setter/expected.js
@@ -2,10 +2,10 @@
 
 var obj = Object.defineProperties({}, {
   foo: {
-    get: function () {
+    get: function get() {
       return 5 + 5;
     },
-    set: function (value) {
+    set: function set(value) {
       this._foo = value;
     },
     configurable: true,
diff --git a/test/core/fixtures/transformation/es5.properties.mutators/getter/expected.js b/test/core/fixtures/transformation/es5.properties.mutators/getter/expected.js
index de11e70dc5..b19b14caa6 100644
--- a/test/core/fixtures/transformation/es5.properties.mutators/getter/expected.js
+++ b/test/core/fixtures/transformation/es5.properties.mutators/getter/expected.js
@@ -2,7 +2,7 @@
 
 var obj = Object.defineProperties({}, {
   foo: {
-    get: function () {
+    get: function get() {
       return 5 + 5;
     },
     configurable: true,
diff --git a/test/core/fixtures/transformation/es5.properties.mutators/setter/expected.js b/test/core/fixtures/transformation/es5.properties.mutators/setter/expected.js
index 2e39901c7c..ec89ed653f 100644
--- a/test/core/fixtures/transformation/es5.properties.mutators/setter/expected.js
+++ b/test/core/fixtures/transformation/es5.properties.mutators/setter/expected.js
@@ -2,7 +2,7 @@
 
 var obj = Object.defineProperties({}, {
   foo: {
-    set: function (value) {
+    set: function set(value) {
       this._foo = value;
     },
     configurable: true,
diff --git a/test/core/fixtures/transformation/es6.block-scoping/issue-1051/expected.js b/test/core/fixtures/transformation/es6.block-scoping/issue-1051/expected.js
index 099a69bb6a..d86a0c2b96 100644
--- a/test/core/fixtures/transformation/es6.block-scoping/issue-1051/expected.js
+++ b/test/core/fixtures/transformation/es6.block-scoping/issue-1051/expected.js
@@ -5,9 +5,9 @@ foo.func1 = function () {
     for (;;) {
       if (cond2) {
         var _ret = (function () {
-          var func2 = function () {};
+          var func2 = function func2() {};
 
-          var func3 = function () {};
+          var func3 = function func3() {};
 
           func4(function () {
             func2();
@@ -19,4 +19,4 @@ foo.func1 = function () {
       }
     }
   }
-};
+};
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.classes/computed-methods/expected.js b/test/core/fixtures/transformation/es6.classes/computed-methods/expected.js
index 4f38b01fa6..fa5f71abfe 100644
--- a/test/core/fixtures/transformation/es6.classes/computed-methods/expected.js
+++ b/test/core/fixtures/transformation/es6.classes/computed-methods/expected.js
@@ -13,10 +13,10 @@ var Foo = (function () {
     value: function foo() {}
   }, {
     key: bar,
-    value: function () {}
+    value: function value() {}
   }, {
     key: bar + "foo",
-    value: function () {}
+    value: function value() {}
   }]);
   return Foo;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.classes/instance-getter-and-setter/expected.js b/test/core/fixtures/transformation/es6.classes/instance-getter-and-setter/expected.js
index c7b50e3e3c..b6d24d0bdf 100644
--- a/test/core/fixtures/transformation/es6.classes/instance-getter-and-setter/expected.js
+++ b/test/core/fixtures/transformation/es6.classes/instance-getter-and-setter/expected.js
@@ -7,12 +7,12 @@ var Test = (function () {
 
   babelHelpers.createClass(Test, [{
     key: "test",
-    get: function () {
+    get: function get() {
       return 5 + 5;
     },
-    set: function (val) {
+    set: function set(val) {
       this._test = val;
     }
   }]);
   return Test;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.classes/instance-getter/expected.js b/test/core/fixtures/transformation/es6.classes/instance-getter/expected.js
index 69d2cd1a38..b1e58e607e 100644
--- a/test/core/fixtures/transformation/es6.classes/instance-getter/expected.js
+++ b/test/core/fixtures/transformation/es6.classes/instance-getter/expected.js
@@ -7,9 +7,9 @@ var Test = (function () {
 
   babelHelpers.createClass(Test, [{
     key: "test",
-    get: function () {
+    get: function get() {
       return 5 + 5;
     }
   }]);
   return Test;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.classes/instance-setter/expected.js b/test/core/fixtures/transformation/es6.classes/instance-setter/expected.js
index 777679d4c2..cebbfe6e73 100644
--- a/test/core/fixtures/transformation/es6.classes/instance-setter/expected.js
+++ b/test/core/fixtures/transformation/es6.classes/instance-setter/expected.js
@@ -7,9 +7,9 @@ var Test = (function () {
 
   babelHelpers.createClass(Test, [{
     key: "test",
-    set: function (val) {
+    set: function set(val) {
       this._test = val;
     }
   }]);
   return Test;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.classes/relaxed-method-coercion/expected.js b/test/core/fixtures/transformation/es6.classes/relaxed-method-coercion/expected.js
index 8aed80c3c0..43cb3ef487 100644
--- a/test/core/fixtures/transformation/es6.classes/relaxed-method-coercion/expected.js
+++ b/test/core/fixtures/transformation/es6.classes/relaxed-method-coercion/expected.js
@@ -9,10 +9,10 @@ var Foo = (function () {
 
   babelHelpers.createClass(Foo, [{
     key: Symbol(),
-    value: function () {}
+    value: function value() {}
   }, {
     key: Symbol(),
-    value: function () {}
+    value: function value() {}
   }]);
   return Foo;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.classes/static/expected.js b/test/core/fixtures/transformation/es6.classes/static/expected.js
index b6363fea51..dc1208b974 100644
--- a/test/core/fixtures/transformation/es6.classes/static/expected.js
+++ b/test/core/fixtures/transformation/es6.classes/static/expected.js
@@ -10,8 +10,8 @@ var A = (function () {
     value: function a() {}
   }, {
     key: "b",
-    get: function () {},
-    set: function (b) {}
+    get: function get() {},
+    set: function set(b) {}
   }]);
   return A;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.classes/super-class-anonymous/expected.js b/test/core/fixtures/transformation/es6.classes/super-class-anonymous/expected.js
index 978b895f62..52ad3b94f2 100644
--- a/test/core/fixtures/transformation/es6.classes/super-class-anonymous/expected.js
+++ b/test/core/fixtures/transformation/es6.classes/super-class-anonymous/expected.js
@@ -9,7 +9,7 @@ var TestEmpty = (function (_ref) {
   babelHelpers.inherits(TestEmpty, _ref);
   return TestEmpty;
 })((function () {
-  var _class = function () {
+  var _class = function _class() {
     babelHelpers.classCallCheck(this, _class);
   };
 
@@ -25,7 +25,7 @@ var TestConstructorOnly = (function (_ref2) {
   babelHelpers.inherits(TestConstructorOnly, _ref2);
   return TestConstructorOnly;
 })((function () {
-  var _class2 = function () {
+  var _class2 = function _class2() {
     babelHelpers.classCallCheck(this, _class2);
   };
 
@@ -41,7 +41,7 @@ var TestMethodOnly = (function (_ref3) {
   babelHelpers.inherits(TestMethodOnly, _ref3);
   return TestMethodOnly;
 })((function () {
-  var _class3 = function () {
+  var _class3 = function _class3() {
     babelHelpers.classCallCheck(this, _class3);
   };
 
@@ -61,7 +61,7 @@ var TestConstructorAndMethod = (function (_ref4) {
   babelHelpers.inherits(TestConstructorAndMethod, _ref4);
   return TestConstructorAndMethod;
 })((function () {
-  var _class4 = function () {
+  var _class4 = function _class4() {
     babelHelpers.classCallCheck(this, _class4);
   };
 
@@ -81,7 +81,7 @@ var TestMultipleMethods = (function (_ref5) {
   babelHelpers.inherits(TestMultipleMethods, _ref5);
   return TestMultipleMethods;
 })((function () {
-  var _class5 = function () {
+  var _class5 = function _class5() {
     babelHelpers.classCallCheck(this, _class5);
   };
 
diff --git a/test/core/fixtures/transformation/es6.properties.shorthand/method-computed/expected.js b/test/core/fixtures/transformation/es6.properties.shorthand/method-computed/expected.js
index 8e53405970..dee1e103a4 100644
--- a/test/core/fixtures/transformation/es6.properties.shorthand/method-computed/expected.js
+++ b/test/core/fixtures/transformation/es6.properties.shorthand/method-computed/expected.js
@@ -3,14 +3,14 @@
 var x = "y";
 var valueSet;
 var obj = Object.defineProperties({}, babelHelpers.defineProperty({}, x, {
-  get: function () {
+  get: function get() {
     return 1;
   },
-  set: function (value) {
+  set: function set(value) {
     valueSet = value;
   },
   configurable: true,
   enumerable: true
 }));
 obj.y = "foo";
-obj.y === 1 && valueSet === "foo";
+obj.y === 1 && valueSet === "foo";
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.decorators/class-getter-and-setter/expected.js b/test/core/fixtures/transformation/es7.decorators/class-getter-and-setter/expected.js
index 8aa07f0846..b30456d7c3 100644
--- a/test/core/fixtures/transformation/es7.decorators/class-getter-and-setter/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/class-getter-and-setter/expected.js
@@ -8,8 +8,8 @@ var Foo = (function () {
   babelHelpers.createDecoratedClass(Foo, [{
     key: "foo",
     decorators: [bar, foo],
-    get: function () {},
-    set: function (bar) {}
+    get: function get() {},
+    set: function set(bar) {}
   }]);
   return Foo;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.decorators/class-getter/expected.js b/test/core/fixtures/transformation/es7.decorators/class-getter/expected.js
index 8c7d3a793d..dc3a201004 100644
--- a/test/core/fixtures/transformation/es7.decorators/class-getter/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/class-getter/expected.js
@@ -8,7 +8,7 @@ var Foo = (function () {
   babelHelpers.createDecoratedClass(Foo, [{
     key: "foo",
     decorators: [bar],
-    get: function () {}
+    get: function get() {}
   }]);
   return Foo;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.decorators/class-init-instance-props/expected.js b/test/core/fixtures/transformation/es7.decorators/class-init-instance-props/expected.js
index db03a7b153..cacebd7e5d 100644
--- a/test/core/fixtures/transformation/es7.decorators/class-init-instance-props/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/class-init-instance-props/expected.js
@@ -11,10 +11,10 @@ var Foo = (function () {
   babelHelpers.createDecoratedClass(Foo, [{
     key: "foo",
     decorators: [bar],
-    initializer: function () {
+    initializer: function initializer() {
       return "Bar";
     },
     enumerable: true
   }], null, _instanceInitializers);
   return Foo;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.decorators/class-init-static-props/expected.js b/test/core/fixtures/transformation/es7.decorators/class-init-static-props/expected.js
index 6c0c573906..6ac35e3513 100644
--- a/test/core/fixtures/transformation/es7.decorators/class-init-static-props/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/class-init-static-props/expected.js
@@ -10,11 +10,11 @@ var Foo = (function () {
   babelHelpers.createDecoratedClass(Foo, null, [{
     key: "foo",
     decorators: [bar],
-    initializer: function () {
+    initializer: function initializer() {
       return "Bar";
     },
     enumerable: true
   }], null, _staticInitializers);
   babelHelpers.defineDecoratedPropertyDescriptor(Foo, "foo", _staticInitializers);
   return Foo;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.decorators/class-setter/expected.js b/test/core/fixtures/transformation/es7.decorators/class-setter/expected.js
index 7b9537b539..1b50456308 100644
--- a/test/core/fixtures/transformation/es7.decorators/class-setter/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/class-setter/expected.js
@@ -8,7 +8,7 @@ var Foo = (function () {
   babelHelpers.createDecoratedClass(Foo, [{
     key: "foo",
     decorators: [bar],
-    set: function (arg) {}
+    set: function set(arg) {}
   }]);
   return Foo;
-})();
+})();
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.decorators/object-getter-and-setter/expected.js b/test/core/fixtures/transformation/es7.decorators/object-getter-and-setter/expected.js
index 68c9af550f..79182f88a2 100644
--- a/test/core/fixtures/transformation/es7.decorators/object-getter-and-setter/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/object-getter-and-setter/expected.js
@@ -3,6 +3,6 @@
 var obj = babelHelpers.createDecoratedObject([{
   key: "foo",
   decorators: [foo, foo],
-  get: function () {},
-  set: function (bar) {}
-}]);
+  get: function get() {},
+  set: function set(bar) {}
+}]);
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.decorators/object-getter/expected.js b/test/core/fixtures/transformation/es7.decorators/object-getter/expected.js
index e0aa727de6..4a49654744 100644
--- a/test/core/fixtures/transformation/es7.decorators/object-getter/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/object-getter/expected.js
@@ -3,5 +3,5 @@
 var obj = babelHelpers.createDecoratedObject([{
   key: "foo",
   decorators: [foo],
-  get: function () {}
-}]);
+  get: function get() {}
+}]);
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.decorators/object-setter/expected.js b/test/core/fixtures/transformation/es7.decorators/object-setter/expected.js
index ee3dc12281..e1d9cd2fa3 100644
--- a/test/core/fixtures/transformation/es7.decorators/object-setter/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/object-setter/expected.js
@@ -3,5 +3,5 @@
 var obj = babelHelpers.createDecoratedObject([{
   key: "foo",
   decorators: [foo],
-  set: function (bar) {}
-}]);
+  set: function set(bar) {}
+}]);
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.decorators/object/expected.js b/test/core/fixtures/transformation/es7.decorators/object/expected.js
index ae77a208df..c6ad34a161 100644
--- a/test/core/fixtures/transformation/es7.decorators/object/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/object/expected.js
@@ -3,16 +3,16 @@
 var obj = babelHelpers.createDecoratedObject([{
   key: "bar",
   decorators: [foo],
-  value: function bar() {}
+  value: function value() {}
 }, {
   key: "foo",
   decorators: [bar],
-  initializer: function () {
+  initializer: function initializer() {
     return "lol";
   }
 }, {
   key: "yes",
-  initializer: function () {
+  initializer: function initializer() {
     return "wow";
   }
-}]);
+}]);
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/source-maps/class/expected.js b/test/core/fixtures/transformation/source-maps/class/expected.js
index 25517b3e99..e81c47b113 100644
--- a/test/core/fixtures/transformation/source-maps/class/expected.js
+++ b/test/core/fixtures/transformation/source-maps/class/expected.js
@@ -7,7 +7,7 @@ var Test = (function () {
 
   babelHelpers.createClass(Test, [{
     key: "bar",
-    get: function () {
+    get: function get() {
       throw new Error("wow");
     }
   }]);
@@ -15,4 +15,4 @@ var Test = (function () {
 })();
 
 var test = new Test();
-test.bar;
+test.bar;
\ No newline at end of file