Some refactoring
Rename function names
Function rename