standardize naming of all buckets