make callback and bucket patterns consistent