Updating function names and prefixes