Make tasklib/database method names more consistent