diff --git a/python/ycm/server/tests/basic_test.py b/python/ycm/server/tests/basic_test.py
index 8f8160fa..e012c856 100644
--- a/python/ycm/server/tests/basic_test.py
+++ b/python/ycm/server/tests/basic_test.py
@@ -18,7 +18,7 @@
 # along with YouCompleteMe.  If not, see <http://www.gnu.org/licenses/>.
 
 from webtest import TestApp
-from .. import server
+from .. import ycmd
 from ..responses import BuildCompletionData
 from nose.tools import ok_, eq_
 import bottle
@@ -41,7 +41,7 @@ def RequestDataForFileWithContents( filename, contents ):
 
 
 def GetCompletions_IdentifierCompleterWorks_test():
-  app = TestApp( server.app )
+  app = TestApp( ycmd.app )
   event_data = RequestDataForFileWithContents( '/foo/bar', 'foo foogoo ba' )
   event_data.update( {
     'event_name': 'FileReadyToParse',
@@ -64,7 +64,7 @@ def GetCompletions_IdentifierCompleterWorks_test():
 
 
 def GetCompletions_IdentifierCompleter_SyntaxKeywordsAdded_test():
-  app = TestApp( server.app )
+  app = TestApp( ycmd.app )
   event_data = RequestDataForFileWithContents( '/foo/bar', '' )
   event_data.update( {
     'event_name': 'FileReadyToParse',
@@ -88,7 +88,7 @@ def GetCompletions_IdentifierCompleter_SyntaxKeywordsAdded_test():
 
 
 def FiletypeCompletionAvailable_Works_test():
-  app = TestApp( server.app )
+  app = TestApp( ycmd.app )
   request_data = {
     'filetypes': ['cpp']
   }
@@ -98,7 +98,7 @@ def FiletypeCompletionAvailable_Works_test():
 
 
 def UserOptions_Works_test():
-  app = TestApp( server.app )
+  app = TestApp( ycmd.app )
   options = app.get( '/user_options' ).json
   ok_( len( options ) )
 
diff --git a/python/ycm/server/server.py b/python/ycm/server/ycmd.py
similarity index 100%
rename from python/ycm/server/server.py
rename to python/ycm/server/ycmd.py
diff --git a/python/ycm/youcompleteme.py b/python/ycm/youcompleteme.py
index 2a5b48b7..b30653c2 100644
--- a/python/ycm/youcompleteme.py
+++ b/python/ycm/youcompleteme.py
@@ -232,5 +232,5 @@ def _GetTagFiles():
 
 def _PathToServerScript():
   dir_of_current_script = os.path.dirname( os.path.abspath( __file__ ) )
-  return os.path.join( dir_of_current_script, 'server/server.py' )
+  return os.path.join( dir_of_current_script, 'server/ycmd.py' )