Remove _ from builtin names