Rename function names for naming consistency