Fix Token type names