Fix buckets namespace