Fix builtin name conflicts, fix Class.add_user and Class.remove_user