diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 593702c2..b6cc55c6 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -15,7 +15,7 @@ Type inference of Python code in |jedi| is based on three assumptions:
 The actual algorithm is based on a principle I call lazy type inference.  That
 said, the typical entry point for static analysis is calling
 ``eval_expr_stmt``. There's separate logic for autocompletion in the API, the
-evaluator is all about evaluating an expression.
+evaluator is all about inferring an expression.
 
 TODO this paragraph is not what jedi does anymore, it's similar, but not the
 same.
diff --git a/jedi/evaluate/star_args.py b/jedi/evaluate/star_args.py
index 2008a852..0a7768a0 100644
--- a/jedi/evaluate/star_args.py
+++ b/jedi/evaluate/star_args.py
@@ -1,5 +1,5 @@
 """
-This module is responsible for evaluating *args and **kwargs for signatures.
+This module is responsible for inferring *args and **kwargs for signatures.
 
 This means for example in this case::
 
diff --git a/jedi/evaluate/syntax_tree.py b/jedi/evaluate/syntax_tree.py
index c55293f3..c5019c0f 100644
--- a/jedi/evaluate/syntax_tree.py
+++ b/jedi/evaluate/syntax_tree.py
@@ -1,5 +1,5 @@
 """
-Functions evaluating the syntax tree.
+Functions inferring the syntax tree.
 """
 import copy
 
diff --git a/jedi/parser_utils.py b/jedi/parser_utils.py
index 99d7a96b..75cfdca3 100644
--- a/jedi/parser_utils.py
+++ b/jedi/parser_utils.py
@@ -30,7 +30,7 @@ def get_executable_nodes(node, last_added=False):
         if last_added is False and node.parent.type != 'param' and next_leaf != '=':
             result.append(node)
     elif typ == 'expr_stmt':
-        # I think evaluating the statement (and possibly returned arrays),
+        # I think inferring the statement (and possibly returned arrays),
         # should be enough for static analysis.
         result.append(node)
         for child in node.children:
diff --git a/jedi/plugins/stdlib.py b/jedi/plugins/stdlib.py
index 8ccb5970..0f98f1d5 100644
--- a/jedi/plugins/stdlib.py
+++ b/jedi/plugins/stdlib.py
@@ -427,7 +427,7 @@ def collections_namedtuple(obj, arguments, callback):
     Implementation of the namedtuple function.
 
     This has to be done by processing the namedtuple class template and
-    evaluating the result.
+    inferring the result.
 
     """
     evaluator = obj.evaluator