Follow token -> token_cursor name change