Change function names :8ball: