Improved function names.