Fix token field name