Gave token type/tag enum a name, renamed items