Improve function names in Database