reflect "cb" claim being renamed to "cdi"