Removed aliases for token types