Clean up function name
Rename recursive calls to avoid ('#recursive_call#' suffix)