Remove version2 postfix from function names