change bucket to data set

review and merge after we've done the collectors