[cvs-nhc98] Give clearer names to some of the TokenId-building functio