Multiple function name support, regex fixes