Minor changes to function names