Updating function names, adding namespace - v2.0.1