rename db_sets consistently