Change names of some functions
Correct error in non-used code