Fixed problem with some function names