diff --git a/.eslintrc b/.eslintrc
index c03a5bd58aa..8356cf8d107 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -70,6 +70,7 @@
     "no-loop-func": [2],
     "no-console": [0],
     "no-unused-labels": [2],
-    "no-useless-escape": [0]
+    "no-useless-escape": [0],
+    "func-name-matching": ["error", "always"]
   }
 }
diff --git a/src/components/dragelement/unhover.js b/src/components/dragelement/unhover.js
index 34b51720032..ec4b4cd0ef7 100644
--- a/src/components/dragelement/unhover.js
+++ b/src/components/dragelement/unhover.js
@@ -32,7 +32,7 @@ unhover.wrapped = function(gd, evt, subplot) {
 
 
 // remove hover effects on mouse out, and emit unhover event
-unhover.raw = function unhoverRaw(gd, evt) {
+unhover.raw = function raw(gd, evt) {
     var fullLayout = gd._fullLayout;
     var oldhoverdata = gd._hoverdata;
 
diff --git a/src/components/fx/helpers.js b/src/components/fx/helpers.js
index ef1db6bfc06..96fa741aad2 100644
--- a/src/components/fx/helpers.js
+++ b/src/components/fx/helpers.js
@@ -18,7 +18,7 @@ exports.getSubplot = function getSubplot(trace) {
 
 // is trace in given list of subplots?
 // does handle splom case
-exports.isTraceInSubplots = function isTraceInSubplot(trace, subplots) {
+exports.isTraceInSubplots = function isTraceInSubplots(trace, subplots) {
     if(trace.type === 'splom') {
         var xaxes = trace.xaxes || [];
         var yaxes = trace.yaxes || [];
diff --git a/src/components/updatemenus/scrollbox.js b/src/components/updatemenus/scrollbox.js
index d43b2516608..96b92ad40c0 100644
--- a/src/components/updatemenus/scrollbox.js
+++ b/src/components/updatemenus/scrollbox.js
@@ -347,7 +347,7 @@ ScrollBox.prototype.disable = function disable() {
  *
  * @method
  */
-ScrollBox.prototype._onBoxDrag = function onBarDrag() {
+ScrollBox.prototype._onBoxDrag = function _onBoxDrag() {
     var translateX = this.translateX;
     var translateY = this.translateY;
 
@@ -367,7 +367,7 @@ ScrollBox.prototype._onBoxDrag = function onBarDrag() {
  *
  * @method
  */
-ScrollBox.prototype._onBoxWheel = function onBarWheel() {
+ScrollBox.prototype._onBoxWheel = function _onBoxWheel() {
     var translateX = this.translateX;
     var translateY = this.translateY;
 
@@ -387,7 +387,7 @@ ScrollBox.prototype._onBoxWheel = function onBarWheel() {
  *
  * @method
  */
-ScrollBox.prototype._onBarDrag = function onBarDrag() {
+ScrollBox.prototype._onBarDrag = function _onBarDrag() {
     var translateX = this.translateX;
     var translateY = this.translateY;
 
diff --git a/src/lib/index.js b/src/lib/index.js
index 772ff06f34b..7a650690a02 100644
--- a/src/lib/index.js
+++ b/src/lib/index.js
@@ -153,7 +153,7 @@ lib.pushUnique = require('./push_unique');
 
 lib.cleanNumber = require('./clean_number');
 
-lib.ensureNumber = function num(v) {
+lib.ensureNumber = function ensureNumber(v) {
     if(!isNumeric(v)) return BADNUM;
     v = Number(v);
     if(v < -FP_SAFE || v > FP_SAFE) return BADNUM;
diff --git a/src/lib/polygon.js b/src/lib/polygon.js
index ee28750d2fe..8cd837d1688 100644
--- a/src/lib/polygon.js
+++ b/src/lib/polygon.js
@@ -181,7 +181,7 @@ polygon.tester = function tester(ptsIn) {
  *      before the line counts as bent
  * @returns boolean: true means this segment is bent, false means straight
  */
-var isBent = polygon.isSegmentBent = function isBent(pts, start, end, tolerance) {
+polygon.isSegmentBent = function isSegmentBent(pts, start, end, tolerance) {
     var startPt = pts[start];
     var segment = [pts[end][0] - startPt[0], pts[end][1] - startPt[1]];
     var segmentSquared = dot(segment, segment);
@@ -226,7 +226,7 @@ polygon.filter = function filter(pts, tolerance) {
         ptsFiltered.splice(doneFilteredIndex + 1);
 
         for(var i = iLast + 1; i < pts.length; i++) {
-            if(i === pts.length - 1 || isBent(pts, iLast, i + 1, tolerance)) {
+            if(i === pts.length - 1 || polygon.isSegmentBent(pts, iLast, i + 1, tolerance)) {
                 ptsFiltered.push(pts[i]);
                 if(ptsFiltered.length < prevFilterLen - 2) {
                     doneRawIndex = i;
diff --git a/src/plots/cartesian/constraints.js b/src/plots/cartesian/constraints.js
index a6d31d3dd8f..cc3a7cedf90 100644
--- a/src/plots/cartesian/constraints.js
+++ b/src/plots/cartesian/constraints.js
@@ -188,7 +188,7 @@ function updateConstraintGroups(constraintGroups, thisGroup, thisID, scaleanchor
     thisGroup[scaleanchor] = 1;
 }
 
-exports.enforce = function enforceAxisConstraints(gd) {
+exports.enforce = function enforce(gd) {
     var fullLayout = gd._fullLayout;
     var constraintGroups = fullLayout._axisConstraintGroups || [];
 
@@ -346,7 +346,7 @@ exports.enforce = function enforceAxisConstraints(gd) {
 
 // For use before autoranging, check if this axis was previously constrained
 // by domain but no longer is
-exports.clean = function cleanConstraints(gd, ax) {
+exports.clean = function clean(gd, ax) {
     if(ax._inputDomain) {
         var isConstrained = false;
         var axId = ax._id;
diff --git a/src/plots/gl2d/index.js b/src/plots/gl2d/index.js
index fe240901ef0..d7b57c9d5a8 100644
--- a/src/plots/gl2d/index.js
+++ b/src/plots/gl2d/index.js
@@ -52,7 +52,7 @@ exports.baseLayoutAttrOverrides = overrideAll({
     // dragmode: fxAttrs.dragmode
 }, 'plot', 'nested');
 
-exports.plot = function plotGl2d(gd) {
+exports.plot = function plot(gd) {
     var fullLayout = gd._fullLayout;
     var fullData = gd._fullData;
     var subplotIds = fullLayout._subplots.gl2d;
diff --git a/src/plots/gl3d/index.js b/src/plots/gl3d/index.js
index 55c390b7619..80a98ca2b9f 100644
--- a/src/plots/gl3d/index.js
+++ b/src/plots/gl3d/index.js
@@ -39,7 +39,7 @@ exports.baseLayoutAttrOverrides = overrideAll({
 
 exports.supplyLayoutDefaults = require('./layout/defaults');
 
-exports.plot = function plotGl3d(gd) {
+exports.plot = function plot(gd) {
     var fullLayout = gd._fullLayout;
     var fullData = gd._fullData;
     var sceneIds = fullLayout._subplots[GL3D];
diff --git a/src/plots/mapbox/index.js b/src/plots/mapbox/index.js
index 5614173550a..3e910f1c3d3 100644
--- a/src/plots/mapbox/index.js
+++ b/src/plots/mapbox/index.js
@@ -50,7 +50,7 @@ exports.layoutAttributes = require('./layout_attributes');
 
 exports.supplyLayoutDefaults = require('./layout_defaults');
 
-exports.plot = function plotMapbox(gd) {
+exports.plot = function plot(gd) {
     var fullLayout = gd._fullLayout;
     var calcData = gd.calcdata;
     var mapboxIds = fullLayout._subplots[MAPBOX];
diff --git a/src/plots/ternary/index.js b/src/plots/ternary/index.js
index 0c6d16169eb..a3656e4a9a6 100644
--- a/src/plots/ternary/index.js
+++ b/src/plots/ternary/index.js
@@ -41,7 +41,7 @@ exports.layoutAttributes = require('./layout_attributes');
 
 exports.supplyLayoutDefaults = require('./layout_defaults');
 
-exports.plot = function plotTernary(gd) {
+exports.plot = function plot(gd) {
     var fullLayout = gd._fullLayout;
     var calcData = gd.calcdata;
     var ternaryIds = fullLayout._subplots[TERNARY];
diff --git a/src/traces/bar/sieve.js b/src/traces/bar/sieve.js
index d9490bd7a7a..3593365da6e 100644
--- a/src/traces/bar/sieve.js
+++ b/src/traces/bar/sieve.js
@@ -84,7 +84,7 @@ Sieve.prototype.put = function put(position, value) {
  *                           (required if this.sepNegVal is true)
  * @returns {number} Current bin value
  */
-Sieve.prototype.get = function put(position, value) {
+Sieve.prototype.get = function get(position, value) {
     var label = this.getLabel(position, value);
     return this.bins[label] || 0;
 };
diff --git a/test/jasmine/assets/unpolyfill.js b/test/jasmine/assets/unpolyfill.js
index 15bf14ff3a8..d90ec6ec98a 100644
--- a/test/jasmine/assets/unpolyfill.js
+++ b/test/jasmine/assets/unpolyfill.js
@@ -11,7 +11,7 @@
             configurable: true,
             enumerable: true,
             writable: true,
-            value: function remove() {
+            value: function() {
                 throw Error([
                     'test/jasmine/assets/unpolyfill.js error: calling ChildNode.remove()',
                     'which is not available in IE.'
@@ -23,7 +23,7 @@
             configurable: true,
             enumerable: true,
             writable: true,
-            value: function remove() {
+            value: function() {
                 throw Error([
                     'test/jasmine/assets/unpolyfill.js error: calling ChildNode.prepend()',
                     'which is not available in IE.'