diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py
index 09947ada..62e33657 100644
--- a/jedi/api/__init__.py
+++ b/jedi/api/__init__.py
@@ -374,7 +374,7 @@ class Script(object):
                         # Iterate tuples.
                         unpack_tuple_to_dict(self._evaluator, types, testlist)
                 else:
-                    try_iter_content(self._evaluator.goto_definition(node))
+                    try_iter_content(self._evaluator.goto_definitions(node))
                 self._evaluator.reset_recursion_limitations()
 
             ana = [a for a in self._evaluator.analysis if self.path == a.path]
diff --git a/jedi/api/helpers.py b/jedi/api/helpers.py
index 9dcf4cd8..c57fd25c 100644
--- a/jedi/api/helpers.py
+++ b/jedi/api/helpers.py
@@ -234,7 +234,7 @@ class ContextResults():
 
         name = self._module.name_for_position(self._pos)
         if name is not None:
-            return self._evaluator.goto_definition(name)
+            return self._evaluator.goto_definitions(name)
 
         leaf = self._module.get_leaf_for_position(self._pos)
         if leaf is None:
diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 013d6f2d..ed426801 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -215,7 +215,7 @@ class Evaluator(object):
                 str_element_names = [str(e) for e in element_names]
                 if any(str(i) in str_element_names for i in if_names):
                     for if_name in if_names:
-                        definitions = self.goto_definition(if_name)
+                        definitions = self.goto_definitions(if_name)
                         # Every name that has multiple different definitions
                         # causes the complexity to rise. The complexity should
                         # never fall below 1.
@@ -438,8 +438,7 @@ class Evaluator(object):
             debug.dbg('execute result: %s in %s', types, obj)
             return types
 
-    def goto_definition(self, name):
-        # TODO rename to goto_definitions
+    def goto_definitions(self, name):
         def_ = name.get_definition()
         is_simple_name = name.parent.type not in ('power', 'trailer')
         if is_simple_name:
diff --git a/jedi/evaluate/dynamic.py b/jedi/evaluate/dynamic.py
index 8cd08641..e5edcaae 100644
--- a/jedi/evaluate/dynamic.py
+++ b/jedi/evaluate/dynamic.py
@@ -97,7 +97,7 @@ def search_function_call(evaluator, func):
                             trailer = t
                             break
                 if trailer is not None:
-                    types = evaluator.goto_definition(name)
+                    types = evaluator.goto_definitions(name)
 
                     # We have to remove decorators, because they are not the
                     # "original" functions, this way we can easily compare.