Updated function names.