Improve the function names