(fix) Update for renames of Token variants.