Rename curr_char to next_char