rename hacks to builtin