function_hooks: clean up some naming