Renaming token scheme to separate captures and atoms