bucket-types vs typed-buckets, should we list both?