Rename some functions.

8 files changed