diff --git a/jedi/api/classes.py b/jedi/api/classes.py
index 12c5b5bd..a51f37b4 100644
--- a/jedi/api/classes.py
+++ b/jedi/api/classes.py
@@ -289,11 +289,19 @@ class BaseDefinition(object):
 
         return self._name.get_root_context().is_stub()
 
-    def goto_assignments(self, **kwargs):  # Python 2...
+    def goto(self, **kwargs):
         with debug.increase_indent_cm('goto for %s' % self._name):
-            return self._goto_assignments(**kwargs)
+            return self._goto(**kwargs)
 
-    def _goto_assignments(self, only_stubs=False, prefer_stubs=False):
+    def goto_assignments(self, **kwargs):  # Python 2...
+        warnings.warn(
+            "Deprecated since version 0.16.0. Use .goto.",
+            DeprecationWarning,
+            stacklevel=2
+        )
+        return self.goto(**kwargs)
+
+    def _goto(self, only_stubs=False, prefer_stubs=False):
         assert not (only_stubs and prefer_stubs)
 
         if not self._name.is_value_name:
diff --git a/test/test_api/test_call_signatures.py b/test/test_api/test_call_signatures.py
index ff797452..78df93cf 100644
--- a/test/test_api/test_call_signatures.py
+++ b/test/test_api/test_call_signatures.py
@@ -316,7 +316,7 @@ def test_signature_is_definition(Script):
     # Now compare all the attributes that a CallSignature must also have.
     for attr_name in dir(definition):
         dont_scan = ['defined_names', 'parent', 'goto_assignments', 'infer',
-                     'params', 'get_signatures', 'execute']
+                     'params', 'get_signatures', 'execute', 'goto']
         if attr_name.startswith('_') or attr_name in dont_scan:
             continue