Updating: renaming some cstream_tokener functions