diff --git a/lib/builder/builder.js b/lib/builder/builder.js
index 1b00282947..5878a5e4fd 100644
--- a/lib/builder/builder.js
+++ b/lib/builder/builder.js
@@ -71,10 +71,11 @@ export default class Builder {
   get plugins() {
     return _.uniqBy(this.options.plugins.map((p, i) => {
       if (typeof p === 'string') p = { src: p }
+      const pluginBaseName = basename(p.src, extname(p.src)).replace(/[^a-zA-Z?\d\s:]/g, '')
       return {
         src: this.nuxt.resolvePath(p.src),
         ssr: (p.ssr !== false),
-        name: basename(p.src, 'nuxt_plugin_' + extname(p.src)).replace(/[^a-zA-Z?\d\s:]/g, '') + '_' + hash(p.src)
+        name: 'nuxt_plugin_' + pluginBaseName + '_' + hash(p.src)
       }
     }), p => p.name)
   }
diff --git a/lib/builder/webpack/warnfix-plugin.js b/lib/builder/webpack/warnfix-plugin.js
index 63ef48ea29..2add942675 100644
--- a/lib/builder/webpack/warnfix-plugin.js
+++ b/lib/builder/webpack/warnfix-plugin.js
@@ -4,7 +4,7 @@ export default class WarnFixPlugin {
       stats.compilation.warnings = stats.compilation.warnings.filter(warn => {
         if (warn.name === 'ModuleDependencyWarning' &&
           warn.message.includes(`export 'default'`) &&
-          warn.message.indexOf('nuxt_plugin_') === 0) {
+          warn.message.includes('nuxt_plugin_')) {
           return false
         }
         return true