diff --git a/autoload/jedi.vim b/autoload/jedi.vim
index 4131650..7e52d2c 100644
--- a/autoload/jedi.vim
+++ b/autoload/jedi.vim
@@ -1,12 +1,12 @@
 " ------------------------------------------------------------------------
 " functions that call python code
 " ------------------------------------------------------------------------
-function! jedi#goto()
+function! jedi#goto_assignments()
     Python jedi_vim.goto()
 endfunction
 
 
-function! jedi#get_definition()
+function! jedi#goto_definitions()
     Python jedi_vim.goto(is_definition=True)
 endfunction
 
diff --git a/ftplugin/python/jedi.vim b/ftplugin/python/jedi.vim
index ff0f221..a6189f0 100644
--- a/ftplugin/python/jedi.vim
+++ b/ftplugin/python/jedi.vim
@@ -21,10 +21,10 @@ if g:jedi#auto_initialization
     endif
     execute "inoremap <buffer>".g:jedi#completions_command." <C-X><C-O>"
 
-    " goto / get_definition / related_names
-    execute "noremap <buffer>".g:jedi#goto_assignments_command." :call jedi#goto()<CR>"
-    execute "noremap <buffer>".g:jedi#goto_definitions_command." :call jedi#get_definition()<CR>"
-    execute "noremap <buffer>".g:jedi#usages_command." :call jedi#related_names()<CR>"
+    " goto / get_definition / usages
+    execute "noremap <buffer>".g:jedi#goto_assignments_command." :call jedi#goto_assignments()<CR>"
+    execute "noremap <buffer>".g:jedi#goto_definitions_command." :call jedi#goto_definitions()<CR>"
+    execute "noremap <buffer>".g:jedi#usages_command." :call jedi#usages()<CR>"
     " rename
     execute "noremap <buffer>".g:jedi#rename_command." :call jedi#rename()<CR>"
     " documentation/pydoc