Rename some functions to coordinate with SQL statements