Refactored a few more function names.