fixup names in builtin module