Correcting the functions names

Removing the sufix Function from function names