Fixed function name matching, for now.