renamed token classes into less SV specific manner