Fixed function names that got mangled by refactor