fixed some functions' name.