rename special tokens to typed tokens

Fixes #45