1 files changed, 14 insertions, 14 deletions
diff --git a/astroid/nodes.py b/astroid/nodes.py
index ff929621..4325c7e2 100644
--- a/astroid/nodes.py
+++ b/astroid/nodes.py
@@ -24,12 +24,12 @@ on all nodes :
  .next_sibling(), returning next sibling statement node
  .statement(), returning the first parent node marked as statement node
  .frame(), returning the first node defining a new local scope (i.e.
-  Module, Function or Class)
+  Module, FunctionDef or ClassDef)
  .set_local(name, node), define an identifier <name> on the first parent frame,
   with the node defining it. This is used by the astroid builder and should not
   be used from out there.
 
-on From and Import :
+on ImportFrom and Import :
  .real_name(name),
 
 
@@ -39,29 +39,29 @@ on From and Import :
 __docformat__ = "restructuredtext en"
 
 from astroid.node_classes import (
-    Arguments, AssAttr, Assert, Assign,
-    AssName, AugAssign, Backquote, BinOp, BoolOp, Break, CallFunc, Compare,
+    Arguments, AssignAttr, Assert, Assign,
+    AssignName, AugAssign, Repr, BinOp, BoolOp, Break, Call, Compare,
     Comprehension, Const, Continue, Decorators, DelAttr, DelName, Delete,
-    Dict, Discard, Ellipsis, EmptyNode, ExceptHandler, Exec, ExtSlice, For,
-    From, Getattr, Global, If, IfExp, Import, Index, Keyword,
+    Dict, Expr, Ellipsis, EmptyNode, ExceptHandler, Exec, ExtSlice, For,
+    ImportFrom, Attribute, Global, If, IfExp, Import, Index, Keyword,
     List, Name, Nonlocal, Pass, Print, Raise, Return, Set, Slice, Starred, Subscript,
     TryExcept, TryFinally, Tuple, UnaryOp, While, With, Yield, YieldFrom,
     const_factory
 )
 from astroid.scoped_nodes import (
-    Module, GenExpr, Lambda, DictComp,
-    ListComp, SetComp, Function, Class,
+    Module, GeneratorExp, Lambda, DictComp,
+    ListComp, SetComp, FunctionDef, ClassDef,
 )
 
 ALL_NODE_CLASSES = (
-    Arguments, AssAttr, Assert, Assign, AssName, AugAssign,
-    Backquote, BinOp, BoolOp, Break,
-    CallFunc, Class, Compare, Comprehension, Const, Continue,
+    Arguments, AssignAttr, Assert, Assign, AssignName, AugAssign,
+    Repr, BinOp, BoolOp, Break,
+    Call, ClassDef, Compare, Comprehension, Const, Continue,
     Decorators, DelAttr, DelName, Delete,
-    Dict, DictComp, Discard,
+    Dict, DictComp, Expr,
     Ellipsis, EmptyNode, ExceptHandler, Exec, ExtSlice,
-    For, From, Function,
-    Getattr, GenExpr, Global,
+    For, ImportFrom, FunctionDef,
+    Attribute, GeneratorExp, Global,
     If, IfExp, Import, Index,
     Keyword,
     Lambda, List, ListComp,