Rename AST stuff for clarity