Rename BucketClient to Bucket, and Bucket to BucketInfo.