diff --git a/server/next-dev-server.js b/server/next-dev-server.js
index 44139369..bcf84cad 100644
--- a/server/next-dev-server.js
+++ b/server/next-dev-server.js
@@ -1,4 +1,4 @@
-import Server from './index'
+import Server from './next-server'
 import { join } from 'path'
 import HotReloader from './hot-reloader'
 import {PHASE_DEVELOPMENT_SERVER} from '../lib/constants'
diff --git a/server/index.js b/server/next-server.js
similarity index 100%
rename from server/index.js
rename to server/next-server.js
diff --git a/server/next.js b/server/next.js
index c60b6127..b79d9b7b 100644
--- a/server/next.js
+++ b/server/next.js
@@ -1,5 +1,5 @@
 // This file is used for when users run `require('next')`
 module.exports = (opts) => {
-  const Server = opts.dev ? require('./next-dev-server').default : require('./index').default
+  const Server = opts.dev ? require('./next-dev-server').default : require('./next-server').default
   return new Server(opts)
 }