Remove puzzle from function names