Changed names of database functions