Fix some names in builtins' [native(cls='name'] annotations