Rename internal token notions to identifier