Changed name of some functions