minor fixes to function naming