Renamed read_token_pair_t to read_token_t, same with write.
Revert "Renamed read_token_pair_t to read_token_t, same with write."

This reverts commit 7d75e43837aba1b32ea5d08c18a317111be87604.