diff --git a/lib/utils/addEntries.js b/lib/utils/addEntries.js
index 699081224f..d74412c9fb 100644
--- a/lib/utils/addEntries.js
+++ b/lib/utils/addEntries.js
@@ -1,51 +1,53 @@
 'use strict';
 
 /* eslint-disable
+  no-shadow,
   no-param-reassign,
+  array-bracket-spacing,
   space-before-function-paren
 */
 const createDomain = require('./createDomain');
 
-function addEntries (webpackOptions, devServerOptions, server) {
-  if (devServerOptions.inline !== false) {
+function addEntries (config, options, server) {
+  if (options.inline !== false) {
     // we're stubbing the app in this method as it's static and doesn't require
     // a server to be supplied. createDomain requires an app with the
     // address() signature.
     const app = server || {
       address() {
-        return { port: devServerOptions.port };
+        return { port: options.port };
       }
     };
 
-    const domain = createDomain(devServerOptions, app);
-    const devClient = [`${require.resolve('../../client/')}?${domain}`];
+    const domain = createDomain(options, app);
+    const entries = [ `${require.resolve('../../client/')}?${domain}` ];
 
-    if (devServerOptions.hotOnly) {
-      devClient.push(require.resolve('webpack/hot/only-dev-server'));
-    } else if (devServerOptions.hot) {
-      devClient.push(require.resolve('webpack/hot/dev-server'));
+    if (options.hotOnly) {
+      entries.push(require.resolve('webpack/hot/only-dev-server'));
+    } else if (options.hot) {
+      entries.push(require.resolve('webpack/hot/dev-server'));
     }
 
-    const prependDevClient = (entry) => {
+    const prependEntry = (entry) => {
       if (typeof entry === 'function') {
-        return () => Promise.resolve(entry()).then(prependDevClient);
+        return () => Promise.resolve(entry()).then(prependEntry);
       }
 
       if (typeof entry === 'object' && !Array.isArray(entry)) {
-        const entryClone = {};
+        const clone = {};
 
         Object.keys(entry).forEach((key) => {
-          entryClone[key] = devClient.concat(entry[key]);
+          clone[key] = entries.concat(entry[key]);
         });
 
-        return entryClone;
+        return clone;
       }
 
-      return devClient.concat(entry);
+      return entries.concat(entry);
     };
 
-    [].concat(webpackOptions).forEach((wpOpt) => {
-      wpOpt.entry = prependDevClient(wpOpt.entry || './src');
+    [].concat(config).forEach((config) => {
+      config.entry = prependEntry(config.entry || './src');
     });
   }
 }