Improve function names.