Change more instances of `bucket_type` to `type`