diff --git a/python/ycm/server/tests/basic_test.py b/python/ycm/server/tests/basic_test.py
index 0dee7ba7..0ba9e1b1 100644
--- a/python/ycm/server/tests/basic_test.py
+++ b/python/ycm/server/tests/basic_test.py
@@ -315,7 +315,7 @@ def FiletypeCompletionAvailable_Works_test():
     'filetypes': ['python']
   }
 
-  ok_( app.post_json( '/filetype_completion_available',
+  ok_( app.post_json( '/semantic_completion_available',
                       request_data ).json )
 
 
diff --git a/python/ycm/server/ycmd.py b/python/ycm/server/ycmd.py
index c679d596..2d3e3f31 100755
--- a/python/ycm/server/ycmd.py
+++ b/python/ycm/server/ycmd.py
@@ -117,8 +117,7 @@ def SetUserOptions():
   _SetUserOptions( request.json )
 
 
-# TODO: Rename this to 'semantic_completion_available'
-@app.post( '/filetype_completion_available')
+@app.post( '/semantic_completion_available')
 def FiletypeCompletionAvailable():
   LOGGER.info( 'Received filetype completion available request')
   return _JsonResponse( SERVER_STATE.FiletypeCompletionAvailable(