More use of function name instead of hardcoding.