diff --git a/jedi/api/classes.py b/jedi/api/classes.py
index 0a0366a5..e67b64ac 100644
--- a/jedi/api/classes.py
+++ b/jedi/api/classes.py
@@ -140,7 +140,7 @@ class BaseDefinition(object):
         resolve = False
         if tree_name is not None:
             # TODO move this to their respective names.
-            definition = tree_name._get_definition()
+            definition = tree_name.get_definition()
             if definition is not None and definition.type == 'import_from' and \
                     tree_name.is_definition():
                 resolve = True
@@ -547,7 +547,7 @@ class Definition(BaseDefinition):
             return typ + ' ' + code
 
 
-        definition = tree_name._get_definition() or tree_name
+        definition = tree_name.get_definition() or tree_name
         # Remove the prefix, because that's not what we want for get_code
         # here.
         txt = definition.get_code(include_prefix=False)
@@ -632,7 +632,7 @@ class CallSignature(Definition):
             if self.params:
                 param_name = self.params[-1]._name
                 if param_name.tree_name is not None:
-                    if param_name.tree_name._get_definition().star_count == 2:
+                    if param_name.tree_name.get_definition().star_count == 2:
                         return i
             return None
 
@@ -641,7 +641,7 @@ class CallSignature(Definition):
                 tree_name = param._name.tree_name
                 if tree_name is not None:
                     # *args case
-                    if tree_name._get_definition().star_count == 1:
+                    if tree_name.get_definition().star_count == 1:
                         return i
             return None
         return self._index
diff --git a/jedi/api/usages.py b/jedi/api/usages.py
index 2d6df619..47b100ed 100644
--- a/jedi/api/usages.py
+++ b/jedi/api/usages.py
@@ -64,7 +64,7 @@ def resolve_potential_imports(evaluator, definitions):
     new = set()
     for d in definitions:
         if isinstance(d, TreeNameDefinition):
-            imp_or_stmt = d.tree_name._get_definition()
+            imp_or_stmt = d.tree_name.get_definition()
             if isinstance(imp_or_stmt, tree.Import):
                 new |= resolve_potential_imports(
                     evaluator,
diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 65ce51fe..710b9a4e 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -444,7 +444,7 @@ class Evaluator(object):
             return types
 
     def goto_definitions(self, context, name):
-        def_ = name._get_definition(import_name_always=True)
+        def_ = name.get_definition(import_name_always=True)
         if def_ is not None:
             type_ = def_.type
             if type_ == 'classdef':
@@ -468,7 +468,7 @@ class Evaluator(object):
         return helpers.evaluate_call_of_leaf(context, name)
 
     def goto(self, context, name):
-        definition = name._get_definition(import_name_always=True)
+        definition = name.get_definition(import_name_always=True)
         if definition is not None:
             type_ = definition.type
             if type_ == 'expr_stmt':
diff --git a/jedi/evaluate/filters.py b/jedi/evaluate/filters.py
index 16a4b6b4..597613ed 100644
--- a/jedi/evaluate/filters.py
+++ b/jedi/evaluate/filters.py
@@ -89,7 +89,7 @@ class TreeNameDefinition(AbstractTreeName):
 
     @property
     def api_type(self):
-        definition = self.tree_name._get_definition()
+        definition = self.tree_name.get_definition()
         if definition is None:
             definition = self.tree_name.parent
             if definition.type == 'dotted_as_name':
diff --git a/jedi/evaluate/finder.py b/jedi/evaluate/finder.py
index be605947..1bbb093c 100644
--- a/jedi/evaluate/finder.py
+++ b/jedi/evaluate/finder.py
@@ -173,7 +173,7 @@ class NameFinder(object):
 
 def _name_to_types(evaluator, context, tree_name):
     types = []
-    node = tree_name._get_definition()
+    node = tree_name.get_definition()
     if node is None:
         node = tree_name.parent
         if node.type == 'global_stmt':