Renamed tokens for consistency. Fixed spelling errors