Modified some functions name. Code refactor.