diff --git a/jedi/parser/parser.py b/jedi/parser/parser.py
index 91491b45..92b01aaa 100644
--- a/jedi/parser/parser.py
+++ b/jedi/parser/parser.py
@@ -31,7 +31,7 @@ class ParserSyntaxError(Exception):
 
 
 class BaseParser(object):
-    ast_mapping = {}
+    node_map = {}
     default_node = tree.Node
 
     def __init__(self, grammar, start_symbol='file_input', error_recovery=False):
@@ -66,7 +66,7 @@ class BaseParser(object):
         # TODO REMOVE symbol, we don't want type here.
         symbol = grammar.number2symbol[type]
         try:
-            return self.ast_mapping[symbol](children)
+            return self.node_map[symbol](children)
         except KeyError:
             return self.default_node(symbol, children)
 
diff --git a/jedi/parser/python/parser.py b/jedi/parser/python/parser.py
index 5b82a231..5798761a 100644
--- a/jedi/parser/python/parser.py
+++ b/jedi/parser/python/parser.py
@@ -8,7 +8,7 @@ from jedi.parser.parser import BaseParser
 
 
 class Parser(BaseParser):
-    ast_mapping = {
+    node_map = {
         'expr_stmt': tree.ExprStmt,
         'classdef': tree.Class,
         'funcdef': tree.Function,
@@ -86,7 +86,7 @@ class Parser(BaseParser):
         # TODO REMOVE symbol, we don't want type here.
         symbol = grammar.number2symbol[type]
         try:
-            return self.ast_mapping[symbol](children)
+            return self.node_map[symbol](children)
         except KeyError:
             if symbol == 'suite':
                 # We don't want the INDENT/DEDENT in our parser tree. Those