Renamed some modules, added some missing builtins.