distinguish function name from resource name or parameter name
more functions recognized
fix function recognition