renaming of AST nodes for consistency with lecture