Update to latest rust and rename AST elements