Changed sections to use function name if available.