better function_name values per github discussion