diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index 6997070..d923de8 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -21,8 +21,8 @@ function! jedi#rename(...)
 endfunction
 
 
-function! jedi#complete(findstart, base)
-    Python jedi_vim.complete()
+function! jedi#completions(findstart, base)
+    Python jedi_vim.completions()
 endfunction
 
 
diff --git a/ftplugin/python/jedi.vim b/ftplugin/python/jedi.vim
index 14cf6e9..14addfd 100644
--- a/ftplugin/python/jedi.vim
+++ b/ftplugin/python/jedi.vim
@@ -8,7 +8,7 @@ endif
 " ------------------------------------------------------------------------
 
 if g:jedi#auto_initialization
-    setlocal omnifunc=jedi#complete
+    setlocal omnifunc=jedi#completions
 
     " map ctrl+space for autocompletion
     if g:jedi#autocompletion_command == "<C-Space>"
diff --git a/jedi b/jedi
index 78f1ae5..80ec8da 160000
--- a/jedi
+++ b/jedi
@@ -1 +1 @@
-Subproject commit 78f1ae5e7163bda737433f1d551b3180cf03e1d1
+Subproject commit 80ec8da51398e1f69d57a4a5ba3dd3a153555868
diff --git a/plugin/jedi.vim b/plugin/jedi.vim
index 020f50c..d7694f3 100644
--- a/plugin/jedi.vim
+++ b/plugin/jedi.vim
@@ -52,7 +52,7 @@ if g:jedi#auto_initialization
     " this is only here because in some cases the VIM library adds their
     " autocompletion as a default, which may cause problems, depending on the
     " order of invocation.
-    autocmd FileType Python setlocal omnifunc=jedi#complete switchbuf=useopen  " needed for pydoc
+    autocmd FileType Python setlocal omnifunc=jedi#completions switchbuf=useopen  " needed for pydoc
 endif
 
 fun! Pyimport(cmd, args)
diff --git a/plugin/jedi_vim.py b/plugin/jedi_vim.py
index e1f424c..7706397 100644
--- a/plugin/jedi_vim.py
+++ b/plugin/jedi_vim.py
@@ -50,7 +50,7 @@ def get_script(source=None, column=None):
     return jedi.Script(source, row, column, buf_path, encoding)
 
 
-def complete():
+def completions():
     row, column = vim.current.window.cursor
     clear_func_def()
     if vim.eval('a:findstart') == '1':