Rename AST objects to match type names