Fixed function names due to rename