Minor changes in function names