fix type name
fix scope and symbol analyzer following the change of AST