A few references the token terminology updated