Changed function names.

More descriptive function names.