Fixing issue preventing recognition of function names containing underscores.