Renaming Token to SymbolicToken and TokenId to NameId