rename function to clear its meaning
Merge rename-function branch