Adjust buckets and paths. Allow either key.