Renamed token class