Change bucket to Bucket (export type)