diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 6bde42b7..ecc6d66b 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -217,7 +217,7 @@ class Evaluator(object):
             if type_ == 'for_stmt':
                 container_types = context.eval_node(def_.children[3])
                 cn = ContextualizedNode(context, def_.children[3])
-                for_types = iterable.py__iter__types(self, container_types, cn)
+                for_types = iterable.iterate_contexts(self, container_types, cn)
                 c_node = ContextualizedName(context, name)
                 return check_tuple_assignments(self, c_node, for_types)
             if type_ in ('import_from', 'import_name'):
diff --git a/jedi/evaluate/iterable.py b/jedi/evaluate/iterable.py
index 465a1226..be30b6a5 100644
--- a/jedi/evaluate/iterable.py
+++ b/jedi/evaluate/iterable.py
@@ -613,10 +613,10 @@ def unpack_tuple_to_dict(context, types, exprlist):
     raise NotImplementedError
 
 
-def py__iter__types(evaluator, contexts, contextualized_node=None):
+def iterate_contexts(evaluator, contexts, contextualized_node=None):
     """
-    Calls `py__iter__`, but ignores the ordering in the end and just returns
-    all types that it contains.
+    Calls `iterate`, on all contexts but ignores the ordering and just returns
+    all contexts that the iterate functions yield.
     """
     return ContextSet.from_sets(
         lazy_context.infer()
@@ -660,7 +660,7 @@ def py__getitem__(evaluator, context, types, trailer):
                     types.remove(typ)
                     result |= typ.dict_values()
             cs = ContextSet.from_set(types)
-            return result | py__iter__types(evaluator, cs)
+            return result | iterate_contexts(evaluator, cs)
 
         for typ in types:
             # The actual getitem call.
@@ -674,7 +674,7 @@ def py__getitem__(evaluator, context, types, trailer):
                 try:
                     result |= getitem(index)
                 except IndexError:
-                    result |= py__iter__types(evaluator, ContextSet(typ))
+                    result |= iterate_contexts(evaluator, ContextSet(typ))
                 except KeyError:
                     # Must be a dict. Lists don't raise KeyErrors.
                     result |= typ.dict_values()
diff --git a/jedi/evaluate/syntax_tree.py b/jedi/evaluate/syntax_tree.py
index f0f5af10..2b9ad9d0 100644
--- a/jedi/evaluate/syntax_tree.py
+++ b/jedi/evaluate/syntax_tree.py
@@ -475,7 +475,7 @@ def tree_name_to_contexts(evaluator, context, tree_name):
             types = context.predefined_names[node][tree_name.value]
         except KeyError:
             cn = ContextualizedNode(context, node.children[3])
-            for_types = iterable.py__iter__types(evaluator, cn.infer(), cn)
+            for_types = iterable.iterate_contexts(evaluator, cn.infer(), cn)
             c_node = ContextualizedName(context, tree_name)
             types = check_tuple_assignments(evaluator, c_node, for_types)
     elif typ == 'expr_stmt':