Tidy up naming of builtin functions