Minor changes to function names and examples