Rename a few functions for clarity.