Fixing some wrong function names